Changeset 28938 in osm for applications/editors/josm/plugins/smed2/src/panels/PanelMain.java

Timestamp:

2012-11-15T19:05:19+01:00 (12 years ago)

Author:

malcolmh

Message:

save

File:

• applications/editors/josm/plugins/smed2/src/panels/PanelMain.java (modified) (3 diffs)

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 smed2.Smed2Action;
 
 import S57.S57dat;
@@ -28 +29 @@
                 }
         };
-        public JButton openButton = null;
+        private 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) {
+        messageBar.setText("Select file");
         int returnVal = fc.showOpenDialog(Main.parent);
         if (returnVal == JFileChooser.APPROVE_OPTION) {
-            new S57dat(fc.getSelectedFile());
-            messageBar.setText("Opening file");
-        }
+          Smed2Action.panelS57.startImport(fc.getSelectedFile());
+         } else {
+           messageBar.setText("");
+         }
       }
                 }
@@ -55 +58 @@
                 
     messageBar = new JTextField();
-    messageBar.setBounds(new Rectangle(40, 430, 320, 20));
+    messageBar.setBounds(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));
+                openButton.setBounds(10, 430, 20, 20);
                 add(openButton);
                 openButton.addActionListener(alOpen);
                 saveButton = new JButton();
-                saveButton.setBounds(new Rectangle(370, 430, 100, 20));
+                saveButton.setBounds(370, 430, 100, 20);
                 saveButton.setText(tr("Save"));
                 add(saveButton);