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

Timestamp:

2013-10-12T13:30:42+02:00 (11 years ago)

Author:

malcolmh

Message:

save

File:

• applications/editors/josm/plugins/smed2/src/smed2/Smed2Action.java (modified) (3 diffs)

applications/editors/josm/plugins/smed2/src/smed2/Smed2Action.java

@@ -31 +31 @@
 import s57.S57dat;
 import seamap.SeaMap;
+import seamap.SeaMap.*;
 
 import panels.PanelMain;
@@ -37 +38 @@
 public class Smed2Action extends JosmAction implements EditLayerChangeListener, SelectionChangedListener {
 
+        private static final long serialVersionUID = 1L;
         private static String editor = tr("SeaMap Editor");
         public static JFrame editFrame = null;
@@ -176 +178 @@
                 OsmPrimitive feature = null;
 
-                if (selection.size() == 0) showFrame.setVisible(false);
+                showFrame.setVisible(false);
+                panelMain.clearMark();
                 for (OsmPrimitive osm : selection) {
-                                nextFeature = osm;
-                                if (selection.size() == 1) {
-                                        if (nextFeature.compareTo(feature) != 0) {
-                                                feature = nextFeature;
-//                                              panelMain.parseMark(map.index.get(feature.getUniqueId()));
-//                                              showFrame.setVisible(true);
-//                                              showFrame.showFeature(feature, map);
+                        nextFeature = osm;
+                        if (selection.size() == 1) {
+                                if (nextFeature.compareTo(feature) != 0) {
+                                        feature = nextFeature;
+                                        Feature id = map.index.get(feature.getUniqueId());
+                                        if (id != null) {
+                                                panelMain.parseMark(id);
+                                                showFrame.setVisible(true);
+                                                showFrame.showFeature(feature, map);
                                         }
-                                } else {
-                                        showFrame.setVisible(false);
-                                        PanelMain.messageBar.setText(tr("Select only one feature"));
-                                }
-                        }
+                                }
+                        } else {
+                                showFrame.setVisible(false);
+                                PanelMain.messageBar.setText(tr("Select only one feature"));
+                        }
+                }
                 if (nextFeature == null) {
                         feature = null;