Changeset 8510 in josm for trunk/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java
- Timestamp:
- 2015-06-20T23:42:21+02:00 (9 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java
r6248 r8510 48 48 protected void cancel() { 49 49 this.canceled = true; 50 synchronized (this) {50 synchronized (this) { 51 51 if (reader != null) { 52 52 reader.cancel(); … … 70 70 return; 71 71 } 72 if (canceled) return;72 if (canceled) return; 73 73 if (lastException != null) { 74 74 ExceptionDialogUtil.explainException(lastException); … … 98 98 * 99 99 */ 100 protected void refreshUserIdentity() {100 protected void refreshUserIdentity() { 101 101 JosmUserIdentityManager im = JosmUserIdentityManager.getInstance(); 102 102 try { … … 104 104 UserInfo info = infoReader.fetchUserInfo(getProgressMonitor().createSubTaskMonitor(1, false)); 105 105 im.setFullyIdentified(info.getDisplayName(), info); 106 } catch (OsmTransferException e) {106 } catch (OsmTransferException e) { 107 107 // retrieving the user info can fail if the current user is not authorised to 108 108 // retrieve it, i.e. if he is working with an OAuth Access Token which doesn't … … 127 127 if (im.isAnonymous()) { 128 128 refreshUserIdentity(); 129 } else if (im.isFullyIdentified()) {129 } else if (im.isFullyIdentified()) { 130 130 // do nothing 131 131 } else if (im.isPartiallyIdentified()) { 132 132 refreshUserIdentity(); 133 133 } 134 if (canceled) return;135 synchronized (this) {134 if (canceled) return; 135 synchronized (this) { 136 136 reader = new OsmServerChangesetReader(); 137 137 } … … 153 153 getProgressMonitor().createSubTaskMonitor(1, false /* not internal */) 154 154 ); 155 } catch (Exception e) {155 } catch (Exception e) { 156 156 if (canceled) 157 157 return;
Note:
See TracChangeset
for help on using the changeset viewer.