Ticket #2168: Fix Exception.patch

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

@@ -214 +214 @@
      * redraw to (possibly) get rid of helper line if selection changes.
      */
     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;
         ctrl = (e.getModifiers() & ActionEvent.CTRL_MASK) != 0;
@@ -531 +531 @@
             currentBaseNode = null;
             return;
         }
-
+        
         double distance = -1;
         double angle = -1;
 

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

@@ -3 +3 @@
 package org.openstreetmap.josm.gui;
 
 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;
 
@@ -45 +45 @@
     /**
      * Center n/e coordinate of the desired screen center.
      */
-    protected EastNorth center;
+    protected EastNorth center = new EastNorth(0, 0);
 
     public NavigatableComponent() {
         setLayout(null);