1.1 --- a/vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/Bundle.properties Thu Jun 15 21:18:01 2000 +0000
1.2 +++ b/vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/Bundle.properties Fri Jun 16 09:45:02 2000 +0000
1.3 @@ -33,6 +33,7 @@
1.4 CvsBranchFrame.revATextField.toolTipText=Click the left mouse button to select the revision
1.5 CvsBranchFrame.title=CVS Branches
1.6 CvsBranchFrame.revBTextField.toolTipText=Click the right mouse button to select the revision
1.7 +CvsBranchFrame.hintLabel.text=HINT: Click the left/right mouse button to select the revision A/B.
1.8
1.9 CvsDiffFrame.fileLabel1.text=CVS Repository file
1.10 CvsDiffFrame.fileLabel2.text=Working file
2.1 --- a/vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/CvsBranchFrame.form Thu Jun 15 21:18:01 2000 +0000
2.2 +++ b/vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/CvsBranchFrame.form Fri Jun 16 09:45:02 2000 +0000
2.3 @@ -2,14 +2,14 @@
2.4
2.5 <Form version="1.0" type="org.netbeans.modules.form.forminfo.JFrameFormInfo">
2.6 <SyntheticProperties>
2.7 - <SyntheticProperty name="menuBar" value="-84,-19,0,5,116,0,9,40,78,111,32,77,101,110,117,41"/>
2.8 - <SyntheticProperty name="formSize" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,0,-56,0,0,1,44"/>
2.9 - <SyntheticProperty name="formPosition" value="-84,-19,0,5,115,114,0,14,106,97,118,97,46,97,119,116,46,80,111,105,110,116,-74,-60,-118,114,52,126,-56,38,2,0,2,73,0,1,120,73,0,1,121,120,112,0,0,0,0,0,0,0,0"/>
2.10 - <SyntheticProperty name="formSizePolicy" value="-84,-19,0,5,115,114,0,17,106,97,118,97,46,108,97,110,103,46,73,110,116,101,103,101,114,18,-30,-96,-92,-9,-127,-121,56,2,0,1,73,0,5,118,97,108,117,101,120,114,0,16,106,97,118,97,46,108,97,110,103,46,78,117,109,98,101,114,-122,-84,-107,29,11,-108,-32,-117,2,0,0,120,112,0,0,0,2"/>
2.11 - <SyntheticProperty name="generatePosition" value="-84,-19,0,5,115,114,0,17,106,97,118,97,46,108,97,110,103,46,66,111,111,108,101,97,110,-51,32,114,-128,-43,-100,-6,-18,2,0,1,90,0,5,118,97,108,117,101,120,112,1"/>
2.12 - <SyntheticProperty name="generateSize" value="-84,-19,0,5,115,114,0,17,106,97,118,97,46,108,97,110,103,46,66,111,111,108,101,97,110,-51,32,114,-128,-43,-100,-6,-18,2,0,1,90,0,5,118,97,108,117,101,120,112,1"/>
2.13 - <SyntheticProperty name="generateCenter" value="-84,-19,0,5,115,114,0,17,106,97,118,97,46,108,97,110,103,46,66,111,111,108,101,97,110,-51,32,114,-128,-43,-100,-6,-18,2,0,1,90,0,5,118,97,108,117,101,120,112,1"/>
2.14 - <SyntheticProperty name="encoding" value="-84,-19,0,5,116,0,10,73,83,79,45,56,56,53,57,45,49"/>
2.15 + <SyntheticProperty name="menuBar" type="java.lang.String" value="(No Menu)"/>
2.16 + <SyntheticProperty name="formSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,0,-56,0,0,1,44"/>
2.17 + <SyntheticProperty name="formPosition" type="java.awt.Point" value="-84,-19,0,5,115,114,0,14,106,97,118,97,46,97,119,116,46,80,111,105,110,116,-74,-60,-118,114,52,126,-56,38,2,0,2,73,0,1,120,73,0,1,121,120,112,0,0,0,0,0,0,0,0"/>
2.18 + <SyntheticProperty name="formSizePolicy" type="int" value="2"/>
2.19 + <SyntheticProperty name="generatePosition" type="boolean" value="true"/>
2.20 + <SyntheticProperty name="generateSize" type="boolean" value="true"/>
2.21 + <SyntheticProperty name="generateCenter" type="boolean" value="true"/>
2.22 + <SyntheticProperty name="encoding" type="java.lang.String" value="ISO-8859-1"/>
2.23 </SyntheticProperties>
2.24
2.25 <Events>
2.26 @@ -23,12 +23,12 @@
2.27 <SubComponents>
2.28 <Container class="javax.swing.JPanel" name="headPanel">
2.29 <Constraints>
2.30 + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
2.31 + <BorderConstraints direction="North"/>
2.32 + </Constraint>
2.33 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
2.34 <GridBagConstraints anchor="10" fill="2" gridHeight="1" gridWidth="1" gridX="-1" gridY="-1" insetsBottom="0" insetsLeft="0" insetsRight="0" insetsTop="0" ipadX="0" ipadY="0" weightX="1.0" weightY="0.0"/>
2.35 </Constraint>
2.36 - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout" value="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout$BorderConstraintsDescription">
2.37 - <BorderConstraints direction="North"/>
2.38 - </Constraint>
2.39 </Constraints>
2.40
2.41 <Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
2.42 @@ -49,10 +49,10 @@
2.43 </Property>
2.44 </Properties>
2.45 <Constraints>
2.46 + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout" value="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout$FlowConstraintsDescription"/>
2.47 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
2.48 <GridBagConstraints anchor="17" fill="0" gridHeight="1" gridWidth="1" gridX="-1" gridY="-1" insetsBottom="0" insetsLeft="0" insetsRight="0" insetsTop="0" ipadX="0" ipadY="0" weightX="0.0" weightY="0.0"/>
2.49 </Constraint>
2.50 - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout" value="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout$FlowConstraintsDescription"/>
2.51 </Constraints>
2.52 </Component>
2.53 <Component class="javax.swing.JTextField" name="revATextField">
2.54 @@ -86,10 +86,10 @@
2.55 </Property>
2.56 </Properties>
2.57 <Constraints>
2.58 + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout" value="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout$FlowConstraintsDescription"/>
2.59 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
2.60 <GridBagConstraints anchor="17" fill="0" gridHeight="1" gridWidth="1" gridX="-1" gridY="-1" insetsBottom="0" insetsLeft="0" insetsRight="0" insetsTop="0" ipadX="0" ipadY="0" weightX="0.0" weightY="0.0"/>
2.61 </Constraint>
2.62 - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout" value="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout$FlowConstraintsDescription"/>
2.63 </Constraints>
2.64 </Component>
2.65 <Component class="javax.swing.JTextField" name="revBTextField">
2.66 @@ -137,10 +137,22 @@
2.67 </Container>
2.68 </SubComponents>
2.69 </Container>
2.70 + <Component class="javax.swing.JLabel" name="hintLabel">
2.71 + <Properties>
2.72 + <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.ResourceBundleStringFormEditor">
2.73 + <ResourceString bundle="org/netbeans/modules/vcs/cmdline/commands/Bundle.properties" key="CvsBranchFrame.hintLabel.text"/>
2.74 + </Property>
2.75 + </Properties>
2.76 + <Constraints>
2.77 + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
2.78 + <GridBagConstraints anchor="17" fill="0" gridHeight="1" gridWidth="1" gridX="-1" gridY="4" insetsBottom="8" insetsLeft="8" insetsRight="8" insetsTop="0" ipadX="0" ipadY="0" weightX="0.0" weightY="0.0"/>
2.79 + </Constraint>
2.80 + </Constraints>
2.81 + </Component>
2.82 <Container class="javax.swing.JPanel" name="buttonPanel">
2.83 <Constraints>
2.84 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
2.85 - <GridBagConstraints anchor="10" fill="2" gridHeight="1" gridWidth="1" gridX="-1" gridY="4" insetsBottom="8" insetsLeft="8" insetsRight="8" insetsTop="0" ipadX="0" ipadY="0" weightX="1.0" weightY="0.0"/>
2.86 + <GridBagConstraints anchor="10" fill="2" gridHeight="1" gridWidth="1" gridX="-1" gridY="5" insetsBottom="8" insetsLeft="8" insetsRight="8" insetsTop="0" ipadX="0" ipadY="0" weightX="1.0" weightY="0.0"/>
2.87 </Constraint>
2.88 </Constraints>
2.89
2.90 @@ -157,10 +169,10 @@
2.91 <EventHandler event="actionPerformed" handler="diffButtonActionPerformed"/>
2.92 </Events>
2.93 <Constraints>
2.94 + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout" value="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout$FlowConstraintsDescription"/>
2.95 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
2.96 <GridBagConstraints anchor="10" fill="0" gridHeight="1" gridWidth="1" gridX="-1" gridY="-1" insetsBottom="0" insetsLeft="0" insetsRight="0" insetsTop="0" ipadX="0" ipadY="0" weightX="1.0" weightY="0.0"/>
2.97 </Constraint>
2.98 - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout" value="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout$FlowConstraintsDescription"/>
2.99 </Constraints>
2.100 </Component>
2.101 <Component class="javax.swing.JButton" name="closeButton">
2.102 @@ -174,10 +186,10 @@
2.103 <EventHandler event="actionPerformed" handler="closeButtonActionPerformed"/>
2.104 </Events>
2.105 <Constraints>
2.106 + <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout" value="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout$FlowConstraintsDescription"/>
2.107 <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
2.108 <GridBagConstraints anchor="10" fill="0" gridHeight="1" gridWidth="1" gridX="-1" gridY="-1" insetsBottom="0" insetsLeft="0" insetsRight="0" insetsTop="0" ipadX="0" ipadY="0" weightX="1.0" weightY="0.0"/>
2.109 </Constraint>
2.110 - <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout" value="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout$FlowConstraintsDescription"/>
2.111 </Constraints>
2.112 </Component>
2.113 </SubComponents>
3.1 --- a/vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/CvsBranchFrame.java Thu Jun 15 21:18:01 2000 +0000
3.2 +++ b/vcscvs/src/org/netbeans/modules/vcs/cmdline/commands/CvsBranchFrame.java Fri Jun 16 09:45:02 2000 +0000
3.3 @@ -42,144 +42,153 @@
3.4 * WARNING: Do NOT modify this code. The content of this method is
3.5 * always regenerated by the FormEditor.
3.6 */
3.7 - private void initComponents () {//GEN-BEGIN:initComponents
3.8 - headPanel = new javax.swing.JPanel ();
3.9 - infoPanel1 = new javax.swing.JPanel ();
3.10 - revALabel = new javax.swing.JLabel ();
3.11 - revATextField = new javax.swing.JTextField ();
3.12 - infoPanel2 = new javax.swing.JPanel ();
3.13 - revBLabel = new javax.swing.JLabel ();
3.14 - revBTextField = new javax.swing.JTextField ();
3.15 - branchPanel = new javax.swing.JPanel ();
3.16 - branchScrollPane = new javax.swing.JScrollPane ();
3.17 - buttonPanel = new javax.swing.JPanel ();
3.18 - diffButton = new javax.swing.JButton ();
3.19 - closeButton = new javax.swing.JButton ();
3.20 - getContentPane ().setLayout (new java.awt.GridBagLayout ());
3.21 + private void initComponents() {//GEN-BEGIN:initComponents
3.22 + headPanel = new javax.swing.JPanel();
3.23 + infoPanel1 = new javax.swing.JPanel();
3.24 + revALabel = new javax.swing.JLabel();
3.25 + revATextField = new javax.swing.JTextField();
3.26 + infoPanel2 = new javax.swing.JPanel();
3.27 + revBLabel = new javax.swing.JLabel();
3.28 + revBTextField = new javax.swing.JTextField();
3.29 + branchPanel = new javax.swing.JPanel();
3.30 + branchScrollPane = new javax.swing.JScrollPane();
3.31 + hintLabel = new javax.swing.JLabel();
3.32 + buttonPanel = new javax.swing.JPanel();
3.33 + diffButton = new javax.swing.JButton();
3.34 + closeButton = new javax.swing.JButton();
3.35 + getContentPane().setLayout(new java.awt.GridBagLayout());
3.36 java.awt.GridBagConstraints gridBagConstraints1;
3.37 - addWindowListener (new java.awt.event.WindowAdapter () {
3.38 - public void windowClosing (java.awt.event.WindowEvent evt) {
3.39 - exitForm (evt);
3.40 - }
3.41 - }
3.42 - );
3.43 + addWindowListener(new java.awt.event.WindowAdapter() {
3.44 + public void windowClosing(java.awt.event.WindowEvent evt) {
3.45 + exitForm(evt);
3.46 + }
3.47 + }
3.48 + );
3.49
3.50 - headPanel.setLayout (new java.awt.GridBagLayout ());
3.51 + headPanel.setLayout(new java.awt.GridBagLayout());
3.52 java.awt.GridBagConstraints gridBagConstraints2;
3.53
3.54 -
3.55 - gridBagConstraints1 = new java.awt.GridBagConstraints ();
3.56 + gridBagConstraints1 = new java.awt.GridBagConstraints();
3.57 gridBagConstraints1.fill = java.awt.GridBagConstraints.HORIZONTAL;
3.58 gridBagConstraints1.weightx = 1.0;
3.59 - getContentPane ().add (headPanel, gridBagConstraints1);
3.60 + getContentPane().add(headPanel, gridBagConstraints1);
3.61
3.62 - infoPanel1.setLayout (new java.awt.GridBagLayout ());
3.63 +
3.64 + infoPanel1.setLayout(new java.awt.GridBagLayout());
3.65 java.awt.GridBagConstraints gridBagConstraints3;
3.66
3.67 - revALabel.setText (org.openide.util.NbBundle.getBundle(CvsBranchFrame.class).getString("CvsBranchFrame.revALabel.text"));
3.68 -
3.69 - gridBagConstraints3 = new java.awt.GridBagConstraints ();
3.70 - gridBagConstraints3.anchor = java.awt.GridBagConstraints.WEST;
3.71 - infoPanel1.add (revALabel, gridBagConstraints3);
3.72 -
3.73 - revATextField.setToolTipText (org.openide.util.NbBundle.getBundle(CvsBranchFrame.class).getString("CvsBranchFrame.revATextField.toolTipText"));
3.74 - revATextField.setEditable (false);
3.75 -
3.76 - gridBagConstraints3 = new java.awt.GridBagConstraints ();
3.77 - gridBagConstraints3.fill = java.awt.GridBagConstraints.HORIZONTAL;
3.78 - gridBagConstraints3.insets = new java.awt.Insets (0, 8, 0, 0);
3.79 - gridBagConstraints3.weightx = 1.0;
3.80 - infoPanel1.add (revATextField, gridBagConstraints3);
3.81 -
3.82 -
3.83 - gridBagConstraints1 = new java.awt.GridBagConstraints ();
3.84 + revALabel.setText(java.util.ResourceBundle.getBundle("org/netbeans/modules/vcs/cmdline/commands/Bundle").getString("CvsBranchFrame.revALabel.text"));
3.85 + gridBagConstraints3 = new java.awt.GridBagConstraints();
3.86 + gridBagConstraints3.anchor = java.awt.GridBagConstraints.WEST;
3.87 + infoPanel1.add(revALabel, gridBagConstraints3);
3.88 +
3.89 +
3.90 + revATextField.setToolTipText(java.util.ResourceBundle.getBundle("org/netbeans/modules/vcs/cmdline/commands/Bundle").getString("CvsBranchFrame.revATextField.toolTipText"));
3.91 + revATextField.setEditable(false);
3.92 + gridBagConstraints3 = new java.awt.GridBagConstraints();
3.93 + gridBagConstraints3.fill = java.awt.GridBagConstraints.HORIZONTAL;
3.94 + gridBagConstraints3.insets = new java.awt.Insets(0, 8, 0, 0);
3.95 + gridBagConstraints3.weightx = 1.0;
3.96 + infoPanel1.add(revATextField, gridBagConstraints3);
3.97 +
3.98 +
3.99 + gridBagConstraints1 = new java.awt.GridBagConstraints();
3.100 gridBagConstraints1.gridy = 1;
3.101 gridBagConstraints1.fill = java.awt.GridBagConstraints.HORIZONTAL;
3.102 - gridBagConstraints1.insets = new java.awt.Insets (8, 8, 8, 8);
3.103 + gridBagConstraints1.insets = new java.awt.Insets(8, 8, 8, 8);
3.104 gridBagConstraints1.weightx = 1.0;
3.105 - getContentPane ().add (infoPanel1, gridBagConstraints1);
3.106 + getContentPane().add(infoPanel1, gridBagConstraints1);
3.107
3.108 - infoPanel2.setLayout (new java.awt.GridBagLayout ());
3.109 +
3.110 + infoPanel2.setLayout(new java.awt.GridBagLayout());
3.111 java.awt.GridBagConstraints gridBagConstraints4;
3.112
3.113 - revBLabel.setText (org.openide.util.NbBundle.getBundle(CvsBranchFrame.class).getString("CvsBranchFrame.revBLabel.text"));
3.114 -
3.115 - gridBagConstraints4 = new java.awt.GridBagConstraints ();
3.116 - gridBagConstraints4.anchor = java.awt.GridBagConstraints.WEST;
3.117 - infoPanel2.add (revBLabel, gridBagConstraints4);
3.118 -
3.119 - revBTextField.setToolTipText (org.openide.util.NbBundle.getBundle(CvsBranchFrame.class).getString("CvsBranchFrame.revBTextField.toolTipText"));
3.120 - revBTextField.setEditable (false);
3.121 -
3.122 - gridBagConstraints4 = new java.awt.GridBagConstraints ();
3.123 - gridBagConstraints4.fill = java.awt.GridBagConstraints.HORIZONTAL;
3.124 - gridBagConstraints4.insets = new java.awt.Insets (0, 8, 0, 0);
3.125 - gridBagConstraints4.weightx = 1.0;
3.126 - infoPanel2.add (revBTextField, gridBagConstraints4);
3.127 -
3.128 -
3.129 - gridBagConstraints1 = new java.awt.GridBagConstraints ();
3.130 + revBLabel.setText(java.util.ResourceBundle.getBundle("org/netbeans/modules/vcs/cmdline/commands/Bundle").getString("CvsBranchFrame.revBLabel.text"));
3.131 + gridBagConstraints4 = new java.awt.GridBagConstraints();
3.132 + gridBagConstraints4.anchor = java.awt.GridBagConstraints.WEST;
3.133 + infoPanel2.add(revBLabel, gridBagConstraints4);
3.134 +
3.135 +
3.136 + revBTextField.setToolTipText(java.util.ResourceBundle.getBundle("org/netbeans/modules/vcs/cmdline/commands/Bundle").getString("CvsBranchFrame.revBTextField.toolTipText"));
3.137 + revBTextField.setEditable(false);
3.138 + gridBagConstraints4 = new java.awt.GridBagConstraints();
3.139 + gridBagConstraints4.fill = java.awt.GridBagConstraints.HORIZONTAL;
3.140 + gridBagConstraints4.insets = new java.awt.Insets(0, 8, 0, 0);
3.141 + gridBagConstraints4.weightx = 1.0;
3.142 + infoPanel2.add(revBTextField, gridBagConstraints4);
3.143 +
3.144 +
3.145 + gridBagConstraints1 = new java.awt.GridBagConstraints();
3.146 gridBagConstraints1.gridy = 2;
3.147 gridBagConstraints1.fill = java.awt.GridBagConstraints.HORIZONTAL;
3.148 - gridBagConstraints1.insets = new java.awt.Insets (0, 8, 8, 8);
3.149 + gridBagConstraints1.insets = new java.awt.Insets(0, 8, 8, 8);
3.150 gridBagConstraints1.weightx = 1.0;
3.151 - getContentPane ().add (infoPanel2, gridBagConstraints1);
3.152 + getContentPane().add(infoPanel2, gridBagConstraints1);
3.153
3.154 - branchPanel.setLayout (new java.awt.GridBagLayout ());
3.155 +
3.156 + branchPanel.setLayout(new java.awt.GridBagLayout());
3.157 java.awt.GridBagConstraints gridBagConstraints5;
3.158 - branchPanel.setPreferredSize (new java.awt.Dimension(300, 200));
3.159 + branchPanel.setPreferredSize(new java.awt.Dimension(300, 200));
3.160
3.161 - branchScrollPane.setPreferredSize (new java.awt.Dimension(200, 200));
3.162 -
3.163 - gridBagConstraints5 = new java.awt.GridBagConstraints ();
3.164 - gridBagConstraints5.fill = java.awt.GridBagConstraints.BOTH;
3.165 - gridBagConstraints5.weightx = 1.0;
3.166 - gridBagConstraints5.weighty = 1.0;
3.167 - branchPanel.add (branchScrollPane, gridBagConstraints5);
3.168 -
3.169 -
3.170 - gridBagConstraints1 = new java.awt.GridBagConstraints ();
3.171 + branchScrollPane.setPreferredSize(new java.awt.Dimension(200, 200));
3.172 + gridBagConstraints5 = new java.awt.GridBagConstraints();
3.173 + gridBagConstraints5.fill = java.awt.GridBagConstraints.BOTH;
3.174 + gridBagConstraints5.weightx = 1.0;
3.175 + gridBagConstraints5.weighty = 1.0;
3.176 + branchPanel.add(branchScrollPane, gridBagConstraints5);
3.177 +
3.178 +
3.179 + gridBagConstraints1 = new java.awt.GridBagConstraints();
3.180 gridBagConstraints1.gridy = 3;
3.181 gridBagConstraints1.fill = java.awt.GridBagConstraints.BOTH;
3.182 - gridBagConstraints1.insets = new java.awt.Insets (0, 8, 8, 8);
3.183 + gridBagConstraints1.insets = new java.awt.Insets(0, 8, 8, 8);
3.184 gridBagConstraints1.weightx = 1.0;
3.185 gridBagConstraints1.weighty = 1.0;
3.186 - getContentPane ().add (branchPanel, gridBagConstraints1);
3.187 + getContentPane().add(branchPanel, gridBagConstraints1);
3.188
3.189 - buttonPanel.setLayout (new java.awt.GridBagLayout ());
3.190 +
3.191 + hintLabel.setText(java.util.ResourceBundle.getBundle("org/netbeans/modules/vcs/cmdline/commands/Bundle").getString("CvsBranchFrame.hintLabel.text"));
3.192 +
3.193 + gridBagConstraints1 = new java.awt.GridBagConstraints();
3.194 + gridBagConstraints1.gridy = 4;
3.195 + gridBagConstraints1.insets = new java.awt.Insets(0, 8, 8, 8);
3.196 + gridBagConstraints1.anchor = java.awt.GridBagConstraints.WEST;
3.197 + getContentPane().add(hintLabel, gridBagConstraints1);
3.198 +
3.199 +
3.200 + buttonPanel.setLayout(new java.awt.GridBagLayout());
3.201 java.awt.GridBagConstraints gridBagConstraints6;
3.202
3.203 - diffButton.setText (org.openide.util.NbBundle.getBundle(CvsBranchFrame.class).getString("CvsBranchFrame.diffButton.text"));
3.204 - diffButton.addActionListener (new java.awt.event.ActionListener () {
3.205 - public void actionPerformed (java.awt.event.ActionEvent evt) {
3.206 - diffButtonActionPerformed (evt);
3.207 - }
3.208 - }
3.209 - );
3.210 -
3.211 - gridBagConstraints6 = new java.awt.GridBagConstraints ();
3.212 - gridBagConstraints6.weightx = 1.0;
3.213 - buttonPanel.add (diffButton, gridBagConstraints6);
3.214 -
3.215 - closeButton.setText (org.openide.util.NbBundle.getBundle(CvsBranchFrame.class).getString("CvsBranchFrame.closeButton.text"));
3.216 - closeButton.addActionListener (new java.awt.event.ActionListener () {
3.217 - public void actionPerformed (java.awt.event.ActionEvent evt) {
3.218 - closeButtonActionPerformed (evt);
3.219 - }
3.220 - }
3.221 - );
3.222 -
3.223 - gridBagConstraints6 = new java.awt.GridBagConstraints ();
3.224 - gridBagConstraints6.weightx = 1.0;
3.225 - buttonPanel.add (closeButton, gridBagConstraints6);
3.226 -
3.227 -
3.228 - gridBagConstraints1 = new java.awt.GridBagConstraints ();
3.229 - gridBagConstraints1.gridy = 4;
3.230 + diffButton.setText(java.util.ResourceBundle.getBundle("org/netbeans/modules/vcs/cmdline/commands/Bundle").getString("CvsBranchFrame.diffButton.text"));
3.231 + diffButton.addActionListener(new java.awt.event.ActionListener() {
3.232 + public void actionPerformed(java.awt.event.ActionEvent evt) {
3.233 + diffButtonActionPerformed(evt);
3.234 + }
3.235 + }
3.236 + );
3.237 + gridBagConstraints6 = new java.awt.GridBagConstraints();
3.238 + gridBagConstraints6.weightx = 1.0;
3.239 + buttonPanel.add(diffButton, gridBagConstraints6);
3.240 +
3.241 +
3.242 + closeButton.setText(java.util.ResourceBundle.getBundle("org/netbeans/modules/vcs/cmdline/commands/Bundle").getString("CvsBranchFrame.closeButton.text"));
3.243 + closeButton.addActionListener(new java.awt.event.ActionListener() {
3.244 + public void actionPerformed(java.awt.event.ActionEvent evt) {
3.245 + closeButtonActionPerformed(evt);
3.246 + }
3.247 + }
3.248 + );
3.249 + gridBagConstraints6 = new java.awt.GridBagConstraints();
3.250 + gridBagConstraints6.weightx = 1.0;
3.251 + buttonPanel.add(closeButton, gridBagConstraints6);
3.252 +
3.253 +
3.254 + gridBagConstraints1 = new java.awt.GridBagConstraints();
3.255 + gridBagConstraints1.gridy = 5;
3.256 gridBagConstraints1.fill = java.awt.GridBagConstraints.HORIZONTAL;
3.257 - gridBagConstraints1.insets = new java.awt.Insets (0, 8, 8, 8);
3.258 + gridBagConstraints1.insets = new java.awt.Insets(0, 8, 8, 8);
3.259 gridBagConstraints1.weightx = 1.0;
3.260 - getContentPane ().add (buttonPanel, gridBagConstraints1);
3.261 + getContentPane().add(buttonPanel, gridBagConstraints1);
3.262
3.263 }//GEN-END:initComponents
3.264
3.265 @@ -392,6 +401,7 @@
3.266 private javax.swing.JTextField revBTextField;
3.267 private javax.swing.JPanel branchPanel;
3.268 private javax.swing.JScrollPane branchScrollPane;
3.269 + private javax.swing.JLabel hintLabel;
3.270 private javax.swing.JPanel buttonPanel;
3.271 private javax.swing.JButton diffButton;
3.272 private javax.swing.JButton closeButton;