Changeset 29787 in osm for applications/editors/josm/plugins/smed2/src/smed2

Timestamp:

2013-07-29T13:53:22+02:00 (11 years ago)

Author:

malcolmh

Message:

save

File:

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

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

@@ -172 +172 @@
         @Override
         public void selectionChanged(Collection<? extends OsmPrimitive> selection) {
-                Node nextNode = null;
-                Node node = null;
-                Way nextWay = null;
-                Way way = null;
+                OsmPrimitive nextFeature = null;
+                OsmPrimitive feature = null;
 
                 if (selection.size() == 0) showFrame.setVisible(false);
                 for (OsmPrimitive osm : selection) {
-                        if (osm instanceof Node) {
-                                nextNode = (Node) osm;
+                                nextFeature = osm;
                                 if (selection.size() == 1) {
-                                        if (nextNode.compareTo(node) != 0) {
-                                                node = nextNode;
+                                        if (nextFeature.compareTo(feature) != 0) {
+                                                feature = nextFeature;
 //                                              showFrame.setVisible(true);
-                                                showFrame.showFeature(node, map);
+                                                showFrame.showFeature(feature, map);
                                         }
                                 } else {
@@ -191 +188 @@
                                 }
                         }
-                        else if (osm instanceof Way) {
-                                nextWay = (Way) osm;
-                                if (selection.size() == 1) {
-                                        if (nextWay.compareTo(way) != 0) {
-                                                way = nextWay;
-//                                              showFrame.setVisible(true);
-                                                showFrame.showFeature(way, map);
-                                        }
-                                } else {
-                                        showFrame.setVisible(false);
-                                }
-                        }
-                }
-                if (nextNode == null) {
-                        node = null;
+                if (nextFeature == null) {
+                        feature = null;
                 }
         }