Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMerger.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMerger.java	(revision 11601)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMerger.java	(revision 11604)
@@ -829,5 +829,5 @@
     }
 
-    protected void handlePropertyChangeFrozen(boolean oldValue, boolean newValue) {
+    protected void handlePropertyChangeFrozen(boolean newValue) {
         myEntriesTable.getSelectionModel().clearSelection();
         myEntriesTable.setEnabled(!newValue);
@@ -853,5 +853,5 @@
     public void propertyChange(PropertyChangeEvent evt) {
         if (evt.getPropertyName().equals(AbstractListMergeModel.FROZEN_PROP)) {
-            handlePropertyChangeFrozen((Boolean) evt.getOldValue(), (Boolean) evt.getNewValue());
+            handlePropertyChangeFrozen((Boolean) evt.getNewValue());
         }
     }
Index: trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java	(revision 11601)
+++ trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java	(revision 11604)
@@ -83,8 +83,7 @@
      *
      * @param e the exception throw by the API
-     * @param monitor a progress monitor
      * @throws OsmTransferException if we can't recover from the exception
      */
-    protected void recoverFromGoneOnServer(OsmApiPrimitiveGoneException e, ProgressMonitor monitor) throws OsmTransferException {
+    protected void recoverFromGoneOnServer(OsmApiPrimitiveGoneException e) throws OsmTransferException {
         if (!e.isKnownPrimitive()) throw e;
         OsmPrimitive p = getPrimitive(e.getPrimitiveType(), e.getPrimitiveId());
@@ -127,5 +126,5 @@
                     break;
                 } catch (OsmApiPrimitiveGoneException e) {
-                    recoverFromGoneOnServer(e, monitor);
+                    recoverFromGoneOnServer(e);
                 }
             }
Index: trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java	(revision 11601)
+++ trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java	(revision 11604)
@@ -279,8 +279,6 @@
      * If the current tileLoader is an instance of OsmTileLoader, a new
      * TmsTileClearController is created and passed to the according clearCache method.
-     *
-     * @param monitor not used in this implementation - as cache clear is instaneus
-     */
-    public void clearTileCache(ProgressMonitor monitor) {
+     */
+    public void clearTileCache() {
         if (tileLoader instanceof CachedTileLoader) {
             ((CachedTileLoader) tileLoader).clearCache(tileSource);
@@ -621,5 +619,5 @@
                 @Override
                 protected void realRun() {
-                    clearTileCache(getProgressMonitor());
+                    clearTileCache();
                 }
 
Index: trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java	(revision 11601)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java	(revision 11604)
@@ -414,5 +414,5 @@
         }
 
-        protected void alertAuthorisationFailed(OsmOAuthAuthorizationException e) {
+        protected void alertAuthorisationFailed() {
             HelpAwareOptionPane.showOptionDialog(
                     FullyAutomaticAuthorizationUI.this,
@@ -445,5 +445,5 @@
         }
 
-        protected void alertLoginFailed(OsmLoginFailedException e) {
+        protected void alertLoginFailed() {
             final String loginUrl = getAdvancedPropertiesPanel().getAdvancedParameters().getOsmLoginUrl();
             HelpAwareOptionPane.showOptionDialog(
@@ -466,7 +466,7 @@
             Runnable r = () -> {
                 if (e instanceof OsmLoginFailedException) {
-                    alertLoginFailed((OsmLoginFailedException) e);
+                    alertLoginFailed();
                 } else {
-                    alertAuthorisationFailed(e);
+                    alertAuthorisationFailed();
                 }
             };
Index: trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java	(revision 11601)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java	(revision 11604)
@@ -66,5 +66,5 @@
     protected void finish() { /* not used in this task */}
 
-    protected void alertRetrievingAccessTokenFailed(OsmOAuthAuthorizationException e) {
+    protected void alertRetrievingAccessTokenFailed() {
         HelpAwareOptionPane.showOptionDialog(
                 parent,
@@ -91,5 +91,5 @@
         } catch (final OsmOAuthAuthorizationException e) {
             Main.error(e);
-            GuiHelper.runInEDT(() -> alertRetrievingAccessTokenFailed(e));
+            GuiHelper.runInEDT(this::alertRetrievingAccessTokenFailed);
             accessToken = null;
         } finally {
Index: trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java	(revision 11601)
+++ trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java	(revision 11604)
@@ -60,5 +60,5 @@
     protected void finish() { /* not used in this task */}
 
-    protected void alertRetrievingRequestTokenFailed(OsmOAuthAuthorizationException e) {
+    protected void alertRetrievingRequestTokenFailed() {
         HelpAwareOptionPane.showOptionDialog(
                 parent,
@@ -85,5 +85,5 @@
         } catch (final OsmOAuthAuthorizationException e) {
             Main.error(e);
-            GuiHelper.runInEDT(() -> alertRetrievingRequestTokenFailed(e));
+            GuiHelper.runInEDT(this::alertRetrievingRequestTokenFailed);
             requestToken = null;
         } finally {