Changeset 12743 in josm for trunk/src/org/openstreetmap/josm/gui/download

Timestamp:

2017-09-05T21:13:21+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15229 - see #15182 - deprecate gui.JosmUserIdentityManager - replaced by data.UserIdentityManager

Location:

trunk/src/org/openstreetmap/josm/gui/download

Files:

• BookmarkList.java (modified) (4 diffs)
• BookmarkSelection.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/download/BookmarkList.java

@@ -26 +26 @@
 import org.openstreetmap.josm.actions.downloadtasks.ChangesetQueryTask;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.UserIdentityManager;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Changeset;
@@ -32 +33 @@
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.Projections;
-import org.openstreetmap.josm.gui.JosmUserIdentityManager;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapViewState;
@@ -193 +193 @@
             setName(tr("Home location"));
             setIcon(ImageProvider.get("help", "home", ImageSizes.SMALLICON));
-            UserInfo info = JosmUserIdentityManager.getInstance().getUserInfo();
+            UserInfo info = UserIdentityManager.getInstance().getUserInfo();
             if (info == null) {
                 throw new IllegalStateException("User not identified");
@@ -251 +251 @@
         final DefaultListModel<Bookmark> model = (DefaultListModel<Bookmark>) getModel();
         model.removeAllElements();
-        JosmUserIdentityManager im = JosmUserIdentityManager.getInstance();
+        UserIdentityManager im = UserIdentityManager.getInstance();
         // Add home location bookmark first, if user fully identified
         if (im.isFullyIdentified()) {

trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java

@@ -24 +24 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.gui.JosmUserIdentityManager;
+import org.openstreetmap.josm.data.UserIdentityManager;
 import org.openstreetmap.josm.gui.download.BookmarkList.Bookmark;
 import org.openstreetmap.josm.gui.widgets.JMultilineLabel;
@@ -290 +290 @@
             putValue(SMALL_ICON, ImageProvider.get("dialogs/changeset", "downloadchangeset"));
             putValue(SHORT_DESCRIPTION, tr("Download bookmarks for my {0} last changesets", BookmarkList.MAX_CHANGESET_BOOKMARKS.get()));
-            setEnabled(!JosmUserIdentityManager.getInstance().isAnonymous());
+            setEnabled(!UserIdentityManager.getInstance().isAnonymous());
         }