Changeset 11604 in josm
- Timestamp:
- 2017-02-23T23:44:29+01:00 (8 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/gui
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/conflict/pair/AbstractListMerger.java
r11331 r11604 829 829 } 830 830 831 protected void handlePropertyChangeFrozen(boolean oldValue, booleannewValue) {831 protected void handlePropertyChangeFrozen(boolean newValue) { 832 832 myEntriesTable.getSelectionModel().clearSelection(); 833 833 myEntriesTable.setEnabled(!newValue); … … 853 853 public void propertyChange(PropertyChangeEvent evt) { 854 854 if (evt.getPropertyName().equals(AbstractListMergeModel.FROZEN_PROP)) { 855 handlePropertyChangeFrozen((Boolean) evt.get OldValue(), (Boolean) evt.getNewValue());855 handlePropertyChangeFrozen((Boolean) evt.getNewValue()); 856 856 } 857 857 } -
trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java
r11553 r11604 83 83 * 84 84 * @param e the exception throw by the API 85 * @param monitor a progress monitor86 85 * @throws OsmTransferException if we can't recover from the exception 87 86 */ 88 protected void recoverFromGoneOnServer(OsmApiPrimitiveGoneException e , ProgressMonitor monitor) throws OsmTransferException {87 protected void recoverFromGoneOnServer(OsmApiPrimitiveGoneException e) throws OsmTransferException { 89 88 if (!e.isKnownPrimitive()) throw e; 90 89 OsmPrimitive p = getPrimitive(e.getPrimitiveType(), e.getPrimitiveId()); … … 127 126 break; 128 127 } catch (OsmApiPrimitiveGoneException e) { 129 recoverFromGoneOnServer(e , monitor);128 recoverFromGoneOnServer(e); 130 129 } 131 130 } -
trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java
r11545 r11604 279 279 * If the current tileLoader is an instance of OsmTileLoader, a new 280 280 * TmsTileClearController is created and passed to the according clearCache method. 281 * 282 * @param monitor not used in this implementation - as cache clear is instaneus 283 */ 284 public void clearTileCache(ProgressMonitor monitor) { 281 */ 282 public void clearTileCache() { 285 283 if (tileLoader instanceof CachedTileLoader) { 286 284 ((CachedTileLoader) tileLoader).clearCache(tileSource); … … 621 619 @Override 622 620 protected void realRun() { 623 clearTileCache( getProgressMonitor());621 clearTileCache(); 624 622 } 625 623 -
trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java
r10938 r11604 414 414 } 415 415 416 protected void alertAuthorisationFailed( OsmOAuthAuthorizationException e) {416 protected void alertAuthorisationFailed() { 417 417 HelpAwareOptionPane.showOptionDialog( 418 418 FullyAutomaticAuthorizationUI.this, … … 445 445 } 446 446 447 protected void alertLoginFailed( OsmLoginFailedException e) {447 protected void alertLoginFailed() { 448 448 final String loginUrl = getAdvancedPropertiesPanel().getAdvancedParameters().getOsmLoginUrl(); 449 449 HelpAwareOptionPane.showOptionDialog( … … 466 466 Runnable r = () -> { 467 467 if (e instanceof OsmLoginFailedException) { 468 alertLoginFailed( (OsmLoginFailedException) e);468 alertLoginFailed(); 469 469 } else { 470 alertAuthorisationFailed( e);470 alertAuthorisationFailed(); 471 471 } 472 472 }; -
trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveAccessTokenTask.java
r10627 r11604 66 66 protected void finish() { /* not used in this task */} 67 67 68 protected void alertRetrievingAccessTokenFailed( OsmOAuthAuthorizationException e) {68 protected void alertRetrievingAccessTokenFailed() { 69 69 HelpAwareOptionPane.showOptionDialog( 70 70 parent, … … 91 91 } catch (final OsmOAuthAuthorizationException e) { 92 92 Main.error(e); 93 GuiHelper.runInEDT( () ->alertRetrievingAccessTokenFailed(e));93 GuiHelper.runInEDT(this::alertRetrievingAccessTokenFailed); 94 94 accessToken = null; 95 95 } finally { -
trunk/src/org/openstreetmap/josm/gui/oauth/RetrieveRequestTokenTask.java
r10627 r11604 60 60 protected void finish() { /* not used in this task */} 61 61 62 protected void alertRetrievingRequestTokenFailed( OsmOAuthAuthorizationException e) {62 protected void alertRetrievingRequestTokenFailed() { 63 63 HelpAwareOptionPane.showOptionDialog( 64 64 parent, … … 85 85 } catch (final OsmOAuthAuthorizationException e) { 86 86 Main.error(e); 87 GuiHelper.runInEDT( () ->alertRetrievingRequestTokenFailed(e));87 GuiHelper.runInEDT(this::alertRetrievingRequestTokenFailed); 88 88 requestToken = null; 89 89 } finally {
Note:
See TracChangeset
for help on using the changeset viewer.