1.1 --- a/sql.wizard/src/org/netbeans/modules/jdbcwizard/wizards/Bundle.properties	Mon Apr 21 22:15:44 2008 +0530
     1.2 +++ b/sql.wizard/src/org/netbeans/modules/jdbcwizard/wizards/Bundle.properties	Tue Apr 22 14:42:17 2008 +0530
     1.3 @@ -307,7 +307,8 @@
     1.4  LBL_SEL=Select
     1.5  LBL_TAB_NAME=Table name
     1.6  LBL_PROP=Properties
     1.7 -LBL_ADV=Advanced..
     1.8 +LABEL_BTN_ADV=Advanced..
     1.9 +MNE_BTN_ADV=A
    1.10  TITLE_COLS=Columns
    1.11  
    1.12  LBL_COL_NAME=Column name
    1.13 @@ -317,10 +318,14 @@
    1.14  TITLE_POLL=Poll Records
    1.15  LBL_JNDINAME=JNDI Name
    1.16  
    1.17 -BTN_SELECT_ALL=Select All
    1.18 -BTN_CLEAR_ALL=Clear All
    1.19 -BTN_OK=OK
    1.20 -BTN_CANCEL=Cancel
    1.21 +LABEL_BTN_SELECT_ALL=Select All
    1.22 +MNE_BTN_SELECT_ALL=S
    1.23 +LABEL_BTN_CLEAR_ALL=Clear All
    1.24 +MNE_BTN_CLEAR_ALL=A
    1.25 +LABEL_BTN_OK=OK
    1.26 +MNE_BTN_OK=O
    1.27 +LABEL_BTN_CANCEL=Cancel
    1.28 +MNE_BTN_CANCEL=C
    1.29  
    1.30  ##########################
    1.31  #JNDINamePanel

     2.1 --- a/sql.wizard/src/org/netbeans/modules/jdbcwizard/wizards/JDBCWizardTablePanel.java	Mon Apr 21 22:15:44 2008 +0530
     2.2 +++ b/sql.wizard/src/org/netbeans/modules/jdbcwizard/wizards/JDBCWizardTablePanel.java	Tue Apr 22 14:42:17 2008 +0530
     2.3 @@ -242,9 +242,8 @@
     2.4          private static final long serialVersionUID = 1L;
     2.5          private JPanel myButPanel;
     2.6  
     2.7 -        MyButtonRenderer(final String disp) {
     2.8 +        MyButtonRenderer() {
     2.9              super();
    2.10 -            this.setText(disp);
    2.11              this.setOpaque(true);
    2.12              this.setHorizontalAlignment(SwingConstants.CENTER);
    2.13              this.myButPanel = new JPanel();
    2.14 @@ -301,7 +300,8 @@
    2.15  
    2.16                  this.setEnabled(true);
    2.17                  this.setFocusable(true);
    2.18 -                this.setText("Advanced..");
    2.19 +                this.setText(NbBundle.getMessage(JDBCWizardTablePanel.class,"LABEL_BTN_ADV"));
    2.20 +                this.setMnemonic(NbBundle.getMessage(JDBCWizardTablePanel.class,"MNE_BTN_ADV").charAt(0));
    2.21              }
    2.22              return this.myButPanel;
    2.23          }
    2.24 @@ -348,7 +348,8 @@
    2.25  					this.myButPanel.setBackground(table.getBackground());
    2.26  				}
    2.27  				this.setFocusable(true);
    2.28 -				this.setText("Advanced..");
    2.29 +				this.setText(NbBundle.getMessage(JDBCWizardTablePanel.class,"LABEL_BTN_ADV"));
    2.30 +                                this.setMnemonic(NbBundle.getMessage(JDBCWizardTablePanel.class,"MNE_BTN_ADV").charAt(0));
    2.31  			}
    2.32  			return this.myButPanel;
    2.33  		}
    2.34 @@ -403,13 +404,13 @@
    2.35      }
    2.36  
    2.37      class ColumnAction implements ActionListener {
    2.38 -        protected JButton okbutton = new JButton(NbBundle.getMessage(JDBCWizardTablePanel.class,"BTN_OK"));
    2.39 +        protected JButton okbutton = new JButton(NbBundle.getMessage(JDBCWizardTablePanel.class,"LABEL_BTN_OK"));
    2.40  
    2.41 -        protected JButton cancelbutton = new JButton(NbBundle.getMessage(JDBCWizardTablePanel.class,"BTN_CANCEL"));
    2.42 +        protected JButton cancelbutton = new JButton(NbBundle.getMessage(JDBCWizardTablePanel.class,"LABEL_BTN_CANCEL"));
    2.43          
    2.44 -        protected JButton selectallbutton = new JButton(NbBundle.getMessage(JDBCWizardTablePanel.class,"BTN_SELECT_ALL"));
    2.45 +        protected JButton selectallbutton = new JButton(NbBundle.getMessage(JDBCWizardTablePanel.class,"LABEL_BTN_SELECT_ALL"));
    2.46          
    2.47 -        protected JButton clearallbutton = new JButton(NbBundle.getMessage(JDBCWizardTablePanel.class,"BTN_CLEAR_ALL"));
    2.48 +        protected JButton clearallbutton = new JButton(NbBundle.getMessage(JDBCWizardTablePanel.class,"LABEL_BTN_CLEAR_ALL"));
    2.49  
    2.50          protected JPanel buttonpanel = new JPanel();
    2.51  
    2.52 @@ -441,12 +442,17 @@
    2.53          
    2.54          RowDataWrapper takes;
    2.55          public ColumnAction(final RowDataWrapper takes) {
    2.56 -        	this.takes = takes;
    2.57 -        	columnDisplayDialog = new ColumnDialog(new JDialog(), true);
    2.58 -        	this.columnDisplayDialog.setAlwaysOnTop(true);
    2.59 +            this.takes = takes;
    2.60 +            columnDisplayDialog = new ColumnDialog(new JDialog(), true);
    2.61 +            this.columnDisplayDialog.setAlwaysOnTop(true);
    2.62              this.columnDisplayDialog.setResizable(true);
    2.63              this.columnDisplayDialog.setEnabled(true);
    2.64              this.columnDisplayDialog.setFocusable(true);
    2.65 +            //set mnemonics for buttons
    2.66 +            okbutton.setMnemonic(NbBundle.getMessage(JDBCWizardTablePanel.class,"MNE_BTN_OK").charAt(0));
    2.67 +            cancelbutton.setMnemonic(NbBundle.getMessage(JDBCWizardTablePanel.class,"MNE_BTN_CANCEL").charAt(0));
    2.68 +            selectallbutton.setMnemonic(NbBundle.getMessage(JDBCWizardTablePanel.class,"MNE_BTN_SELECT_ALL").charAt(0));
    2.69 +            clearallbutton.setMnemonic(NbBundle.getMessage(JDBCWizardTablePanel.class,"MNE_BTN_CLEAR_ALL").charAt(0));
    2.70          }
    2.71  
    2.72          // this is the default action when the button corresponding to the
    2.73 @@ -940,9 +946,9 @@
    2.74          final MyTableModel myMod = new MyTableModel(tableNameList);
    2.75          this.metaDataTable.setModel(myMod);
    2.76          this.metaDataTable.getColumn(NbBundle.getMessage(JDBCWizardTablePanel.class,"LBL_PROP"))
    2.77 -                .setCellRenderer(new MyButtonRenderer(NbBundle.getMessage(JDBCWizardTablePanel.class,"LBL_ADV")));
    2.78 +                .setCellRenderer(new MyButtonRenderer());
    2.79          this.metaDataTable.getColumn(NbBundle.getMessage(JDBCWizardTablePanel.class,"LBL_PROP"))
    2.80 -                .setCellEditor(new MyButtonRenderer(NbBundle.getMessage(JDBCWizardTablePanel.class,"LBL_ADV")));
    2.81 +                .setCellEditor(new MyButtonRenderer());
    2.82          // set checkbox column size
    2.83          final TableColumn column = this.metaDataTable.getColumnModel().getColumn(0);
    2.84          column.setResizable(true);
    2.85 @@ -961,9 +967,9 @@
    2.86          final MyTableModel myModel = new MyTableModel(testList);
    2.87          this.metaDataTable.setModel(myModel);
    2.88          this.metaDataTable.getColumn(NbBundle.getMessage(JDBCWizardTablePanel.class,"LBL_PROP"))
    2.89 -                .setCellRenderer(new MyButtonRenderer(NbBundle.getMessage(JDBCWizardTablePanel.class,"LBL_ADV")));
    2.90 +                .setCellRenderer(new MyButtonRenderer());
    2.91          this.metaDataTable.getColumn(NbBundle.getMessage(JDBCWizardTablePanel.class,"LBL_PROP"))
    2.92 -                .setCellEditor(new MyButtonRenderer(NbBundle.getMessage(JDBCWizardTablePanel.class,"LBL_ADV")));
    2.93 +                .setCellEditor(new MyButtonRenderer());
    2.94          this.setLayout(new BorderLayout());
    2.95          // add(headerPnl, BorderLayout.NORTH);
    2.96          this.setPreferredSize(new Dimension(100, 100));