Changeset 28722 in osm for applications/editors/josm

Timestamp:

2012-09-21T19:52:00+02:00 (12 years ago)

Author:

malcolmh

Message:

save

Location:

applications/editors/josm/plugins/smed2

Files:

• build.xml (modified) (1 diff)
• src/S57/S57dat.java (added)
• src/S57/S57obj.java (modified) (1 diff)
• src/S57/S57val.java (modified) (1 diff)
• src/images (added)
• src/images/fileButton.png (added)
• src/images/fileButton.svg (added)
• src/panels/PanelMain.java (modified) (3 diffs)
• src/smed2/Smed2Action.java (modified) (2 diffs)

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

@@ -71 +71 @@
         <copy todir="${plugin.build.dir}/resources">
             <fileset dir="resources"/>
+        </copy>
+        <copy todir="${plugin.build.dir}/images">
+            <fileset dir="${plugin.src.dir}/images"/>
         </copy>
         <copy todir="${plugin.build.dir}/images">

applications/editors/josm/plugins/smed2/src/S57/S57obj.java

@@ -79 +79 @@
         private static final EnumMap<Obj, String> ObjSTR = new EnumMap<Obj, String>(Obj.class);
         static {
-                ObjSTR.put(Obj.UNKOBJ, "");     ObjSTR.put(Obj.ADMARE, "administration");       ObjSTR.put(Obj.AIRARE, "airfield");     ObjSTR.put(Obj.ACHBRT, "anchor_berth");
+                ObjSTR.put(Obj.UNKOBJ, "");     ObjSTR.put(Obj.ADMARE, "administrative_area");  ObjSTR.put(Obj.AIRARE, "airfield");     ObjSTR.put(Obj.ACHBRT, "anchor_berth");
                 ObjSTR.put(Obj.ACHARE, "anchorage"); ObjSTR.put(Obj.BCNCAR, "beacon_cardinal"); ObjSTR.put(Obj.BCNISD, "beacon_isolated_danger");
                 ObjSTR.put(Obj.BCNLAT, "beacon_lateral");       ObjSTR.put(Obj.BCNSAW, "beacon_safe_water"); ObjSTR.put(Obj.BCNSPP, "beacon_special_purpose");

applications/editors/josm/plugins/smed2/src/S57/S57val.java

@@ -62 +62 @@
         private static final EnumMap<CatACH, S57enum> Catach = new EnumMap<CatACH, S57enum>(CatACH.class); static {Catach.put(CatACH.ACH_UNKN, new S57enum(0, ""));
                 Catach.put(CatACH.ACH_UNRD, new S57enum(1, "unrestricted")); Catach.put(CatACH.ACH_DEEP, new S57enum(2, "deep_water")); Catach.put(CatACH.ACH_TANK, new S57enum(3, "tanker"));
-                Catach.put(CatACH.ACH_EXPL, new S57enum(4, "explosives")); Catach.put(CatACH.ACH_QUAR, new S57enum(5, "quarantine")); Catach.put(CatACH.ACH_SEAP, new S57enum(6, "sea-plane"));
+                Catach.put(CatACH.ACH_EXPL, new S57enum(4, "explosives")); Catach.put(CatACH.ACH_QUAR, new S57enum(5, "quarantine")); Catach.put(CatACH.ACH_SEAP, new S57enum(6, "seaplane"));
                 Catach.put(CatACH.ACH_SMCF, new S57enum(7, "small_craft")); Catach.put(CatACH.ACH_SMCM, new S57enum(8, "small_craft_mooring")); Catach.put(CatACH.ACH_H24P, new S57enum(9, "24_hour"));
                 Catach.put(CatACH.ACH_LTPD, new S57enum(10, "limited_period")); Catach.put(CatACH.ACH_NPSH, new S57enum(11, "non_pushing")); Catach.put(CatACH.ACH_DRYC, new S57enum(12, "dry_cargo"));

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

@@ -7 +7 @@
 import java.awt.Rectangle;
 import java.awt.event.ActionListener;
+import java.io.File;
 
 import javax.swing.*;
+
+import org.openstreetmap.josm.Main;
+
+import S57.S57dat;
 
 public class PanelMain extends JPanel {
@@ -21 +26 @@
                 public void actionPerformed(java.awt.event.ActionEvent e) {
 //                      item.saveSign(???);
+                }
+        };
+        public JButton openButton = null;
+        final JFileChooser fc = new JFileChooser();
+        private ActionListener alOpen = new ActionListener() {
+                public void actionPerformed(java.awt.event.ActionEvent e) {
+                        if (e.getSource() == openButton) {
+        int returnVal = fc.showOpenDialog(Main.parent);
+        if (returnVal == JFileChooser.APPROVE_OPTION) {
+            new S57dat(fc.getSelectedFile());
+            messageBar.setText("Opening file");
+        }
+      }
                 }
         };
@@ -37 +55 @@
                 
     messageBar = new JTextField();
-    messageBar.setBounds(new Rectangle(10, 430, 350, 20));
+    messageBar.setBounds(new Rectangle(40, 430, 320, 20));
     messageBar.setEditable(false);
     messageBar.setBackground(Color.WHITE);
     add(messageBar);
+                openButton = new JButton(new ImageIcon(getClass().getResource("/images/fileButton.png")));
+                openButton.setBounds(new Rectangle(10, 430, 20, 20));
+                add(openButton);
+                openButton.addActionListener(alOpen);
                 saveButton = new JButton();
                 saveButton.setBounds(new Rectangle(370, 430, 100, 20));

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

@@ -1 +1 @@
 package smed2;
 
+import java.awt.Dialog;
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
@@ -52 +53 @@
                 });
                 frame.setSize(new Dimension(480, 480));
+                frame.setLocation(100, 200);
+                frame.setAlwaysOnTop(true);
                 frame.setVisible(true);
                 panelMain = new PanelMain();