Attachment #133897 for bug #229106

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 229106
Collapse All | Expand All

Lines 42-48 Link Here

(-)a/git/src/org/netbeans/modules/git/ui/branch/Bundle.properties (-2 / +2 lines)
42	LBL_CreateBranchAction_PopupName=Create Branch...	42	LBL_CreateBranchAction_PopupName=Create Branch...
43	LBL_CreateBranch.OKButton.text=&Create	43	LBL_CreateBranch.OKButton.text=&Create
44	LBL_CreateBranch.title=Create Branch	44	LBL_CreateBranch.title=Create Branch
45	CreateBranchPanel.jLabel1.text=&Branch Name:	45	CreateBranchPanel.jLabel1.text=Branch &Name:
46	CreateBranchPanel.branchNameField.text=	46	CreateBranchPanel.branchNameField.text=
47	MSG_CreateBranchAction.branchCreated = Branch created\n\	47	MSG_CreateBranchAction.branchCreated = Branch created\n\
48	Name: {0}\n\	48	Name: {0}\n\
Lines 60-64 Link Here
60	Do you still want to delete the branch?	60	Do you still want to delete the branch?
61	LBL_DeleteBranchAction.confirmation=Delete Branch	61	LBL_DeleteBranchAction.confirmation=Delete Branch
62	MSG_DeleteBranchAction.confirmation=Do you really want to delete branch {0}	62	MSG_DeleteBranchAction.confirmation=Do you really want to delete branch {0}
63	CreateBranchPanel.cbCheckoutBranch.text=&Checkout Created Branch	63	CreateBranchPanel.cbCheckoutBranch.text=Check&out Created Branch
64	CreateBranchPanel.cbCheckoutBranch.TTtext=Checkout the branch right after it is created	64	CreateBranchPanel.cbCheckoutBranch.TTtext=Checkout the branch right after it is created




  <Layout>
    <DimensionLayout dim="0">
      <Group type="103" groupAlignment="0" attributes="0">
          <Group type="102" alignment="1" attributes="0">
              <EmptySpace max="-2" attributes="0"/>
              <Group type="103" groupAlignment="0" attributes="0">
                  <Component id="revisionPickerDialog1" alignment="1" pref="0" max="32767" attributes="0"/>
                  <Group type="102" alignment="0" attributes="0">
                      <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
                      <EmptySpace max="-2" attributes="0"/>

              </Group>
              <EmptySpace max="-2" attributes="0"/>
          </Group>
          <Component id="revisionPickerDialog1" alignment="0" max="32767" attributes="0"/>
      </Group>
    </DimensionLayout>
    <DimensionLayout dim="1">




        this.setLayout(layout);
        layout.setHorizontalGroup(
            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
                .addContainerGap()
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                    .addComponent(revisionPickerDialog1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
                    .addGroup(layout.createSequentialGroup()
                        .addComponent(jLabel1)
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)

                        .addGap(0, 0, Short.MAX_VALUE))
                    .addComponent(lblError, javax.swing.GroupLayout.DEFAULT_SIZE, 479, Short.MAX_VALUE))
                .addContainerGap())
            .addComponent(revisionPickerDialog1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
        );
        layout.setVerticalGroup(
            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)

Lines 89-95 Link Here

(-)a/git/src/org/netbeans/modules/git/ui/repository/Bundle.properties (-2 / +2 lines)
89	RevisionListPanel.btnRefresh.text=&Refresh	89	RevisionListPanel.btnRefresh.text=&Refresh
90	#RevisionDialog	90	#RevisionDialog
91	MSG_RevisionDialog.selectBranch = Select Branch	91	MSG_RevisionDialog.selectBranch = Select Branch
92	RevisionDialog.lblRevision.text=Re&vision	92	RevisionDialog.lblRevision.text=Re&vision:
93	RevisionDialog.lblBranch.text=&Branch	93	RevisionDialog.lblBranch.text=&Branch:
94	RevisionListPanel.jLabel4.text=&Filter:	94	RevisionListPanel.jLabel4.text=&Filter:
95	RevisionListPanel.jLabel4.TTtext=Remove revisions from the list not complying to this criteria	95	RevisionListPanel.jLabel4.TTtext=Remove revisions from the list not complying to this criteria




<?xml version="1.0" encoding="UTF-8" ?>

