Changeset 29215 in osm for applications/editors/josm/plugins/smed2/src/s57

Timestamp:

2013-01-29T21:49:08+01:00 (12 years ago)

Author:

malcolmh

Message:

save

Location:

applications/editors/josm/plugins/smed2/src/s57

Files:

• S57att.java (modified) (1 diff)
• S57dat.java (modified) (6 diffs)
• S57obj.java (modified) (2 diffs)

applications/editors/josm/plugins/smed2/src/s57/S57att.java

@@ -246 +246 @@
         
         public static Att enumAttribute(String attribute, Obj obj) {    // Convert OSeaM attribute string to OSeaM enumeration
-          if ((attribute != null) && (attribute.length() > 0)) {
+          if ((attribute != null) && !attribute.isEmpty()) {
             for (Att att : AttStr.keySet()) {
               if (AttStr.get(att).equals(attribute) && (verifyAttribute(obj, att) != Ver.NON ))

applications/editors/josm/plugins/smed2/src/s57/S57dat.java

@@ -7 +7 @@
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.io.IOException;
 
@@ -66 +66 @@
         private File importFile;
         private FileInputStream inp;
+        private File exportFile;
+        private FileOutputStream outp;
         private OsmDataLayer layer;
         private DataSet data;
@@ -74 +76 @@
                         if (e.getSource() == importButton) {
                                 readFile();
-                    Smed2Action.panelS57.setVisible(false);
-                    Smed2Action.panelMain.setVisible(true);
+                    Smed2Action.panelS57.setVisible(true);
+                    Smed2Action.panelMain.setVisible(false);
         PanelMain.messageBar.setText("File imported");
+      }
+                }
+        };
+        private JButton exportButton;
+        private ActionListener alExport = new ActionListener() {
+                public void actionPerformed(java.awt.event.ActionEvent e) {
+                        if (e.getSource() == exportButton) {
+                                writeFile();
+                    Smed2Action.panelS57.setVisible(true);
+                    Smed2Action.panelMain.setVisible(false);
+        PanelMain.messageBar.setText("File exported");
       }
                 }
@@ -89 +102 @@
                     Smed2Action.panelS57.setVisible(false);
                     Smed2Action.panelMain.setVisible(true);
-        PanelMain.messageBar.setText("Import cancelled");
+        PanelMain.messageBar.setText("Operation cancelled");
       }
                 }
@@ -108 +121 @@
                 importButton.addActionListener(alImport);
                 add(importButton);
+                exportButton = new JButton();
+                exportButton.setBounds(370, 430, 100, 20);
+                exportButton.setText(tr("Export"));
+                exportButton.addActionListener(alExport);
+                add(exportButton);
         }
 
@@ -120 +138 @@
     Smed2Action.panelMain.setVisible(false);
     Smed2Action.panelS57.setVisible(true);
+        }
+
+        public void startExport(File file) {
+                exportFile = file;
+                try {
+                        outp = new FileOutputStream(file);
+                } catch (IOException e) {
+      PanelMain.messageBar.setText("Failed to open file");
+                        return;
+                }
+    Smed2Action.panelMain.setVisible(false);
+    Smed2Action.panelS57.setVisible(true);
+        }
+
+        private void writeFile() {
         }
 

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

@@ -150 +150 @@
         static {
                 for (Map.Entry<Obj, String> entry : ObjStr.entrySet()) {
-                        StrObj.put(entry.getValue(), entry.getKey());
+                        if (!entry.getValue().isEmpty())
+                                StrObj.put(entry.getValue(), entry.getKey());
                 }
         }
@@ -173 +174 @@
 
         public static Obj enumType(String type) { // Convert OSeaM object string to OSeaM object enumeration
-                if (StrObj.containsKey(type))
+                if ((type != null) && !type.isEmpty() && (StrObj.containsKey(type)))
                         return StrObj.get(type);
                 else