Changeset 29930 in osm for applications/editors/josm/plugins

Timestamp:

2013-09-18T21:26:49+02:00 (11 years ago)

Author:

donvip

Message:

[josm_namemanager] fix #josm9073 - NPE

Location:

applications/editors/josm/plugins/namemanager

Files:

• .classpath (modified) (1 diff)
• .settings (added)
• .settings/org.eclipse.jdt.core.prefs (added)
• README.template (deleted)
• src/org/openstreetmap/josm/plugins/namemanager/listeners/NameManagerAction.java (modified) (1 diff)

applications/editors/josm/plugins/namemanager/.classpath

@@ -3 +3 @@
         <classpathentry kind="src" path="src"/>
         <classpathentry kind="src" path="resources"/>
-        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
         <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
         <classpathentry kind="output" path="bin"/>

applications/editors/josm/plugins/namemanager/src/org/openstreetmap/josm/plugins/namemanager/listeners/NameManagerAction.java

@@ -70 +70 @@
     @Override
     public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
-        setEnabled(newSelection != null
-                && Main.main.getCurrentDataSet().getSelectedWays().size() == 1
-                && Main.main.getCurrentDataSet().getSelectedWays().iterator().next().firstNode() == Main.main.getCurrentDataSet()
-                        .getSelectedWays().iterator().next().lastNode());
+        boolean enabledState = false;
+        DataSet ds = Main.main.getCurrentDataSet();
+        if (newSelection != null && ds != null) {
+            Collection<Way> selectedWays = ds.getSelectedWays();
+            enabledState = selectedWays.size() == 1 && selectedWays.iterator().next().isClosed();
+        }
+        setEnabled(enabledState);
     }
 }