Changeset 6851 in josm for trunk/src

Timestamp:

2014-02-14T12:03:27+01:00 (11 years ago)

Author:

Don-vip

Message:

see #9710 - enable OAuth debug output with --debug + single endpoint to change system properties

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (1 diff)
• gui/MainApplication.java (modified) (3 diffs)
• tools/PlatformHookOsx.java (modified) (6 diffs)

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

@@ -1288 +1288 @@
     }
 
-    private void updateSystemProperty(String key, String value) {
+    /**
+     * Updates a given system property.
+     * @param key The property key
+     * @param value The property value
+     * @return the previous value of the system property, or {@code null} if it did not have one.
+     * @since 6851
+     */
+    public static String updateSystemProperty(String key, String value) {
         if (value != null) {
             String old = System.setProperty(key, value);
             Main.debug("System property '"+key+"' set to '"+value+"'. Old value was '"+old+"'");
-        }
+            return old;
+        }
+        return null;
     }
 

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

@@ -40 +40 @@
 import org.openstreetmap.josm.data.AutosaveTask;
 import org.openstreetmap.josm.data.CustomConfigurator;
+import org.openstreetmap.josm.data.Preferences;
 import org.openstreetmap.josm.data.Version;
 import org.openstreetmap.josm.gui.download.DownloadDialog;
@@ -305 +306 @@
         // http://stackoverflow.com/q/75218/2257172
         // To be replaced with official API when switching to Java 7: https://bugs.openjdk.java.net/browse/JDK-4714232
-        System.setProperty("sun.awt.exception.handler", BugReportExceptionHandler.class.getName());
+        Preferences.updateSystemProperty("sun.awt.exception.handler", BugReportExceptionHandler.class.getName());
 
         // initialize the platform hook, and
@@ -320 +321 @@
 
         if (args.containsKey(Option.DEBUG)) {
+            // Enable JOSM debug level
             logLevel = 4;
+            // Enable debug in OAuth signpost
+            Preferences.updateSystemProperty("debug", "true");
             Main.debug(tr("Print debugging messages to console"));
         }

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

@@ -13 +13 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Preferences;
 
 /**
@@ -19 +20 @@
  */
 public class PlatformHookOsx extends PlatformHookUnixoid implements PlatformHook, InvocationHandler {
-    
+
     private static PlatformHookOsx ivhandler = new PlatformHookOsx();
-    
+
     @Override
     public void preStartupHook() {
@@ -28 +29 @@
         // And will not work when one of the system independent LAFs is used.
         // They just insist on painting themselves...
-        System.setProperty("apple.laf.useScreenMenuBar", "true");
-    }
-    
+        Preferences.updateSystemProperty("apple.laf.useScreenMenuBar", "true");
+    }
+
     @Override
     public void startupHook() {
@@ -48 +49 @@
         }
     }
-    
+
     @Override
     public Object invoke (Object proxy, Method method, Object[] args) throws Throwable {
@@ -69 +70 @@
         return null;
     }
-    
+
     @Override
     public void openUrl(String url) throws IOException {
@@ -212 +213 @@
         Shortcut.registerSystemShortcut("view:zoomout", tr("reserved"), KeyEvent.VK_SUBTRACT, KeyEvent.META_DOWN_MASK); // Zoom out
     }
-    
+
     @Override
     public String makeTooltip(String name, Shortcut sc) {