Changeset 29996 in osm for applications/editors/josm

Timestamp:

2013-10-06T03:09:03+02:00 (11 years ago)

Author:

malcolmh

Message:

save

Location:

applications/editors/josm/plugins/smed2

Files:

• build.xml (modified) (1 diff)
• src/messages (added)
• src/messages/Messages.java (added)
• src/messages/msg (added)
• src/messages/msg/messages.properties (added)
• src/messages/msg/messages_de.properties (added)
• src/messages/msg/messages_en.properties (added)
• src/panels/PanelMain.java (modified) (5 diffs)
• src/smed2/S57en.java (deleted)
• src/smed2/Smed2Action.java (modified) (3 diffs)

applications/editors/josm/plugins/smed2/build.xml

@@ -77 +77 @@
         <copy todir="${plugin.build.dir}/images">
             <fileset dir="images"/>
+        </copy>
+        <copy todir="${plugin.build.dir}/msg">
+            <fileset dir="${plugin.src.dir}/messages/msg"/>
         </copy>
         <copy todir="${plugin.build.dir}/data">

applications/editors/josm/plugins/smed2/src/panels/PanelMain.java

@@ -12 +12 @@
 import javax.swing.*;
 
+import messages.Messages;
+
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
 
 import s57.S57att.Att;
 import s57.S57obj.Obj;
-import s57.S57val;
-import seamap.SeaMap;
 import seamap.SeaMap.*;
 import smed2.S57en;
@@ -96 +95 @@
         public void parseMark(Feature feature) {
                 decode.setText("Selected feature:\n");
-                decode.append("\tType: " + S57en.ObjEN.get(feature.type) + "\n");
+                decode.append("\t" + tr("Type") + ": " + Messages.getString(feature.type.name()) + "\n");
                 if (feature.atts.get(Att.OBJNAM) != null) {
-                        decode.append("\tName: " + feature.atts.get(Att.OBJNAM).val + "\n");
+                        decode.append("\t" + tr("Name") + ": " + feature.atts.get(Att.OBJNAM).val + "\n");
                 }
                 decode.append("\tObjects:\n");
                 for (Obj obj : feature.objs.keySet()) {
-                        decode.append("\t\t" + S57en.ObjEN.get(obj) + "\n");
+                        decode.append("\t\t" + Messages.getString(obj.name()) + "\n");
                         if (feature.objs.get(obj).size() != 0) {
                                 for (AttMap atts : feature.objs.get(obj).values()) {
@@ -109 +108 @@
                                                 switch (item.conv) {
                                                 case E:
-                                                        decode.append("\t\t\t" + S57en.AttEN.get(att) + ": " + S57en.enums.get(att).get(item.val) + "\n");
+                                                        decode.append("\t\t\t" + Messages.getString(att.name()) + ": " + S57en.enums.get(att).get(item.val) + "\n");
                                                         break;
                                                 case L:
-                                                        decode.append("\t\t\t" + S57en.AttEN.get(att) + ": ");
+                                                        decode.append("\t\t\t" + Messages.getString(att.name()) + ": ");
                                                         Iterator it = ((ArrayList)item.val).iterator();
                                                         while (it.hasNext()) {
@@ -124 +123 @@
                                                         break;
                                                 default:
-                                                        decode.append("\t\t\t" + S57en.AttEN.get(att) + ": " + item.val + "\n");
+                                                        decode.append("\t\t\t" + Messages.getString(att.name()) + ": " + item.val + "\n");
                                                 }
                                         }
@@ -130 +129 @@
                         }
                 }
+        }
+        
+        public void clearMark() {
+                decode.setText(tr("No feature selected"));
         }
         

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

@@ -18 +18 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+import messages.Messages;
+
 import org.openstreetmap.josm.actions.JosmAction;
 import org.openstreetmap.josm.gui.MapView;
@@ -125 +127 @@
                 editFrame.add(panelS57);
 
-                showFrame = new ShowFrame("Seamark Inspector");
+                showFrame = new ShowFrame(tr("Seamark Inspector"));
                 showFrame.setSize(new Dimension(300, 300));
                 Rectangle rect = Main.map.mapView.getBounds();
@@ -187 +189 @@
                                 } else {
                                         showFrame.setVisible(false);
+                                        PanelMain.messageBar.setText(tr("Select only one feature"));
                                 }
                         }
                 if (nextFeature == null) {
                         feature = null;
+                        panelMain.clearMark();
+                        PanelMain.messageBar.setText(tr("Select a map feature"));
                 }
         }