khammond    01/11/22 08:41:18

  Modified:    src/org/apache/jmeter/protocol/http/gui AuthPanel.java
  Log:
  Bug fixes. 1) Password table column now displays "****" instead of the plain text 
password. 2) Delete and Save As buttons now get enabled when you load an XML file 
containing an Auth Manager with entries.
  
  Revision  Changes    Path
  1.11      +56 -5     
jakarta-jmeter/src/org/apache/jmeter/protocol/http/gui/AuthPanel.java
  
  Index: AuthPanel.java
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/org/apache/jmeter/protocol/http/gui/AuthPanel.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- AuthPanel.java    2001/10/08 05:20:49     1.10
  +++ AuthPanel.java    2001/11/22 16:41:18     1.11
  @@ -69,8 +69,8 @@
    *  user selects.
    *
    *@author     $Author: khammond $
  - *@created    $Date: 2001/10/08 05:20:49 $
  - *@version    $Revision: 1.10 $
  + *@created    $Date: 2001/11/22 16:41:18 $
  + *@version    $Revision: 1.11 $
    ***********************************************************/
   public class AuthPanel extends JPanel implements ModelSupported, ActionListener
   {
  @@ -282,6 +282,10 @@
                authTable.setColumnSelectionAllowed(false);
                authTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
   
  +             TableColumn passwordColumn = authTable.getColumnModel().getColumn(2);
  +             passwordColumn.setCellEditor(new DefaultCellEditor(new 
JPasswordField()));
  +             passwordColumn.setCellRenderer(new PasswordCellRenderer());
  +
                // create a JScrollPane and place the auth JTable inside it
                JScrollPane scroller = new JScrollPane(authTable);
                authTable.setPreferredScrollableViewportSize(new Dimension(520, 150));
  @@ -298,7 +302,16 @@
   
                // DELETE button
                deleteButton = new JButton(JMeterUtils.getResString("delete"));
  -             deleteButton.setEnabled(false);  // disabled by default
  +
  +             if (tableModel.getRowCount() == 0)
  +             {
  +                     deleteButton.setEnabled(false);
  +             }
  +             else
  +             {
  +                     deleteButton.setEnabled(true);
  +             }
  +
                deleteButton.setMnemonic('D');
                deleteButton.setActionCommand("Delete");
                deleteButton.addActionListener(this);
  @@ -311,7 +324,16 @@
   
                // SAVE button
                saveButton = new JButton(JMeterUtils.getResString("save"));
  -             saveButton.setEnabled(false);  // disabled by default
  +
  +             if (tableModel.getRowCount() == 0)
  +             {
  +                     saveButton.setEnabled(false);
  +             }
  +             else
  +             {
  +                     saveButton.setEnabled(true);
  +             }
  +
                saveButton.setMnemonic('S');
                saveButton.setActionCommand("Save");
                saveButton.addActionListener(this);
  @@ -432,6 +454,35 @@
                        {
                                auth.setPass((String)value);
                        }
  +             }
  +     }
  +
  +     private class PasswordCellRenderer extends JPasswordField implements 
TableCellRenderer
  +     {
  +              private Border myBorder;
  +
  +             public PasswordCellRenderer() 
  +             {
  +                     super();
  +                     myBorder = new EmptyBorder(1, 2, 1, 2);
  +                     setOpaque(true);
  +                     setBorder(myBorder);
  +             }
  +
  +             public Component getTableCellRendererComponent(JTable table,
  +                                                     Object value, boolean 
isSelected, boolean hasFocus, 
  +                                                     int row, int column) 
  +             {
  +                     setText((String)value);
  +
  +                     setBackground(isSelected && !hasFocus ? 
  +                             table.getSelectionBackground() : 
table.getBackground());
  +                     setForeground(isSelected && !hasFocus ? 
  +                             table.getSelectionForeground() : 
table.getForeground());
  +        
  +                     setFont(table.getFont());
  +
  +                     return this;
                }
        }
   }
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to