Changeset 5752 in josm for trunk/src/org

Timestamp:

2013-03-03T00:10:46+01:00 (12 years ago)

Author:

Don-vip

Message:

fix #8404 - workaround for JDK bug 6322854 (crash when inserting password from clipboard corrupted by KeePass)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MainApplet.java (modified) (2 diffs)
• io/CredentialDialog.java (modified) (2 diffs)
• oauth/FullyAutomaticAuthorizationUI.java (modified) (2 diffs)
• oauth/FullyAutomaticPropertiesPanel.java (modified) (2 diffs)
• preferences/server/BasicAuthenticationPreferencesPanel.java (modified) (2 diffs)
• preferences/server/ProxyPreferencesPanel.java (modified) (2 diffs)
• widgets/JosmPasswordField.java (added)

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

@@ -29 +29 @@
 import org.openstreetmap.josm.data.ServerSidePreferences;
 import org.openstreetmap.josm.gui.MainApplication.Option;
+import org.openstreetmap.josm.gui.widgets.JosmPasswordField;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.I18n;
@@ -113 +114 @@
                 p.add(user, GBC.eol().fill(GBC.HORIZONTAL));
                 p.add(new JLabel(tr("Password")), GBC.std().insets(0,0,20,0));
-                JPasswordField pass = new JPasswordField(password == null ? "" : password);
+                JPasswordField pass = new JosmPasswordField(password == null ? "" : password);
                 p.add(pass, GBC.eol().fill(GBC.HORIZONTAL));
                 JOptionPane.showMessageDialog(null, p);

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

@@ -36 +36 @@
 import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.preferences.server.ProxyPreferencesPanel;
+import org.openstreetmap.josm.gui.widgets.JosmPasswordField;
 import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -157 +158 @@
         protected void build() {
             tfUserName = new JTextField(20);
-            tfPassword = new JPasswordField(20);
+            tfPassword = new JosmPasswordField(20);
             tfUserName.addFocusListener(new SelectAllOnFocusHandler());
             tfPassword.addFocusListener(new SelectAllOnFocusHandler());

trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java

@@ -40 +40 @@
 import org.openstreetmap.josm.gui.widgets.AbstractTextComponentValidator;
 import org.openstreetmap.josm.gui.widgets.HtmlPanel;
+import org.openstreetmap.josm.gui.widgets.JosmPasswordField;
 import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
 import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
@@ -130 +131 @@
         gc.gridx = 1;
         gc.weightx = 1.0;
-        pnl.add(tfPassword = new JPasswordField(), gc);
+        pnl.add(tfPassword = new JosmPasswordField(), gc);
         SelectAllOnFocusGainedDecorator.decorate(tfPassword);
         valPassword = new PasswordValidator(tfPassword);

trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java

@@ -17 +17 @@
 
 import org.openstreetmap.josm.gui.widgets.AbstractTextComponentValidator;
+import org.openstreetmap.josm.gui.widgets.JosmPasswordField;
 import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
 
@@ -56 +57 @@
         gc.gridx = 1;
         gc.weightx = 1.0;
-        pnl.add(tfPassword = new JPasswordField(), gc);
+        pnl.add(tfPassword = new JosmPasswordField(), gc);
         SelectAllOnFocusGainedDecorator.decorate(tfPassword);
 

trunk/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java

@@ -17 +17 @@
 import javax.swing.JTextField;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.widgets.JosmPasswordField;
 import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
 import org.openstreetmap.josm.io.auth.CredentialsAgent;
 import org.openstreetmap.josm.io.auth.CredentialsAgentException;
 import org.openstreetmap.josm.io.auth.CredentialsManager;
-import org.openstreetmap.josm.io.auth.JosmPreferencesCredentialAgent;
 import org.openstreetmap.josm.io.OsmApi;
 
@@ -70 +69 @@
         gc.gridx = 1;
         gc.weightx = 1.0;
-        add(tfOsmPassword = new JPasswordField(), gc);
+        add(tfOsmPassword = new JosmPasswordField(), gc);
         SelectAllOnFocusGainedDecorator.decorate(tfOsmPassword);
         tfOsmPassword.setToolTipText(tr("Please enter your OSM password"));

trunk/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java

@@ -29 +29 @@
 import org.openstreetmap.josm.gui.JMultilineLabel;
 import org.openstreetmap.josm.gui.help.HelpUtil;
+import org.openstreetmap.josm.gui.widgets.JosmPasswordField;
 import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
 import org.openstreetmap.josm.io.DefaultProxySelector;
@@ -146 +147 @@
         gc.gridx = 1;
         gc.weightx = 1.0;
-        pnl.add(tfProxyHttpPassword = new JPasswordField(20),gc);
+        pnl.add(tfProxyHttpPassword = new JosmPasswordField(20),gc);
         tfProxyHttpPassword.setMinimumSize(tfProxyHttpPassword.getPreferredSize());