Changeset 8556 in josm for trunk

Timestamp:

2015-07-01T22:06:09+02:00 (9 years ago)

Author:

bastiK

Message:

applied #11636 - Moved cursor management to new class and used java library functions for the cursor stack

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• NavigatableComponent.java (modified) (4 diffs)
• util/CursorManager.java (added)

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -52 +52 @@
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
 import org.openstreetmap.josm.gui.mappaint.mapcss.MapCSSStyleSource;
+import org.openstreetmap.josm.gui.util.CursorManager;
 import org.openstreetmap.josm.tools.Predicate;
 import org.openstreetmap.josm.tools.Utils;
@@ -187 +188 @@
 
     protected transient ViewportData initialViewport;
+
+    protected transient final CursorManager cursorManager = new CursorManager(this);
 
     /**
@@ -1437 +1440 @@
     }
 
-    private static class CursorInfo {
-        private final Cursor cursor;
-        private final Object object;
-
-        public CursorInfo(Cursor c, Object o) {
-            cursor = c;
-            object = o;
-        }
-    }
-
-    private LinkedList<CursorInfo> cursors = new LinkedList<>();
-
     /**
      * Set new cursor.
      */
     public void setNewCursor(Cursor cursor, Object reference) {
-        if (!cursors.isEmpty()) {
-            CursorInfo l = cursors.getLast();
-            if (l != null && l.cursor == cursor && l.object == reference)
-                return;
-            stripCursors(reference);
-        }
-        cursors.add(new CursorInfo(cursor, reference));
-        setCursor(cursor);
+        cursorManager.setNewCursor(cursor, reference);
     }
 
@@ -1471 +1455 @@
      */
     public void resetCursor(Object reference) {
-        if (cursors.isEmpty()) {
-            setCursor(null);
-            return;
-        }
-        CursorInfo l = cursors.getLast();
-        stripCursors(reference);
-        if (l != null && l.object == reference) {
-            if (cursors.isEmpty()) {
-                setCursor(null);
-            } else {
-                setCursor(cursors.getLast().cursor);
-            }
-        }
-    }
-
-    private void stripCursors(Object reference) {
-        LinkedList<CursorInfo> c = new LinkedList<>();
-        for (CursorInfo i : cursors) {
-            if (i.object != reference) {
-                c.add(i);
-            }
-        }
-        cursors = c;
+        cursorManager.resetCursor(reference);
+    }
+
+    /**
+     * Gets the cursor manager that is used for this NavigatableComponent.
+     * @return The cursor manager.
+     */
+    public CursorManager getCursorManager() {
+        return cursorManager;
     }