<Form version="1.4" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
  <AuxValues>

    <DimensionLayout dim="0">
      <Group type="103" groupAlignment="0" attributes="0">
          <Group type="102" alignment="1" attributes="0">
              <EmptySpace min="-2" max="-2" attributes="0"/>
              <Group type="103" groupAlignment="1" attributes="0">
                  <Component id="revisionInfoPanel" alignment="0" pref="399" max="32767" attributes="0"/>
                  <Group type="102" alignment="1" attributes="0">
                      <Component id="lblRevision" min="-2" max="-2" attributes="0"/>
                      <EmptySpace max="-2" attributes="0"/>
                      <Component id="revisionField" max="32767" attributes="0"/>
                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
                      <Component id="btnSelectRevision" min="-2" max="-2" attributes="0"/>
                  </Group>
                  <Group type="102" alignment="0" attributes="0">
                      <Component id="lblBranch" min="-2" max="-2" attributes="0"/>
                      <EmptySpace type="unrelated" min="-2" max="-2" attributes="0"/>
                      <Component id="cmbBranches" max="32767" attributes="0"/>
                  </Group>
              </Group>
              <EmptySpace min="-2" max="-2" attributes="0"/>
          </Group>
      </Group>
    </DimensionLayout>

                  <Component id="cmbBranches" alignment="3" min="-2" max="-2" attributes="0"/>
              </Group>
              <EmptySpace type="unrelated" max="-2" attributes="0"/>
              <Component id="revisionInfoPanel" max="32767" attributes="0"/>
              <EmptySpace max="-2" attributes="0"/>
          </Group>
      </Group>

    </Component>
    <Component class="javax.swing.JLabel" name="lblBranch">
      <Properties>
        <Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">
          <ComponentRef name="cmbBranches"/>
        </Property>
        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
          <ResourceString bundle="org/netbeans/modules/git/ui/repository/Bundle.properties" key="RevisionDialog.lblBranch.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
        </Property>





        org.openide.awt.Mnemonics.setLocalizedText(btnSelectRevision, org.openide.util.NbBundle.getMessage(RevisionDialog.class, "RevisionDialog.btnSelectRevision.text")); // NOI18N

        lblBranch.setLabelFor(cmbBranches);
        org.openide.awt.Mnemonics.setLocalizedText(lblBranch, org.openide.util.NbBundle.getMessage(RevisionDialog.class, "RevisionDialog.lblBranch.text")); // NOI18N

        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);

            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
                .addContainerGap()
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
                    .addComponent(revisionInfoPanel, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 399, Short.MAX_VALUE)
                    .addGroup(layout.createSequentialGroup()
                        .addComponent(lblRevision)
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                        .addComponent(revisionField)
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                        .addComponent(btnSelectRevision))
                    .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
                        .addComponent(lblBranch)
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                        .addComponent(cmbBranches, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
                .addContainerGap())
        );
        layout.setVerticalGroup(

                    .addComponent(lblBranch)
                    .addComponent(cmbBranches, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
                .addComponent(revisionInfoPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                .addContainerGap())
        );
    }// </editor-fold>//GEN-END:initComponents

Lines 1-4 Link Here

(-)a/git/src/org/netbeans/modules/git/ui/repository/RevisionInfoPanel.form (-1 / +1 lines)
1	<?xml version="1.1" encoding="UTF-8" ?>	1	<?xml version="1.0" encoding="UTF-8" ?>
2		2
3	<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">	3	<Form version="1.5" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
4	<Properties>	4	<Properties>

Return to bug 229106

Lines 16-25 Link Here

(-)a/git/src/org/netbeans/modules/git/ui/branch/CreateBranchPanel.form (-2 / +2 lines)
16	<Layout>	16	<Layout>
17	<DimensionLayout dim="0">	17	<DimensionLayout dim="0">
18	<Group type="103" groupAlignment="0" attributes="0">	18	<Group type="103" groupAlignment="0" attributes="0">
19	<Group type="102" attributes="0">	19	<Group type="102" alignment="1" attributes="0">
20	<EmptySpace max="-2" attributes="0"/>	20	<EmptySpace max="-2" attributes="0"/>
21	<Group type="103" groupAlignment="0" attributes="0">	21	<Group type="103" groupAlignment="0" attributes="0">
22	<Component id="revisionPickerDialog1" alignment="1" pref="0" max="32767" attributes="0"/>
23	<Group type="102" alignment="0" attributes="0">	22	<Group type="102" alignment="0" attributes="0">
24	<Component id="jLabel1" min="-2" max="-2" attributes="0"/>	23	<Component id="jLabel1" min="-2" max="-2" attributes="0"/>
25	<EmptySpace max="-2" attributes="0"/>	24	<EmptySpace max="-2" attributes="0"/>
Lines 33-38 Link Here
33	</Group>	32	</Group>
34	<EmptySpace max="-2" attributes="0"/>	33	<EmptySpace max="-2" attributes="0"/>
35	</Group>	34	</Group>
		35	<Component id="revisionPickerDialog1" alignment="0" max="32767" attributes="0"/>
