Changeset 205 in josm

Timestamp:

2007-04-03T13:49:40+02:00 (17 years ago)

Author:

imi

Message:

• added "addToggleDialog" to MapFrame to give plugins the chance of providing new toggle dialogs
• fixed display of <different> in the property dialog when selecting different non-empty values
• fixed the preferences directory under Windows (JOSM now uses environment variable APPDATA)
• added LiveGPS plugin to exception detection heuristic

Location:

src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (1 diff)
• gui/MainApplication.java (modified) (3 diffs)
• gui/MapFrame.java (modified) (4 diffs)
• gui/dialogs/PropertiesDialog.java (modified) (1 diff)
• tools/BugReportExceptionHandler.java (modified) (2 diffs)

src/org/openstreetmap/josm/data/Preferences.java

@@ -61 +61 @@
          */
         public String getPreferencesDir() {
+                if (System.getenv("APPDATA") != null)
+                        return System.getenv("APPDATA")+"/JOSM/";
                 return System.getProperty("user.home")+"/.josm/";
         }

src/org/openstreetmap/josm/gui/MainApplication.java

@@ -84 +84 @@
                 // get the preferences.
                 final File prefDir = new File(Main.pref.getPreferencesDir());
+
+                // check if preferences directory has moved (TODO: Update code. Remove this after some time)
+                File oldPrefDir = new File(System.getProperty("user.home")+"/.josm");
+                if (!prefDir.isDirectory() && oldPrefDir.isDirectory()) {
+                        if (oldPrefDir.renameTo(prefDir)) {
+                                // do not translate this
+                                JOptionPane.showMessageDialog(null, "The preference directory has been moved to "+prefDir);
+                        } else {
+                                JOptionPane.showMessageDialog(null, "The preference directory location has changed. Please move "+oldPrefDir+" to "+prefDir);
+                        }
+                }
+
                 if (prefDir.exists() && !prefDir.isDirectory()) {
                         JOptionPane.showMessageDialog(null, "Cannot open preferences directory: "+Main.pref.getPreferencesDir());
@@ -105 +117 @@
                 if (args.containsKey("default-classloader"))
                         PluginInformation.useJosmClassloader = true;
-                
+
                 // load the early plugins
-            if (Main.pref.hasKey("plugins")) {
+                if (Main.pref.hasKey("plugins")) {
                         for (String pluginName : Main.pref.get("plugins").split(",")) {
                                 try {
@@ -169 +181 @@
                         public void run() {
                                 main.postConstructorProcessCmdLine(args);
-            }
+                        }
                 });
         }

src/org/openstreetmap/josm/gui/MapFrame.java

@@ -51 +51 @@
         public MapView mapView;
         /**
-         * The toolbar with the action icons
+         * The toolbar with the action icons. To add new toggle dialog actions, use addToggleDialog
+         * instead of adding directly to this list.
          */
         public JToolBar toolBarActions = new JToolBar(JToolBar.VERTICAL);
@@ -60 +61 @@
 
         public ConflictDialog conflictDialog;
-        private JPanel toggleDialogs = new JPanel();
+        /**
+         * The panel list of all toggle dialog icons. To add new toggle dialog actions, use addToggleDialog
+         * instead of adding directly to this list.
+         */
+        public JPanel toggleDialogs = new JPanel();
 
         public final ButtonGroup toolGroup = new ButtonGroup();
@@ -118 +123 @@
                 toggleDialogs.setLayout(new BoxLayout(toggleDialogs, BoxLayout.Y_AXIS));
 
-                addIconToggle(toggleDialogs, new LayerListDialog(this));
-                addIconToggle(toggleDialogs, new PropertiesDialog(this));
-                addIconToggle(toggleDialogs, new HistoryDialog());
-                addIconToggle(toggleDialogs, new SelectionListDialog());
-                addIconToggle(toggleDialogs, conflictDialog = new ConflictDialog());
-                addIconToggle(toggleDialogs, new CommandStackDialog(this));
+                addToggleDialog(new LayerListDialog(this));
+                addToggleDialog(new PropertiesDialog(this));
+                addToggleDialog(new HistoryDialog());
+                addToggleDialog(new SelectionListDialog());
+                addToggleDialog(conflictDialog = new ConflictDialog());
+                addToggleDialog(new CommandStackDialog(this));
 
                 // status line below the map
@@ -147 +152 @@
         }
 
-        private void addIconToggle(JPanel toggleDialogs, ToggleDialog dlg) {
+        /**
+         * Call this to add new toggle dialogs to the left button-list
+         * @param dlg The toggle dialog. It must not be in the list already.
+         */
+        public void addToggleDialog(ToggleDialog dlg) {
                 IconToggleButton button = new IconToggleButton(dlg.action);
                 dlg.action.button = button;

src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java

@@ -359 +359 @@
                         JComboBox value = new JComboBox(e.getValue().toArray());
                         value.setEditable(true);
-                        value.getEditor().setItem(valueCount.get(e.getKey()) != newSelection.size() ? tr("<different>") : e.getValue().iterator().next());
+                        value.getEditor().setItem(e.getValue().size() > 1 || valueCount.get(e.getKey()) != newSelection.size() ? tr("<different>") : e.getValue().iterator().next());
                         data.addRow(new Object[]{e.getKey(), value});
                 }

src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java

@@ -65 +65 @@
                                                         JOptionPane.YES_NO_OPTION);
                                         if (answer == JOptionPane.OK_OPTION) {
-                                                plugins.remove(pluginName);
+                                                while (plugins.remove(pluginName)) {}
                                                 String p = "";
                                                 for (String s : plugins)
@@ -157 +157 @@
                         if (c.contains("landsat.") || c.contains(".LandsatLayer"))
                                 return "landsat";
+                        if (c.contains("livegps."))
+                                return "livegps";
                         if (c.contains("mappaint."))
                                 return "mappaint";