Changeset 1430 in josm for trunk/src

Timestamp:

2009-02-19T18:30:44+01:00 (16 years ago)

Author:

stoecker

Message:

fixed #2168. patch by xeen

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/mapmode/DrawAction.java (modified) (2 diffs)
• gui/NavigatableComponent.java (modified) (2 diffs)

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

@@ -215 +215 @@
      */
     public void eventDispatched(AWTEvent event) {
-        if(!Main.map.mapView.isDrawableLayer())
+        if(Main.map == null ||Main.map.mapView == null || !Main.map.mapView.isDrawableLayer())
             return;
         InputEvent e = (InputEvent) event;
@@ -532 +532 @@
             return;
         }
-
+        
         double distance = -1;
         double angle = -1;

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

@@ -4 +4 @@
 
 import java.awt.Point;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
 import java.util.TreeMap;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.LinkedList;
 
 import javax.swing.JComponent;
@@ -46 +46 @@
      * Center n/e coordinate of the desired screen center.
      */
-    protected EastNorth center;
+    protected EastNorth center = new EastNorth(0, 0);
 
     public NavigatableComponent() {