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 181801
Collapse All | Expand All

(-)versioning.system.cvss/src/org/netbeans/modules/versioning/system/cvss/ui/actions/tag/MergePanel.form (-15 / +18 lines)
Lines 1-6 Link Here
1
<?xml version="1.0" encoding="UTF-8" ?>
1
<?xml version="1.1" encoding="UTF-8" ?>
2
2
3
<Form version="1.3" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
3
<Form version="1.4" maxVersion="1.4" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
4
  <NonVisualComponents>
4
  <NonVisualComponents>
5
    <Component class="javax.swing.ButtonGroup" name="buttonGroup1">
5
    <Component class="javax.swing.ButtonGroup" name="buttonGroup1">
6
    </Component>
6
    </Component>
Lines 8-13 Link Here
8
    </Component>
8
    </Component>
9
  </NonVisualComponents>
9
  </NonVisualComponents>
10
  <AuxValues>
10
  <AuxValues>
11
    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
12
    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
11
    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
13
    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
12
    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
14
    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
13
    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
15
    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
Lines 26-43 Link Here
26
                      <EmptySpace min="17" pref="17" max="17" attributes="0"/>
28
                      <EmptySpace min="17" pref="17" max="17" attributes="0"/>
27
                      <Component id="jLabel4" min="-2" max="-2" attributes="0"/>
29
                      <Component id="jLabel4" min="-2" max="-2" attributes="0"/>
28
                      <EmptySpace max="-2" attributes="0"/>
30
                      <EmptySpace max="-2" attributes="0"/>
29
                      <Component id="tfAfterMergeTagName" pref="289" max="32767" attributes="0"/>
31
                      <Component id="tfAfterMergeTagName" pref="350" max="32767" attributes="0"/>
30
                      <EmptySpace max="-2" attributes="0"/>
32
                      <EmptySpace max="-2" attributes="0"/>
31
                      <Component id="browseAfterMergeTag" min="-2" max="-2" attributes="0"/>
33
                      <Component id="browseAfterMergeTag" min="-2" max="-2" attributes="0"/>
32
                      <EmptySpace max="-2" attributes="0"/>
34
                      <EmptySpace max="-2" attributes="0"/>
33
                  </Group>
35
                  </Group>
34
                  <Group type="102" alignment="0" attributes="0">
36
                  <Group type="102" alignment="0" attributes="0">
35
                      <Group type="103" groupAlignment="0" attributes="0">
37
                      <Group type="103" groupAlignment="0" attributes="0">
36
                          <Group type="102" alignment="0" attributes="0">
37
                              <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
38
                              <EmptySpace max="-2" attributes="0"/>
39
                              <Component id="tfCurrentBranch" pref="178" max="32767" attributes="0"/>
40
                          </Group>
41
                          <Component id="jLabel2" alignment="0" min="-2" max="-2" attributes="0"/>
38
                          <Component id="jLabel2" alignment="0" min="-2" max="-2" attributes="0"/>
42
                          <Group type="102" alignment="0" attributes="0">
39
                          <Group type="102" alignment="0" attributes="0">
43
                              <EmptySpace min="10" pref="10" max="10" attributes="0"/>
40
                              <EmptySpace min="10" pref="10" max="10" attributes="0"/>
Lines 45-51 Link Here
45
                                  <Group type="102" alignment="0" attributes="0">
42
                                  <Group type="102" alignment="0" attributes="0">
46
                                      <Component id="rbFromTag" min="-2" max="-2" attributes="0"/>
43
                                      <Component id="rbFromTag" min="-2" max="-2" attributes="0"/>
47
                                      <EmptySpace max="-2" attributes="0"/>
44
                                      <EmptySpace max="-2" attributes="0"/>
48
                                      <Component id="tfStartTag" pref="257" max="32767" attributes="0"/>
45
                                      <Component id="tfStartTag" pref="319" max="32767" attributes="0"/>
49
                                  </Group>
46
                                  </Group>
50
                                  <Component id="rbFromBranchRoot" alignment="0" min="-2" max="-2" attributes="0"/>
47
                                  <Component id="rbFromBranchRoot" alignment="0" min="-2" max="-2" attributes="0"/>
51
                              </Group>
48
                              </Group>
Lines 57-63 Link Here
57
                  </Group>
54
                  </Group>
58
                  <Group type="102" alignment="0" attributes="0">
55
                  <Group type="102" alignment="0" attributes="0">
59
                      <Component id="jLabel3" min="-2" max="-2" attributes="0"/>
