Ignore:
Timestamp:
2017-09-05T21:13:21+02:00 (2 years ago)
Author:
Don-vip
Message:

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

Location:
trunk/src/org/openstreetmap/josm/data/osm
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java

    r12537 r12743  
    1515import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
    1616import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
    17 import org.openstreetmap.josm.gui.JosmUserIdentityManager;
     17import org.openstreetmap.josm.data.UserIdentityManager;
    1818import org.openstreetmap.josm.gui.util.GuiHelper;
    1919import org.openstreetmap.josm.tools.SubclassFilteredCollection;
     
    244244
    245245    /**
    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,
    248248     * the unfiltered {@link #getOpenChangesets() open changesets} are returned.
    249249     *
     
    251251     */
    252252    public List<Changeset> getOpenChangesetsForCurrentUser() {
    253         if (JosmUserIdentityManager.getInstance().isAnonymous()) {
     253        if (UserIdentityManager.getInstance().isAnonymous()) {
    254254            return getOpenChangesets();
    255255        } else {
    256256            return new ArrayList<>(SubclassFilteredCollection.filter(getOpenChangesets(),
    257                     object -> JosmUserIdentityManager.getInstance().isCurrentUser(object.getUser())));
     257                    object -> UserIdentityManager.getInstance().isCurrentUser(object.getUser())));
    258258        }
    259259    }
  • trunk/src/org/openstreetmap/josm/data/osm/NoteData.java

    r12734 r12743  
    1010import java.util.Map;
    1111
     12import org.openstreetmap.josm.data.UserIdentityManager;
    1213import org.openstreetmap.josm.data.coor.LatLon;
    1314import org.openstreetmap.josm.data.notes.Note;
    1415import org.openstreetmap.josm.data.notes.Note.State;
    1516import org.openstreetmap.josm.data.notes.NoteComment;
    16 import org.openstreetmap.josm.gui.JosmUserIdentityManager;
    1717import org.openstreetmap.josm.tools.ListenerList;
    1818import org.openstreetmap.josm.tools.Logging;
     
    234234
    235235    private static User getCurrentUser() {
    236         JosmUserIdentityManager userMgr = JosmUserIdentityManager.getInstance();
     236        UserIdentityManager userMgr = UserIdentityManager.getInstance();
    237237        return User.createOsmUser(userMgr.getUserId(), userMgr.getUserName());
    238238    }
Note: See TracChangeset for help on using the changeset viewer.