Changeset 4143 in josm for trunk/src/org

Timestamp:

2011-06-19T00:18:54+02:00 (13 years ago)

Author:

stoecker

Message:

fix #6463 - fix NPE, remove some of the new toolbar warnings for image menu

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• ImageryMenu.java (modified) (3 diffs)
• layer/GpxLayer.java (modified) (1 diff)

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

@@ -68 +68 @@
     JMenuItem singleOffset = new JMenuItem(offsetAction);
     JMenuItem offsetMenuItem = singleOffset;
+    Map_Rectifier_WMSmenuAction rectaction = new Map_Rectifier_WMSmenuAction();
+    JosmAction blankmenu = new JosmAction(
+            tr("Blank Layer"), "blankmenu", tr("Open a blank WMS layer to load data from a file"), null, false) {
+        @Override
+        public void actionPerformed(ActionEvent ev) {
+            if (!isEnabled()) return;
+            Main.main.addLayer(new WMSLayer());
+        }
+
+        @Override
+        protected void updateEnabledState() {
+            setEnabled(Main.map != null && Main.map.mapView != null && !Main.map.mapView.getAllLayers().isEmpty());
+        }
+    };
     int offsPos;
 
@@ -83 +97 @@
         }
         addSeparator();
-        add(new JMenuItem(new Map_Rectifier_WMSmenuAction()));
+        add(new JMenuItem(rectaction));
 
         addSeparator();
@@ -89 +103 @@
         add(offsetMenuItem);
         addSeparator();
-        add(new JMenuItem(new JosmAction(
-                tr("Blank Layer"), "blankmenu", tr("Open a blank WMS layer to load data from a file"), null, false) {
-            @Override
-            public void actionPerformed(ActionEvent ev) {
-                if (!isEnabled()) return;
-                Main.main.addLayer(new WMSLayer());
-            }
-
-            @Override
-            protected void updateEnabledState() {
-                setEnabled(Main.map != null && Main.map.mapView != null && !Main.map.mapView.getAllLayers().isEmpty());
-            }
-        }));
+        add(new JMenuItem(blankmenu));
     }
 

trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -462 +462 @@
 
         LinkedList<WayPoint> visibleSegments = new LinkedList<WayPoint>();
+        WayPoint last = null;
         for (GpxTrack trk: data.tracks) {
             for (GpxTrackSegment trkSeg: trk.getSegments()) {
-                WayPoint last = null;
                 for(WayPoint pt : trkSeg.getWayPoints())
                 {