36	</Group>	36	</Group>
37	</DimensionLayout>	37	</DimensionLayout>
38	<DimensionLayout dim="1">	38	<DimensionLayout dim="1">

Lines 91-100 Link Here

(-)a/git/src/org/netbeans/modules/git/ui/branch/CreateBranchPanel.java (-2 / +2 lines)
91	this.setLayout(layout);	91	this.setLayout(layout);
92	layout.setHorizontalGroup(	92	layout.setHorizontalGroup(
93	layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)	93	layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
94	.addGroup(layout.createSequentialGroup()	94	.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
95	.addContainerGap()	95	.addContainerGap()
96	.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)	96	.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
97	.addComponent(revisionPickerDialog1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 0, Short.MAX_VALUE)
98	.addGroup(layout.createSequentialGroup()	97	.addGroup(layout.createSequentialGroup()
99	.addComponent(jLabel1)	98	.addComponent(jLabel1)
100	.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)	99	.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
Lines 104-109 Link Here
104	.addGap(0, 0, Short.MAX_VALUE))	103	.addGap(0, 0, Short.MAX_VALUE))
105	.addComponent(lblError, javax.swing.GroupLayout.DEFAULT_SIZE, 479, Short.MAX_VALUE))	104	.addComponent(lblError, javax.swing.GroupLayout.DEFAULT_SIZE, 479, Short.MAX_VALUE))
106	.addContainerGap())	105	.addContainerGap())
		106	.addComponent(revisionPickerDialog1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
107	);	107	);
108	layout.setVerticalGroup(	108	layout.setVerticalGroup(
109	layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)	109	layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)

Lines 82-87 Link Here

(-)a/git/src/org/netbeans/modules/git/ui/repository/RevisionDialog.java (-5 / +6 lines)
82		82
83	org.openide.awt.Mnemonics.setLocalizedText(btnSelectRevision, org.openide.util.NbBundle.getMessage(RevisionDialog.class, "RevisionDialog.btnSelectRevision.text")); // NOI18N	83	org.openide.awt.Mnemonics.setLocalizedText(btnSelectRevision, org.openide.util.NbBundle.getMessage(RevisionDialog.class, "RevisionDialog.btnSelectRevision.text")); // NOI18N
84		84
		85	lblBranch.setLabelFor(cmbBranches);
85	org.openide.awt.Mnemonics.setLocalizedText(lblBranch, org.openide.util.NbBundle.getMessage(RevisionDialog.class, "RevisionDialog.lblBranch.text")); // NOI18N	86	org.openide.awt.Mnemonics.setLocalizedText(lblBranch, org.openide.util.NbBundle.getMessage(RevisionDialog.class, "RevisionDialog.lblBranch.text")); // NOI18N
86		87
87	javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);	88	javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
Lines 91-107 Link Here
91	.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()	92	.addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
92	.addContainerGap()	93	.addContainerGap()
93	.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)	94	.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
94	.addComponent(revisionInfoPanel, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 395, Short.MAX_VALUE)	95	.addComponent(revisionInfoPanel, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 399, Short.MAX_VALUE)
95	.addGroup(layout.createSequentialGroup()	96	.addGroup(layout.createSequentialGroup()
96	.addComponent(lblRevision)	97	.addComponent(lblRevision)
97	.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)	98	.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
98	.addComponent(revisionField, javax.swing.GroupLayout.DEFAULT_SIZE, 234, Short.MAX_VALUE)	99	.addComponent(revisionField)
99	.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)	100	.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
100	.addComponent(btnSelectRevision))	101	.addComponent(btnSelectRevision))
101	.addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()	102	.addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
102	.addComponent(lblBranch)	103	.addComponent(lblBranch)
103	.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)	104	.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
104	.addComponent(cmbBranches, 0, 334, Short.MAX_VALUE)))	105	.addComponent(cmbBranches, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
105	.addContainerGap())	106	.addContainerGap())
106	);	107	);
107	layout.setVerticalGroup(	108	layout.setVerticalGroup(
Lines 117-123 Link Here
117	.addComponent(lblBranch)	118	.addComponent(lblBranch)
118	.addComponent(cmbBranches, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))	119	.addComponent(cmbBranches, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
119	.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)	120	.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
120	.addComponent(revisionInfoPanel, javax.swing.GroupLayout.DEFAULT_SIZE, 146, Short.MAX_VALUE)	121	.addComponent(revisionInfoPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
121	.addContainerGap())	122	.addContainerGap())
122	);	123	);
123	}// </editor-fold>//GEN-END:initComponents	124	}// </editor-fold>//GEN-END:initComponents