Changeset 12743 in josm for trunk/src/org/openstreetmap/josm/io
- Timestamp:
- 2017-09-05T21:13:21+02:00 (7 years ago)
- Location:
- trunk/src/org/openstreetmap/josm/io
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java
r12620 r12743 17 17 18 18 import org.openstreetmap.josm.data.Bounds; 19 import org.openstreetmap.josm.data.UserIdentityManager; 19 20 import org.openstreetmap.josm.data.coor.LatLon; 20 import org.openstreetmap.josm.gui.JosmUserIdentityManager;21 21 import org.openstreetmap.josm.tools.CheckParameterUtil; 22 22 import org.openstreetmap.josm.tools.Logging; … … 71 71 */ 72 72 public static ChangesetQuery forCurrentUser() { 73 JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();73 UserIdentityManager im = UserIdentityManager.getInstance(); 74 74 if (im.isAnonymous()) { 75 75 throw new IllegalStateException("anonymous user"); -
trunk/src/org/openstreetmap/josm/io/MessageNotifier.java
r12620 r12743 17 17 18 18 import org.openstreetmap.josm.Main; 19 import org.openstreetmap.josm.data.UserIdentityManager; 19 20 import org.openstreetmap.josm.data.osm.UserInfo; 20 21 import org.openstreetmap.josm.data.preferences.BooleanProperty; 21 22 import org.openstreetmap.josm.data.preferences.IntegerProperty; 22 import org.openstreetmap.josm.gui.JosmUserIdentityManager;23 23 import org.openstreetmap.josm.gui.Notification; 24 24 import org.openstreetmap.josm.gui.progress.NullProgressMonitor; … … 130 130 */ 131 131 public static boolean isUserEnoughIdentified() { 132 JosmUserIdentityManager identManager = JosmUserIdentityManager.getInstance();132 UserIdentityManager identManager = UserIdentityManager.getInstance(); 133 133 if (identManager.isFullyIdentified()) { 134 134 return true; -
trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java
r12687 r12743 13 13 import java.util.concurrent.TimeUnit; 14 14 15 import org.openstreetmap.josm.data.UserIdentityManager; 15 16 import org.openstreetmap.josm.data.osm.Changeset; 16 17 import org.openstreetmap.josm.data.osm.OsmPrimitive; 17 18 import org.openstreetmap.josm.data.osm.OsmPrimitiveType; 18 import org.openstreetmap.josm.gui.JosmUserIdentityManager;19 19 import org.openstreetmap.josm.gui.progress.NullProgressMonitor; 20 20 import org.openstreetmap.josm.gui.progress.ProgressMonitor; … … 202 202 api.openChangeset(changeset, monitor.createSubTaskMonitor(0, false)); 203 203 // update the user information 204 changeset.setUser( JosmUserIdentityManager.getInstance().asUser());204 changeset.setUser(UserIdentityManager.getInstance().asUser()); 205 205 } else { 206 206 api.updateChangeset(changeset, monitor.createSubTaskMonitor(0, false)); -
trunk/src/org/openstreetmap/josm/io/auth/CredentialsManager.java
r12620 r12743 7 7 import java.util.Objects; 8 8 9 import org.openstreetmap.josm.data.UserIdentityManager; 9 10 import org.openstreetmap.josm.data.oauth.OAuthToken; 10 import org.openstreetmap.josm.gui.JosmUserIdentityManager;11 11 import org.openstreetmap.josm.io.OsmApi; 12 12 import org.openstreetmap.josm.tools.CheckParameterUtil; … … 122 122 String username = credentials.getUserName(); 123 123 if (username != null && !username.trim().isEmpty()) { 124 JosmUserIdentityManager.getInstance().setPartiallyIdentified(username);124 UserIdentityManager.getInstance().setPartiallyIdentified(username); 125 125 } 126 126 }
Note:
See TracChangeset
for help on using the changeset viewer.