Changeset 5752 in josm for trunk


Ignore:
Timestamp:
2013-03-03T00:10:46+01:00 (7 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:
1 added
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/MainApplet.java

    r5711 r5752  
    2929import org.openstreetmap.josm.data.ServerSidePreferences;
    3030import org.openstreetmap.josm.gui.MainApplication.Option;
     31import org.openstreetmap.josm.gui.widgets.JosmPasswordField;
    3132import org.openstreetmap.josm.tools.GBC;
    3233import org.openstreetmap.josm.tools.I18n;
     
    113114                p.add(user, GBC.eol().fill(GBC.HORIZONTAL));
    114115                p.add(new JLabel(tr("Password")), GBC.std().insets(0,0,20,0));
    115                 JPasswordField pass = new JPasswordField(password == null ? "" : password);
     116                JPasswordField pass = new JosmPasswordField(password == null ? "" : password);
    116117                p.add(pass, GBC.eol().fill(GBC.HORIZONTAL));
    117118                JOptionPane.showMessageDialog(null, p);
  • trunk/src/org/openstreetmap/josm/gui/io/CredentialDialog.java

    r5111 r5752  
    3636import org.openstreetmap.josm.gui.help.HelpUtil;
    3737import org.openstreetmap.josm.gui.preferences.server.ProxyPreferencesPanel;
     38import org.openstreetmap.josm.gui.widgets.JosmPasswordField;
    3839import org.openstreetmap.josm.io.OsmApi;
    3940import org.openstreetmap.josm.tools.ImageProvider;
     
    157158        protected void build() {
    158159            tfUserName = new JTextField(20);
    159             tfPassword = new JPasswordField(20);
     160            tfPassword = new JosmPasswordField(20);
    160161            tfUserName.addFocusListener(new SelectAllOnFocusHandler());
    161162            tfPassword.addFocusListener(new SelectAllOnFocusHandler());
  • trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java

    r5452 r5752  
    4040import org.openstreetmap.josm.gui.widgets.AbstractTextComponentValidator;
    4141import org.openstreetmap.josm.gui.widgets.HtmlPanel;
     42import org.openstreetmap.josm.gui.widgets.JosmPasswordField;
    4243import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
    4344import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
     
    130131        gc.gridx = 1;
    131132        gc.weightx = 1.0;
    132         pnl.add(tfPassword = new JPasswordField(), gc);
     133        pnl.add(tfPassword = new JosmPasswordField(), gc);
    133134        SelectAllOnFocusGainedDecorator.decorate(tfPassword);
    134135        valPassword = new PasswordValidator(tfPassword);
  • trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java

    r3083 r5752  
    1717
    1818import org.openstreetmap.josm.gui.widgets.AbstractTextComponentValidator;
     19import org.openstreetmap.josm.gui.widgets.JosmPasswordField;
    1920import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
    2021
     
    5657        gc.gridx = 1;
    5758        gc.weightx = 1.0;
    58         pnl.add(tfPassword = new JPasswordField(), gc);
     59        pnl.add(tfPassword = new JosmPasswordField(), gc);
    5960        SelectAllOnFocusGainedDecorator.decorate(tfPassword);
    6061
  • trunk/src/org/openstreetmap/josm/gui/preferences/server/BasicAuthenticationPreferencesPanel.java

    r4690 r5752  
    1717import javax.swing.JTextField;
    1818
    19 import org.openstreetmap.josm.Main;
     19import org.openstreetmap.josm.gui.widgets.JosmPasswordField;
    2020import org.openstreetmap.josm.gui.widgets.SelectAllOnFocusGainedDecorator;
    2121import org.openstreetmap.josm.io.auth.CredentialsAgent;
    2222import org.openstreetmap.josm.io.auth.CredentialsAgentException;
    2323import org.openstreetmap.josm.io.auth.CredentialsManager;
    24 import org.openstreetmap.josm.io.auth.JosmPreferencesCredentialAgent;
    2524import org.openstreetmap.josm.io.OsmApi;
    2625
     
    7069        gc.gridx = 1;
    7170        gc.weightx = 1.0;
    72         add(tfOsmPassword = new JPasswordField(), gc);
     71        add(tfOsmPassword = new JosmPasswordField(), gc);
    7372        SelectAllOnFocusGainedDecorator.decorate(tfOsmPassword);
    7473        tfOsmPassword.setToolTipText(tr("Please enter your OSM password"));
  • trunk/src/org/openstreetmap/josm/gui/preferences/server/ProxyPreferencesPanel.java

    r4690 r5752  
    2929import org.openstreetmap.josm.gui.JMultilineLabel;
    3030import org.openstreetmap.josm.gui.help.HelpUtil;
     31import org.openstreetmap.josm.gui.widgets.JosmPasswordField;
    3132import org.openstreetmap.josm.gui.widgets.VerticallyScrollablePanel;
    3233import org.openstreetmap.josm.io.DefaultProxySelector;
     
    146147        gc.gridx = 1;
    147148        gc.weightx = 1.0;
    148         pnl.add(tfProxyHttpPassword = new JPasswordField(20),gc);
     149        pnl.add(tfProxyHttpPassword = new JosmPasswordField(20),gc);
    149150        tfProxyHttpPassword.setMinimumSize(tfProxyHttpPassword.getPreferredSize());
    150151
Note: See TracChangeset for help on using the changeset viewer.