Changeset 2655 in josm for trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

Timestamp:

2009-12-19T10:47:49+01:00 (14 years ago)

Author:

jttt

Message:

Fixed #4161 Major slowdown in recent versions, used correct pattern for listeners realized using CopyOnWriteArrayList

File:

• trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -30 +30 @@
 import java.util.Map;
 import java.util.Set;
-import java.util.logging.Logger;
 
 import javax.swing.JComponent;
@@ -62 +61 @@
  */
 public class DrawAction extends MapMode implements MapViewPaintable, SelectionChangedListener, AWTEventListener {
-    static private final Logger logger = Logger.getLogger(DrawAction.class.getName());
+    //static private final Logger logger = Logger.getLogger(DrawAction.class.getName());
 
     final private Cursor cursorCrosshair;
@@ -70 +69 @@
     private Cursors currCursor = Cursors.crosshair;
 
-    private static Node lastUsedNode = null;
+    private Node lastUsedNode = null;
     private double PHI=Math.toRadians(90);
 
@@ -119 +118 @@
         if(currCursor.equals(c) || (!drawTargetCursor && currCursor.equals(Cursors.crosshair)))
             return;
-        try {
-            // We invoke this to prevent strange things from happening
-            EventQueue.invokeLater(new Runnable() {
-                public void run() {
-                    // Don't change cursor when mode has changed already
-                    if(!(Main.map.mapMode instanceof DrawAction))
-                        return;
-                    switch(c) {
-                    case way:
-                        Main.map.mapView.setCursor(cursorJoinWay);
-                        break;
-                    case node:
-                        Main.map.mapView.setCursor(cursorJoinNode);
-                        break;
-                    default:
-                        Main.map.mapView.setCursor(cursorCrosshair);
-                        break;
-                    }
-                }
-            });
-            currCursor = c;
-        } catch(Exception e) {}
+        // We invoke this to prevent strange things from happening
+        EventQueue.invokeLater(new Runnable() {
+            public void run() {
+                // Don't change cursor when mode has changed already
+                if(!(Main.map.mapMode instanceof DrawAction))
+                    return;
+                switch(c) {
+                case way:
+                    Main.map.mapView.setCursor(cursorJoinWay);
+                    break;
+                case node:
+                    Main.map.mapView.setCursor(cursorJoinNode);
+                    break;
+                default:
+                    Main.map.mapView.setCursor(cursorCrosshair);
+                    break;
+                }
+            }
+        });
+        currCursor = c;
     }
 
@@ -975 +972 @@
          */
         if (getCurrentDataSet() != null && getCurrentDataSet().getSelectedWays().size() > 0 && !wayIsFinished && !alt) {
-            Way w = (Way) getCurrentDataSet().getSelectedWays().iterator().next();
+            Way w = getCurrentDataSet().getSelectedWays().iterator().next();
             for (Node m : w.getNodes()) {
                 if (m.equals(mouseOnExistingNode) || mouseOnExistingWays.contains(w)) {