Changeset 2748 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2010-01-06T20:35:56+01:00 (14 years ago)

Author:

Gubaer

Message:

new: JOSM now supports OAuth

See also online help for server preferences and new OAuth Authorisation Wizard

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• ExceptionDialogUtil.java (modified) (2 diffs)
• MainApplication.java (modified) (4 diffs)
• dialogs/changeset/query/AdvancedChangesetQueryPanel.java (modified) (5 diffs)
• widgets/VerticallyScrollablePanel.java (added)

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

@@ -229 +229 @@
 
     /**
+     * Explains a {@see OsmApiException} which was thrown because the authentication at
+     * the OSM server failed
+     *
+     * @param e the exception
+     */
+    public static void explainAuthenticationFailed(OsmApiException e) {
+        String authMethod = Main.pref.get("osm-server.auth-method", "basic");
+        String msg;
+        if (authMethod.equals("oauth")) {
+            msg = ExceptionUtil.explainFailedOAuthAuthentication(e);
+        } else {
+            msg = ExceptionUtil.explainFailedBasicAuthentication(e);
+        }
+
+        HelpAwareOptionPane.showOptionDialog(
+                Main.parent,
+                msg,
+                tr("Authentication Failed"),
+                JOptionPane.ERROR_MESSAGE,
+                ht("/ErrorMessages#AuthenticationFailed")
+        );
+    }
+
+    /**
+     * Explains a {@see OsmApiException} which was thrown because accessing a protected
+     * resource was forbidden.
+     *
+     * @param e the exception
+     */
+    public static void explainAuthorizationFailed(OsmApiException e) {
+        HelpAwareOptionPane.showOptionDialog(
+                Main.parent,
+                ExceptionUtil.explainFailedOAuthAuthorisation(e),
+                tr("Authorisation Failed"),
+                JOptionPane.ERROR_MESSAGE,
+                ht("/ErrorMessages#AuthenticationFailed")
+        );
+    }
+
+
+    /**
      * Explains a {@see UnknownHostException} which has caused an {@see OsmTransferException}.
      * This is most likely happening when there is an error in the API URL or when
@@ -302 +343 @@
         if (e instanceof OsmApiException) {
             OsmApiException oae = (OsmApiException) e;
-            if (oae.getResponseCode() == HttpURLConnection.HTTP_PRECON_FAILED) {
+            switch(oae.getResponseCode()) {
+            case HttpURLConnection.HTTP_PRECON_FAILED:
                 explainPreconditionFailed(oae);
                 return;
+            case HttpURLConnection.HTTP_GONE:
+                explainGoneForUnknownPrimitive(oae);
+                return;
+            case HttpURLConnection.HTTP_INTERNAL_ERROR:
+                explainInternalServerError(oae);
+                return;
+            case HttpURLConnection.HTTP_BAD_REQUEST:
+                explainBadRequest(oae);
+                return;
+            case HttpURLConnection.HTTP_NOT_FOUND:
+                explainNotFound(oae);
+                return;
+            case HttpURLConnection.HTTP_CONFLICT:
+                explainConflict(oae);
+                return;
+            case HttpURLConnection.HTTP_UNAUTHORIZED:
+                explainAuthenticationFailed(oae);
+                return;
+            case HttpURLConnection.HTTP_FORBIDDEN:
+                explainAuthorizationFailed(oae);
+                return;
             }
-            if (oae.getResponseCode() == HttpURLConnection.HTTP_GONE) {
-                explainGoneForUnknownPrimitive(oae);
-                return;
-            }
-            if (oae.getResponseCode() == HttpURLConnection.HTTP_INTERNAL_ERROR) {
-                explainInternalServerError(oae);
-                return;
-            }
-            if (oae.getResponseCode() == HttpURLConnection.HTTP_BAD_REQUEST) {
-                explainBadRequest(oae);
-                return;
-            }
-            if (oae.getResponseCode() == HttpURLConnection.HTTP_NOT_FOUND) {
-                explainNotFound(oae);
-                return;
-            }
-            if (oae.getResponseCode() == HttpURLConnection.HTTP_CONFLICT) {
-                explainConflict(oae);
-                return;
-            }
-
-        }
-        explainGeneric(e);
+            explainGeneric(e);
+        }
     }
 

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

@@ -21 +21 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
 import org.openstreetmap.josm.io.DefaultProxySelector;
 import org.openstreetmap.josm.io.auth.CredentialsManagerFactory;
@@ -62 +63 @@
 
     /**
+     * Displays help on the console
+     * 
+     */
+    public static void showHelp() {
+        // TODO: put in a platformHook for system that have no console by default
+        System.out.println(tr("Java OpenStreetMap Editor")+"\n\n"+
+                tr("usage")+":\n"+
+                "\tjava -jar josm.jar <options>...\n\n"+
+                tr("options")+":\n"+
+                "\t--help|-?|-h                              "+tr("Show this help")+"\n"+
+                "\t--geometry=widthxheight(+|-)x(+|-)y       "+tr("Standard unix geometry argument")+"\n"+
+                "\t[--download=]minlat,minlon,maxlat,maxlon  "+tr("Download the bounding box")+"\n"+
+                "\t[--download=]<url>                        "+tr("Download the location at the url (with lat=x&lon=y&zoom=z)")+"\n"+
+                "\t[--download=]<filename>                   "+tr("Open file (as raw gps, if .gpx)")+"\n"+
+                "\t--downloadgps=minlat,minlon,maxlat,maxlon "+tr("Download the bounding box as raw gps")+"\n"+
+                "\t--selection=<searchstring>                "+tr("Select with the given search")+"\n"+
+                "\t--[no-]maximize                           "+tr("Launch in maximized mode")+"\n"+
+                "\t--reset-preferences                       "+tr("Reset the preferences to default")+"\n\n"+
+                "\t--language=<language>                     "+tr("Set the language.")+"\n\n"+
+                tr("options provided as Java system properties")+":\n"+
+                "\t-Djosm.home="+tr("/PATH/TO/JOSM/FOLDER/         ")+tr("Change the folder for all user settings")+"\n\n"+
+                tr("note: For some tasks, JOSM needs a lot of memory. It can be necessary to add the following\n" +
+                "      Java option to increase the maximum size of allocated memory")+":\n"+
+                "\t-Xmx...m\n\n"+
+                tr("examples")+":\n"+
+                "\tjava -jar josm.jar track1.gpx track2.gpx london.osm\n"+
+                "\tjava -jar josm.jar http://www.openstreetmap.org/index.html?lat=43.2&lon=11.1&zoom=13\n"+
+                "\tjava -jar josm.jar london.osm --selection=http://www.ostertag.name/osm/OSM_errors_node-duplicate.xml\n"+
+                "\tjava -jar josm.jar 43.2,11.1,43.4,11.4\n"+
+                "\tjava -Djosm.home=/home/user/.josm_dev -jar josm.jar\n"+
+                "\tjava -Xmx400m -jar josm.jar\n\n"+
+                tr("Parameters are read in the order they are specified, so make sure you load\n"+
+                "some data before --selection")+"\n\n"+
+                tr("Instead of --download=<bbox> you may specify osm://<bbox>\n"));
+    }
+
+    /**
      * Main application Startup
      */
