Changeset 5752 in josm for trunk/src/org/openstreetmap/josm/gui/preferences/server

Timestamp:

2013-03-03T00:10:46+01:00 (11 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/preferences/server

Files:

• BasicAuthenticationPreferencesPanel.java (modified) (2 diffs)
• ProxyPreferencesPanel.java (modified) (2 diffs)

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());