Changeset 12807 in josm

Timestamp:

2017-09-09T19:58:38+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15229 - see #15182 - see #14794 - checkstyle, unit tests

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/util/MultikeyActionsHandler.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/util/MultikeyShortcutAction.java (modified) (1 diff)
• test/functional/org/openstreetmap/josm/tools/HttpClientTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/util/MultikeyActionsHandler.java

@@ -28 +28 @@
 import org.openstreetmap.josm.tools.Shortcut;
 
+/**
+ * Handles the different multikey actions.
+ * The possible actions can be selected through a popup menu.
+ * @since 4595
+ */
 public final class MultikeyActionsHandler {
 

trunk/src/org/openstreetmap/josm/gui/util/MultikeyShortcutAction.java

@@ -8 +8 @@
 import org.openstreetmap.josm.tools.Shortcut;
 
+/**
+ * Action implementing a multikey shortcut - shorcuts like Ctrl+Alt+S,n will toggle n-th layer visibility.
+ * @since 4595
+ */
 public interface MultikeyShortcutAction extends Action {
 

trunk/test/functional/org/openstreetmap/josm/tools/HttpClientTest.java

@@ -183 +183 @@
     }
 
-    @Test()
+    @Test
     public void testHttp401() throws IOException {
         // https://tools.ietf.org/html/rfc2324

trunk/test/unit/org/openstreetmap/josm/testutils/JOSMTestRules.java

@@ -23 +23 @@
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
+import org.openstreetmap.josm.gui.oauth.OAuthAuthorizationWizard;
 import org.openstreetmap.josm.gui.tagging.presets.TaggingPresets;
 import org.openstreetmap.josm.gui.util.GuiHelper;
@@ -28 +29 @@
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.io.OsmApiInitializationException;
+import org.openstreetmap.josm.io.OsmConnection;
 import org.openstreetmap.josm.io.OsmTransferCanceledException;
 import org.openstreetmap.josm.tools.I18n;
@@ -283 +285 @@
         // Setup callbacks
         DeleteCommand.setDeletionCallback(DeleteAction.defaultDeletionCallback);
+        OsmConnection.setOAuthAccessTokenFetcher(OAuthAuthorizationWizard::obtainAccessToken);
 
         // Set up i18n