56
                      <Component id="jLabel3" min="-2" max="-2" attributes="0"/>
60
                      <EmptySpace pref="434" max="32767" attributes="0"/>
57
                      <EmptySpace pref="536" max="32767" attributes="0"/>
61
                  </Group>
58
                  </Group>
62
                  <Group type="102" alignment="0" attributes="0">
59
                  <Group type="102" alignment="0" attributes="0">
63
                      <EmptySpace min="10" pref="10" max="10" attributes="0"/>
60
                      <EmptySpace min="10" pref="10" max="10" attributes="0"/>
Lines 70-77 Link Here
70
                              </Group>
67
                              </Group>
71
                              <EmptySpace max="-2" attributes="0"/>
68
                              <EmptySpace max="-2" attributes="0"/>
72
                              <Group type="103" groupAlignment="0" attributes="0">
69
                              <Group type="103" groupAlignment="0" attributes="0">
73
                                  <Component id="tfEndTag" alignment="1" pref="257" max="32767" attributes="0"/>
70
                                  <Component id="tfEndTag" alignment="1" pref="319" max="32767" attributes="0"/>
74
                                  <Component id="tfBranch" alignment="1" pref="257" max="32767" attributes="0"/>
71
                                  <Component id="tfBranch" alignment="1" pref="319" max="32767" attributes="0"/>
75
                              </Group>
72
                              </Group>
76
                              <EmptySpace max="-2" attributes="0"/>
73
                              <EmptySpace max="-2" attributes="0"/>
77
                              <Group type="103" groupAlignment="0" attributes="0">
74
                              <Group type="103" groupAlignment="0" attributes="0">
Lines 84-104 Link Here
84
                  </Group>
81
                  </Group>
85
                  <Group type="102" alignment="0" attributes="0">
82
                  <Group type="102" alignment="0" attributes="0">
86
                      <Component id="cbTagAfterMerge" min="-2" max="-2" attributes="0"/>
83
                      <Component id="cbTagAfterMerge" min="-2" max="-2" attributes="0"/>
87
                      <EmptySpace pref="290" max="32767" attributes="0"/>
84
                      <EmptySpace pref="335" max="32767" attributes="0"/>
88
                  </Group>
85
                  </Group>
86
                  <Group type="102" attributes="0">
87
                      <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
88
                      <EmptySpace min="-2" max="-2" attributes="0"/>
89
                      <Component id="tfCurrentBranch" pref="286" max="32767" attributes="0"/>
90
                      <EmptySpace min="-2" max="-2" attributes="0"/>
89
              </Group>
91
              </Group>
90
          </Group>
92
          </Group>
91
      </Group>
93
      </Group>
94
      </Group>
92
    </DimensionLayout>
95
    </DimensionLayout>
93
    <DimensionLayout dim="1">
96
    <DimensionLayout dim="1">
94
      <Group type="103" groupAlignment="0" attributes="0">
97
      <Group type="103" groupAlignment="0" attributes="0">
95
          <Group type="102" alignment="0" attributes="0">
98
          <Group type="102" alignment="0" attributes="0">
96
              <EmptySpace max="-2" attributes="0"/>
99
              <EmptySpace min="-2" max="-2" attributes="0"/>
97
              <Group type="103" groupAlignment="3" attributes="0">
100
              <Group type="103" groupAlignment="3" attributes="0">
98
                  <Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
101
                  <Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
99
                  <Component id="tfCurrentBranch" alignment="3" min="-2" max="-2" attributes="0"/>
102
                  <Component id="tfCurrentBranch" alignment="3" min="-2" max="-2" attributes="0"/>
100
              </Group>
103
              </Group>
101
              <EmptySpace max="-2" attributes="0"/>
104
              <EmptySpace min="-2" max="-2" attributes="0"/>
102
              <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
105
              <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
103
              <EmptySpace max="-2" attributes="0"/>
106
              <EmptySpace max="-2" attributes="0"/>
104
              <Component id="rbFromBranchRoot" min="-2" max="-2" attributes="0"/>
107
              <Component id="rbFromBranchRoot" min="-2" max="-2" attributes="0"/>
(-)versioning.system.cvss/src/org/netbeans/modules/versioning/system/cvss/ui/actions/tag/MergePanel.java (-11 / +12 lines)
Lines 236-242 Link Here
236
     * WARNING: Do NOT modify this code. The content of this method is
236
     * WARNING: Do NOT modify this code. The content of this method is
237
     * always regenerated by the Form Editor.
