)"/> + + + - - - + + + @@ -32,12 +32,12 @@ - - - + + + @@ -48,16 +48,15 @@ - - - + + + - @@ -74,7 +73,6 @@ - @@ -86,12 +84,12 @@ - - - + + + @@ -102,17 +100,16 @@ - - - + + + - @@ -126,15 +123,15 @@ - - + + Index: core/ide/src/org/netbeans/core/upgrade/UpgradePanel.java =================================================================== RCS file: /shared/data/helm/cvs/repository/core/ide/src/org/netbeans/core/upgrade/UpgradePanel.java,v retrieving revision 1.8 diff -u -r1.8 UpgradePanel.java --- core/ide/src/org/netbeans/core/upgrade/UpgradePanel.java 3 Jan 2003 15:31:27 -0000 1.8 +++ core/ide/src/org/netbeans/core/upgrade/UpgradePanel.java 23 Feb 2003 23:38:23 -0000 @@ -104,11 +104,9 @@ private void initAccessibility() { txtVersion.selectAll(); this.getAccessibleContext().setAccessibleDescription(bundle.getString("LBL_Upgrade_Description_Top")); - lblLocation.setDisplayedMnemonic((bundle.getString("LBL_lblLocation_Mnem")).charAt(0)); txtLocation.getAccessibleContext().setAccessibleDescription(bundle.getString("ACS_txtLocation")); txtVersion.getAccessibleContext().setAccessibleDescription(bundle.getString("ACS_txtVersion")); cmdSelectDir.getAccessibleContext().setAccessibleDescription(bundle.getString("ACS_cmdSelectDir")); - cmdSelectDir.setMnemonic((bundle.getString("LBL_cmdSelectDir_Mnem")).charAt(0)); } @@ -131,14 +129,14 @@ setLayout(new java.awt.GridBagLayout()); - setPreferredSize(new java.awt.Dimension(550, 350)); - setName(bundle.getString("LBL_UpgradePanel_Name")); - setMinimumSize(new java.awt.Dimension(500, 279)); setMaximumSize(new java.awt.Dimension(123456, 123456)); + setMinimumSize(new java.awt.Dimension(500, 279)); + setName(bundle.getString("LBL_UpgradePanel_Name")); + setPreferredSize(new java.awt.Dimension(550, 350)); pnlUpgrade.setLayout(new java.awt.GridBagLayout()); - lblLocation.setText(bundle.getString("LBL_lblLocation")); lblLocation.setLabelFor(txtLocation); + org.openide.awt.Mnemonics.setLocalizedText(lblLocation,bundle.getString("LBL_lblLocation")); lblLocation.setHorizontalTextPosition(javax.swing.SwingConstants.LEFT); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; @@ -147,8 +145,8 @@ gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; pnlUpgrade.add(lblLocation, gridBagConstraints); - txtLocation.setDisabledTextColor(java.awt.Color.black); txtLocation.setBorder(new javax.swing.border.EtchedBorder()); + txtLocation.setDisabledTextColor(java.awt.Color.black); txtLocation.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { txtLocationActionPerformed(evt); @@ -169,7 +167,7 @@ gridBagConstraints.insets = new java.awt.Insets(0, 12, 0, 0); pnlUpgrade.add(txtLocation, gridBagConstraints); - cmdSelectDir.setText(bundle.getString("LBL_cmdSelectDir")); + org.openide.awt.Mnemonics.setLocalizedText(cmdSelectDir,bundle.getString("LBL_cmdSelectDir")); cmdSelectDir.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { cmdSelectDirActionPerformed(evt); @@ -183,8 +181,8 @@ gridBagConstraints.insets = new java.awt.Insets(0, 12, 0, 0); pnlUpgrade.add(cmdSelectDir, gridBagConstraints); - lblVersion.setText(bundle.getString("LBL_lblVersion")); lblVersion.setLabelFor(txtVersion); + org.openide.awt.Mnemonics.setLocalizedText(lblVersion,bundle.getString("LBL_lblVersion")); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 1; @@ -194,8 +192,8 @@ pnlUpgrade.add(lblVersion, gridBagConstraints); txtVersion.setEditable(false); - txtVersion.setDisabledTextColor(java.awt.Color.black); txtVersion.setBorder(new javax.swing.border.EtchedBorder()); + txtVersion.setDisabledTextColor(java.awt.Color.black); txtVersion.setEnabled(false); txtVersion.addFocusListener(new java.awt.event.FocusAdapter() { public void focusGained(java.awt.event.FocusEvent evt) { @@ -219,11 +217,11 @@ gridBagConstraints.insets = new java.awt.Insets(12, 0, 0, 0); add(pnlUpgrade, gridBagConstraints); - txtLabelTop.setWrapStyleWord(true); - txtLabelTop.setLineWrap(true); txtLabelTop.setEditable(false); txtLabelTop.setFont(lblLocation.getFont()); + txtLabelTop.setLineWrap(true); txtLabelTop.setText(bundle.getString("LBL_Upgrade_Description_Top")); + txtLabelTop.setWrapStyleWord(true); txtLabelTop.setDisabledTextColor(lblLocation.getForeground()); txtLabelTop.setDoubleBuffered(true); txtLabelTop.setEnabled(false); @@ -321,16 +319,16 @@ DialogDisplayer.getDefault().notify(descr); } - // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JTextField txtVersion; - private javax.swing.JPanel pnlUpgrade; - private javax.swing.JTextArea txtLabelTop; + // ?????????? ?????????? - ?? ????????? ?????? ???//GEN-BEGIN:variables + private javax.swing.JLabel lblVersion; private javax.swing.JButton cmdSelectDir; + private javax.swing.JTextField txtVersion; + private javax.swing.JTextField txtLocation; private javax.swing.JLabel lblLocation; - private javax.swing.JLabel lblVersion; + private javax.swing.JPanel pnlUpgrade; private javax.swing.JPanel jPanel1; - private javax.swing.JTextField txtLocation; - // End of variables declaration//GEN-END:variables + private javax.swing.JTextArea txtLabelTop; + // ????? ?????????? ??????????//GEN-END:variables private File lastLocation = null; private static final ResourceBundle bundle = NbBundle.getBundle(UpgradePanel.class); Index: core/output/src/org/netbeans/core/output/Bundle.properties =================================================================== RCS file: /shared/data/helm/cvs/repository/core/output/src/org/netbeans/core/output/Bundle.properties,v retrieving revision 1.2 diff -u -r1.2 Bundle.properties --- core/output/src/org/netbeans/core/output/Bundle.properties 2 Nov 2002 21:06:39 -0000 1.2 +++ core/output/src/org/netbeans/core/output/Bundle.properties 23 Feb 2003 23:38:30 -0000 @@ -80,14 +80,10 @@ #Find Dialog LBL_Find_Title=Find -LBL_Find_What=Find What: -LBL_Find_Case=Match Case -LBL_Find_Whole=Match Whole Words Only -LBL_Find_Back=Backward Search -LBL_Find_What_Mnemonic=F -LBL_Find_Case_Mnemonic=M -LBL_Find_Whole_Mnemonic=W -LBL_Find_Back_Mnemonic=B +LBL_Find_What=&Find What: +LBL_Find_Case=&Match Case +LBL_Find_Whole=Match &Whole Words Only +LBL_Find_Back=&Backward Search BTN_Find=Find ACSN_Find=N/A ACSD_Find=N/A Index: core/output/src/org/netbeans/core/output/FindDialogPanel.form =================================================================== RCS file: /shared/data/helm/cvs/repository/core/output/src/org/netbeans/core/output/FindDialogPanel.form,v retrieving revision 1.2 diff -u -r1.2 FindDialogPanel.form --- core/output/src/org/netbeans/core/output/FindDialogPanel.form 2 Nov 2002 21:06:40 -0000 1.2 +++ core/output/src/org/netbeans/core/output/FindDialogPanel.form 23 Feb 2003 23:38:31 -0000 @@ -9,9 +9,6 @@ - - - @@ -43,9 +40,6 @@ - - - @@ -66,9 +60,6 @@ - - - @@ -89,9 +80,6 @@ - - - Index: core/output/src/org/netbeans/core/output/FindDialogPanel.java =================================================================== RCS file: /shared/data/helm/cvs/repository/core/output/src/org/netbeans/core/output/FindDialogPanel.java,v retrieving revision 1.3 diff -u -r1.3 FindDialogPanel.java --- core/output/src/org/netbeans/core/output/FindDialogPanel.java 3 Dec 2002 14:09:48 -0000 1.3 +++ core/output/src/org/netbeans/core/output/FindDialogPanel.java 23 Feb 2003 23:38:32 -0000 @@ -75,9 +75,8 @@ setLayout(new java.awt.GridBagLayout()); - findWhatLabel.setDisplayedMnemonic(NbBundle.getBundle(FindDialogPanel.class).getString("LBL_Find_What_Mnemonic").charAt(0)); findWhatLabel.setLabelFor(findWhat); - findWhatLabel.setText(org.openide.util.NbBundle.getBundle(FindDialogPanel.class).getString("LBL_Find_What")); + org.openide.awt.Mnemonics.setLocalizedText(findWhatLabel,org.openide.util.NbBundle.getBundle(FindDialogPanel.class).getString("LBL_Find_What")); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 1; @@ -95,8 +94,7 @@ gridBagConstraints.insets = new java.awt.Insets(0, 11, 9, 10); add(findWhat, gridBagConstraints); - matchCase.setMnemonic(NbBundle.getBundle(FindDialogPanel.class).getString("LBL_Find_Case_Mnemonic").charAt(0)); - matchCase.setText(org.openide.util.NbBundle.getBundle(FindDialogPanel.class).getString("LBL_Find_Case")); + org.openide.awt.Mnemonics.setLocalizedText(matchCase,org.openide.util.NbBundle.getBundle(FindDialogPanel.class).getString("LBL_Find_Case")); matchCase.setBorder(new javax.swing.border.EmptyBorder(new java.awt.Insets(1, 1, 1, 1))); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 1; @@ -105,36 +103,34 @@ gridBagConstraints.insets = new java.awt.Insets(0, 11, 0, 0); add(matchCase, gridBagConstraints); - wholeWords.setMnemonic(NbBundle.getBundle(FindDialogPanel.class).getString("LBL_Find_Whole_Mnemonic").charAt(0)); - wholeWords.setText(org.openide.util.NbBundle.getBundle(FindDialogPanel.class).getString("LBL_Find_Whole")); + org.openide.awt.Mnemonics.setLocalizedText(wholeWords,org.openide.util.NbBundle.getBundle(FindDialogPanel.class).getString("LBL_Find_Whole")); wholeWords.setBorder(new javax.swing.border.EmptyBorder(new java.awt.Insets(1, 1, 1, 1))); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 1; gridBagConstraints.gridy = 4; - gridBagConstraints.insets = new java.awt.Insets(0, 11, 0, 0); gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; + gridBagConstraints.insets = new java.awt.Insets(0, 11, 0, 0); add(wholeWords, gridBagConstraints); - bwdSearch.setMnemonic(NbBundle.getBundle(FindDialogPanel.class).getString("LBL_Find_Back_Mnemonic").charAt(0)); - bwdSearch.setText(org.openide.util.NbBundle.getBundle(FindDialogPanel.class).getString("LBL_Find_Back")); + org.openide.awt.Mnemonics.setLocalizedText(bwdSearch,org.openide.util.NbBundle.getBundle(FindDialogPanel.class).getString("LBL_Find_Back")); bwdSearch.setBorder(new javax.swing.border.EmptyBorder(new java.awt.Insets(1, 1, 1, 1))); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 2; gridBagConstraints.gridy = 3; - gridBagConstraints.insets = new java.awt.Insets(0, 11, 0, 10); gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; + gridBagConstraints.insets = new java.awt.Insets(0, 11, 0, 10); add(bwdSearch, gridBagConstraints); }//GEN-END:initComponents - // Variables declaration - do not modify//GEN-BEGIN:variables - protected javax.swing.JComboBox findWhat; + // ?????????? ?????????? - ?? ????????? ?????? ???//GEN-BEGIN:variables protected javax.swing.JCheckBox bwdSearch; + protected javax.swing.JComboBox findWhat; protected javax.swing.JCheckBox matchCase; - protected javax.swing.JCheckBox wholeWords; protected javax.swing.JLabel findWhatLabel; - // End of variables declaration//GEN-END:variables + protected javax.swing.JCheckBox wholeWords; + // ????? ?????????? ??????????//GEN-END:variables static FindDialogPanel showFindDialog() { Index: core/src/org/netbeans/beaninfo/Bundle.properties =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/beaninfo/Bundle.properties,v retrieving revision 1.46 diff -u -r1.46 Bundle.properties --- core/src/org/netbeans/beaninfo/Bundle.properties 18 Feb 2003 14:29:29 -0000 1.46 +++ core/src/org/netbeans/beaninfo/Bundle.properties 23 Feb 2003 23:38:35 -0000 @@ -87,21 +87,16 @@ HINT_systemName=Should uniquely identify the filesystem, as it will be used during serialization of its files. # LoaderActionsPanel -LoaderActionsPanel.jButton1.text=Add -LoaderActionsPanel.jButton2.text=Add Separator -LoaderActionsPanel.jButton3.text=Remove -LoaderActionsPanel.jButton4.text=Move Up -LoaderActionsPanel.jButton5.text=Move Down +LoaderActionsPanel.jButton1.text=&Add +LoaderActionsPanel.jButton2.text=Add &Separator +LoaderActionsPanel.jButton3.text=&Remove +LoaderActionsPanel.jButton4.text=Move &Up +LoaderActionsPanel.jButton5.text=Move Do&wn LoaderActionsPanel.jButton1.toolTipText=Adds an action from the actions pool to the end of the list. LoaderActionsPanel.jButton2.toolTipText=Adds a separator to the end of the list. LoaderActionsPanel.jButton3.toolTipText=Removes the selected action from the list. LoaderActionsPanel.jButton4.toolTipText=Moves the selected item up in the list. LoaderActionsPanel.jButton5.toolTipText=Moves the selected item down in the list. -LoaderActionsPanel.jButton1.mnemonic=A -LoaderActionsPanel.jButton2.mnemonic=S -LoaderActionsPanel.jButton3.mnemonic=R -LoaderActionsPanel.jButton4.mnemonic=U -LoaderActionsPanel.jButton5.mnemonic=w ACS_LoaderActionsPanel.beanTreeView=Actions pool ACSD_LoaderActionsPanel.beanTreeView=N/A ACS_LoaderActionsPanel.list=Actions list Index: core/src/org/netbeans/beaninfo/LoaderActionsPanel.form =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/beaninfo/LoaderActionsPanel.form,v retrieving revision 1.5 diff -u -r1.5 LoaderActionsPanel.form --- core/src/org/netbeans/beaninfo/LoaderActionsPanel.form 10 Jan 2002 15:22:02 -0000 1.5 +++ core/src/org/netbeans/beaninfo/LoaderActionsPanel.form 23 Feb 2003 23:38:38 -0000 @@ -11,8 +11,6 @@ - - @@ -66,14 +64,13 @@ - - - + + + - @@ -100,100 +97,95 @@ - - - + + + - - + - - - + + + - - + - - - + + + - - + - - - + + + - - + - - - + + + - - + Index: core/src/org/netbeans/beaninfo/LoaderActionsPanel.java =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/beaninfo/LoaderActionsPanel.java,v retrieving revision 1.12 diff -u -r1.12 LoaderActionsPanel.java --- core/src/org/netbeans/beaninfo/LoaderActionsPanel.java 19 Dec 2002 04:21:47 -0000 1.12 +++ core/src/org/netbeans/beaninfo/LoaderActionsPanel.java 23 Feb 2003 23:38:42 -0000 @@ -63,12 +63,6 @@ java.util.ResourceBundle bundle = NbBundle.getBundle(LoaderActionsPanel.class); - addButton.setMnemonic(bundle.getString("LoaderActionsPanel.jButton1.mnemonic").charAt(0)); - separatorButton.setMnemonic(bundle.getString("LoaderActionsPanel.jButton2.mnemonic").charAt(0)); - removeButton.setMnemonic(bundle.getString("LoaderActionsPanel.jButton3.mnemonic").charAt(0)); - upButton.setMnemonic(bundle.getString("LoaderActionsPanel.jButton4.mnemonic").charAt(0)); - downButton.setMnemonic(bundle.getString("LoaderActionsPanel.jButton5.mnemonic").charAt(0)); - beanTreeView2.getAccessibleContext().setAccessibleName(bundle.getString("ACS_LoaderActionsPanel.beanTreeView")); beanTreeView2.getAccessibleContext().setAccessibleDescription(bundle.getString("ACSD_LoaderActionsPanel.beanTreeView")); list.getAccessibleContext().setAccessibleName(bundle.getString("ACS_LoaderActionsPanel.list")); @@ -82,6 +76,8 @@ * always regenerated by the FormEditor. */ private void initComponents() {//GEN-BEGIN:initComponents + java.awt.GridBagConstraints gridBagConstraints; + splitPane = new javax.swing.JSplitPane(); explorerPanel = new org.openide.explorer.ExplorerPanel(); beanTreeView2 = new org.openide.explorer.view.BeanTreeView(); @@ -94,9 +90,9 @@ removeButton = new javax.swing.JButton(); upButton = new javax.swing.JButton(); downButton = new javax.swing.JButton(); - + setLayout(new java.awt.BorderLayout(11, 0)); - + setBorder(new javax.swing.border.EmptyBorder(new java.awt.Insets(12, 12, 0, 11))); setPreferredSize(new java.awt.Dimension(600, 500)); splitPane.setDividerSize(5); @@ -104,108 +100,107 @@ beanTreeView2.setDefaultActionAllowed(false); beanTreeView2.setPopupAllowed(false); explorerPanel.add(beanTreeView2, java.awt.BorderLayout.CENTER); - + splitPane.setLeftComponent(explorerPanel); - - list.setCellRenderer(this); + list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + list.setCellRenderer(this); list.addListSelectionListener(new javax.swing.event.ListSelectionListener() { public void valueChanged(javax.swing.event.ListSelectionEvent evt) { listValueChanged(evt); } }); - + jScrollPane1.setViewportView(list); - + splitPane.setRightComponent(jScrollPane1); - + add(splitPane, java.awt.BorderLayout.CENTER); - + jPanel2.setLayout(new java.awt.FlowLayout(java.awt.FlowLayout.CENTER, 0, 0)); - + jPanel1.setLayout(new java.awt.GridBagLayout()); - java.awt.GridBagConstraints gridBagConstraints1; - + + org.openide.awt.Mnemonics.setLocalizedText(addButton,java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/Bundle").getString("LoaderActionsPanel.jButton1.text")); addButton.setToolTipText(java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/Bundle").getString("LoaderActionsPanel.jButton1.toolTipText")); - addButton.setText(java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/Bundle").getString("LoaderActionsPanel.jButton1.text")); addButton.setEnabled(false); addButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { addButtonActionPerformed(evt); } }); - - gridBagConstraints1 = new java.awt.GridBagConstraints(); - gridBagConstraints1.fill = java.awt.GridBagConstraints.HORIZONTAL; - gridBagConstraints1.insets = new java.awt.Insets(0, 0, 5, 0); - jPanel1.add(addButton, gridBagConstraints1); - + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.insets = new java.awt.Insets(0, 0, 5, 0); + jPanel1.add(addButton, gridBagConstraints); + + org.openide.awt.Mnemonics.setLocalizedText(separatorButton,java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/Bundle").getString("LoaderActionsPanel.jButton2.text")); separatorButton.setToolTipText(java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/Bundle").getString("LoaderActionsPanel.jButton2.toolTipText")); - separatorButton.setText(java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/Bundle").getString("LoaderActionsPanel.jButton2.text")); separatorButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { separatorButtonActionPerformed(evt); } }); - - gridBagConstraints1 = new java.awt.GridBagConstraints(); - gridBagConstraints1.gridx = 0; - gridBagConstraints1.gridy = 1; - gridBagConstraints1.fill = java.awt.GridBagConstraints.HORIZONTAL; - gridBagConstraints1.insets = new java.awt.Insets(0, 0, 5, 0); - jPanel1.add(separatorButton, gridBagConstraints1); - + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 1; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.insets = new java.awt.Insets(0, 0, 5, 0); + jPanel1.add(separatorButton, gridBagConstraints); + + org.openide.awt.Mnemonics.setLocalizedText(removeButton,java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/Bundle").getString("LoaderActionsPanel.jButton3.text")); removeButton.setToolTipText(java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/Bundle").getString("LoaderActionsPanel.jButton3.toolTipText")); - removeButton.setText(java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/Bundle").getString("LoaderActionsPanel.jButton3.text")); removeButton.setEnabled(false); removeButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { removeButtonActionPerformed(evt); } }); - - gridBagConstraints1 = new java.awt.GridBagConstraints(); - gridBagConstraints1.gridx = 0; - gridBagConstraints1.gridy = 2; - gridBagConstraints1.fill = java.awt.GridBagConstraints.HORIZONTAL; - gridBagConstraints1.insets = new java.awt.Insets(0, 0, 11, 0); - jPanel1.add(removeButton, gridBagConstraints1); - + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 2; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.insets = new java.awt.Insets(0, 0, 11, 0); + jPanel1.add(removeButton, gridBagConstraints); + + org.openide.awt.Mnemonics.setLocalizedText(upButton,java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/Bundle").getString("LoaderActionsPanel.jButton4.text")); upButton.setToolTipText(java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/Bundle").getString("LoaderActionsPanel.jButton4.toolTipText")); - upButton.setText(java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/Bundle").getString("LoaderActionsPanel.jButton4.text")); upButton.setEnabled(false); upButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { upButtonActionPerformed(evt); } }); - - gridBagConstraints1 = new java.awt.GridBagConstraints(); - gridBagConstraints1.gridx = 0; - gridBagConstraints1.gridy = 3; - gridBagConstraints1.fill = java.awt.GridBagConstraints.HORIZONTAL; - gridBagConstraints1.insets = new java.awt.Insets(0, 0, 5, 0); - jPanel1.add(upButton, gridBagConstraints1); - + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 3; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.insets = new java.awt.Insets(0, 0, 5, 0); + jPanel1.add(upButton, gridBagConstraints); + + org.openide.awt.Mnemonics.setLocalizedText(downButton,java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/Bundle").getString("LoaderActionsPanel.jButton5.text")); downButton.setToolTipText(java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/Bundle").getString("LoaderActionsPanel.jButton5.toolTipText")); - downButton.setText(java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/Bundle").getString("LoaderActionsPanel.jButton5.text")); downButton.setEnabled(false); downButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { downButtonActionPerformed(evt); } }); - - gridBagConstraints1 = new java.awt.GridBagConstraints(); - gridBagConstraints1.gridx = 0; - gridBagConstraints1.gridy = 4; - gridBagConstraints1.fill = java.awt.GridBagConstraints.HORIZONTAL; - jPanel1.add(downButton, gridBagConstraints1); - + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 4; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + jPanel1.add(downButton, gridBagConstraints); + jPanel2.add(jPanel1); - + add(jPanel2, java.awt.BorderLayout.EAST); - + }//GEN-END:initComponents private void listValueChanged (javax.swing.event.ListSelectionEvent evt) {//GEN-FIRST:event_listValueChanged @@ -264,20 +259,20 @@ }//GEN-LAST:event_addButtonActionPerformed - // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JSplitPane splitPane; - private org.openide.explorer.ExplorerPanel explorerPanel; - private org.openide.explorer.view.BeanTreeView beanTreeView2; + // ?????????? ?????????? - ?? ????????? ?????? ???//GEN-BEGIN:variables private javax.swing.JScrollPane jScrollPane1; - private javax.swing.JList list; + private org.openide.explorer.view.BeanTreeView beanTreeView2; + private javax.swing.JButton upButton; private javax.swing.JPanel jPanel2; + private javax.swing.JList list; + private org.openide.explorer.ExplorerPanel explorerPanel; + private javax.swing.JButton separatorButton; private javax.swing.JPanel jPanel1; + private javax.swing.JSplitPane splitPane; + private javax.swing.JButton downButton; private javax.swing.JButton addButton; - private javax.swing.JButton separatorButton; private javax.swing.JButton removeButton; - private javax.swing.JButton upButton; - private javax.swing.JButton downButton; - // End of variables declaration//GEN-END:variables + // ????? ?????????? ??????????//GEN-END:variables /** Try to find a system action instance among a set of nodes. */ private static SystemAction findAction (Node[] nodes) { Index: core/src/org/netbeans/beaninfo/editors/Bundle.properties =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/beaninfo/editors/Bundle.properties,v retrieving revision 1.58 diff -u -r1.58 Bundle.properties --- core/src/org/netbeans/beaninfo/editors/Bundle.properties 23 Feb 2003 20:04:29 -0000 1.58 +++ core/src/org/netbeans/beaninfo/editors/Bundle.properties 23 Feb 2003 23:38:49 -0000 @@ -67,10 +67,8 @@ #DimensionCustomEditor CTL_Dimension=Dimension -CTL_Width=Width: -CTL_Width_mnemonic=W -CTL_Height=Height: -CTL_Height_mnemonic=H +CTL_Width=&Width: +CTL_Height=&Height: ACSD_CTL_Width=N/A ACSD_CTL_Height=N/A ACSD_DimensionCustomEditor=N/A @@ -88,12 +86,9 @@ CTL_Bold=Bold CTL_Italic=Italic CTL_BoldItalic=Bold Italic -CTL_Font=Font: -CTL_Font_mnemonic=t -CTL_FontStyle=Font Style: -CTL_FontStyle_mnemonic=y -CTL_Size=Size: -CTL_Size_mnemonic=S +CTL_Font=Fon&t: +CTL_FontStyle=Font St&yle: +CTL_Size=&Size: CTL_Preview=Preview ACSD_CTL_Font=N/A ACSD_CTL_FontStyle=N/A @@ -102,14 +97,10 @@ #InsetsCustomEditor CTL_Insets=Insets -CTL_Top=Top: -CTL_Top_Mnemonic=T -CTL_Left=Left: -CTL_Left_Mnemonic=L -CTL_Bottom=Bottom: -CTL_Bottom_Mnemonic=B -CTL_Right=Right: -CTL_Right_Mnemonic=R +CTL_Top=&Top: +CTL_Left=&Left: +CTL_Bottom=&Bottom: +CTL_Right=&Right: ACSD_CTL_Top=N/A ACSD_CTL_Left=N/A ACSD_CTL_Bottom=N/A @@ -125,11 +116,9 @@ #PointCustomEditor CTL_Point=Point -CTL_X=X: -CTL_X_Mnemonic=X +CTL_X=&X: ACSD_CTL_X=N/A -CTL_Y=Y: -CTL_Y_Mnemonic=Y +CTL_Y=&Y: ACSD_CTL_Y=N/A ACSD_PointCustomEditor=N/A @@ -176,27 +165,18 @@ #CTL_Preset_label=Preset Name\: #CTL_TextProperties= -CTL_FileSystemPanel.originalRadioButton.text=Original (Old) Value -CTL_FileSystemPanel.originalRadioButton.text_Mnemonic=V -CTL_FileSystemPanel.dirRadioButton.text=Add Local Directory -CTL_FileSystemPanel.dirRadioButton.text_Mnemonic=A -LAB_FileSystemPanel.dirLabel.text=Directory: -LAB_FileSystemPanel.dirLabel.text_Mnemonic=D +CTL_FileSystemPanel.originalRadioButton.text=Original (Old) &Value +CTL_FileSystemPanel.dirRadioButton.text=&Add Local Directory +LAB_FileSystemPanel.dirLabel.text=&Directory: LAB_FileSystemPanel.dirPathLabel.text=Not Used -CTL_FileSystemPanel.jarRadioButton.text=Add JAR File -CTL_FileSystemPanel.jarRadioButton.text_Mnemonic=J -LAB_FileSystemPanel.jarLabel.text=JAR File: -LAB_FileSystemPanel.jarLabel.text_Mnemonic=F +CTL_FileSystemPanel.jarRadioButton.text=Add &JAR File +LAB_FileSystemPanel.jarLabel.text=JAR &File: LAB_FileSystemPanel.jarPathLabel.text=Not Used -CTL_FileSystemPanel.browseDirButton.text=Browse... -CTL_FileSystemPanel.browseDirButton.text_Mnemonic=B -CTL_FileSystemPanel.browseJarButton.text=Browse... -CTL_FileSystemPanel.browseJarButton.text_Mnemonic=R +CTL_FileSystemPanel.browseDirButton.text=&Browse... +CTL_FileSystemPanel.browseJarButton.text=B&rowse... CTL_FileSystemPanel.browseJarButton.hint=Browse... -CTL_FileSystemPanel.otherRadioButton.text=Add (other file system type) -CTL_FileSystemPanel.otherRadioButton.text_Mnemonic=O -LAB_FileSystemPanel.createLabel.text=Type: -LAB_FileSystemPanel.createLabel.text_Mnemonic=T +CTL_FileSystemPanel.otherRadioButton.text=Add (&other file system type) +LAB_FileSystemPanel.createLabel.text=&Type: CTL_FileSystemPanel.Jar_Dialog_Title=Add JAR File CTL_FileSystemPanel.Approve_Button_Title=OK CTL_FileSystemPanel.Local_Dialog_Title=Add Local Directory @@ -212,15 +192,11 @@ FMT_TemplateDefaultFolderName=newFolder LAB_DefaultDataFolder=Default LAB_SelectPackageBorder=Select Package -LAB_TargetLocationDescription=Target Location -LAB_package=Folder: -LAB_directory=Directory: +LAB_TargetLocationDescription=&Target Location +LAB_package=F&older: +LAB_directory=&Directory: LAB_TargetLocationPanelName=Target Location -CTL_Create=Create -LAB_TargetLocationDescription_mnemonic=T -LAB_package_mnemonic=O -LAB_directory_mnemonic=D -CTL_Create_mnemonic=C +CTL_Create=&Create ACSD_DataFolderTree=N/A ACSD_package=N/A @@ -247,16 +223,11 @@ MSG_PropertiesComments=Commented properties can be lost after saving this change. Continue? #ExtensionListCustomEditor -CTL_ELCE_Item=Item: -CTL_ELCE_ItemList=Item List -CTL_ELCE_Add=Add -CTL_ELCE_Change=Edit -CTL_ELCE_Remove=Remove -CTL_ELCE_Item_Mnemonic=I -CTL_ELCE_ItemList_Mnemonic=L -CTL_ELCE_Add_Mnemonic=A -CTL_ELCE_Change_Mnemonic=E -CTL_ELCE_Remove_Mnemonic=R +CTL_ELCE_Item=&Item: +CTL_ELCE_ItemList=Item &List +CTL_ELCE_Add=&Add +CTL_ELCE_Change=&Edit +CTL_ELCE_Remove=&Remove ACSD_ELCE=N/A ACSD_ELCE_Item=N/A ACSD_ELCE_ItemList=N/A @@ -271,25 +242,18 @@ #StringArrayCustomEditor CTL_Empty= -CTL_Item=Item: -CTL_Item_Mnemonic=I +CTL_Item=&Item: ACSD_CTL_Item=N/A -CTL_ItemList=Item List -CTL_ItemList_Mnemonic=L +CTL_ItemList=Item &List ACSD_CTL_ItemList=N/A -CTL_Add_StringArrayCustomEditor=Add -CTL_Add_StringArrayCustomEditor_Mnemonic=A +CTL_Add_StringArrayCustomEditor=&Add ACSD_CTL_Add_StringArrayCustomEditor=N/A -CTL_Change_StringArrayCustomEditor=Edit -CTL_Change_StringArrayCustomEditor_Mnemonic=E +CTL_Change_StringArrayCustomEditor=&Edit ACSD_CTL_Change_StringArrayCustomEditor=N/A -CTL_Remove=Remove -CTL_Remove_Mnemonic=R +CTL_Remove=&Remove ACSD_CTL_Remove=N/A -CTL_MoveUp=Up -CTL_MoveUp_Mnemonic=U +CTL_MoveUp=&Up ACSD_CTL_MoveUp=N/A -CTL_MoveDown=Down -CTL_MoveDown_Mnemonic=w +CTL_MoveDown=Do&wn ACSD_CTL_MoveDown=N/A ACSD_StringArrayCustomEditor=N/A Index: core/src/org/netbeans/beaninfo/editors/DataFolderPanel.java =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/beaninfo/editors/DataFolderPanel.java,v retrieving revision 1.19 diff -u -r1.19 DataFolderPanel.java --- core/src/org/netbeans/beaninfo/editors/DataFolderPanel.java 29 Jan 2003 01:42:23 -0000 1.19 +++ core/src/org/netbeans/beaninfo/editors/DataFolderPanel.java 23 Feb 2003 23:38:54 -0000 @@ -102,11 +102,6 @@ packageName.getDocument().addDocumentListener(this); packageName.unregisterKeyboardAction(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0)); - descriptionLabel.setDisplayedMnemonic(getString("LAB_TargetLocationDescription_mnemonic").charAt(0)); - packageLabel.setDisplayedMnemonic(getString("LAB_package_mnemonic").charAt(0)); - dirLabel.setDisplayedMnemonic(getString("LAB_directory_mnemonic").charAt(0)); - createButton.setMnemonic(getString("CTL_Create_mnemonic").charAt(0)); - beanTreeView.getAccessibleContext().setAccessibleDescription(getString("ACSD_DataFolderTree")); packageName.getAccessibleContext().setAccessibleDescription(getString("ACSD_package")); directoryName.getAccessibleContext().setAccessibleDescription(getString("ACSD_directory")); @@ -167,7 +162,7 @@ packagesPanel.add(beanTreeView, gridBagConstraints); descriptionLabel.setLabelFor(beanTreeView); - descriptionLabel.setText(java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("LAB_TargetLocationDescription")); + org.openide.awt.Mnemonics.setLocalizedText(descriptionLabel,java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("LAB_TargetLocationDescription")); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 0; @@ -177,7 +172,7 @@ packagesPanel.add(descriptionLabel, gridBagConstraints); packageLabel.setLabelFor(packageName); - packageLabel.setText(java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("LAB_package")); + org.openide.awt.Mnemonics.setLocalizedText(packageLabel,java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("LAB_package")); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 2; @@ -194,7 +189,7 @@ gridBagConstraints.insets = new java.awt.Insets(0, 0, 5, 5); packagesPanel.add(packageName, gridBagConstraints); - dirLabel.setText(java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("LAB_directory")); + org.openide.awt.Mnemonics.setLocalizedText(dirLabel,java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("LAB_directory")); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 3; @@ -210,7 +205,7 @@ gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; packagesPanel.add(directoryName, gridBagConstraints); - createButton.setText(java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("CTL_Create")); + org.openide.awt.Mnemonics.setLocalizedText(createButton,java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("CTL_Create")); createButton.setEnabled(false); createButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { @@ -244,16 +239,16 @@ }//GEN-LAST:event_createButtonActionPerformed - // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JButton createButton; + // ?????????? ?????????? - ?? ????????? ?????? ???//GEN-BEGIN:variables private javax.swing.JLabel packageLabel; - private org.openide.explorer.view.BeanTreeView beanTreeView; - private javax.swing.JTextField packageName; - private javax.swing.JTextField directoryName; private org.openide.explorer.ExplorerPanel packagesPanel; - private javax.swing.JLabel dirLabel; + private javax.swing.JButton createButton; + private javax.swing.JTextField directoryName; private javax.swing.JLabel descriptionLabel; - // End of variables declaration//GEN-END:variables + private javax.swing.JLabel dirLabel; + private javax.swing.JTextField packageName; + private org.openide.explorer.view.BeanTreeView beanTreeView; + // ????? ?????????? ??????????//GEN-END:variables // // Filter to accept only folders Index: core/src/org/netbeans/beaninfo/editors/DimensionCustomEditor.java =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/beaninfo/editors/DimensionCustomEditor.java,v retrieving revision 1.24 diff -u -r1.24 DimensionCustomEditor.java --- core/src/org/netbeans/beaninfo/editors/DimensionCustomEditor.java 3 Dec 2002 14:09:55 -0000 1.24 +++ core/src/org/netbeans/beaninfo/editors/DimensionCustomEditor.java 23 Feb 2003 23:39:19 -0000 @@ -46,11 +46,11 @@ if (dimension == null) dimension = new Dimension (0, 0); jLabel1.setText(bundle.getString ("CTL_Dimension")); - widthLabel.setText (bundle.getString("CTL_Width")); - widthLabel.setDisplayedMnemonic(bundle.getString("CTL_Width_mnemonic").charAt(0)); + org.openide.awt.Mnemonics.setLocalizedText(widthLabel, + bundle.getString("CTL_Width")); widthLabel.setLabelFor(widthField); - heightLabel.setText (bundle.getString("CTL_Height")); - heightLabel.setDisplayedMnemonic(bundle.getString("CTL_Height_mnemonic").charAt(0)); + org.openide.awt.Mnemonics.setLocalizedText(heightLabel, + bundle.getString("CTL_Height")); heightLabel.setLabelFor(heightField); widthField.setText ("" + dimension.width); // NOI18N Index: core/src/org/netbeans/beaninfo/editors/ExtensionListCustomEditor.java =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/beaninfo/editors/ExtensionListCustomEditor.java,v retrieving revision 1.4 diff -u -r1.4 ExtensionListCustomEditor.java --- core/src/org/netbeans/beaninfo/editors/ExtensionListCustomEditor.java 3 Dec 2002 14:09:55 -0000 1.4 +++ core/src/org/netbeans/beaninfo/editors/ExtensionListCustomEditor.java 23 Feb 2003 23:39:19 -0000 @@ -70,17 +70,16 @@ ResourceBundle bundle = NbBundle.getBundle ( ExtensionListCustomEditor.class); - itemLabel.setText (bundle.getString ("CTL_ELCE_Item")); - itemListLabel.setText(bundle.getString ("CTL_ELCE_ItemList")); - addButton.setText (bundle.getString ("CTL_ELCE_Add")); - changeButton.setText (bundle.getString ("CTL_ELCE_Change")); - removeButton.setText (bundle.getString ("CTL_ELCE_Remove")); - - itemLabel.setDisplayedMnemonic(bundle.getString("CTL_ELCE_Item_Mnemonic").charAt(0)); - itemListLabel.setDisplayedMnemonic(bundle.getString("CTL_ELCE_ItemList_Mnemonic").charAt(0)); - addButton.setMnemonic(bundle.getString("CTL_ELCE_Add_Mnemonic").charAt(0)); - changeButton.setMnemonic(bundle.getString("CTL_ELCE_Change_Mnemonic").charAt(0)); - removeButton.setMnemonic(bundle.getString("CTL_ELCE_Remove_Mnemonic").charAt(0)); + org.openide.awt.Mnemonics.setLocalizedText(itemLabel, + bundle.getString ("CTL_ELCE_Item")); + org.openide.awt.Mnemonics.setLocalizedText(itemListLabel, + bundle.getString ("CTL_ELCE_ItemList")); + org.openide.awt.Mnemonics.setLocalizedText(addButton, + bundle.getString ("CTL_ELCE_Add")); + org.openide.awt.Mnemonics.setLocalizedText(changeButton, + bundle.getString ("CTL_ELCE_Change")); + org.openide.awt.Mnemonics.setLocalizedText(removeButton, + bundle.getString ("CTL_ELCE_Remove")); getAccessibleContext().setAccessibleDescription(bundle.getString("ACSD_ELCE")); itemField.getAccessibleContext().setAccessibleDescription(bundle.getString("ACSD_ELCE_Item")); Index: core/src/org/netbeans/beaninfo/editors/FileSystemPanel.form =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/beaninfo/editors/FileSystemPanel.form,v retrieving revision 1.8 diff -u -r1.8 FileSystemPanel.form --- core/src/org/netbeans/beaninfo/editors/FileSystemPanel.form 23 Feb 2003 20:04:28 -0000 1.8 +++ core/src/org/netbeans/beaninfo/editors/FileSystemPanel.form 23 Feb 2003 23:39:24 -0000 @@ -1,6 +1,6 @@ -
+ @@ -21,8 +21,6 @@ - - @@ -32,13 +30,12 @@ - - + @@ -49,39 +46,37 @@ - - + - - - + + + - + - - + @@ -91,13 +86,12 @@ - - + @@ -107,28 +101,27 @@ - - + - - - + + + - + @@ -136,33 +129,31 @@ - - + - - - + + + - - + @@ -172,55 +163,53 @@ - - + - - - + + + - + - + - + - - + - + Index: core/src/org/netbeans/beaninfo/editors/FileSystemPanel.java =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/beaninfo/editors/FileSystemPanel.java,v retrieving revision 1.20 diff -u -r1.20 FileSystemPanel.java --- core/src/org/netbeans/beaninfo/editors/FileSystemPanel.java 23 Feb 2003 20:04:29 -0000 1.20 +++ core/src/org/netbeans/beaninfo/editors/FileSystemPanel.java 23 Feb 2003 23:39:30 -0000 @@ -82,6 +82,8 @@ initialize(); } private void initComponents() {//GEN-BEGIN:initComponents + java.awt.GridBagConstraints gridBagConstraints; + group = new javax.swing.ButtonGroup(); originalRadioButton = new javax.swing.JRadioButton(); dirRadioButton = new javax.swing.JRadioButton(); @@ -96,185 +98,183 @@ createLabel = new javax.swing.JLabel(); typeComboBox = new javax.swing.JComboBox(); propertySheet1 = new org.openide.explorer.propertysheet.PropertySheet(); - - + setLayout(new java.awt.GridBagLayout()); - java.awt.GridBagConstraints gridBagConstraints1; - + setBorder(new javax.swing.border.CompoundBorder(new javax.swing.border.TitledBorder(java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("CTL_FileSystemPanel.Border_Title")), new javax.swing.border.EmptyBorder(new java.awt.Insets(8, 8, 8, 8)))); - originalRadioButton.setText(java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("CTL_FileSystemPanel.originalRadioButton.text")); + org.openide.awt.Mnemonics.setLocalizedText(originalRadioButton,java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("CTL_FileSystemPanel.originalRadioButton.text")); originalRadioButton.addItemListener(new java.awt.event.ItemListener() { public void itemStateChanged(java.awt.event.ItemEvent evt) { originalRadioButtonItemStateChanged(evt); } }); - - gridBagConstraints1 = new java.awt.GridBagConstraints(); - gridBagConstraints1.gridx = 0; - gridBagConstraints1.gridy = 0; - gridBagConstraints1.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints1.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints1.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints1.weightx = 1.0; - add(originalRadioButton, gridBagConstraints1); - + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 0; + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; + gridBagConstraints.weightx = 1.0; + add(originalRadioButton, gridBagConstraints); + dirRadioButton.setSelected(true); - dirRadioButton.setText(java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("CTL_FileSystemPanel.dirRadioButton.text")); + org.openide.awt.Mnemonics.setLocalizedText(dirRadioButton,java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("CTL_FileSystemPanel.dirRadioButton.text")); dirRadioButton.addItemListener(new java.awt.event.ItemListener() { public void itemStateChanged(java.awt.event.ItemEvent evt) { dirRadioButtonItemStateChanged(evt); } }); - - gridBagConstraints1 = new java.awt.GridBagConstraints(); - gridBagConstraints1.gridx = 0; - gridBagConstraints1.gridy = 1; - gridBagConstraints1.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints1.fill = java.awt.GridBagConstraints.BOTH; - add(dirRadioButton, gridBagConstraints1); - - dirLabel.setText(java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("LAB_FileSystemPanel.dirLabel.text")); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 1; + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + add(dirRadioButton, gridBagConstraints); + dirLabel.setLabelFor(dirTextField); - gridBagConstraints1 = new java.awt.GridBagConstraints(); - gridBagConstraints1.gridx = 0; - gridBagConstraints1.gridy = 2; - gridBagConstraints1.insets = new java.awt.Insets(0, 24, 0, 0); - gridBagConstraints1.anchor = java.awt.GridBagConstraints.WEST; - add(dirLabel, gridBagConstraints1); - + org.openide.awt.Mnemonics.setLocalizedText(dirLabel,java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("LAB_FileSystemPanel.dirLabel.text")); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 2; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(0, 24, 0, 0); + add(dirLabel, gridBagConstraints); + dirTextField.addFocusListener(new java.awt.event.FocusAdapter() { public void focusLost(java.awt.event.FocusEvent evt) { dirTextFieldFocusLost(evt); } }); - - gridBagConstraints1 = new java.awt.GridBagConstraints(); - gridBagConstraints1.gridx = 1; - gridBagConstraints1.gridy = 2; - gridBagConstraints1.fill = java.awt.GridBagConstraints.HORIZONTAL; - gridBagConstraints1.weightx = 1.0; - add(dirTextField, gridBagConstraints1); - - browseDirButton.setText(java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("CTL_FileSystemPanel.browseDirButton.text")); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 2; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.weightx = 1.0; + add(dirTextField, gridBagConstraints); + + org.openide.awt.Mnemonics.setLocalizedText(browseDirButton,java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("CTL_FileSystemPanel.browseDirButton.text")); browseDirButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { browseDirButtonActionPerformed(evt); } }); - - gridBagConstraints1 = new java.awt.GridBagConstraints(); - gridBagConstraints1.gridx = 2; - gridBagConstraints1.gridy = 2; - gridBagConstraints1.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints1.insets = new java.awt.Insets(0, 8, 0, 0); - gridBagConstraints1.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints1.weightx = 0.1; - add(browseDirButton, gridBagConstraints1); - - jarRadioButton.setText(java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("CTL_FileSystemPanel.jarRadioButton.text")); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 2; + gridBagConstraints.gridy = 2; + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.weightx = 0.1; + gridBagConstraints.insets = new java.awt.Insets(0, 8, 0, 0); + add(browseDirButton, gridBagConstraints); + + org.openide.awt.Mnemonics.setLocalizedText(jarRadioButton,java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("CTL_FileSystemPanel.jarRadioButton.text")); jarRadioButton.addItemListener(new java.awt.event.ItemListener() { public void itemStateChanged(java.awt.event.ItemEvent evt) { jarRadioButtonItemStateChanged(evt); } }); - - gridBagConstraints1 = new java.awt.GridBagConstraints(); - gridBagConstraints1.gridx = 0; - gridBagConstraints1.gridy = 3; - gridBagConstraints1.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints1.fill = java.awt.GridBagConstraints.BOTH; - add(jarRadioButton, gridBagConstraints1); - - jarLabel.setText(java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("LAB_FileSystemPanel.jarLabel.text")); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 3; + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + add(jarRadioButton, gridBagConstraints); + jarLabel.setLabelFor(jarTextField); - gridBagConstraints1 = new java.awt.GridBagConstraints(); - gridBagConstraints1.gridx = 0; - gridBagConstraints1.gridy = 4; - gridBagConstraints1.insets = new java.awt.Insets(0, 24, 0, 0); - gridBagConstraints1.anchor = java.awt.GridBagConstraints.WEST; - add(jarLabel, gridBagConstraints1); - + org.openide.awt.Mnemonics.setLocalizedText(jarLabel,java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("LAB_FileSystemPanel.jarLabel.text")); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 4; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(0, 24, 0, 0); + add(jarLabel, gridBagConstraints); + jarTextField.setEnabled(false); jarTextField.addFocusListener(new java.awt.event.FocusAdapter() { public void focusLost(java.awt.event.FocusEvent evt) { jarTextFieldFocusLost(evt); } }); - - gridBagConstraints1 = new java.awt.GridBagConstraints(); - gridBagConstraints1.gridx = 1; - gridBagConstraints1.gridy = 4; - gridBagConstraints1.fill = java.awt.GridBagConstraints.HORIZONTAL; - gridBagConstraints1.weightx = 1.0; - add(jarTextField, gridBagConstraints1); - + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 4; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.weightx = 1.0; + add(jarTextField, gridBagConstraints); + + org.openide.awt.Mnemonics.setLocalizedText(browseJarButton,java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("CTL_FileSystemPanel.browseJarButton.text")); browseJarButton.setToolTipText(java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("CTL_FileSystemPanel.browseJarButton.hint")); - browseJarButton.setText(java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("CTL_FileSystemPanel.browseJarButton.text")); browseJarButton.setEnabled(false); browseJarButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { browseJarButtonActionPerformed(evt); } }); - - gridBagConstraints1 = new java.awt.GridBagConstraints(); - gridBagConstraints1.gridx = 2; - gridBagConstraints1.gridy = 4; - gridBagConstraints1.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints1.insets = new java.awt.Insets(0, 8, 0, 0); - gridBagConstraints1.anchor = java.awt.GridBagConstraints.WEST; - add(browseJarButton, gridBagConstraints1); - - otherRadioButton.setText(java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("CTL_FileSystemPanel.otherRadioButton.text")); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 2; + gridBagConstraints.gridy = 4; + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(0, 8, 0, 0); + add(browseJarButton, gridBagConstraints); + + org.openide.awt.Mnemonics.setLocalizedText(otherRadioButton,java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("CTL_FileSystemPanel.otherRadioButton.text")); otherRadioButton.addItemListener(new java.awt.event.ItemListener() { public void itemStateChanged(java.awt.event.ItemEvent evt) { otherRadioButtonItemStateChanged(evt); } }); - - gridBagConstraints1 = new java.awt.GridBagConstraints(); - gridBagConstraints1.gridx = 0; - gridBagConstraints1.gridy = 5; - gridBagConstraints1.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints1.fill = java.awt.GridBagConstraints.BOTH; - add(otherRadioButton, gridBagConstraints1); - - createLabel.setText(java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("LAB_FileSystemPanel.createLabel.text")); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 5; + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + add(otherRadioButton, gridBagConstraints); + createLabel.setLabelFor(typeComboBox); - gridBagConstraints1 = new java.awt.GridBagConstraints(); - gridBagConstraints1.gridx = 0; - gridBagConstraints1.gridy = 6; - gridBagConstraints1.insets = new java.awt.Insets(0, 24, 0, 0); - gridBagConstraints1.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints1.weightx = 0.1; - add(createLabel, gridBagConstraints1); - - typeComboBox.setPreferredSize(new java.awt.Dimension(200, 25)); + org.openide.awt.Mnemonics.setLocalizedText(createLabel,java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("LAB_FileSystemPanel.createLabel.text")); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 6; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.weightx = 0.1; + gridBagConstraints.insets = new java.awt.Insets(0, 24, 0, 0); + add(createLabel, gridBagConstraints); + typeComboBox.setMinimumSize(new java.awt.Dimension(200, 25)); + typeComboBox.setPreferredSize(new java.awt.Dimension(200, 25)); typeComboBox.setEnabled(false); typeComboBox.addItemListener(new java.awt.event.ItemListener() { public void itemStateChanged(java.awt.event.ItemEvent evt) { typeComboBoxItemStateChanged(evt); } }); - - gridBagConstraints1 = new java.awt.GridBagConstraints(); - gridBagConstraints1.gridx = 1; - gridBagConstraints1.gridy = 6; - gridBagConstraints1.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints1.weightx = 0.8; - add(typeComboBox, gridBagConstraints1); - - gridBagConstraints1 = new java.awt.GridBagConstraints(); - gridBagConstraints1.gridx = 0; - gridBagConstraints1.gridy = 7; - gridBagConstraints1.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints1.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints1.insets = new java.awt.Insets(24, 0, 0, 0); - gridBagConstraints1.weightx = 1.0; - gridBagConstraints1.weighty = 1.0; - add(propertySheet1, gridBagConstraints1); - + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 6; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.weightx = 0.8; + add(typeComboBox, gridBagConstraints); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 7; + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; + gridBagConstraints.weightx = 1.0; + gridBagConstraints.weighty = 1.0; + gridBagConstraints.insets = new java.awt.Insets(24, 0, 0, 0); + add(propertySheet1, gridBagConstraints); + }//GEN-END:initComponents /** We check the path user typed in the jarTextField. If the path * is ok, we update the jarFS accordingly. @@ -509,22 +509,22 @@ }//GEN-LAST:event_selectExisting - // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.ButtonGroup group; - private javax.swing.JRadioButton originalRadioButton; - private javax.swing.JRadioButton dirRadioButton; - private javax.swing.JLabel dirLabel; - private javax.swing.JTextField dirTextField; - private javax.swing.JButton browseDirButton; - private javax.swing.JRadioButton jarRadioButton; - private javax.swing.JLabel jarLabel; - private javax.swing.JTextField jarTextField; - private javax.swing.JButton browseJarButton; - private javax.swing.JRadioButton otherRadioButton; - private javax.swing.JLabel createLabel; - private javax.swing.JComboBox typeComboBox; - private org.openide.explorer.propertysheet.PropertySheet propertySheet1; - // End of variables declaration//GEN-END:variables + // ?????????? ?????????? - ?? ????????? ?????? ???//GEN-BEGIN:variables + private javax.swing.JRadioButton originalRadioButton; + private javax.swing.JRadioButton dirRadioButton; + private javax.swing.JTextField dirTextField; + private javax.swing.JButton browseJarButton; + private javax.swing.JLabel createLabel; + private javax.swing.JTextField jarTextField; + private javax.swing.JLabel jarLabel; + private javax.swing.JRadioButton jarRadioButton; + private javax.swing.JButton browseDirButton; + private javax.swing.ButtonGroup group; + private javax.swing.JLabel dirLabel; + private javax.swing.JComboBox typeComboBox; + private org.openide.explorer.propertysheet.PropertySheet propertySheet1; + private javax.swing.JRadioButton otherRadioButton; + // ????? ?????????? ??????????//GEN-END:variables /** Sets the edited node and sets the fs variable.*/ private void setActiveFS(Node n, FileSystem f) { @@ -558,15 +558,6 @@ newTypeNames = (String[])c.toArray(new String[c.size()]); // set the names in typeCombobox typeComboBox.setModel(new DefaultComboBoxModel(newTypeNames)); - - dirRadioButton.setMnemonic (java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("CTL_FileSystemPanel.dirRadioButton.text_Mnemonic").charAt (0)); - jarRadioButton.setMnemonic (java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("CTL_FileSystemPanel.jarRadioButton.text_Mnemonic").charAt (0)); - otherRadioButton.setMnemonic (java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("CTL_FileSystemPanel.otherRadioButton.text_Mnemonic").charAt (0)); - dirLabel.setDisplayedMnemonic (java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("LAB_FileSystemPanel.dirLabel.text_Mnemonic").charAt (0)); - jarLabel.setDisplayedMnemonic (java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("LAB_FileSystemPanel.jarLabel.text_Mnemonic").charAt (0)); - createLabel.setDisplayedMnemonic (java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("LAB_FileSystemPanel.createLabel.text_Mnemonic").charAt (0)); - browseDirButton.setMnemonic (java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("CTL_FileSystemPanel.browseDirButton.text_Mnemonic").charAt (0)); - browseJarButton.setMnemonic (java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("CTL_FileSystemPanel.browseJarButton.text_Mnemonic").charAt (0)); group.add(originalRadioButton); group.add(dirRadioButton); Index: core/src/org/netbeans/beaninfo/editors/FontEditor.java =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/beaninfo/editors/FontEditor.java,v retrieving revision 1.30 diff -u -r1.30 FontEditor.java --- core/src/org/netbeans/beaninfo/editors/FontEditor.java 3 Dec 2002 14:09:56 -0000 1.30 +++ core/src/org/netbeans/beaninfo/editors/FontEditor.java 23 Feb 2003 23:39:33 -0000 @@ -188,23 +188,23 @@ c.weightx = 1.0; c.insets = new Insets (0, 0, 0, 0); c.anchor = GridBagConstraints.WEST; - JLabel l = new JLabel (bundle.getString ("CTL_Font")); //NoI18N - l.setDisplayedMnemonic(bundle.getString ("CTL_Font_mnemonic").charAt(0)); //NoI18N + JLabel l = new JLabel (); + org.openide.awt.Mnemonics.setLocalizedText(l,bundle.getString ("CTL_Font")); //NoI18N l.setLabelFor(lFont); la.setConstraints (l, c); add (l); c.insets = new Insets (0, 5, 0, 0); - l = new JLabel (bundle.getString ("CTL_FontStyle")); //NoI18N - l.setDisplayedMnemonic(bundle.getString ("CTL_FontStyle_mnemonic").charAt(0)); //NoI18N + l = new JLabel (); + org.openide.awt.Mnemonics.setLocalizedText(l,bundle.getString ("CTL_FontStyle")); //NoI18N l.setLabelFor(lStyle); la.setConstraints (l, c); add (l); c.insets = new Insets (0, 5, 0, 0); c.gridwidth = GridBagConstraints.REMAINDER; - l = new JLabel (bundle.getString ("CTL_Size")); //NoI18N - l.setDisplayedMnemonic(bundle.getString ("CTL_Size_mnemonic").charAt(0)); //NoI18N + l = new JLabel (); + org.openide.awt.Mnemonics.setLocalizedText(l,bundle.getString ("CTL_Size")); //NoI18N l.setLabelFor(tfSize); la.setConstraints (l, c); add (l); Index: core/src/org/netbeans/beaninfo/editors/InsetsCustomEditor.form =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/beaninfo/editors/InsetsCustomEditor.form,v retrieving revision 1.6 diff -u -r1.6 InsetsCustomEditor.form --- core/src/org/netbeans/beaninfo/editors/InsetsCustomEditor.form 15 Mar 2002 13:26:11 -0000 1.6 +++ core/src/org/netbeans/beaninfo/editors/InsetsCustomEditor.form 23 Feb 2003 23:39:34 -0000 @@ -1,9 +1,9 @@ - - - + + + @@ -29,7 +29,6 @@ - @@ -52,7 +51,6 @@ - @@ -75,7 +73,6 @@ - @@ -98,7 +95,6 @@ - Index: core/src/org/netbeans/beaninfo/editors/InsetsCustomEditor.java =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/beaninfo/editors/InsetsCustomEditor.java,v retrieving revision 1.23 diff -u -r1.23 InsetsCustomEditor.java --- core/src/org/netbeans/beaninfo/editors/InsetsCustomEditor.java 3 Dec 2002 14:09:57 -0000 1.23 +++ core/src/org/netbeans/beaninfo/editors/InsetsCustomEditor.java 23 Feb 2003 23:39:36 -0000 @@ -57,11 +57,6 @@ bottomLabel.setLabelFor(bottomField); rightLabel.setLabelFor(rightField); - topLabel.setDisplayedMnemonic(bundle.getString("CTL_Top_Mnemonic").charAt(0)); - leftLabel.setDisplayedMnemonic(bundle.getString("CTL_Left_Mnemonic").charAt(0)); - bottomLabel.setDisplayedMnemonic(bundle.getString("CTL_Bottom_Mnemonic").charAt(0)); - rightLabel.setDisplayedMnemonic(bundle.getString("CTL_Right_Mnemonic").charAt(0)); - topField.getAccessibleContext().setAccessibleDescription(bundle.getString("ACSD_CTL_Top")); leftField.getAccessibleContext().setAccessibleDescription(bundle.getString("ACSD_CTL_Left")); bottomField.getAccessibleContext().setAccessibleDescription(bundle.getString("ACSD_CTL_Bottom")); @@ -118,7 +113,7 @@ jPanel2.setLayout(new java.awt.GridBagLayout()); - topLabel.setText(java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("CTL_Top")); + org.openide.awt.Mnemonics.setLocalizedText(topLabel,java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("CTL_Top")); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; jPanel2.add(topLabel, gridBagConstraints); @@ -136,7 +131,7 @@ gridBagConstraints.insets = new java.awt.Insets(4, 8, 4, 0); jPanel2.add(topField, gridBagConstraints); - leftLabel.setText(java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("CTL_Left")); + org.openide.awt.Mnemonics.setLocalizedText(leftLabel,java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("CTL_Left")); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; jPanel2.add(leftLabel, gridBagConstraints); @@ -154,7 +149,7 @@ gridBagConstraints.insets = new java.awt.Insets(4, 8, 4, 0); jPanel2.add(leftField, gridBagConstraints); - bottomLabel.setText(java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("CTL_Bottom")); + org.openide.awt.Mnemonics.setLocalizedText(bottomLabel,java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("CTL_Bottom")); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; jPanel2.add(bottomLabel, gridBagConstraints); @@ -172,7 +167,7 @@ gridBagConstraints.insets = new java.awt.Insets(4, 8, 4, 0); jPanel2.add(bottomField, gridBagConstraints); - rightLabel.setText(java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("CTL_Right")); + org.openide.awt.Mnemonics.setLocalizedText(rightLabel,java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("CTL_Right")); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; jPanel2.add(rightLabel, gridBagConstraints); @@ -211,17 +206,17 @@ } } - // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JLabel topLabel; + // ?????????? ?????????? - ?? ????????? ?????? ???//GEN-BEGIN:variables + private javax.swing.JLabel rightLabel; + private javax.swing.JLabel bottomLabel; private javax.swing.JTextField topField; - private javax.swing.JLabel leftLabel; private javax.swing.JTextField leftField; private javax.swing.JPanel jPanel2; - private javax.swing.JLabel rightLabel; - private javax.swing.JLabel bottomLabel; - private javax.swing.JTextField rightField; + private javax.swing.JLabel topLabel; private javax.swing.JTextField bottomField; - // End of variables declaration//GEN-END:variables + private javax.swing.JLabel leftLabel; + private javax.swing.JTextField rightField; + // ????? ?????????? ??????????//GEN-END:variables private InsetsEditor editor; Index: core/src/org/netbeans/beaninfo/editors/PointCustomEditor.form =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/beaninfo/editors/PointCustomEditor.form,v retrieving revision 1.6 diff -u -r1.6 PointCustomEditor.form --- core/src/org/netbeans/beaninfo/editors/PointCustomEditor.form 17 Oct 2001 14:42:56 -0000 1.6 +++ core/src/org/netbeans/beaninfo/editors/PointCustomEditor.form 23 Feb 2003 23:39:36 -0000 @@ -1,8 +1,6 @@ - - @@ -17,53 +15,51 @@ - - - + + + - + - - + - - - + + + - + - - + Index: core/src/org/netbeans/beaninfo/editors/PointCustomEditor.java =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/beaninfo/editors/PointCustomEditor.java,v retrieving revision 1.23 diff -u -r1.23 PointCustomEditor.java --- core/src/org/netbeans/beaninfo/editors/PointCustomEditor.java 3 Dec 2002 14:09:57 -0000 1.23 +++ core/src/org/netbeans/beaninfo/editors/PointCustomEditor.java 23 Feb 2003 23:39:38 -0000 @@ -45,9 +45,6 @@ xField.setText (""+point.x); // NOI18N yField.setText (""+point.y); // NOI18N - xLabel.setDisplayedMnemonic(bundle.getString("CTL_X_Mnemonic").charAt(0)); - yLabel.setDisplayedMnemonic(bundle.getString("CTL_Y_Mnemonic").charAt(0)); - xField.getAccessibleContext().setAccessibleDescription(bundle.getString("ACSD_CTL_X")); yField.getAccessibleContext().setAccessibleDescription(bundle.getString("ACSD_CTL_Y")); @@ -64,11 +61,11 @@ xField.setText ("" + dimension.width); // NOI18N yField.setText ("" + dimension.height); // NOI18N - xLabel.setText (bundle.getString("CTL_Width")); - xLabel.setDisplayedMnemonic(bundle.getString("CTL_Width_mnemonic").charAt(0)); + org.openide.awt.Mnemonics.setLocalizedText(xLabel, + bundle.getString("CTL_Width")); xLabel.setLabelFor(xField); - yLabel.setText (bundle.getString("CTL_Height")); - yLabel.setDisplayedMnemonic(bundle.getString("CTL_Height_mnemonic").charAt(0)); + org.openide.awt.Mnemonics.setLocalizedText(yLabel, + bundle.getString("CTL_Height")); yLabel.setLabelFor(yField); xField.getAccessibleContext().setAccessibleDescription(bundle.getString("ACSD_CTL_Width")); @@ -123,57 +120,58 @@ * always regenerated by the FormEditor. */ private void initComponents() {//GEN-BEGIN:initComponents + java.awt.GridBagConstraints gridBagConstraints; + insidePanel = new javax.swing.JPanel(); xLabel = new javax.swing.JLabel(); xField = new javax.swing.JTextField(); yLabel = new javax.swing.JLabel(); yField = new javax.swing.JTextField(); - + setLayout(new java.awt.BorderLayout()); - + insidePanel.setLayout(new java.awt.GridBagLayout()); - java.awt.GridBagConstraints gridBagConstraints1; - - xLabel.setText(java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("CTL_X")); + xLabel.setLabelFor(xField); - gridBagConstraints1 = new java.awt.GridBagConstraints(); - gridBagConstraints1.anchor = java.awt.GridBagConstraints.WEST; - insidePanel.add(xLabel, gridBagConstraints1); - + org.openide.awt.Mnemonics.setLocalizedText(xLabel,java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("CTL_X")); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + insidePanel.add(xLabel, gridBagConstraints); + xField.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { updateInsets(evt); } }); - - gridBagConstraints1 = new java.awt.GridBagConstraints(); - gridBagConstraints1.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints1.fill = java.awt.GridBagConstraints.HORIZONTAL; - gridBagConstraints1.insets = new java.awt.Insets(4, 8, 4, 0); - gridBagConstraints1.weightx = 1.0; - insidePanel.add(xField, gridBagConstraints1); - - yLabel.setText(java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("CTL_Y")); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.weightx = 1.0; + gridBagConstraints.insets = new java.awt.Insets(4, 8, 4, 0); + insidePanel.add(xField, gridBagConstraints); + yLabel.setLabelFor(yField); - gridBagConstraints1 = new java.awt.GridBagConstraints(); - gridBagConstraints1.anchor = java.awt.GridBagConstraints.WEST; - insidePanel.add(yLabel, gridBagConstraints1); - + org.openide.awt.Mnemonics.setLocalizedText(yLabel,java.util.ResourceBundle.getBundle("org/netbeans/beaninfo/editors/Bundle").getString("CTL_Y")); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + insidePanel.add(yLabel, gridBagConstraints); + yField.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { updateInsets(evt); } }); - - gridBagConstraints1 = new java.awt.GridBagConstraints(); - gridBagConstraints1.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints1.fill = java.awt.GridBagConstraints.HORIZONTAL; - gridBagConstraints1.insets = new java.awt.Insets(4, 8, 4, 0); - gridBagConstraints1.weightx = 1.0; - insidePanel.add(yField, gridBagConstraints1); - + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.weightx = 1.0; + gridBagConstraints.insets = new java.awt.Insets(4, 8, 4, 0); + insidePanel.add(yField, gridBagConstraints); + add(insidePanel, java.awt.BorderLayout.CENTER); - + }//GEN-END:initComponents @@ -191,13 +189,13 @@ }//GEN-LAST:event_updateInsets - // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JPanel insidePanel; + // ?????????? ?????????? - ?? ????????? ?????? ???//GEN-BEGIN:variables + private javax.swing.JLabel yLabel; private javax.swing.JLabel xLabel; private javax.swing.JTextField xField; - private javax.swing.JLabel yLabel; + private javax.swing.JPanel insidePanel; private javax.swing.JTextField yField; - // End of variables declaration//GEN-END:variables + // ????? ?????????? ??????????//GEN-END:variables private ArrayOfIntSupport editor; Index: core/src/org/netbeans/beaninfo/editors/RectangleCustomEditor.java =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/beaninfo/editors/RectangleCustomEditor.java,v retrieving revision 1.20 diff -u -r1.20 RectangleCustomEditor.java --- core/src/org/netbeans/beaninfo/editors/RectangleCustomEditor.java 3 Dec 2002 14:09:58 -0000 1.20 +++ core/src/org/netbeans/beaninfo/editors/RectangleCustomEditor.java 23 Feb 2003 23:39:40 -0000 @@ -50,20 +50,19 @@ " " + bundle.getString ("CTL_Rectangle") + " "), new javax.swing.border.EmptyBorder (new java.awt.Insets(5, 5, 5, 5)))); - xLabel.setText (bundle.getString ("CTL_X")); - yLabel.setText (bundle.getString ("CTL_Y")); - widthLabel.setText (bundle.getString ("CTL_Width")); - heightLabel.setText (bundle.getString ("CTL_Height")); + org.openide.awt.Mnemonics.setLocalizedText(xLabel, + bundle.getString ("CTL_X")); + org.openide.awt.Mnemonics.setLocalizedText(yLabel, + bundle.getString ("CTL_Y")); + org.openide.awt.Mnemonics.setLocalizedText(widthLabel, + bundle.getString ("CTL_Width")); + org.openide.awt.Mnemonics.setLocalizedText(heightLabel, + bundle.getString ("CTL_Height")); xLabel.setLabelFor(xField); yLabel.setLabelFor(yField); widthLabel.setLabelFor(widthField); heightLabel.setLabelFor(heightField); - - xLabel.setDisplayedMnemonic(bundle.getString("CTL_X_Mnemonic").charAt(0)); - yLabel.setDisplayedMnemonic(bundle.getString("CTL_Y_Mnemonic").charAt(0)); - widthLabel.setDisplayedMnemonic(bundle.getString("CTL_Width_mnemonic").charAt(0)); - heightLabel.setDisplayedMnemonic(bundle.getString("CTL_Height_mnemonic").charAt(0)); xField.getAccessibleContext().setAccessibleDescription(bundle.getString("ACSD_CTL_X")); yField.getAccessibleContext().setAccessibleDescription(bundle.getString("ACSD_CTL_Y")); Index: core/src/org/netbeans/beaninfo/editors/StringArrayCustomEditor.java =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/beaninfo/editors/StringArrayCustomEditor.java,v retrieving revision 1.2 diff -u -r1.2 StringArrayCustomEditor.java --- core/src/org/netbeans/beaninfo/editors/StringArrayCustomEditor.java 16 Oct 2002 06:03:48 -0000 1.2 +++ core/src/org/netbeans/beaninfo/editors/StringArrayCustomEditor.java 23 Feb 2003 23:39:43 -0000 @@ -56,21 +56,20 @@ setBorder (new javax.swing.border.EmptyBorder (new java.awt.Insets(16, 8, 8, 0))); buttonsPanel.setBorder (new javax.swing.border.EmptyBorder (new java.awt.Insets(0, 5, 5, 5))); - itemLabel.setText (bundle.getString ("CTL_Item")); - itemListLabel.setText(bundle.getString ("CTL_ItemList")); - addButton.setText (bundle.getString ("CTL_Add_StringArrayCustomEditor")); - changeButton.setText (bundle.getString ("CTL_Change_StringArrayCustomEditor")); - removeButton.setText (bundle.getString ("CTL_Remove")); - moveUpButton.setText (bundle.getString ("CTL_MoveUp")); - moveDownButton.setText (bundle.getString ("CTL_MoveDown")); - - itemLabel.setDisplayedMnemonic(bundle.getString("CTL_Item_Mnemonic").charAt(0)); - itemListLabel.setDisplayedMnemonic(bundle.getString("CTL_ItemList_Mnemonic").charAt(0)); - addButton.setMnemonic(bundle.getString("CTL_Add_StringArrayCustomEditor_Mnemonic").charAt(0)); - changeButton.setMnemonic(bundle.getString("CTL_Change_StringArrayCustomEditor_Mnemonic").charAt(0)); - removeButton.setMnemonic(bundle.getString("CTL_Remove_Mnemonic").charAt(0)); - moveUpButton.setMnemonic(bundle.getString("CTL_MoveUp_Mnemonic").charAt(0)); - moveDownButton.setMnemonic(bundle.getString("CTL_MoveDown_Mnemonic").charAt(0)); + org.openide.awt.Mnemonics.setLocalizedText(itemLabel, + bundle.getString ("CTL_Item")); + org.openide.awt.Mnemonics.setLocalizedText(itemListLabel, + bundle.getString ("CTL_ItemList")); + org.openide.awt.Mnemonics.setLocalizedText(addButton, + bundle.getString ("CTL_Add_StringArrayCustomEditor")); + org.openide.awt.Mnemonics.setLocalizedText(changeButton, + bundle.getString ("CTL_Change_StringArrayCustomEditor")); + org.openide.awt.Mnemonics.setLocalizedText(removeButton, + bundle.getString ("CTL_Remove")); + org.openide.awt.Mnemonics.setLocalizedText(moveUpButton, + bundle.getString ("CTL_MoveUp")); + org.openide.awt.Mnemonics.setLocalizedText(moveDownButton, + bundle.getString ("CTL_MoveDown")); getAccessibleContext().setAccessibleDescription(bundle.getString("ACSD_StringArrayCustomEditor")); itemField.getAccessibleContext().setAccessibleDescription(bundle.getString("ACSD_CTL_Item")); Index: core/src/org/netbeans/core/ActionsPanel.java =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/core/ActionsPanel.java,v retrieving revision 1.31 diff -u -r1.31 ActionsPanel.java --- core/src/org/netbeans/core/ActionsPanel.java 29 Jan 2003 01:42:24 -0000 1.31 +++ core/src/org/netbeans/core/ActionsPanel.java 23 Feb 2003 23:39:48 -0000 @@ -57,8 +57,6 @@ this.canChangeKey = canChangeKey; initComponents (); initAccessibility (); - shortcutAddButton.setMnemonic(bundle.getString("ActionsPanel.shortcutAddButton.text_Mnemonic").charAt(0)); - shortcutRemoveButton.setMnemonic(bundle.getString("ActionsPanel.shortcutRemoveButton.text_Mnemonic").charAt(0)); shortcutPanel.setBorder (new javax.swing.border.CompoundBorder( new javax.swing.border.TitledBorder( @@ -180,7 +178,7 @@ shortcutsButtonsPanel.setLayout(new java.awt.GridBagLayout()); java.awt.GridBagConstraints gridBagConstraints3; - shortcutAddButton.setText(java.util.ResourceBundle.getBundle("org/netbeans/core/Bundle").getString("ActionsPanel.shortcutAddButton.text")); + org.openide.awt.Mnemonics.setLocalizedText(shortcutAddButton, java.util.ResourceBundle.getBundle("org/netbeans/core/Bundle").getString("ActionsPanel.shortcutAddButton.text")); shortcutAddButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { shortcutAddButtonActionPerformed(evt); @@ -192,7 +190,7 @@ gridBagConstraints3.fill = java.awt.GridBagConstraints.HORIZONTAL; shortcutsButtonsPanel.add(shortcutAddButton, gridBagConstraints3); - shortcutRemoveButton.setText(java.util.ResourceBundle.getBundle("org/netbeans/core/Bundle").getString("ActionsPanel.shortcutRemoveButton.text")); + org.openide.awt.Mnemonics.setLocalizedText(shortcutRemoveButton, java.util.ResourceBundle.getBundle("org/netbeans/core/Bundle").getString("ActionsPanel.shortcutRemoveButton.text")); shortcutRemoveButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { shortcutRemoveButtonActionPerformed(evt); @@ -387,7 +385,7 @@ } } - public TreeNode getChildAt(int childIndex) { return (TreeNode) actions.get(childIndex); } + public TreeNode getChildAt(int childIndex) { return (TreeNode) actions.get(childIndex); } public int getChildCount() { return actions.size (); } public TreeNode getParent() { return parent; } public int getIndex(TreeNode node) { return actions.indexOf (node); } @@ -429,9 +427,10 @@ ShortcutEnterPanel (KeyStroke stroke) { defaultStroke = stroke; - shortcutLabel = new javax.swing.JLabel (bundle.getString ("ActionsPanel.ShortcutLabel")); + shortcutLabel = new javax.swing.JLabel (); + org.openide.awt.Mnemonics.setLocalizedText(shortcutLabel, + bundle.getString ("ActionsPanel.ShortcutLabel")); shortcutField = new javax.swing.JTextField (); - shortcutLabel.setDisplayedMnemonic(bundle.getString("ActionsPanel.ShortcutLabel_Mnemonic").charAt(0)); shortcutLabel.setLabelFor(shortcutField); this.setLayout (new java.awt.GridBagLayout ()); java.awt.GridBagConstraints gridBagConstraints1; Index: core/src/org/netbeans/core/Bundle.properties =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/core/Bundle.properties,v retrieving revision 1.358 diff -u -r1.358 Bundle.properties --- core/src/org/netbeans/core/Bundle.properties 20 Feb 2003 04:53:35 -0000 1.358 +++ core/src/org/netbeans/core/Bundle.properties 23 Feb 2003 23:39:54 -0000 @@ -276,13 +276,11 @@ #NbDialog - standard button captions YES_OPTION_CAPTION=Yes -NO_OPTION_CAPTION=No -NO_OPTION_CAPTION_MNEMONIC=N +NO_OPTION_CAPTION=&No OK_OPTION_CAPTION=OK CANCEL_OPTION_CAPTION=Cancel CLOSED_OPTION_CAPTION=Close -HELP_OPTION_CAPTION=Help -HELP_OPTION_CAPTION_MNEMONIC=H +HELP_OPTION_CAPTION=&Help ACS_YES_OPTION_NAME=Yes ACS_YES_OPTION_DESC=Yes button ACS_NO_OPTION_NAME=No @@ -405,10 +403,8 @@ # Shortcuts Editor Controls ShortcutsEditor.viewByLabel=View By: -ShortcutsEditor.actionsButton.text=Actions -ShortcutsEditor.actionsButton.text_Mnemonic=C -ShortcutsEditor.shortcutsButton.text=Shortcuts -ShortcutsEditor.shortcutsButton.text_Mnemonic=S +ShortcutsEditor.actionsButton.text=A&ctions +ShortcutsEditor.shortcutsButton.text=&Shortcuts ShortcutsEditor.typeTitle=View Shortcuts By ActionsPanel.shortcutLabel.text=Shortcut\: ShortcutsPanel.shortcutTextArea.text=Select View by Actions to Edit Shortcuts for an Action @@ -419,15 +415,12 @@ ShortcutsPanel.AddActionTitle=New Shortcut CTL_ConfigureShortcuts=Configure Shortcuts... CTL_ConfigureShortcuts_Title=Configure Shortcuts -ActionsPanel.shortcutAddButton.text=Add... -ActionsPanel.shortcutAddButton.text_Mnemonic=A -ActionsPanel.shortcutRemoveButton.text=Remove -ActionsPanel.shortcutRemoveButton.text_Mnemonic=R +ActionsPanel.shortcutAddButton.text=&Add... +ActionsPanel.shortcutRemoveButton.text=&Remove ActionsPanel.ActionsTitle=Actions ActionsPanel.ShortcutsTitle=Edit Shortcuts ActionsPanel.AddShortcut=Add Shortcut -ActionsPanel.ShortcutLabel=Shortcut: -ActionsPanel.ShortcutLabel_Mnemonic=S +ActionsPanel.ShortcutLabel=&Shortcut: ACS_ShortcutsPanel.shortcutTextArea.text.a11yName=Select View by Actions to Edit Shortcuts for an Action ACS_ShortcutsEditor.actionsButton.text.a11yDesc=Select View by Actions to Edit Shortcuts for an Action ACS_ShortcutsEditor.shortcutsButton.text.a11yDesc=Select View by Shortcuts, but for Edit Shortcuts should be View by Action selected @@ -465,14 +458,10 @@ EXC_Save=An exception occurred while saving # NotifyException CTL_Title_Exception=Exception -CTL_NextException=Next > -CTL_PreviousException=< Previous -CTL_Exception_Hide_Details=Hide Details -CTL_Exception_Show_Details=Show Details -CTL_NextException_Mnemonic=N -CTL_PreviousException_Mnemonic=P -CTL_Exception_Hide_Details_Mnemonic=H -CTL_Exception_Show_Details_Mnemonic=S +CTL_NextException=&Next > +CTL_PreviousException=< &Previous +CTL_Exception_Hide_Details=&Hide Details +CTL_Exception_Show_Details=&Show Details ACSD_NextException=N/A ACSD_PreviousException=N/A ACSD_Exception_Hide_Details=N/A @@ -488,10 +477,8 @@ LAB_FS_Configuration=Configuration #NbAuthenticator -LAB_AUTH_User_Name=User Name\: -LAB_AUTH_User_Name_Mnemonic=U -LAB_AUTH_Password=Password\: -LAB_AUTH_Password_Mnemonic=P +LAB_AUTH_User_Name=&User Name\: +LAB_AUTH_Password=&Password\: ACSD_PasswordField=N/A ACSD_UserNameField=N/A ACSD_NbAuthenticatorPasswordPanel=N/A Index: core/src/org/netbeans/core/ExitDialog.java =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/core/ExitDialog.java,v retrieving revision 1.31 diff -u -r1.31 ExitDialog.java --- core/src/org/netbeans/core/ExitDialog.java 3 Dec 2002 14:10:03 -0000 1.31 +++ core/src/org/netbeans/core/ExitDialog.java 23 Feb 2003 23:39:56 -0000 @@ -260,9 +260,9 @@ // special handling to handle a button title with mnemonic // and to allow enable/disable control of the option - Actions.setMenuText(buttonSave, bundle.getString("CTL_Save"), true); - Actions.setMenuText(buttonSaveAll, bundle.getString("CTL_SaveAll"), true); - Actions.setMenuText(buttonDiscardAll, bundle.getString("CTL_DiscardAll"), true); + org.openide.awt.Mnemonics.setLocalizedText(buttonSave, bundle.getString("CTL_Save")); + org.openide.awt.Mnemonics.setLocalizedText(buttonSaveAll, bundle.getString("CTL_SaveAll")); + org.openide.awt.Mnemonics.setLocalizedText(buttonDiscardAll, bundle.getString("CTL_DiscardAll")); exitOptions = new Object[] { buttonSave, Index: core/src/org/netbeans/core/FileSelector.java =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/core/FileSelector.java,v retrieving revision 1.29 diff -u -r1.29 FileSelector.java --- core/src/org/netbeans/core/FileSelector.java 16 Jan 2003 16:37:28 -0000 1.29 +++ core/src/org/netbeans/core/FileSelector.java 23 Feb 2003 23:39:58 -0000 @@ -176,8 +176,11 @@ comboPanel.setLayout(new BorderLayout(5, 0)); // support for mnemonics (defaults to first char) - JLabel label = new JLabel(rootLabel.replace('&', ' ')); - label.setDisplayedMnemonic(rootLabel.charAt(rootLabel.indexOf('&') + 1)); + JLabel label = new JLabel(); + if (rootLabel.indexOf('&')>=0) + org.openide.awt.Mnemonics.setLocalizedText(label,rootLabel); + else + org.openide.awt.Mnemonics.setLocalizedText(label,"&"+rootLabel); label.setLabelFor(combo); comboPanel.add(label, BorderLayout.WEST); comboPanel.add(combo, BorderLayout.CENTER); Index: core/src/org/netbeans/core/NbAuthenticator.java =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/core/NbAuthenticator.java,v retrieving revision 1.14 diff -u -r1.14 NbAuthenticator.java --- core/src/org/netbeans/core/NbAuthenticator.java 3 Dec 2002 14:10:05 -0000 1.14 +++ core/src/org/netbeans/core/NbAuthenticator.java 23 Feb 2003 23:40:00 -0000 @@ -93,8 +93,8 @@ mainPanel.add (promptLabel, gridBagConstraints1); jLabel1 = new javax.swing.JLabel (); - jLabel1.setText (bundle.getString("LAB_AUTH_User_Name")); - jLabel1.setDisplayedMnemonic(bundle.getString("LAB_AUTH_User_Name_Mnemonic").charAt(0)); + org.openide.awt.Mnemonics.setLocalizedText(jLabel1, + bundle.getString("LAB_AUTH_User_Name")); gridBagConstraints1 = new java.awt.GridBagConstraints (); gridBagConstraints1.insets = new java.awt.Insets (0, 0, 5, 12); @@ -115,8 +115,8 @@ mainPanel.add (usernameField, gridBagConstraints1); jLabel2 = new javax.swing.JLabel (); - jLabel2.setText (org.openide.util.NbBundle.getBundle(NbAuthenticator.class).getString("LAB_AUTH_Password")); - jLabel2.setDisplayedMnemonic(bundle.getString("LAB_AUTH_Password_Mnemonic").charAt(0)); + org.openide.awt.Mnemonics.setLocalizedText(jLabel2, + org.openide.util.NbBundle.getBundle(NbAuthenticator.class).getString("LAB_AUTH_Password")); gridBagConstraints1 = new java.awt.GridBagConstraints (); gridBagConstraints1.insets = new java.awt.Insets (0, 0, 0, 12); Index: core/src/org/netbeans/core/NbPresenter.java =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/core/NbPresenter.java,v retrieving revision 1.77 diff -u -r1.77 NbPresenter.java --- core/src/org/netbeans/core/NbPresenter.java 6 Feb 2003 13:01:24 -0000 1.77 +++ core/src/org/netbeans/core/NbPresenter.java 23 Feb 2003 23:40:07 -0000 @@ -44,11 +44,11 @@ protected NotifyDescriptor descriptor; private final JButton stdYesButton = new JButton(NbBundle.getBundle(NbPresenter.class).getString("YES_OPTION_CAPTION")); - private final JButton stdNoButton = new JButton(NbBundle.getBundle(NbPresenter.class).getString("NO_OPTION_CAPTION")); + private final JButton stdNoButton = new JButton(); private final JButton stdOKButton = new JButton(NbBundle.getBundle(NbPresenter.class).getString("OK_OPTION_CAPTION")); private final JButton stdCancelButton = new JButton(NbBundle.getBundle(NbPresenter.class).getString("CANCEL_OPTION_CAPTION")); private final JButton stdClosedButton = new JButton(NbBundle.getBundle(NbPresenter.class).getString("CLOSED_OPTION_CAPTION")); - private final JButton stdHelpButton = new JButton(NbBundle.getBundle(NbPresenter.class).getString("HELP_OPTION_CAPTION")); + private final JButton stdHelpButton = new JButton(); private final JButton stdDetailButton = new JButton(NbBundle.getBundle(NbPresenter.class).getString("HELP_OPTION_CAPTION")); { stdYesButton.setDefaultCapable(true); @@ -59,8 +59,10 @@ stdClosedButton.setDefaultCapable(false); stdHelpButton.setDefaultCapable(false); stdDetailButton.setDefaultCapable(false); - stdNoButton.setMnemonic(NbBundle.getBundle(NbPresenter.class).getString("NO_OPTION_CAPTION_MNEMONIC").charAt(0)); - stdHelpButton.setMnemonic(NbBundle.getBundle(NbPresenter.class).getString("HELP_OPTION_CAPTION_MNEMONIC").charAt(0)); + org.openide.awt.Mnemonics.setLocalizedText(stdNoButton, + NbBundle.getBundle(NbPresenter.class).getString("NO_OPTION_CAPTION")); + org.openide.awt.Mnemonics.setLocalizedText(stdHelpButton, + NbBundle.getBundle(NbPresenter.class).getString("HELP_OPTION_CAPTION")); /** Initilizes accessible contexts */ initAccessibility(); Index: core/src/org/netbeans/core/NotifyException.java =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/core/NotifyException.java,v retrieving revision 1.44 diff -u -r1.44 NotifyException.java --- core/src/org/netbeans/core/NotifyException.java 21 Feb 2003 13:52:04 -0000 1.44 +++ core/src/org/netbeans/core/NotifyException.java 23 Feb 2003 23:40:11 -0000 @@ -79,8 +79,12 @@ exceptions=new ArrayListPos(); java.util.ResourceBundle bundle = org.openide.util.NbBundle.getBundle(NotifyException.class); - next = new JButton (bundle.getString("CTL_NextException")); - previous = new JButton (bundle.getString("CTL_PreviousException")); + next = new JButton (); + org.openide.awt.Mnemonics.setLocalizedText(next, + bundle.getString("CTL_NextException")); + previous = new JButton (); + org.openide.awt.Mnemonics.setLocalizedText(previous, + bundle.getString("CTL_PreviousException")); details = new JButton (); /* @@ -101,8 +105,6 @@ //setViewportView (output); - next.setMnemonic(bundle.getString("CTL_NextException_Mnemonic").charAt(0)); - previous.setMnemonic(bundle.getString("CTL_PreviousException_Mnemonic").charAt(0)); next.getAccessibleContext().setAccessibleDescription(bundle.getString("ACSD_NextException")); previous.getAccessibleContext().setAccessibleDescription(bundle.getString("ACSD_PreviousException")); output.getAccessibleContext().setAccessibleName(bundle.getString("ACSN_ExceptionStackTrace")); @@ -209,13 +211,13 @@ previous.setVisible (exceptions.existsPreviousElement()); if (showDetails) { - details.setText (org.openide.util.NbBundle.getBundle(NotifyException.class).getString("CTL_Exception_Hide_Details")); - details.setMnemonic(org.openide.util.NbBundle.getBundle(NotifyException.class).getString("CTL_Exception_Hide_Details_Mnemonic").charAt(0)); + org.openide.awt.Mnemonics.setLocalizedText(details, + org.openide.util.NbBundle.getBundle(NotifyException.class).getString("CTL_Exception_Hide_Details")); details.getAccessibleContext().setAccessibleDescription( org.openide.util.NbBundle.getBundle(NotifyException.class).getString("ACSD_Exception_Hide_Details")); } else { - details.setText(org.openide.util.NbBundle.getBundle(NotifyException.class).getString("CTL_Exception_Show_Details")); - details.setMnemonic(org.openide.util.NbBundle.getBundle(NotifyException.class).getString("CTL_Exception_Show_Details_Mnemonic").charAt(0)); + org.openide.awt.Mnemonics.setLocalizedText(details, + org.openide.util.NbBundle.getBundle(NotifyException.class).getString("CTL_Exception_Show_Details")); details.getAccessibleContext().setAccessibleDescription( org.openide.util.NbBundle.getBundle(NotifyException.class).getString("ACSD_Exception_Show_Details")); } Index: core/src/org/netbeans/core/ShortcutsEditor.form =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/core/ShortcutsEditor.form,v retrieving revision 1.10 diff -u -r1.10 ShortcutsEditor.form --- core/src/org/netbeans/core/ShortcutsEditor.form 10 Jan 2002 15:22:04 -0000 1.10 +++ core/src/org/netbeans/core/ShortcutsEditor.form 23 Feb 2003 23:40:11 -0000 @@ -8,15 +8,13 @@ - - - + @@ -31,18 +29,16 @@ - - - + @@ -52,13 +48,12 @@ - - + @@ -70,7 +65,7 @@ - + Index: core/src/org/netbeans/core/ShortcutsEditor.java =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/core/ShortcutsEditor.java,v retrieving revision 1.32 diff -u -r1.32 ShortcutsEditor.java --- core/src/org/netbeans/core/ShortcutsEditor.java 3 Dec 2002 14:10:08 -0000 1.32 +++ core/src/org/netbeans/core/ShortcutsEditor.java 23 Feb 2003 23:40:13 -0000 @@ -49,8 +49,6 @@ initComponents (); initAccessibility (); viewByLabel.setLabelFor(actionsButton); - actionsButton.setMnemonic(bundle.getString ("ShortcutsEditor.actionsButton.text_Mnemonic").charAt(0)); - shortcutsButton.setMnemonic(bundle.getString ("ShortcutsEditor.shortcutsButton.text_Mnemonic").charAt(0)); javax.swing.ButtonGroup group = new javax.swing.ButtonGroup (); group.add(actionsButton); @@ -84,60 +82,60 @@ * always regenerated by the FormEditor. */ private void initComponents() {//GEN-BEGIN:initComponents + java.awt.GridBagConstraints gridBagConstraints; + radioPanel = new javax.swing.JPanel(); actionsButton = new javax.swing.JRadioButton(); shortcutsButton = new javax.swing.JRadioButton(); viewByLabel = new javax.swing.JLabel(); - + setLayout(new java.awt.GridBagLayout()); - java.awt.GridBagConstraints gridBagConstraints1; - + setBorder(new javax.swing.border.EmptyBorder(new java.awt.Insets(12, 12, 0, 11))); radioPanel.setLayout(new java.awt.GridBagLayout()); - java.awt.GridBagConstraints gridBagConstraints2; - - actionsButton.setText(java.util.ResourceBundle.getBundle("org/netbeans/core/Bundle").getString("ShortcutsEditor.actionsButton.text")); + + org.openide.awt.Mnemonics.setLocalizedText(actionsButton,java.util.ResourceBundle.getBundle("org/netbeans/core/Bundle").getString("ShortcutsEditor.actionsButton.text")); actionsButton.setContentAreaFilled(actionsButton.isContentAreaFilled()); actionsButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { actionsButtonActionPerformed(evt); } }); - - gridBagConstraints2 = new java.awt.GridBagConstraints(); - gridBagConstraints2.gridx = 1; - gridBagConstraints2.gridy = 0; - gridBagConstraints2.insets = new java.awt.Insets(0, 12, 0, 0); - radioPanel.add(actionsButton, gridBagConstraints2); - - shortcutsButton.setText(java.util.ResourceBundle.getBundle("org/netbeans/core/Bundle").getString("ShortcutsEditor.shortcutsButton.text")); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 0; + gridBagConstraints.insets = new java.awt.Insets(0, 12, 0, 0); + radioPanel.add(actionsButton, gridBagConstraints); + + org.openide.awt.Mnemonics.setLocalizedText(shortcutsButton,java.util.ResourceBundle.getBundle("org/netbeans/core/Bundle").getString("ShortcutsEditor.shortcutsButton.text")); shortcutsButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { shortcutsButtonActionPerformed(evt); } }); - - gridBagConstraints2 = new java.awt.GridBagConstraints(); - gridBagConstraints2.gridx = 2; - gridBagConstraints2.gridy = 0; - gridBagConstraints2.fill = java.awt.GridBagConstraints.HORIZONTAL; - gridBagConstraints2.insets = new java.awt.Insets(0, 12, 0, 0); - gridBagConstraints2.weightx = 1.0; - radioPanel.add(shortcutsButton, gridBagConstraints2); - - viewByLabel.setText(java.util.ResourceBundle.getBundle("org/netbeans/core/Bundle").getString("ShortcutsEditor.viewByLabel")); - gridBagConstraints2 = new java.awt.GridBagConstraints(); - gridBagConstraints2.gridx = 0; - gridBagConstraints2.gridy = 0; - radioPanel.add(viewByLabel, gridBagConstraints2); - - gridBagConstraints1 = new java.awt.GridBagConstraints(); - gridBagConstraints1.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints1.fill = java.awt.GridBagConstraints.HORIZONTAL; - gridBagConstraints1.anchor = java.awt.GridBagConstraints.WEST; - gridBagConstraints1.weightx = 1.0; - add(radioPanel, gridBagConstraints1); - + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 2; + gridBagConstraints.gridy = 0; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.weightx = 1.0; + gridBagConstraints.insets = new java.awt.Insets(0, 12, 0, 0); + radioPanel.add(shortcutsButton, gridBagConstraints); + + org.openide.awt.Mnemonics.setLocalizedText(viewByLabel,java.util.ResourceBundle.getBundle("org/netbeans/core/Bundle").getString("ShortcutsEditor.viewByLabel")); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 0; + radioPanel.add(viewByLabel, gridBagConstraints); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.weightx = 1.0; + add(radioPanel, gridBagConstraints); + }//GEN-END:initComponents private void shortcutsButtonActionPerformed (java.awt.event.ActionEvent evt) {//GEN-FIRST:event_shortcutsButtonActionPerformed @@ -178,12 +176,12 @@ } } - // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JPanel radioPanel; - private javax.swing.JRadioButton actionsButton; + // ?????????? ?????????? - ?? ????????? ?????? ???//GEN-BEGIN:variables private javax.swing.JRadioButton shortcutsButton; + private javax.swing.JRadioButton actionsButton; + private javax.swing.JPanel radioPanel; private javax.swing.JLabel viewByLabel; - // End of variables declaration//GEN-END:variables + // ????? ?????????? ??????????//GEN-END:variables /** Adds given shortcut to the list changes. */ void addShortcut(KeyStroke key, Action action) { Index: core/src/org/netbeans/core/ShortcutsPanel.form =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/core/ShortcutsPanel.form,v retrieving revision 1.9 diff -u -r1.9 ShortcutsPanel.form --- core/src/org/netbeans/core/ShortcutsPanel.form 10 Jan 2002 15:22:04 -0000 1.9 +++ core/src/org/netbeans/core/ShortcutsPanel.form 23 Feb 2003 23:40:15 -0000 @@ -1,9 +1,9 @@ - - - + + + @@ -17,11 +17,9 @@ - - @@ -39,18 +37,18 @@ - - - + + - + - - + + + @@ -64,7 +62,6 @@ - @@ -80,7 +77,6 @@ - Index: core/src/org/netbeans/core/ShortcutsPanel.java =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/core/ShortcutsPanel.java,v retrieving revision 1.20 diff -u -r1.20 ShortcutsPanel.java --- core/src/org/netbeans/core/ShortcutsPanel.java 5 Dec 2002 14:18:17 -0000 1.20 +++ core/src/org/netbeans/core/ShortcutsPanel.java 23 Feb 2003 23:40:18 -0000 @@ -41,19 +41,16 @@ /** Creates new form ActionsPanel */ public ShortcutsPanel(ShortcutsEditor shortcutsEditor) { - ResourceBundle bundle; - this.shortcutsEditor = shortcutsEditor; updateData (); initComponents (); initAccessibility(); - addButton.setMnemonic((bundle = NbBundle.getBundle(ShortcutsPanel.class)).getString("ActionsPanel.shortcutAddButton.text_Mnemonic").charAt(0)); - removeButton.setMnemonic(bundle.getString("ActionsPanel.shortcutRemoveButton.text_Mnemonic").charAt(0)); buttonsPanel.setBorder (new javax.swing.border.CompoundBorder( new javax.swing.border.TitledBorder( - new javax.swing.border.EtchedBorder(), bundle.getString ("ActionsPanel.ShortcutsTitle")), + new javax.swing.border.EtchedBorder(), + NbBundle.getBundle(ShortcutsPanel.class).getString ("ActionsPanel.ShortcutsTitle")), new javax.swing.border.EmptyBorder(new java.awt.Insets(12, 12, 11, 11)))); shortcutsList.setCellRenderer (new KeyStrokeRenderer ()); @@ -96,12 +93,12 @@ buttonsPanel.setLayout(new java.awt.GridBagLayout()); - shortcutTextArea.setWrapStyleWord(true); - shortcutTextArea.setToolTipText(java.util.ResourceBundle.getBundle("org/netbeans/core/Bundle").getString("ACS_ShortcutsPanel.shortcutTextArea.text.a11yName")); - shortcutTextArea.setLineWrap(true); + shortcutTextArea.setBackground(buttonsPanel.getBackground()); shortcutTextArea.setEditable(false); + shortcutTextArea.setLineWrap(true); shortcutTextArea.setText(java.util.ResourceBundle.getBundle("org/netbeans/core/Bundle").getString("ShortcutsPanel.shortcutTextArea.text")); - shortcutTextArea.setBackground(buttonsPanel.getBackground()); + shortcutTextArea.setToolTipText(java.util.ResourceBundle.getBundle("org/netbeans/core/Bundle").getString("ACS_ShortcutsPanel.shortcutTextArea.text.a11yName")); + shortcutTextArea.setWrapStyleWord(true); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 0; @@ -110,7 +107,7 @@ gridBagConstraints.weightx = 1.0; buttonsPanel.add(shortcutTextArea, gridBagConstraints); - addButton.setText(java.util.ResourceBundle.getBundle("org/netbeans/core/Bundle").getString("ShortcutsPanel.addButton.text")); + org.openide.awt.Mnemonics.setLocalizedText(addButton,java.util.ResourceBundle.getBundle("org/netbeans/core/Bundle").getString("ShortcutsPanel.addButton.text")); addButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { addButtonActionPerformed(evt); @@ -125,7 +122,7 @@ gridBagConstraints.insets = new java.awt.Insets(0, 12, 0, 0); buttonsPanel.add(addButton, gridBagConstraints); - removeButton.setText(java.util.ResourceBundle.getBundle("org/netbeans/core/Bundle").getString("ShortcutsPanel.removeButton.text")); + org.openide.awt.Mnemonics.setLocalizedText(removeButton,java.util.ResourceBundle.getBundle("org/netbeans/core/Bundle").getString("ShortcutsPanel.removeButton.text")); removeButton.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { removeButtonActionPerformed(evt); @@ -216,14 +213,14 @@ removeButton.setEnabled(shortcutsList.getSelectedIndices().length > 0); } - // Variables declaration - do not modify//GEN-BEGIN:variables + // ?????????? ?????????? - ?? ????????? ?????? ???//GEN-BEGIN:variables + private javax.swing.JList shortcutsList; + private javax.swing.JPanel buttonsPanel; private javax.swing.JScrollPane shortcutsScrollPane; - private javax.swing.JButton addButton; private javax.swing.JTextArea shortcutTextArea; - private javax.swing.JPanel buttonsPanel; - private javax.swing.JList shortcutsList; + private javax.swing.JButton addButton; private javax.swing.JButton removeButton; - // End of variables declaration//GEN-END:variables + // ????? ?????????? ??????????//GEN-END:variables private void initAccessibility() { ResourceBundle bundle = NbBundle.getBundle(ShortcutsPanel.class); Index: core/src/org/netbeans/core/actions/Bundle.properties =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/core/actions/Bundle.properties,v retrieving revision 1.126 diff -u -r1.126 Bundle.properties --- core/src/org/netbeans/core/actions/Bundle.properties 29 Jan 2003 09:50:00 -0000 1.126 +++ core/src/org/netbeans/core/actions/Bundle.properties 23 Feb 2003 23:40:18 -0000 @@ -103,10 +103,8 @@ #OptionsAction Options=&Options -CTL_close_button=Close -CTL_close_button_mnemonic=C -CTL_help_button=Help -CTL_help_button_mnemonic=H +CTL_close_button=&Close +CTL_help_button=&Help ACSD_help_button=N/A ACSD_close_button=N/A ACSN_optionsTree=N/A Index: core/src/org/netbeans/core/actions/OptionsAction.java =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/core/actions/OptionsAction.java,v retrieving revision 1.48 diff -u -r1.48 OptionsAction.java --- core/src/org/netbeans/core/actions/OptionsAction.java 4 Feb 2003 16:39:57 -0000 1.48 +++ core/src/org/netbeans/core/actions/OptionsAction.java 23 Feb 2003 23:40:23 -0000 @@ -201,8 +201,9 @@ gridBagConstraints.gridwidth = 2; add (split, gridBagConstraints); - javax.swing.JButton close = new javax.swing.JButton (NbBundle.getMessage (OptionsAction.class, "CTL_close_button")); - close.setMnemonic(NbBundle.getMessage (OptionsAction.class, "CTL_close_button_mnemonic").charAt(0)); + javax.swing.JButton close = new javax.swing.JButton (); + org.openide.awt.Mnemonics.setLocalizedText(close, + NbBundle.getMessage (OptionsAction.class, "CTL_close_button")); close.setDefaultCapable (true); gridBagConstraints = new GridBagConstraints (); gridBagConstraints.gridx = 0; @@ -220,8 +221,9 @@ }); add (close, gridBagConstraints); - javax.swing.JButton help = new javax.swing.JButton (NbBundle.getMessage (OptionsAction.class, "CTL_help_button")); - help.setMnemonic(NbBundle.getMessage (OptionsAction.class, "CTL_help_button_mnemonic").charAt(0)); + javax.swing.JButton help = new javax.swing.JButton (); + org.openide.awt.Mnemonics.setLocalizedText(help, + NbBundle.getMessage (OptionsAction.class, "CTL_help_button")); help.setMinimumSize (close.getMinimumSize ()); help.setMaximumSize (close.getMaximumSize ()); help.setPreferredSize (close.getPreferredSize ()); Index: core/src/org/netbeans/core/ui/Bundle.properties =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/core/ui/Bundle.properties,v retrieving revision 1.55 diff -u -r1.55 Bundle.properties --- core/src/org/netbeans/core/ui/Bundle.properties 6 Feb 2003 16:43:18 -0000 1.55 +++ core/src/org/netbeans/core/ui/Bundle.properties 23 Feb 2003 23:40:30 -0000 @@ -11,13 +11,10 @@ CTL_DID_YOU_KNOW=Did you know? CTL_OpeningBrowser=Opening browser ... -CTL_NEXTSTARTUP=\ Do not show Welcome Screen again -MNE_NEXTSTARTUP=D +CTL_NEXTSTARTUP=\ &Do not show Welcome Screen again CTL_START_TITLE=Welcome to NetBeans -CTL_NEXT_BUTTON=Next Tip -MNE_NEXT_BUTTON=N -CTL_PREV_BUTTON=Previous Tip -MNE_PREV_BUTTON=P +CTL_NEXT_BUTTON=&Next Tip +CTL_PREV_BUTTON=&Previous Tip CTL_Welcome_hint=Items for the Welcome Screen #CTL_newMenuName=Menu name @@ -64,15 +61,13 @@ #{1} = comment passed by the iterator CTL_TemplateTitle=New... {0} {1} LAB_TemplateChooserPanelName=Choose Filesystem type -LAB_SelectTemplateBorder=Select Filesystem type +LAB_SelectTemplateBorder=&Select Filesystem type Msg_attr_change_error=Could not change attributes on the {0} file. MSG_NoDescription=No description -LAB_TemplateDescriptionBorder=New Filesystem description +LAB_TemplateDescriptionBorder=New Filesys&tem description LAB_TargetLocationPanelName=Target Location LAB_TargetLocationDescription=Please select a package for the newly created object or enter the package name below. LAB_SelectPackageBorder=Select Package -LAB_SelectTemplateBorder_Mnemonic=S -LAB_TemplateDescriptionBorder_Mnemonic=T ACSD_TemplatesTree=N/A ACSD_TemplateWizard1=N/A @@ -94,28 +89,19 @@ # ProxySettings ProxySettings=Proxy Settings PROP_ProxySettings=Proxy Settings -LAB_ProxyUse=Use Proxy -LAB_ProxyUse_Mnemonic=U -LAB_ProxyHost=Proxy Host: -LAB_ProxyHost_Mnemonic=H -LAB_ProxyPort=Proxy Port: -LAB_ProxyPort_Mnemonic=P +LAB_ProxyUse=&Use Proxy +LAB_ProxyHost=Proxy &Host: +LAB_ProxyPort=Proxy &Port: CTL_SetupWizardTitle=Setup Wizard # IDE Settings panel -LBL_Server_Name_Mnemonic=N -LBL__Port_Mnemonic=P -LBL_UseProxyServer_Mnemonic=U -LBL_SDI_Mnemonic=S -LBL_MDI_Mnemonic=M -LBL_AdvancedCheckBox_Mnemonic=A LBL_IDEPanelName=General NetBeans Settings -LBL_UseProxyServer=Use HTTP Proxy Server -LBL_SDI=Multiple Smaller Windows Mode ("SDI") -LBL_MDI=Full Screen Mode ("MDI") -LBL_Server_Name=Proxy Server Name: +LBL_UseProxyServer=&Use HTTP Proxy Server +LBL_SDI=Multiple &Smaller Windows Mode ("SDI") +LBL_MDI=Full Screen &Mode ("MDI") +LBL_Server_Name=Proxy Server &Name: LBL_Head=Set general NetBeans settings on this page. -LBL_Port=Port: +LBL_Port=&Port: LBL_WindowMode=Window Mode: LBL_WebProxy=Web Proxy: LBL_ProxyDesc=If you are behind a firewall, you should set the proxy server, so that the IDE can properly direct outgoing HTTP traffic. @@ -127,8 +113,7 @@ # Web Browser Panel LBL_WebBrowserPanelName=Select Web Browser -CTL_BrowserLabel=Web Browser: -CTL_BrowserLabel_mnemonic=W +CTL_BrowserLabel=&Web Browser: CTL_HelpTextArea=This is the browser that NetBeans uses to display internal and external web pages. The Swing HTML Browser provides the highest level of integration with NetBeans but other browsers might provide more functionality. # Product Information panel @@ -258,8 +243,6 @@ #CTL_ModuleInstallation=Module Installation #LBL_Description=Description: LBL_SetupWizardModuleInstallation=Module Installation -LBL_SetupWizardDescription=Description: -LBL_SetupWizardDescription_MNE=D -LBL_SetupWizardCheckModules=Check modules to enable: -LBL_SetupWizardCheckModules_MNE=C +LBL_SetupWizardDescription=&Description: +LBL_SetupWizardCheckModules=&Check modules to enable: Index: core/src/org/netbeans/core/ui/IDESettingsPanel.java =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/core/ui/IDESettingsPanel.java,v retrieving revision 1.28 diff -u -r1.28 IDESettingsPanel.java --- core/src/org/netbeans/core/ui/IDESettingsPanel.java 5 Feb 2003 16:22:51 -0000 1.28 +++ core/src/org/netbeans/core/ui/IDESettingsPanel.java 23 Feb 2003 23:40:37 -0000 @@ -58,9 +58,6 @@ public IDESettingsPanel() { initComponents(); - serverLabel.setDisplayedMnemonic(bundle.getString("LBL_Server_Name_Mnemonic").charAt(0)); - portLabel.setDisplayedMnemonic(bundle.getString("LBL__Port_Mnemonic").charAt(0)); - // inserting space character before radiobuttons and checkboxes String string = bundle.getString("LBL_UseProxyServer"); proxyCheckBox.setText(new StringBuffer(string.length() + 1).append(' ').append(string).toString()); @@ -69,10 +66,6 @@ string = bundle.getString("LBL_MDI"); mdiRadioButton.setText(new StringBuffer(string.length() + 1).append(' ').append(string).toString()); - proxyCheckBox.setMnemonic(bundle.getString("LBL_UseProxyServer_Mnemonic").charAt(0)); - sdiRadioButton.setMnemonic(bundle.getString("LBL_SDI_Mnemonic").charAt(0)); - mdiRadioButton.setMnemonic(bundle.getString("LBL_MDI_Mnemonic").charAt(0)); - javax.swing.ButtonGroup bg = new javax.swing.ButtonGroup(); bg.add(mdiRadioButton); bg.add(sdiRadioButton); @@ -179,7 +172,7 @@ add(mdiRadioButton, gridBagConstraints); serverLabel.setLabelFor(serverField); - serverLabel.setText(bundle.getString("LBL_Server_Name")); + org.openide.awt.Mnemonics.setLocalizedText(serverLabel,bundle.getString("LBL_Server_Name")); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 8; @@ -189,7 +182,7 @@ add(serverLabel, gridBagConstraints); portLabel.setLabelFor(portField); - portLabel.setText(bundle.getString("LBL_Port")); + org.openide.awt.Mnemonics.setLocalizedText(portLabel,bundle.getString("LBL_Port")); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 9; @@ -199,7 +192,7 @@ add(portLabel, gridBagConstraints); windowLabel.setLabelFor(sdiRadioButton); - windowLabel.setText(bundle.getString("LBL_WindowMode")); + org.openide.awt.Mnemonics.setLocalizedText(windowLabel,bundle.getString("LBL_WindowMode")); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 1; @@ -208,7 +201,7 @@ add(windowLabel, gridBagConstraints); browserLabel.setLabelFor(browserComboBox); - browserLabel.setText(org.openide.util.NbBundle.getMessage(IDESettingsPanel.class, "CTL_BrowserLabel")); + org.openide.awt.Mnemonics.setLocalizedText(browserLabel,org.openide.util.NbBundle.getMessage(IDESettingsPanel.class, "CTL_BrowserLabel")); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 4; @@ -280,7 +273,7 @@ add(jTextArea1, gridBagConstraints); proxyLabel.setLabelFor(sdiRadioButton); - proxyLabel.setText(bundle.getString("LBL_WebProxy")); + org.openide.awt.Mnemonics.setLocalizedText(proxyLabel,bundle.getString("LBL_WebProxy")); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 6; @@ -335,7 +328,7 @@ }//GEN-LAST:event_changeWindowMode - // Variables declaration - do not modify//GEN-BEGIN:variables + // ?????????? ?????????? - ?? ????????? ?????? ???//GEN-BEGIN:variables private javax.swing.JTextArea jTextArea2; private javax.swing.JRadioButton mdiRadioButton; private javax.swing.JLabel browserLabel; @@ -352,7 +345,7 @@ private javax.swing.JLabel mdiIcon; private javax.swing.JLabel portLabel; private javax.swing.JCheckBox proxyCheckBox; - // End of variables declaration//GEN-END:variables + // ????? ?????????? ??????????//GEN-END:variables private int uiMode; @@ -378,7 +371,6 @@ mdiRadioButton.setSelected(uiMode == UIModeManager.MDI_MODE); // web browser, proxy init... - browserLabel.setDisplayedMnemonic (bundle.getString ("CTL_BrowserLabel_mnemonic").charAt (0)); try { IDESettings settings = (IDESettings)IDESettings.findObject (IDESettings.class, true); proxyCheckBox.setSelected(settings.getUseProxy()); Index: core/src/org/netbeans/core/ui/ModuleSelectionPanel.java =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/core/ui/ModuleSelectionPanel.java,v retrieving revision 1.14 diff -u -r1.14 ModuleSelectionPanel.java --- core/src/org/netbeans/core/ui/ModuleSelectionPanel.java 10 Jan 2003 11:07:37 -0000 1.14 +++ core/src/org/netbeans/core/ui/ModuleSelectionPanel.java 23 Feb 2003 23:40:40 -0000 @@ -135,14 +135,14 @@ add(descriptionPane, gridBagConstraints); tableLabel.setLabelFor(treeTableView); - tableLabel.setText(java.util.ResourceBundle.getBundle("org/netbeans/core/ui/Bundle").getString("LBL_SetupWizardCheckModules")); + org.openide.awt.Mnemonics.setLocalizedText(tableLabel,java.util.ResourceBundle.getBundle("org/netbeans/core/ui/Bundle").getString("LBL_SetupWizardCheckModules")); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.insets = new java.awt.Insets(0, 1, 5, 0); add(tableLabel, gridBagConstraints); descriptionLabel.setLabelFor(descriptionArea); - descriptionLabel.setText(java.util.ResourceBundle.getBundle("org/netbeans/core/ui/Bundle").getString("LBL_SetupWizardDescription")); + org.openide.awt.Mnemonics.setLocalizedText(descriptionLabel,java.util.ResourceBundle.getBundle("org/netbeans/core/ui/Bundle").getString("LBL_SetupWizardDescription")); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 2; @@ -167,14 +167,14 @@ // Add your handling code here: }//GEN-LAST:event_prevButtonActionPerformed - // Variables declaration - do not modify//GEN-BEGIN:variables + // ?????????? ?????????? - ?? ????????? ?????? ???//GEN-BEGIN:variables private javax.swing.JTextArea descriptionArea; private javax.swing.JLabel tableLabel; private org.openide.explorer.view.TreeTableView treeTableView; private org.openide.explorer.ExplorerPanel explorerPanel; private javax.swing.JLabel descriptionLabel; private javax.swing.JScrollPane descriptionPane; - // End of variables declaration//GEN-END:variables + // ????? ?????????? ??????????//GEN-END:variables private ExplorerManager manager; @@ -226,10 +226,8 @@ this.getAccessibleContext().setAccessibleDescription(b.getString("ACSD_ModuleSelectionPanel")); - tableLabel.setDisplayedMnemonic(b.getString("LBL_SetupWizardCheckModules_MNE").charAt(0)); tableLabel.getAccessibleContext().setAccessibleDescription(b.getString("ACSD_tableLabel")); - descriptionLabel.setDisplayedMnemonic(b.getString("LBL_SetupWizardDescription_MNE").charAt(0)); descriptionLabel.getAccessibleContext().setAccessibleDescription(b.getString("ACSD_descriptionLabel")); } Index: core/src/org/netbeans/core/ui/MountNode.java =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/core/ui/MountNode.java,v retrieving revision 1.28 diff -u -r1.28 MountNode.java --- core/src/org/netbeans/core/ui/MountNode.java 4 Feb 2003 16:40:01 -0000 1.28 +++ core/src/org/netbeans/core/ui/MountNode.java 23 Feb 2003 23:40:44 -0000 @@ -266,12 +266,8 @@ // Fix of #19667 - those values will be retreived in addNotify jp.putClientProperty("LAB_SelectTemplateBorder", // NOI18N bundle.getString("LAB_SelectTemplateBorder")); - jp.putClientProperty("LAB_SelectTemplateBorder_Mnemonic", // NOI18N - bundle.getString("LAB_SelectTemplateBorder_Mnemonic")); jp.putClientProperty("LAB_TemplateDescriptionBorder", // NOI18N bundle.getString("LAB_TemplateDescriptionBorder")); - jp.putClientProperty("LAB_TemplateDescriptionBorder_Mnemonic", // NOI18N - bundle.getString("LAB_TemplateDescriptionBorder_Mnemonic")); jp.putClientProperty("ACSD_TemplatesTree", // NOI18N bundle.getString("ACSD_TemplatesTree")); jp.putClientProperty("ACSD_TemplateWizard1", // NOI18N Index: core/src/org/netbeans/core/ui/ProxySettingsDialog.form =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/core/ui/ProxySettingsDialog.form,v retrieving revision 1.1 diff -u -r1.1 ProxySettingsDialog.form --- core/src/org/netbeans/core/ui/ProxySettingsDialog.form 23 Oct 2000 14:43:27 -0000 1.1 +++ core/src/org/netbeans/core/ui/ProxySettingsDialog.form 23 Feb 2003 23:40:45 -0000 @@ -1,21 +1,18 @@ - - - - - + + - + @@ -24,20 +21,20 @@ - - + + - + - + @@ -46,35 +43,34 @@ - - + + - + - - - + + + - - + Index: core/src/org/netbeans/core/ui/ProxySettingsDialog.java =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/core/ui/ProxySettingsDialog.java,v retrieving revision 1.5 diff -u -r1.5 ProxySettingsDialog.java --- core/src/org/netbeans/core/ui/ProxySettingsDialog.java 16 Oct 2002 06:04:47 -0000 1.5 +++ core/src/org/netbeans/core/ui/ProxySettingsDialog.java 23 Feb 2003 23:40:46 -0000 @@ -34,9 +34,6 @@ jCheckBoxProxyUse.setSelected(settings.getUseProxy()); jTextFieldProxyHost.setText(settings.getProxyHost()); jTextFieldProxyPort.setText(settings.getProxyPort()); - jCheckBoxProxyUse.setMnemonic(bundle.getString("LAB_ProxyUse_Mnemonic").charAt(0)); - jLabelProxyHost.setDisplayedMnemonic(bundle.getString("LAB_ProxyHost_Mnemonic").charAt(0)); - jLabelProxyPort.setDisplayedMnemonic(bundle.getString("LAB_ProxyPort_Mnemonic").charAt(0)); } /** This method is called from within the constructor to @@ -45,72 +42,65 @@ * always regenerated by the Form Editor. */ private void initComponents() {//GEN-BEGIN:initComponents + java.awt.GridBagConstraints gridBagConstraints; + jCheckBoxProxyUse = new javax.swing.JCheckBox(); jLabelProxyHost = new javax.swing.JLabel(); jTextFieldProxyHost = new javax.swing.JTextField(); jLabelProxyPort = new javax.swing.JLabel(); jTextFieldProxyPort = new javax.swing.JTextField(); + setLayout(new java.awt.GridBagLayout()); - java.awt.GridBagConstraints gridBagConstraints1; - - jCheckBoxProxyUse.setText(bundle.getString("LAB_ProxyUse")); - - gridBagConstraints1 = new java.awt.GridBagConstraints(); - gridBagConstraints1.gridwidth = 2; - gridBagConstraints1.insets = new java.awt.Insets(12, 12, 11, 11); - gridBagConstraints1.anchor = java.awt.GridBagConstraints.WEST; - add(jCheckBoxProxyUse, gridBagConstraints1); - - + + org.openide.awt.Mnemonics.setLocalizedText(jCheckBoxProxyUse,java.util.ResourceBundle.getBundle("org/netbeans/core/ui/Bundle").getString("LAB_ProxyUse")); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridwidth = 2; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(12, 12, 11, 11); + add(jCheckBoxProxyUse, gridBagConstraints); + jLabelProxyHost.setLabelFor(jTextFieldProxyHost); - jLabelProxyHost.setText(bundle.getString("LAB_ProxyHost")); - - gridBagConstraints1 = new java.awt.GridBagConstraints(); - gridBagConstraints1.gridx = 0; - gridBagConstraints1.gridy = 1; - gridBagConstraints1.insets = new java.awt.Insets(0, 12, 11, 12); - gridBagConstraints1.anchor = java.awt.GridBagConstraints.WEST; - add(jLabelProxyHost, gridBagConstraints1); - - - - gridBagConstraints1 = new java.awt.GridBagConstraints(); - gridBagConstraints1.gridx = 1; - gridBagConstraints1.gridy = 1; - gridBagConstraints1.fill = java.awt.GridBagConstraints.HORIZONTAL; - gridBagConstraints1.insets = new java.awt.Insets(0, 0, 11, 11); - gridBagConstraints1.weightx = 1.0; - add(jTextFieldProxyHost, gridBagConstraints1); - - + org.openide.awt.Mnemonics.setLocalizedText(jLabelProxyHost,java.util.ResourceBundle.getBundle("org/netbeans/core/ui/Bundle").getString("LAB_ProxyHost")); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 1; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(0, 12, 11, 12); + add(jLabelProxyHost, gridBagConstraints); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 1; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.weightx = 1.0; + gridBagConstraints.insets = new java.awt.Insets(0, 0, 11, 11); + add(jTextFieldProxyHost, gridBagConstraints); + jLabelProxyPort.setLabelFor(jTextFieldProxyPort); - jLabelProxyPort.setText(bundle.getString("LAB_ProxyPort")); - - gridBagConstraints1 = new java.awt.GridBagConstraints(); - gridBagConstraints1.gridx = 0; - gridBagConstraints1.gridy = 2; - gridBagConstraints1.insets = new java.awt.Insets(0, 12, 17, 12); - gridBagConstraints1.anchor = java.awt.GridBagConstraints.WEST; - add(jLabelProxyPort, gridBagConstraints1); - - - jTextFieldProxyPort.setPreferredSize(new java.awt.Dimension(40, 20)); + org.openide.awt.Mnemonics.setLocalizedText(jLabelProxyPort,java.util.ResourceBundle.getBundle("org/netbeans/core/ui/Bundle").getString("LAB_ProxyPort")); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 2; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(0, 12, 17, 12); + add(jLabelProxyPort, gridBagConstraints); + jTextFieldProxyPort.setMaximumSize(new java.awt.Dimension(40, 2147483647)); jTextFieldProxyPort.setMinimumSize(new java.awt.Dimension(40, 20)); + jTextFieldProxyPort.setPreferredSize(new java.awt.Dimension(40, 20)); jTextFieldProxyPort.addActionListener(new java.awt.event.ActionListener() { public void actionPerformed(java.awt.event.ActionEvent evt) { jTextFieldProxyPortActionPerformed(evt); } - } - ); - - gridBagConstraints1 = new java.awt.GridBagConstraints(); - gridBagConstraints1.gridx = 1; - gridBagConstraints1.gridy = 2; - gridBagConstraints1.insets = new java.awt.Insets(0, 0, 17, 11); - gridBagConstraints1.anchor = java.awt.GridBagConstraints.WEST; - add(jTextFieldProxyPort, gridBagConstraints1); - + }); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 2; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(0, 0, 17, 11); + add(jTextFieldProxyPort, gridBagConstraints); + }//GEN-END:initComponents private void jTextFieldProxyPortActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jTextFieldProxyPortActionPerformed @@ -118,13 +108,13 @@ }//GEN-LAST:event_jTextFieldProxyPortActionPerformed - // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JCheckBox jCheckBoxProxyUse; + // ?????????? ?????????? - ?? ????????? ?????? ???//GEN-BEGIN:variables private javax.swing.JLabel jLabelProxyHost; - private javax.swing.JTextField jTextFieldProxyHost; + private javax.swing.JCheckBox jCheckBoxProxyUse; private javax.swing.JLabel jLabelProxyPort; private javax.swing.JTextField jTextFieldProxyPort; - // End of variables declaration//GEN-END:variables + private javax.swing.JTextField jTextFieldProxyHost; + // ????? ?????????? ??????????//GEN-END:variables private static final java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("org/netbeans/core/ui/Bundle"); // NOI18N Index: core/src/org/netbeans/core/ui/WebBrowserPanel.form =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/core/ui/WebBrowserPanel.form,v retrieving revision 1.3 diff -u -r1.3 WebBrowserPanel.form --- core/src/org/netbeans/core/ui/WebBrowserPanel.form 29 Mar 2001 15:27:09 -0000 1.3 +++ core/src/org/netbeans/core/ui/WebBrowserPanel.form 23 Feb 2003 23:40:47 -0000 @@ -1,9 +1,6 @@ - - - @@ -15,31 +12,31 @@ - + - + - - - + + - - + + + - + Index: core/src/org/netbeans/core/ui/WebBrowserPanel.java =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/core/ui/WebBrowserPanel.java,v retrieving revision 1.5 diff -u -r1.5 WebBrowserPanel.java --- core/src/org/netbeans/core/ui/WebBrowserPanel.java 11 Apr 2002 16:28:07 -0000 1.5 +++ core/src/org/netbeans/core/ui/WebBrowserPanel.java 23 Feb 2003 23:40:48 -0000 @@ -35,7 +35,6 @@ /** Creates new form WebBrowserPanel */ public WebBrowserPanel () { initComponents(); - browserLabel.setDisplayedMnemonic (bundle.getString ("CTL_BrowserLabel_mnemonic").charAt (0)); browserLabel.setLabelFor (browserComboBox); helpTextArea.setFont (javax.swing.UIManager.getFont ("Label.font")); // NOI18N helpTextArea.setDisabledTextColor (javax.swing.UIManager.getColor ("Label.foreground")); // NOI18N @@ -63,52 +62,53 @@ * always regenerated by the Form Editor. */ private void initComponents() {//GEN-BEGIN:initComponents + java.awt.GridBagConstraints gridBagConstraints; + browserLabel = new javax.swing.JLabel(); browserComboBox = new javax.swing.JComboBox(); helpTextArea = new javax.swing.JTextArea(); - + setLayout(new java.awt.GridBagLayout()); - java.awt.GridBagConstraints gridBagConstraints1; - - browserLabel.setText(bundle.getString ("CTL_BrowserLabel")); - gridBagConstraints1 = new java.awt.GridBagConstraints(); - gridBagConstraints1.gridx = 0; - gridBagConstraints1.gridy = 0; - gridBagConstraints1.anchor = java.awt.GridBagConstraints.WEST; - add(browserLabel, gridBagConstraints1); - - gridBagConstraints1 = new java.awt.GridBagConstraints(); - gridBagConstraints1.gridx = 1; - gridBagConstraints1.gridy = 0; - gridBagConstraints1.insets = new java.awt.Insets(0, 12, 0, 0); - gridBagConstraints1.anchor = java.awt.GridBagConstraints.WEST; - add(browserComboBox, gridBagConstraints1); - - helpTextArea.setWrapStyleWord(true); - helpTextArea.setLineWrap(true); + + org.openide.awt.Mnemonics.setLocalizedText(browserLabel,bundle.getString ("CTL_BrowserLabel")); + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 0; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + add(browserLabel, gridBagConstraints); + + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 1; + gridBagConstraints.gridy = 0; + gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; + gridBagConstraints.insets = new java.awt.Insets(0, 12, 0, 0); + add(browserComboBox, gridBagConstraints); + helpTextArea.setEditable(false); + helpTextArea.setLineWrap(true); helpTextArea.setText(bundle.getString("CTL_HelpTextArea")); + helpTextArea.setWrapStyleWord(true); helpTextArea.setEnabled(false); helpTextArea.setOpaque(false); - gridBagConstraints1 = new java.awt.GridBagConstraints(); - gridBagConstraints1.gridx = 0; - gridBagConstraints1.gridy = 1; - gridBagConstraints1.gridwidth = java.awt.GridBagConstraints.REMAINDER; - gridBagConstraints1.fill = java.awt.GridBagConstraints.HORIZONTAL; - gridBagConstraints1.insets = new java.awt.Insets(17, 0, 0, 0); - gridBagConstraints1.anchor = java.awt.GridBagConstraints.NORTHWEST; - gridBagConstraints1.weightx = 1.0; - gridBagConstraints1.weighty = 1.0; - add(helpTextArea, gridBagConstraints1); - + gridBagConstraints = new java.awt.GridBagConstraints(); + gridBagConstraints.gridx = 0; + gridBagConstraints.gridy = 1; + gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; + gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; + gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST; + gridBagConstraints.weightx = 1.0; + gridBagConstraints.weighty = 1.0; + gridBagConstraints.insets = new java.awt.Insets(17, 0, 0, 0); + add(helpTextArea, gridBagConstraints); + }//GEN-END:initComponents - // Variables declaration - do not modify//GEN-BEGIN:variables + // ?????????? ?????????? - ?? ????????? ?????? ???//GEN-BEGIN:variables private javax.swing.JLabel browserLabel; private javax.swing.JComboBox browserComboBox; private javax.swing.JTextArea helpTextArea; - // End of variables declaration//GEN-END:variables + // ????? ?????????? ??????????//GEN-END:variables /** listeners on validation of panel changes */ private ArrayList changeListeners = new ArrayList(1); Index: core/src/org/netbeans/core/ui/WelcomePanel.form =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/core/ui/WelcomePanel.form,v retrieving revision 1.23 diff -u -r1.23 WelcomePanel.form --- core/src/org/netbeans/core/ui/WelcomePanel.form 21 May 2002 15:17:01 -0000 1.23 +++ core/src/org/netbeans/core/ui/WelcomePanel.form 23 Feb 2003 23:40:51 -0000 @@ -62,9 +62,6 @@ - - - @@ -150,16 +147,13 @@ + - - - - @@ -259,12 +253,12 @@ + + + - - - Index: core/src/org/netbeans/core/ui/WelcomePanel.java =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/core/ui/WelcomePanel.java,v retrieving revision 1.48 diff -u -r1.48 WelcomePanel.java --- core/src/org/netbeans/core/ui/WelcomePanel.java 18 Dec 2002 23:41:31 -0000 1.48 +++ core/src/org/netbeans/core/ui/WelcomePanel.java 23 Feb 2003 23:40:58 -0000 @@ -207,8 +207,7 @@ jPanelHtml.add(contextBrowserScroll, gridBagConstraints); jLabelHtmlTitle.setLabelFor(buttonSetPanel); - jLabelHtmlTitle.setText(bundle.getString("LABEL_WelcomeHTMLPages")); - jLabelHtmlTitle.setForeground(java.awt.Color.black); + org.openide.awt.Mnemonics.setLocalizedText(jLabelHtmlTitle,bundle.getString("LABEL_WelcomeHTMLPages")); jLabelHtmlTitle.setRequestFocusEnabled(false); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; @@ -241,18 +240,18 @@ jPanelButton.setLayout(new java.awt.GridBagLayout()); jPanelButton.setRequestFocusEnabled(false); - showOnStartupCheckBox.setText(bundle.getString("CTL_NEXTSTARTUP")); + org.openide.awt.Mnemonics.setLocalizedText(showOnStartupCheckBox,bundle.getString("CTL_NEXTSTARTUP")); showOnStartupCheckBox.setNextFocusableComponent(closeButton); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridx = 0; gridBagConstraints.gridy = 0; gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; - gridBagConstraints.insets = new java.awt.Insets(0, 0, 0, 12); gridBagConstraints.anchor = java.awt.GridBagConstraints.WEST; gridBagConstraints.weightx = 1.0; + gridBagConstraints.insets = new java.awt.Insets(0, 0, 0, 12); jPanelButton.add(showOnStartupCheckBox, gridBagConstraints); - closeButton.setText(bundle.getString("CTL_CLOSE")); + org.openide.awt.Mnemonics.setLocalizedText(closeButton,bundle.getString("CTL_CLOSE")); jPanelButton.add(closeButton, new java.awt.GridBagConstraints()); gridBagConstraints = new java.awt.GridBagConstraints(); @@ -267,10 +266,9 @@ jPanelTip.setBorder(new javax.swing.border.EtchedBorder()); jPanelTip.setRequestFocusEnabled(false); - jLabelTipTitle.setLabelFor(tipsBrowser); - jLabelTipTitle.setText(bundle.getString("LABEL_WelcomeTipPages")); - jLabelTipTitle.setForeground(java.awt.Color.black); jLabelTipTitle.setHorizontalAlignment(javax.swing.SwingConstants.LEFT); + jLabelTipTitle.setLabelFor(tipsBrowser); + org.openide.awt.Mnemonics.setLocalizedText(jLabelTipTitle,bundle.getString("LABEL_WelcomeTipPages")); jLabelTipTitle.setRequestFocusEnabled(false); gridBagConstraints = new java.awt.GridBagConstraints(); gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER; @@ -282,7 +280,7 @@ jPanelTipButton.setRequestFocusEnabled(false); nextTipButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/core/resources/actions/tipOfTheDay.gif"))); - nextTipButton.setText(bundle1.getString("CTL_NEXT_BUTTON")); + org.openide.awt.Mnemonics.setLocalizedText(nextTipButton,bundle1.getString("CTL_NEXT_BUTTON")); nextTipButton.setBorder(new javax.swing.border.EmptyBorder(new java.awt.Insets(2, 2, 2, 2))); nextTipButton.setHorizontalAlignment(javax.swing.SwingConstants.LEFT); nextTipButton.setNextFocusableComponent(prevTipButton); @@ -300,7 +298,7 @@ jPanelTipButton.add(nextTipButton, gridBagConstraints); prevTipButton.setIcon(new javax.swing.ImageIcon(getClass().getResource("/org/netbeans/core/resources/actions/tipOfTheDay.gif"))); - prevTipButton.setText(bundle1.getString("CTL_PREV_BUTTON")); + org.openide.awt.Mnemonics.setLocalizedText(prevTipButton,bundle1.getString("CTL_PREV_BUTTON")); prevTipButton.setBorder(new javax.swing.border.EmptyBorder(new java.awt.Insets(2, 2, 2, 2))); prevTipButton.setHorizontalAlignment(javax.swing.SwingConstants.LEFT); prevTipButton.setNextFocusableComponent(tipsBrowser); @@ -331,9 +329,9 @@ tipsScrollPane.setPreferredSize(new java.awt.Dimension(420, 120)); tipsBrowser.setEditable(false); tipsBrowser.setFont(new java.awt.Font("Dialog", 0, 11)); + tipsBrowser.setNextFocusableComponent(showOnStartupCheckBox); tipsBrowser.setRequestFocusEnabled(false); tipsBrowser.setEditorKit(new javax.swing.text.html.HTMLEditorKit ()); - tipsBrowser.setNextFocusableComponent(showOnStartupCheckBox); tipsScrollPane.setViewportView(tipsBrowser); gridBagConstraints = new java.awt.GridBagConstraints(); @@ -365,23 +363,23 @@ }//GEN-LAST:event_nextTipButtonActionPerformed - // Variables declaration - do not modify//GEN-BEGIN:variables - private javax.swing.JPanel jPanelButton; - private javax.swing.JCheckBox showOnStartupCheckBox; - private javax.swing.JButton closeButton; - private javax.swing.JEditorPane contextBrowser; + // ?????????? ?????????? - ?? ????????? ?????? ???//GEN-BEGIN:variables + private javax.swing.JScrollPane tipsScrollPane; private javax.swing.JButton nextTipButton; - private javax.swing.JLabel jLabelTipTitle; - private javax.swing.JEditorPane tipsBrowser; - private javax.swing.JPanel buttonSetPanel; + private javax.swing.JEditorPane contextBrowser; + private javax.swing.JCheckBox showOnStartupCheckBox; + private javax.swing.JButton prevTipButton; + private javax.swing.JPanel jPanelButton; + private javax.swing.JLabel jLabelHtmlTitle; private javax.swing.JPanel jPanelHtml; + private javax.swing.JLabel jLabelTipTitle; private javax.swing.JPanel jPanelTip; - private javax.swing.JLabel jLabelHtmlTitle; - private javax.swing.JPanel jPanelTipButton; - private javax.swing.JButton prevTipButton; - private javax.swing.JScrollPane tipsScrollPane; private javax.swing.JScrollPane contextBrowserScroll; - // End of variables declaration//GEN-END:variables + private javax.swing.JPanel jPanelTipButton; + private javax.swing.JButton closeButton; + private javax.swing.JEditorPane tipsBrowser; + private javax.swing.JPanel buttonSetPanel; + // ????? ?????????? ??????????//GEN-END:variables javax.swing.JButton getCloseButton() { return closeButton; @@ -913,10 +911,6 @@ ResourceBundle b = NbBundle.getBundle(this.getClass()); - showOnStartupCheckBox.setMnemonic(b.getString("MNE_NEXTSTARTUP").charAt(0)); - nextTipButton.setMnemonic(b.getString("MNE_NEXT_BUTTON").charAt(0)); - prevTipButton.setMnemonic(b.getString("MNE_PREV_BUTTON").charAt(0)); - nextTipButton.getAccessibleContext().setAccessibleDescription(b.getString("ACSD_nextTipButton")); prevTipButton.getAccessibleContext().setAccessibleDescription(b.getString("ACSD_prevTipButton")); Index: core/src/org/netbeans/core/windows/Bundle.properties =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/core/windows/Bundle.properties,v retrieving revision 1.49 diff -u -r1.49 Bundle.properties --- core/src/org/netbeans/core/windows/Bundle.properties 29 Jan 2003 16:56:11 -0000 1.49 +++ core/src/org/netbeans/core/windows/Bundle.properties 23 Feb 2003 23:41:00 -0000 @@ -88,10 +88,8 @@ LBL_ChooseWorkspace=Choose Workspace or Window Below: #WorkspaceExplorerDialog -CTL_Open=Open Selected -CTL_Cancel=Cancel -CTL_Open_Mnem=O -CTL_Cancel_Mnem=C +CTL_Open=&Open Selected +CTL_Cancel=&Cancel ACS_Open=Open selected workspace and its mode ACS_Cancel=Close this dialog without changes Index: core/src/org/netbeans/core/windows/WorkspaceExplorerDialog.java =================================================================== RCS file: /shared/data/helm/cvs/repository/core/src/org/netbeans/core/windows/WorkspaceExplorerDialog.java,v retrieving revision 1.6 diff -u -r1.6 WorkspaceExplorerDialog.java --- core/src/org/netbeans/core/windows/WorkspaceExplorerDialog.java 3 Dec 2002 14:10:43 -0000 1.6 +++ core/src/org/netbeans/core/windows/WorkspaceExplorerDialog.java 23 Feb 2003 23:41:02 -0000 @@ -139,19 +139,17 @@ private JButton[] getButtons() { if (buttons == null) { buttons = new JButton[] { - new JButton(NbBundle.getMessage(WorkspaceExplorerDialog.class, - "CTL_Open")), - new JButton(NbBundle.getMessage(WorkspaceExplorerDialog.class, - "CTL_Cancel")) + new JButton(), + new JButton() }; - buttons[0].setMnemonic(NbBundle.getMessage( - WorkspaceExplorerDialog.class, "CTL_Open_Mnem").charAt(0)); + org.openide.awt.Mnemonics.setLocalizedText(buttons[0], + NbBundle.getMessage(WorkspaceExplorerDialog.class,"CTL_Open")); buttons[0].getAccessibleContext().setAccessibleDescription( NbBundle.getMessage(WorkspaceExplorerDialog.class, "ACS_Open")); - buttons[1].setMnemonic(NbBundle.getMessage( - WorkspaceExplorerDialog.class, "CTL_Cancel_Mnem").charAt(0)); + org.openide.awt.Mnemonics.setLocalizedText(buttons[1], + NbBundle.getMessage(WorkspaceExplorerDialog.class,"CTL_Cancel")); buttons[1].getAccessibleContext().setAccessibleDescription( NbBundle.getMessage(WorkspaceExplorerDialog.class, "ACS_Cancel"));