@@ -102 +140 @@
         Main.pref.updateSystemProperties();
 
-        Authenticator.setDefault(
-                new DefaultAuthenticator(
-                        CredentialsManagerFactory.getCredentialManager()
-                )
-        );
+        DefaultAuthenticator.createInstance(CredentialsManagerFactory.getCredentialManager());
+        Authenticator.setDefault(DefaultAuthenticator.getInstance());
         ProxySelector.setDefault(new DefaultProxySelector(ProxySelector.getDefault()));
-
+        OAuthAccessTokenHolder.getInstance().init(Main.pref, CredentialsManagerFactory.getCredentialManager());
+
+        // asking for help? show help and exit
         if (argList.contains("--help") || argList.contains("-?") || argList.contains("-h")) {
-            // TODO: put in a platformHook for system that have no console by default
-            System.out.println(tr("Java OpenStreetMap Editor")+"\n\n"+
-                    tr("usage")+":\n"+
-                    "\tjava -jar josm.jar <options>...\n\n"+
-                    tr("options")+":\n"+
-                    "\t--help|-?|-h                              "+tr("Show this help")+"\n"+
-                    "\t--geometry=widthxheight(+|-)x(+|-)y       "+tr("Standard unix geometry argument")+"\n"+
-                    "\t[--download=]minlat,minlon,maxlat,maxlon  "+tr("Download the bounding box")+"\n"+
-                    "\t[--download=]<url>                        "+tr("Download the location at the url (with lat=x&lon=y&zoom=z)")+"\n"+
-                    "\t[--download=]<filename>                   "+tr("Open file (as raw gps, if .gpx)")+"\n"+
-                    "\t--downloadgps=minlat,minlon,maxlat,maxlon "+tr("Download the bounding box as raw gps")+"\n"+
-                    "\t--selection=<searchstring>                "+tr("Select with the given search")+"\n"+
-                    "\t--[no-]maximize                           "+tr("Launch in maximized mode")+"\n"+
-                    "\t--reset-preferences                       "+tr("Reset the preferences to default")+"\n\n"+
-                    "\t--language=<language>                     "+tr("Set the language.")+"\n\n"+
-                    tr("options provided as Java system properties")+":\n"+
-                    "\t-Djosm.home="+tr("/PATH/TO/JOSM/FOLDER/         ")+tr("Change the folder for all user settings")+"\n\n"+
-                    tr("note: For some tasks, JOSM needs a lot of memory. It can be necessary to add the following\n" +
-                    "      Java option to increase the maximum size of allocated memory")+":\n"+
-                    "\t-Xmx...m\n\n"+
-                    tr("examples")+":\n"+
-                    "\tjava -jar josm.jar track1.gpx track2.gpx london.osm\n"+
-                    "\tjava -jar josm.jar http://www.openstreetmap.org/index.html?lat=43.2&lon=11.1&zoom=13\n"+
-                    "\tjava -jar josm.jar london.osm --selection=http://www.ostertag.name/osm/OSM_errors_node-duplicate.xml\n"+
-                    "\tjava -jar josm.jar 43.2,11.1,43.4,11.4\n"+
-                    "\tjava -Djosm.home=/home/user/.josm_dev -jar josm.jar\n"+
-                    "\tjava -Xmx400m -jar josm.jar\n\n"+
-                    tr("Parameters are read in the order they are specified, so make sure you load\n"+
-                    "some data before --selection")+"\n\n"+
-                    tr("Instead of --download=<bbox> you may specify osm://<bbox>\n"));
+            showHelp();
             System.exit(0);
         }
