Changeset 1415 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2009-02-16T15:14:34+01:00 (16 years ago)

Author:

stoecker

Message:

applied patch #2185 by bruce89

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• BugReportExceptionHandler.java (modified) (1 diff)
• PlatformHookOsx.java (modified) (1 diff)
• PlatformHookWindows.java (modified) (1 diff)
• PresetTextComparator.java (modified) (1 diff)
• Shortcut.java (modified) (1 diff)

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

@@ -10 +10 @@
 import java.awt.datatransfer.StringSelection;
 import java.awt.datatransfer.Transferable;
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import java.net.URL;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.LinkedList;
 
 import javax.swing.JLabel;

trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java

@@ -45 +45 @@
         //System.out.println("Going to handle method "+method+" (short: "+method.getName()+") with event "+args[0]);
         if (method.getName().equals("handleQuit")) {
-            handled = !Main.main.breakBecauseUnsavedChanges();
+            handled = !Main.breakBecauseUnsavedChanges();
         } else if (method.getName().equals("handleAbout")) {
             Main.main.menu.about.actionPerformed(null);

trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java

@@ -2 +2 @@
 package org.openstreetmap.josm.tools;
 
-import static org.openstreetmap.josm.tools.I18n.tr;
 import org.openstreetmap.josm.tools.Shortcut;
 import org.openstreetmap.josm.tools.PlatformHookUnixoid;

trunk/src/org/openstreetmap/josm/tools/PresetTextComparator.java

@@ -5 +5 @@
 import javax.swing.JMenuItem;
 
-public class PresetTextComparator implements Comparator {
+public class PresetTextComparator implements Comparator<JMenuItem> {
         //TODO add error checking and stuff
-        public int compare(Object arg0, Object arg1) {
-                return ((JMenuItem)arg0).getText().compareTo(((JMenuItem)arg1).getText());
+        public int compare(JMenuItem arg0, JMenuItem arg1) {
+                return arg0.getText().compareTo(arg1.getText());
         }
 

trunk/src/org/openstreetmap/josm/tools/Shortcut.java

@@ -260 +260 @@
     public static final int GROUPS_ALT2 = GROUP__MAX * 2;
 
-    // safely read a shortcut from the preferences
-    private static String[] getConfigStringArray(String key) {
-        String s = Main.pref.get(key, null);
-        if (s == null || s.equals("null") || s.equals(""))
-            return null;
-        return s.split(";");
-    }
-
     // bootstrap
     private static boolean initdone = false;