237
     * always regenerated by the Form Editor.
238
     */
238
     */
239
    // <editor-fold defaultstate="collapsed" desc=" Generated Code ">//GEN-BEGIN:initComponents
239
   // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
240
    private void initComponents() {
240
    private void initComponents() {
241
241
242
        buttonGroup1 = new javax.swing.ButtonGroup();
242
        buttonGroup1 = new javax.swing.ButtonGroup();
Lines 378-393 Link Here
378
                        .add(17, 17, 17)
378
                        .add(17, 17, 17)
379
                        .add(jLabel4)
379
                        .add(jLabel4)
380
                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
380
                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
381
                        .add(tfAfterMergeTagName, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 289, Short.MAX_VALUE)
381
                  .add(tfAfterMergeTagName, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 350, Short.MAX_VALUE)
382
                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
382
                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
383
                        .add(browseAfterMergeTag)
383
                        .add(browseAfterMergeTag)
384
                        .addContainerGap())
384
                        .addContainerGap())
385
                    .add(layout.createSequentialGroup()
385
                    .add(layout.createSequentialGroup()
386
                        .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
386
                        .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
387
                            .add(layout.createSequentialGroup()
388
                                .add(jLabel1)
389
                                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
390
                                .add(tfCurrentBranch, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 178, Short.MAX_VALUE))
391
                            .add(jLabel2)
387
                            .add(jLabel2)
392
                            .add(layout.createSequentialGroup()
388
                            .add(layout.createSequentialGroup()
393
                                .add(10, 10, 10)
389
                                .add(10, 10, 10)
Lines 395-408 Link Here
395
                                    .add(layout.createSequentialGroup()
391
                                    .add(layout.createSequentialGroup()
396
                                        .add(rbFromTag)
392
                                        .add(rbFromTag)
397
                                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
393
                                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
398
                                        .add(tfStartTag, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 257, Short.MAX_VALUE))
394
                              .add(tfStartTag, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 319, Short.MAX_VALUE))
399
                                    .add(rbFromBranchRoot))))
395
                                    .add(rbFromBranchRoot))))
400
                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
396
                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
401
                        .add(browseStartTag)
397
                        .add(browseStartTag)
402
                        .addContainerGap())
398
                        .addContainerGap())
403
                    .add(layout.createSequentialGroup()
399
                    .add(layout.createSequentialGroup()
404
                        .add(jLabel3)
400
                        .add(jLabel3)
405
                        .addContainerGap(434, Short.MAX_VALUE))
401
                  .addContainerGap(536, Short.MAX_VALUE))
406
                    .add(layout.createSequentialGroup()
402
                    .add(layout.createSequentialGroup()
407
                        .add(10, 10, 10)
403
                        .add(10, 10, 10)
408
                        .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
404
                        .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
Lines 413-420 Link Here
413
                                    .add(rbToBranchHead))
409
                                    .add(rbToBranchHead))
414
                                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
410
                                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
415
                                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
411
                                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
416
                                    .add(org.jdesktop.layout.GroupLayout.TRAILING, tfEndTag, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 257, Short.MAX_VALUE)
412
                           .add(org.jdesktop.layout.GroupLayout.TRAILING, tfEndTag, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 319, Short.MAX_VALUE)
417
                                    .add(org.jdesktop.layout.GroupLayout.TRAILING, tfBranch, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 257, Short.MAX_VALUE))
413
                           .add(org.jdesktop.layout.GroupLayout.TRAILING, tfBranch, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 319, Short.MAX_VALUE))
418
                                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
414
                                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
419
                                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
415
                                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
420
                                    .add(browseBranch)
416
                                    .add(browseBranch)
Lines 422-428 Link Here
422
                                .addContainerGap())))
418
                                .addContainerGap())))
423
                    .add(layout.createSequentialGroup()
419
                    .add(layout.createSequentialGroup()
424
                        .add(cbTagAfterMerge)
420
                        .add(cbTagAfterMerge)
425
                        .addContainerGap(290, Short.MAX_VALUE))))
421
                  .addContainerGap(335, Short.MAX_VALUE))
422
               .add(layout.createSequentialGroup()
423
                  .add(jLabel1)
424
                  .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
425
                  .add(tfCurrentBranch, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 286, Short.MAX_VALUE)
426
                  .addContainerGap())))
426
        );
427
        );
427
        layout.setVerticalGroup(
428
        layout.setVerticalGroup(
428
            layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
429
            layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)

Return to bug 181801