@@ -185 +193 @@
     public static void removeObsoletePreferences() {
         String[] obsolete = {
-                "sample.preference.that.does.not.exist", // sample comment, expiry date should go here
-                "osm-server.version", // remove this around 10/2009
-                "osm-server.additional-versions", // remove this around 10/2009
-                null
+                "proxy.anonymous", // 01/2010 - not needed anymore. Can be removed mid 2010
+                "proxy.enable"     // 01/2010 - not needed anymore. Can be removed mid 2010
         };
-        for (String i : obsolete) {
-            if (i == null) {
-                continue;
-            }
-            if (Main.pref.hasKey(i)) {
-                Main.pref.removeFromCollection(i, Main.pref.get(i));
-                System.out.println(tr("Preference setting {0} has been removed since it is no longer used.", i));
+        for (String key : obsolete) {
+            if (Main.pref.hasKey(key)) {
+                Main.pref.removeFromCollection(key, Main.pref.get(key));
+                System.out.println(tr("Preference setting {0} has been removed since it is no longer used.", key));
             }
         }

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java

@@ -6 +6 @@
 import java.awt.BorderLayout;
 import java.awt.Color;
-import java.awt.Dimension;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
-import java.awt.Rectangle;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
@@ -28 +26 @@
 import javax.swing.JScrollPane;
 import javax.swing.JTextField;
-import javax.swing.Scrollable;
 import javax.swing.text.JTextComponent;
 
@@ -39 +36 @@
 import org.openstreetmap.josm.gui.widgets.BoundingBoxSelectionPanel;
 import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
+import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
 import org.openstreetmap.josm.io.ChangesetQuery;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -59 +57 @@
     protected JPanel buildQueryPanel() {
         ItemListener stateChangeHandler = new RestrictionGroupStateChangeHandler();
-        JPanel pnl  = new QuerySpecificationPanel();
+        JPanel pnl  = new VerticallyScrollablePanel();
         pnl.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
         pnl.setLayout(new GridBagLayout());
@@ -961 +959 @@
     }
 
-    static private class QuerySpecificationPanel extends JPanel implements Scrollable {
-        public Dimension getPreferredScrollableViewportSize() {
-            return getPreferredSize();
-        }
-
-        public int getScrollableBlockIncrement(Rectangle arg0, int arg1, int arg2) {
-            return 20;
-        }
-
-        public boolean getScrollableTracksViewportHeight() {
-            return false;
-        }
-
-        public boolean getScrollableTracksViewportWidth() {
-            return true;
-        }
-
-        public int getScrollableUnitIncrement(Rectangle arg0, int arg1, int arg2) {
-            return 10;
-        }
-    }
-
     /**
      * Validator for user ids entered in in a {@see JTextComponent}.