Changeset 9519 in josm for trunk/src/org

Timestamp:

2016-01-17T23:24:09+01:00 (9 years ago)

Author:

simon04

Message:

fix #7090 - Upload dialog allow select another user open changeset

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/CloseChangesetAction.java (modified) (1 diff)
• data/osm/ChangesetCache.java (modified) (2 diffs)
• gui/JosmUserIdentityManager.java (modified) (2 diffs)
• gui/io/OpenChangesetComboBoxModel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java

@@ -55 +55 @@
 
     protected void onPostDownloadOpenChangesets() {
-        List<Changeset> openChangesets = ChangesetCache.getInstance().getOpenChangesets();
+        List<Changeset> openChangesets = ChangesetCache.getInstance().getOpenChangesetsForCurrentUser();
         if (openChangesets.isEmpty()) {
             JOptionPane.showMessageDialog(

trunk/src/org/openstreetmap/josm/data/osm/ChangesetCache.java

@@ -14 +14 @@
 import org.openstreetmap.josm.data.Preferences.PreferenceChangeEvent;
 import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
+import org.openstreetmap.josm.gui.JosmUserIdentityManager;
 import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.tools.Predicate;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -192 +195 @@
     }
 
+    /**
+     * If the current user {@link JosmUserIdentityManager#isAnonymous() is known}, the {@link #getOpenChangesets() open changesets}
+     * for the {@link JosmUserIdentityManager#isCurrentUser(User) current user} are returned. Otherwise,
+     * the unfiltered {@link #getOpenChangesets() open changesets} are returned.
+     *
+     * @return a list of changesets
+     */
+    public List<Changeset> getOpenChangesetsForCurrentUser() {
+        if (JosmUserIdentityManager.getInstance().isAnonymous()) {
+            return getOpenChangesets();
+        } else {
+            return new ArrayList<>(Utils.filter(getOpenChangesets(), new Predicate<Changeset>() {
+                @Override
+                public boolean evaluate(Changeset object) {
+                    return JosmUserIdentityManager.getInstance().isCurrentUser(object.getUser());
+                }
+            }));
+        }
+    }
+
     /* ------------------------------------------------------------------------- */
     /* interface PreferenceChangedListener                                       */

trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java

@@ -10 +10 @@
 import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
 import org.openstreetmap.josm.data.Preferences.StringSetting;
+import org.openstreetmap.josm.data.osm.User;
 import org.openstreetmap.josm.data.osm.UserInfo;
 import org.openstreetmap.josm.gui.preferences.server.OAuthAccessTokenHolder;
@@ -223 +224 @@
 
     /**
-     * Replies true if the user with name <code>username</code> is the current
-     * user
+     * Replies true if the user with name <code>username</code> is the current user
      *
      * @param username the user name
-     * @return true if the user with name <code>username</code> is the current
-     * user
+     * @return true if the user with name <code>username</code> is the current user
      */
     public boolean isCurrentUser(String username) {
-        if (username == null || this.userName == null) return false;
-        return this.userName.equals(username);
+        return username != null && this.userName != null && this.userName.equals(username);
+    }
+
+    /**
+     * Replies true if the current user is {@link #isFullyIdentified() fully identified} and the {@link #getUserId() user ids} match,
+     * or if the current user is not {@link #isFullyIdentified() fully identified} and the {@link #userName user names} match.
+     *
+     * @param user the user to test
+     * @return true if given user is the current user
+     */
+    public boolean isCurrentUser(User user) {
+        if (user == null) {
+            return false;
+        } else if (isFullyIdentified()) {
+            return getUserId() == user.getId();
+        } else {
+            return isCurrentUser(user.getName());
+        }
     }
 

trunk/src/org/openstreetmap/josm/gui/io/OpenChangesetComboBoxModel.java

@@ -41 +41 @@
     public void refresh() {
         changesets.clear();
-        changesets.addAll(ChangesetCache.getInstance().getOpenChangesets());
+        changesets.addAll(ChangesetCache.getInstance().getOpenChangesetsForCurrentUser());
         fireContentsChanged(this, 0, getSize());
         int idx = changesets.indexOf(selectedChangeset);