Changeset 5572 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2012-11-08T18:40:06+01:00 (11 years ago)

Author:

bastiK

Message:

fixed #8184 - Map paint settings: wrong file filter for adding local style files

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/preferences/SourceEditor.java (modified) (4 diffs)
• gui/util/FileFilterAllFiles.java (added)
• gui/widgets/JFileChooserManager.java (modified) (2 diffs)
• io/session/SessionReader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

@@ -27 +27 @@
 import java.net.URL;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
@@ -66 +67 @@
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
+import javax.swing.filechooser.FileFilter;
 import javax.swing.table.AbstractTableModel;
 import javax.swing.table.DefaultTableCellRenderer;
@@ -72 +74 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.ExtensionFileFilter;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
+import org.openstreetmap.josm.gui.util.FileFilterAllFiles;
 import org.openstreetmap.josm.gui.widgets.JFileChooserManager;
 import org.openstreetmap.josm.io.MirroredInputStream;
@@ -752 +756 @@
 
             public void actionPerformed(ActionEvent e) {
-                JFileChooserManager fcm = new JFileChooserManager(true).createFileChooser();
+                FileFilter ff;
+                if (isMapPaint) {
+                    ff = new ExtensionFileFilter("xml,mapcss,css", "xml", tr("Map paint style file (*.xml, *.mapcss)"));
+                } else {
+                    ff = new ExtensionFileFilter("xml", "xml", tr("Preset definition file (*.xml)"));
+                }
+                JFileChooserManager fcm = new JFileChooserManager(true)
+                        .createFileChooser(true, null, Arrays.asList(ff, FileFilterAllFiles.getInstance()), ff, JFileChooser.FILES_ONLY);
                 prepareFileChooser(tfURL.getText(), fcm.getFileChooser());
                 JFileChooser fc = fcm.openFileChooser(JOptionPane.getFrameForComponent(SourceEditor.this));

trunk/src/org/openstreetmap/josm/gui/widgets/JFileChooserManager.java

@@ -42 +42 @@
      * @param open If true, "Open File" dialogs will be created. If false, "Save File" dialogs will be created.
      * @param lastDirProperty The name of the property used to get the last directory. This directory is used to initialize the JFileChooser. 
-     *                        Then, if the user effetively choses a file or a directory, this property will be updated to the directory path.
+     *                        Then, if the user effectively chooses a file or a directory, this property will be updated to the directory path.
      * @see #createFileChooser
      */
@@ -53 +53 @@
      * @param open If true, "Open File" dialogs will be created. If false, "Save File" dialogs will be created.
      * @param lastDirProperty The name of the property used to get the last directory. This directory is used to initialize the JFileChooser. 
-     *                        Then, if the user effetively choses a file or a directory, this property will be updated to the directory path.
+     *                        Then, if the user effectively chooses a file or a directory, this property will be updated to the directory path.
      * @param defaultDir The default directory used to initialize the JFileChooser if the {@code lastDirProperty} property value is missing. 
      * @see #createFileChooser

trunk/src/org/openstreetmap/josm/io/session/SessionReader.java

@@ -18 +18 @@
 import java.util.Enumeration;
 import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;