Changeset 12743 in josm for trunk/src/org/openstreetmap/josm/data
- Timestamp:
- 2017-09-05T21:13:21+02:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/data
- Files:
-
- 1 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java
r12537 r12743 15 15 import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent; 16 16 import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener; 17 import org.openstreetmap.josm. gui.JosmUserIdentityManager;17 import org.openstreetmap.josm.data.UserIdentityManager; 18 18 import org.openstreetmap.josm.gui.util.GuiHelper; 19 19 import org.openstreetmap.josm.tools.SubclassFilteredCollection; … … 244 244 245 245 /** 246 * If the current user {@link JosmUserIdentityManager#isAnonymous() is known}, the {@link #getOpenChangesets() open changesets}247 * for the {@link JosmUserIdentityManager#isCurrentUser(User) current user} are returned. Otherwise,246 * If the current user {@link UserIdentityManager#isAnonymous() is known}, the {@link #getOpenChangesets() open changesets} 247 * for the {@link UserIdentityManager#isCurrentUser(User) current user} are returned. Otherwise, 248 248 * the unfiltered {@link #getOpenChangesets() open changesets} are returned. 249 249 * … … 251 251 */ 252 252 public List<Changeset> getOpenChangesetsForCurrentUser() { 253 if ( JosmUserIdentityManager.getInstance().isAnonymous()) {253 if (UserIdentityManager.getInstance().isAnonymous()) { 254 254 return getOpenChangesets(); 255 255 } else { 256 256 return new ArrayList<>(SubclassFilteredCollection.filter(getOpenChangesets(), 257 object -> JosmUserIdentityManager.getInstance().isCurrentUser(object.getUser())));257 object -> UserIdentityManager.getInstance().isCurrentUser(object.getUser()))); 258 258 } 259 259 } -
trunk/src/org/openstreetmap/josm/data/osm/NoteData.java
r12734 r12743 10 10 import java.util.Map; 11 11 12 import org.openstreetmap.josm.data.UserIdentityManager; 12 13 import org.openstreetmap.josm.data.coor.LatLon; 13 14 import org.openstreetmap.josm.data.notes.Note; 14 15 import org.openstreetmap.josm.data.notes.Note.State; 15 16 import org.openstreetmap.josm.data.notes.NoteComment; 16 import org.openstreetmap.josm.gui.JosmUserIdentityManager;17 17 import org.openstreetmap.josm.tools.ListenerList; 18 18 import org.openstreetmap.josm.tools.Logging; … … 234 234 235 235 private static User getCurrentUser() { 236 JosmUserIdentityManager userMgr = JosmUserIdentityManager.getInstance();236 UserIdentityManager userMgr = UserIdentityManager.getInstance(); 237 237 return User.createOsmUser(userMgr.getUserId(), userMgr.getUserName()); 238 238 }
Note:
See TracChangeset
for help on using the changeset viewer.