Changeset 29423 in osm for applications/editors/josm/plugins/smed/plugs

Timestamp:

2013-03-29T11:01:50+01:00 (12 years ago)

Author:

malcolmh

Message:

all primitives

Location:

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam

Files:

• dialogs/OSeaMAction.java (modified) (1 diff)
• msg/messages.properties (modified) (1 diff)
• msg/messages_de.properties (modified) (1 diff)
• msg/messages_en.properties (modified) (1 diff)
• seamarks/SeaMark.java (modified) (3 diffs)

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/dialogs/OSeaMAction.java

@@ -21 +21 @@
         public PanelMain panelMain = null;
 
-        public Node node = null;
+        public OsmPrimitive node = null;
         private Collection<? extends OsmPrimitive> Selection = null;
 
         public SelectionChangedListener SmpListener = new SelectionChangedListener() {
                 public void selectionChanged(Collection<? extends OsmPrimitive> newSelection) {
-                        Node nextNode = null;
+                        OsmPrimitive nextNode = null;
                         Selection = newSelection;
 
                         for (OsmPrimitive osm : Selection) {
-                                if (osm instanceof Node) {
-                                        nextNode = (Node) osm;
-                                        if (Selection.size() == 1) {
-                                                if (nextNode.compareTo(node) != 0) {
-                                                        node = nextNode;
-                                                        panelMain.mark.parseMark(node);
-                                                }
-                                        } else {
-                                                node = null;
-                                                panelMain.mark.clrMark();
-                                                manager.showVisualMessage(Messages.getString("OneNode"));
+                                nextNode = (OsmPrimitive) osm;
+                                if (Selection.size() == 1) {
+                                        if (nextNode.compareTo(node) != 0) {
+                                                node = nextNode;
+                                                panelMain.mark.parseMark(node);
                                         }
+                                } else {
+                                        node = null;
+                                        panelMain.mark.clrMark();
+                                        manager.showVisualMessage(Messages.getString("OneNode"));
                                 }
                         }

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages.properties

@@ -65 +65 @@
 CircleDay=Circular daymark
 
-SelectNode=Please select a node
-OneNode=Please select only one node
-NoMark=No seamark recognised at this node
+SelectNode=Please select a feature
+OneNode=Please select only one feature
+NoMark=No seamark recognised on this feature
 
 NoChar=No character

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_de.properties

@@ -65 +65 @@
 CircleDay=Kreis Tagzeichen
 
-SelectNode=Bitte einen Knoten auswählen
-OneNode=Bitte nur einen Knoten auswählen
-NoMark=Knoten nicht als Seezeichen identifiziert
+SelectNode=Bitte einen Kartenobjekt auswählen
+OneNode=Bitte nur einen Kartenobjekt auswählen
+NoMark=Kartenobjekt nicht als Seezeichen identifiziert
 
 NoChar=Keinen Charakter

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/msg/messages_en.properties

@@ -65 +65 @@
 CircleDay=Circular daymark
 
-SelectNode=Please select a node
-OneNode=Please select only one node
-NoMark=No seamark recognised at this node
+SelectNode=Please select a feature
+OneNode=Please select only one feature
+NoMark=No seamark recognised on this feature
 
 NoChar=No character

applications/editors/josm/plugins/smed/plugs/oseam/src/oseam/seamarks/SeaMark.java

@@ -9 +9 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.*;
 import org.openstreetmap.josm.command.ChangePropertyCommand;
 
@@ -1396 +1396 @@
         }
 
-        public void parseMark(Node node) {
+        public void parseMark(OsmPrimitive node) {
                 dlg.manager.showVisualMessage("");
                 String str = Main.pref.get("smedplugin.IALA");
@@ -2536 +2536 @@
         }
 
-        public void saveSign(Node node) {
+        public void saveSign(OsmPrimitive node) {
                 
                 if (getObject() != Obj.UNKOBJ) {