Changeset 15725 in josm for trunk/src/org/openstreetmap

Timestamp:

2020-01-19T10:36:30+01:00 (5 years ago)

Author:

GerdP

Message:

fix #11914: Allow to show user name in titlebar

• implement UserIdentityListener in UserIdentityManager
• add new checkbox "Show user name in title" in "Look and Feel" preference dialog
• if enabled and not anonymous, show current user prefixed with "@" in titlebar of main window

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/UserIdentityManager.java (modified) (7 diffs)
• gui/MainFrame.java (modified) (3 diffs)
• gui/preferences/display/LafPreference.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/UserIdentityManager.java

@@ -22 +22 @@
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
+import org.openstreetmap.josm.tools.ListenerList;
 import org.openstreetmap.josm.tools.Logging;
 
@@ -57 +58 @@
 
     private static UserIdentityManager instance;
+    private final ListenerList<UserIdentityListener> listeners = ListenerList.create();
 
     /**
@@ -97 +99 @@
         userName = null;
         userInfo = null;
+        fireUserIdentityChanged();
     }
 
@@ -115 +118 @@
         this.userName = trimmedUserName;
         userInfo = null;
+        fireUserIdentityChanged();
     }
 
@@ -135 +139 @@
         this.userName = trimmedUserName;
         this.userInfo = userInfo;
+        fireUserIdentityChanged();
     }
 
@@ -209 +214 @@
      */
     public void initFromPreferences() {
-        String userName = CredentialsManager.getInstance().getUsername();
+        String credentialsUserName = CredentialsManager.getInstance().getUsername();
         if (isAnonymous()) {
-            if (userName != null && !userName.trim().isEmpty()) {
-                setPartiallyIdentified(userName);
+            if (credentialsUserName != null && !credentialsUserName.trim().isEmpty()) {
+                setPartiallyIdentified(credentialsUserName);
             }
         } else {
-            if (userName != null && !userName.equals(this.userName)) {
-                setPartiallyIdentified(userName);
+            if (credentialsUserName != null && !credentialsUserName.equals(this.userName)) {
+                setPartiallyIdentified(credentialsUserName);
             }
             // else: same name in the preferences as JOSM already knows about.
@@ -312 +317 @@
         }
     }
+
+    /**
+     * This listener is notified whenever the osm user is changed.
+     */
+    @FunctionalInterface
+    public interface UserIdentityListener {
+        /**
+         * The current user was changed.
+         */
+        void userIdentityChanged();
+    }
+
+    /**
+     * Add a listener that listens to changes of the current user.
+     * @param listener The listener
+     */
+    public void addListener(UserIdentityListener listener) {
+        listeners.addListener(listener);
+    }
+
+    private void fireUserIdentityChanged() {
+        listeners.fireEvent(UserIdentityListener::userIdentityChanged);
+    }
 }

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

@@ -21 +21 @@
 import javax.swing.JPanel;
 
+import org.openstreetmap.josm.data.UserIdentityManager;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerAddEvent;
 import org.openstreetmap.josm.gui.layer.LayerManager.LayerChangeListener;
@@ -103 +104 @@
         MainApplication.getLayerManager().addActiveLayerChangeListener(e -> refreshTitle());
         MainApplication.getLayerManager().addAndFireLayerChangeListener(new ManageLayerListeners());
-
+        UserIdentityManager.getInstance().addListener(this::refreshTitle);
+        Config.getPref().addKeyPreferenceChangeListener("draw.show-user", e -> refreshTitle());
         refreshTitle();
 
@@ -166 +168 @@
         boolean dirty = editLayer != null && (editLayer.requiresSaveToFile()
                 || (editLayer.requiresUploadToServer() && !editLayer.isUploadDiscouraged()));
-        setTitle((dirty ? "* " : "") + tr("Java OpenStreetMap Editor"));
+        String userInfo = UserIdentityManager.getInstance().getUserName();
+        if (userInfo != null && Config.getPref().getBoolean("draw.show-user", false))
+            userInfo = tr(" ({0})", "@" + userInfo);
+        else
+            userInfo = "";
+        setTitle((dirty ? "* " : "") + tr("Java OpenStreetMap Editor") + userInfo);
         getRootPane().putClientProperty("Window.documentModified", dirty);
     }

trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java

@@ -81 +81 @@
     VerticallyScrollablePanel panel;
     private final JCheckBox showSplashScreen = new JCheckBox(tr("Show splash screen at startup"));
+    private final JCheckBox showUser = new JCheckBox(tr("Show user name in title"));
     private final JCheckBox showID = new JCheckBox(tr("Show object ID in selection lists"));
     private final JCheckBox showVersion = new JCheckBox(tr("Show object version in selection lists"));
@@ -130 +131 @@
         panel.add(showSplashScreen, GBC.eop().insets(20, 0, 0, 0));
 
+        // Show user name in title
+        showUser.setToolTipText(tr("Show user name in title"));
+        showUser.setSelected(Config.getPref().getBoolean("draw.show-user", false));
+
         // Show ID in selection
         showID.setToolTipText(tr("Show object ID in selection lists"));
@@ -151 +156 @@
         ExpertToggleAction.addVisibilitySwitcher(modeless);
 
+        panel.add(showUser, GBC.eop().insets(20, 0, 0, 0));
         panel.add(showID, GBC.eop().insets(20, 0, 0, 0));
         panel.add(showVersion, GBC.eop().insets(20, 0, 0, 0));
@@ -216 +222 @@
         boolean mod = false;
         Config.getPref().putBoolean("draw.splashscreen", showSplashScreen.isSelected());
+        Config.getPref().putBoolean("draw.show-user", showUser.isSelected());
         Config.getPref().putBoolean("osm-primitives.showid", showID.isSelected());
         Config.getPref().putBoolean("osm-primitives.showversion", showVersion.isSelected());