Changeset 693 in josm for trunk

Timestamp:

2008-07-09T11:40:18+02:00 (16 years ago)

Author:

stoecker

Message:

Save dialog now distinguish between OSM and GPX. Saving OSM layer as GPX is still possible. Closes #836

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• DiskAccessAction.java (modified) (1 diff)
• GpxExportAction.java (modified) (1 diff)
• HelpAction.java (modified) (5 diffs)
• OpenAction.java (modified) (1 diff)
• SaveAction.java (modified) (1 diff)
• SaveActionBase.java (modified) (2 diffs)
• SaveAsAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/DiskAccessAction.java

@@ -20 +20 @@
         }
         
-        protected static JFileChooser createAndOpenFileChooser(boolean open, boolean multiple) {
+        protected static JFileChooser createAndOpenFileChooser(boolean open, boolean multiple, String title) {
                 String curDir = Main.pref.get("lastDirectory");
                 if (curDir.equals(""))
                         curDir = ".";
                 JFileChooser fc = new JFileChooser(new File(curDir));
+                if(title != null)
+                        fc.setDialogTitle(title);
+
                 fc.setMultiSelectionEnabled(multiple);
                 for (int i = 0; i < ExtensionFileFilter.filters.length; ++i)

trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java

@@ -55 +55 @@
                 }
 
-                JFileChooser fc = createAndOpenFileChooser(false, false);
+                JFileChooser fc = createAndOpenFileChooser(false, false, null);
                 if (fc == null)
                         return;

trunk/src/org/openstreetmap/josm/actions/HelpAction.java

@@ -46 +46 @@
     }
 
-        private JFrame helpBrowser = new JFrame("JOSM Online Help");
+        private JFrame helpBrowser = new JFrame(tr("JOSM Online Help"));
         private String baseurl = Main.pref.get("help.baseurl", "http://josm.openstreetmap.de");
         private JEditorPane help = new JEditorPane();
@@ -82 +82 @@
                 JPanel buttons = new JPanel();
                 p.add(buttons, BorderLayout.SOUTH);
-                createButton(buttons, "Open in Browser");
-                createButton(buttons, "Edit");
-                createButton(buttons, "Reload");
+                createButton(buttons, tr("Open in Browser"));
+                createButton(buttons, tr("Edit"));
+                createButton(buttons, tr("Reload"));
 
                 helpBrowser.addWindowListener(new WindowAdapter(){
@@ -101 +101 @@
 
         public void actionPerformed(ActionEvent e) {
-                if ("Open in Browser".equals(e.getActionCommand())) {
+                if (tr("Open in Browser").equals(e.getActionCommand())) {
                         OpenBrowser.displayUrl(url);
-                } else if ("Edit".equals(e.getActionCommand())) {
+                } else if (tr("Edit").equals(e.getActionCommand())) {
                         if (!url.startsWith(baseurl)) {
                                 JOptionPane.showMessageDialog(Main.parent, tr("Can only edit help pages from JOSM Online Help"));
@@ -109 +109 @@
                         }
                         OpenBrowser.displayUrl(url+"?action=edit");
-                } else if ("Reload".equals(e.getActionCommand())) {
+                } else if (tr("Reload").equals(e.getActionCommand())) {
                         setHelpUrl(url);
                 } else if (e.getActionCommand() == null) {
@@ -166 +166 @@
                         help.read(new StringReader(reader.read(url)), help.getEditorKit().createDefaultDocument());
         } catch (IOException e) {
-                help.setText("Error while loading page "+url);
+                help.setText(tr("Error while loading page {0}",url));
         }
                 helpBrowser.setVisible(true);

trunk/src/org/openstreetmap/josm/actions/OpenAction.java

@@ -41 +41 @@
 
         public void actionPerformed(ActionEvent e) {
-                JFileChooser fc = createAndOpenFileChooser(true, true);
+                JFileChooser fc = createAndOpenFileChooser(true, true, null);
                 if (fc == null)
                         return;

trunk/src/org/openstreetmap/josm/actions/SaveAction.java

@@ -40 +40 @@
                         }
                 }
-                return openFileDialog();
+                return openFileDialog(layer);
         }
 }

trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java

@@ -87 +87 @@
         }
 
-        public static File openFileDialog() {
-                JFileChooser fc = createAndOpenFileChooser(false, false);
+        public static File openFileDialog(Layer layer) {
+                JFileChooser fc = createAndOpenFileChooser(false, false, layer instanceof GpxLayer ? tr("Save GPX file") : tr("Save OSM file"));
                 if (fc == null)
                         return null;
@@ -99 +99 @@
                         if (ff instanceof ExtensionFileFilter)
                                 fn += "." + ((ExtensionFileFilter)ff).defaultExtension;
+                        else if (layer instanceof GpxLayer)
+                                fn += ".gpx";
                         else
                                 fn += ".osm";

trunk/src/org/openstreetmap/josm/actions/SaveAsAction.java

@@ -26 +26 @@
         
         @Override protected File getFile(Layer layer) {
-                return openFileDialog();
+                return openFileDialog(layer);
         }
 }