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

(-)a/mercurial/src/org/netbeans/modules/mercurial/options/MercurialPanel.form (-47 / +48 lines)
Lines 17-52 Link Here
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" attributes="0">
20
              <EmptySpace min="-2" max="-2" attributes="0"/>
21
              <Group type="103" groupAlignment="0" attributes="0">
20
              <Group type="103" groupAlignment="0" attributes="0">
22
                  <Group type="102" alignment="0" attributes="0">
21
                  <Group type="102" alignment="0" attributes="0">
23
                      <Component id="jTextPane1" min="-2" pref="261" max="-2" attributes="0"/>
24
                      <EmptySpace min="-2" max="-2" attributes="0"/>
25
                      <Component id="manageButton" min="-2" max="-2" attributes="1"/>
26
                  </Group>
27
                  <Group type="102" alignment="0" attributes="0">
28
                      <Component id="jLabel3" min="-2" max="-2" attributes="0"/>
29
                      <EmptySpace min="-2" max="-2" attributes="0"/>
30
                      <Component id="annotationTextField" max="32767" attributes="0"/>
31
                      <EmptySpace min="-2" max="-2" attributes="0"/>
32
                      <Component id="addButton" min="-2" pref="147" max="-2" attributes="1"/>
33
                  </Group>
34
              </Group>
35
              <EmptySpace min="-2" pref="18" max="-2" attributes="0"/>
36
          </Group>
37
          <Group type="102" attributes="0">
38
              <Group type="103" groupAlignment="0" attributes="0">
39
                  <Group type="102" alignment="0" attributes="0">
40
                      <Component id="jLabel5" min="-2" max="-2" attributes="0"/>
41
                      <EmptySpace min="-2" max="-2" attributes="0"/>
42
                      <Component id="jSeparator1" min="-2" pref="261" max="-2" attributes="0"/>
43
                  </Group>
44
                  <Group type="102" alignment="0" attributes="0">
45
                      <Component id="jLabel6" min="-2" max="-2" attributes="0"/>
46
                      <EmptySpace max="-2" attributes="0"/>
47
                      <Component id="jSeparator2" min="-2" pref="277" max="-2" attributes="0"/>
48
                  </Group>
49
                  <Group type="102" alignment="0" attributes="0">
50
                      <EmptySpace max="-2" attributes="0"/>
22
                      <EmptySpace max="-2" attributes="0"/>
51
                      <Group type="103" groupAlignment="0" attributes="0">
23
                      <Group type="103" groupAlignment="0" attributes="0">
52
                          <Component id="cbOpenOutputWindow" alignment="0" min="-2" max="-2" attributes="0"/>
24
                          <Component id="cbOpenOutputWindow" alignment="0" min="-2" max="-2" attributes="0"/>
Lines 57-85 Link Here
57
                  </Group>
29
                  </Group>
58
                  <Component id="jLabel1" alignment="0" min="-2" max="-2" attributes="1"/>
30
                  <Component id="jLabel1" alignment="0" min="-2" max="-2" attributes="1"/>
59
                  <Group type="102" alignment="0" attributes="0">
31
                  <Group type="102" alignment="0" attributes="0">
60
                      <Group type="103" groupAlignment="0" attributes="0">
32
                      <Component id="jLabel6" max="32767" attributes="0"/>
61
                          <Component id="jLabel2" min="-2" max="-2" attributes="1"/>
33
                      <EmptySpace min="201" pref="201" max="-2" attributes="0"/>
62
                          <Component id="exportFilename" min="-2" max="-2" attributes="1"/>
34
                  </Group>
35
              </Group>
36
              <EmptySpace min="-2" pref="248" max="-2" attributes="0"/>
37
          </Group>
38
          <Group type="102" attributes="0">
39
              <Component id="jLabel5" min="-2" max="-2" attributes="0"/>
40
              <EmptySpace max="-2" attributes="0"/>
41
              <Component id="jSeparator1" max="32767" attributes="0"/>
42
          </Group>
43
          <Group type="102" attributes="0">
44
              <Group type="103" groupAlignment="0" attributes="0">
45
                  <Component id="jLabel2" min="-2" max="-2" attributes="1"/>
46
                  <Component id="exportFilename" min="-2" max="-2" attributes="1"/>
47
              </Group>
48
              <EmptySpace min="-2" max="-2" attributes="0"/>
49
              <Group type="103" groupAlignment="0" attributes="0">
50
                  <Group type="102" attributes="0">
51
                      <Group type="103" groupAlignment="1" attributes="0">
52
                          <Component id="executablePathTextField" max="32767" attributes="2"/>
53
                          <Component id="exportFilenameTextField" max="32767" attributes="2"/>
63
                      </Group>
54
                      </Group>
64
                      <EmptySpace min="-2" max="-2" attributes="0"/>
55
                      <EmptySpace min="-2" max="-2" attributes="0"/>
65
                      <Group type="103" groupAlignment="0" attributes="0">
56
                      <Group type="103" groupAlignment="0" attributes="0">
66
                          <Group type="102" attributes="0">
57
                          <Component id="exportFilenameBrowseButton" min="-2" max="-2" attributes="1"/>
67
                              <Group type="103" groupAlignment="1" attributes="0">
58
                          <Component id="execPathBrowseButton" min="-2" max="-2" attributes="1"/>
68
                                  <Component id="executablePathTextField" max="32767" attributes="2"/>
69
                                  <Component id="exportFilenameTextField" max="32767" attributes="2"/>
70
                              </Group>
71
                              <EmptySpace min="-2" max="-2" attributes="0"/>
72
                              <Group type="103" groupAlignment="0" attributes="0">
73
                                  <Component id="exportFilenameBrowseButton" min="-2" max="-2" attributes="1"/>
74
                                  <Component id="execPathBrowseButton" min="-2" max="-2" attributes="1"/>
75
                              </Group>
76
                          </Group>
77
                          <Component id="userNameTextField" max="32767" attributes="2"/>
78
                      </Group>
59
                      </Group>
79
                      <EmptySpace min="-2" pref="10" max="-2" attributes="0"/>
60
                  </Group>
61
                  <Component id="userNameTextField" max="32767" attributes="2"/>
62
              </Group>
63
          </Group>
64
          <Group type="102" alignment="1" attributes="0">
65
              <EmptySpace min="-2" max="-2" attributes="0"/>
66
              <Group type="103" groupAlignment="0" attributes="0">
67
                  <Group type="102" attributes="0">
68
                      <Component id="jLabel3" min="-2" max="-2" attributes="0"/>
69
                      <EmptySpace max="-2" attributes="0"/>
70
                      <Component id="annotationTextField" max="32767" attributes="0"/>
71
                      <EmptySpace max="-2" attributes="0"/>
72
                      <Component id="addButton" min="-2" pref="125" max="-2" attributes="1"/>
73
                  </Group>
74
                  <Group type="102" alignment="0" attributes="0">
75
                      <Component id="jTextPane1" max="32767" attributes="0"/>
76
                      <EmptySpace type="unrelated" max="-2" attributes="0"/>
77
                      <Component id="manageButton" min="-2" max="-2" attributes="1"/>
78
                  </Group>
79
                  <Group type="102" alignment="1" attributes="0">
80
                      <EmptySpace min="-2" pref="92" max="-2" attributes="0"/>
81
                      <Component id="jSeparator2" max="32767" attributes="0"/>
80
                  </Group>
82
                  </Group>
81
              </Group>
83
              </Group>
82
              <EmptySpace min="-2" pref="10" max="-2" attributes="0"/>
83
          </Group>
84
          </Group>
84
      </Group>
85
      </Group>
85
    </DimensionLayout>
86
    </DimensionLayout>
Lines 103-111 Link Here
103
                  <Component id="exportFilenameBrowseButton" alignment="3" min="-2" max="-2" attributes="0"/>
104
                  <Component id="exportFilenameBrowseButton" alignment="3" min="-2" max="-2" attributes="0"/>
104
              </Group>
105
              </Group>
105
              <EmptySpace type="separate" max="-2" attributes="0"/>
106
              <EmptySpace type="separate" max="-2" attributes="0"/>
106
              <Group type="103" groupAlignment="1" attributes="0">
107
              <Group type="103" groupAlignment="0" attributes="0">
107
                  <Component id="jLabel5" min="-2" max="-2" attributes="0"/>
108
                  <Component id="jLabel5" min="-2" max="-2" attributes="0"/>
108
                  <Component id="jSeparator1" min="-2" max="-2" attributes="0"/>
109
                  <Component id="jSeparator1" alignment="1" min="-2" max="-2" attributes="0"/>
109
              </Group>
110
              </Group>
110
              <EmptySpace max="-2" attributes="0"/>
111
              <EmptySpace max="-2" attributes="0"/>
111
              <Group type="103" groupAlignment="3" attributes="0">
112
              <Group type="103" groupAlignment="3" attributes="0">
(-)a/mercurial/src/org/netbeans/modules/mercurial/options/MercurialPanel.java (-38 / +38 lines)
Lines 189-218 Link Here
189
        layout.setHorizontalGroup(
189
        layout.setHorizontalGroup(
190
            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
190
            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
191
            .addGroup(layout.createSequentialGroup()
191
            .addGroup(layout.createSequentialGroup()
192
                .addContainerGap()
193
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
192
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
194
                    .addGroup(layout.createSequentialGroup()
193
                    .addGroup(layout.createSequentialGroup()
195
                        .addComponent(jTextPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 261, javax.swing.GroupLayout.PREFERRED_SIZE)
196
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
197
                        .addComponent(manageButton))
198
                    .addGroup(layout.createSequentialGroup()
199
                        .addComponent(jLabel3)
200
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
201
                        .addComponent(annotationTextField)
202
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
203
                        .addComponent(addButton, javax.swing.GroupLayout.PREFERRED_SIZE, 147, javax.swing.GroupLayout.PREFERRED_SIZE)))
204
                .addGap(18, 18, 18))
205
            .addGroup(layout.createSequentialGroup()
206
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
207
                    .addGroup(layout.createSequentialGroup()
208
                        .addComponent(jLabel5)
209
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
210
                        .addComponent(jSeparator1, javax.swing.GroupLayout.PREFERRED_SIZE, 261, javax.swing.GroupLayout.PREFERRED_SIZE))
211
                    .addGroup(layout.createSequentialGroup()
212
                        .addComponent(jLabel6)
213
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
214
                        .addComponent(jSeparator2, javax.swing.GroupLayout.PREFERRED_SIZE, 277, javax.swing.GroupLayout.PREFERRED_SIZE))
215
                    .addGroup(layout.createSequentialGroup()
216
                        .addContainerGap()
194
                        .addContainerGap()
217
                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
195
                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
218
                            .addComponent(cbOpenOutputWindow)
196
                            .addComponent(cbOpenOutputWindow)
Lines 221-242 Link Here
221
                            .addComponent(excludeNewFiles)))
199
                            .addComponent(excludeNewFiles)))
222
                    .addComponent(jLabel1)
200
                    .addComponent(jLabel1)
223
                    .addGroup(layout.createSequentialGroup()
201
                    .addGroup(layout.createSequentialGroup()
224
                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
202
                        .addComponent(jLabel6, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
225
                            .addComponent(jLabel2)
203
                        .addGap(201, 201, 201)))
226
                            .addComponent(exportFilename))
204
                .addGap(248, 248, 248))
205
            .addGroup(layout.createSequentialGroup()
206
                .addComponent(jLabel5)
207
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
208
                .addComponent(jSeparator1))
209
            .addGroup(layout.createSequentialGroup()
210
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
211
                    .addComponent(jLabel2)
212
                    .addComponent(exportFilename))
213
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
214
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
215
                    .addGroup(layout.createSequentialGroup()
216
                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
217
                            .addComponent(executablePathTextField)
218
                            .addComponent(exportFilenameTextField))
227
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
219
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
228
                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
220
                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
229
                            .addGroup(layout.createSequentialGroup()
221
                            .addComponent(exportFilenameBrowseButton)
230
                                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
222
                            .addComponent(execPathBrowseButton)))
231
                                    .addComponent(executablePathTextField)
223
                    .addComponent(userNameTextField)))
232
                                    .addComponent(exportFilenameTextField))
224
            .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
233
                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
225
                .addContainerGap()
234
                                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
226
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
235
                                    .addComponent(exportFilenameBrowseButton)
227
                    .addGroup(layout.createSequentialGroup()
236
                                    .addComponent(execPathBrowseButton)))
228
                        .addComponent(jLabel3)
237
                            .addComponent(userNameTextField))
229
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
238
                        .addGap(10, 10, 10)))
230
                        .addComponent(annotationTextField)
239
                .addGap(10, 10, 10))
231
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
232
                        .addComponent(addButton, javax.swing.GroupLayout.PREFERRED_SIZE, 125, javax.swing.GroupLayout.PREFERRED_SIZE))
233
                    .addGroup(layout.createSequentialGroup()
234
                        .addComponent(jTextPane1)
235
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
236
                        .addComponent(manageButton))
237
                    .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
238
                        .addGap(92, 92, 92)
239
                        .addComponent(jSeparator2))))
240
        );
240
        );
241
        layout.setVerticalGroup(
241
        layout.setVerticalGroup(
242
            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
242
            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
Lines 255-263 Link Here
255
                    .addComponent(exportFilenameTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
255
                    .addComponent(exportFilenameTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
256
                    .addComponent(exportFilenameBrowseButton))
256
                    .addComponent(exportFilenameBrowseButton))
257
                .addGap(18, 18, 18)
257
                .addGap(18, 18, 18)
258
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
258
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
259
                    .addComponent(jLabel5)
259
                    .addComponent(jLabel5)
260
                    .addComponent(jSeparator1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
260
                    .addComponent(jSeparator1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
261
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
261
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
262
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
262
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
263
                    .addComponent(jLabel3)
263
                    .addComponent(jLabel3)
(-)a/subversion/src/org/netbeans/modules/subversion/options/Bundle.properties (-4 / +4 lines)
Lines 23-29 Link Here
23
SvnOptionsPanel.browseButton.text=&Browse...
23
SvnOptionsPanel.browseButton.text=&Browse...
24
ACSN_SvnOptionsPanel.browseButton.text=Browse 
24
ACSN_SvnOptionsPanel.browseButton.text=Browse 
25
ACSD_SvnOptionsPanel.browseButton.text=Lets you browse for the SVN Executable
25
ACSD_SvnOptionsPanel.browseButton.text=Lets you browse for the SVN Executable
26
SvnOptionsPanel.jLabel1.text=&Path to the SVN executable File\:
26
SvnOptionsPanel.jLabel1.text=&Path to the SVN executable file:
27
SvnOptionsPanel.jLabel5.windows.text=(e.g., C:\\Program Files\\Subversion\\bin)
27
SvnOptionsPanel.jLabel5.windows.text=(e.g., C:\\Program Files\\Subversion\\bin)
28
SvnOptionsPanel.jLabel5.unix.text=(e.g., /usr/local/bin)
28
SvnOptionsPanel.jLabel5.unix.text=(e.g., /usr/local/bin)
29
ACSN_SvnOptionsPanel.executablePathTextField.text=Path to the Executable File
29
ACSN_SvnOptionsPanel.executablePathTextField.text=Path to the Executable File
Lines 95-102 Link Here
95
95
96
SvnOptionsPanel.jLabel4.text=Subversion Status Labels
96
SvnOptionsPanel.jLabel4.text=Subversion Status Labels
97
MissingCliClientPanel.browseButton.text=Browse...
97
MissingCliClientPanel.browseButton.text=Browse...
98
SvnOptionsPanel.jLabel6.text=<html>Use this Button to manage the Connection<br>Settings for all previously used URLs:</html>
98
SvnOptionsPanel.jLabel6.text=<html>Use this Button to manage the Connection Settings for all previously used URLs:</html>
99
SvnOptionsPanel.jLabel7.text=<html>To define the Folder variable content<br>(Branch/Tag name) press:</html>
99
SvnOptionsPanel.jLabel7.text=<html>To define the folder variable content (Branch/Tag name) press:</html>
100
SvnOptionsPanel.jLabel6.AccessibleContext.accessibleDescription=Lets you to manage the connection settings
100
SvnOptionsPanel.jLabel6.AccessibleContext.accessibleDescription=Lets you to manage the connection settings
101
SvnOptionsPanel.jLabel6.AccessibleContext.accessibleName=Manage connections
101
SvnOptionsPanel.jLabel6.AccessibleContext.accessibleName=Manage connections
102
SvnOptionsPanel.jLabel7.AccessibleContext.accessibleName=Define Folder variable
102
SvnOptionsPanel.jLabel7.AccessibleContext.accessibleName=Define Folder variable
Lines 125-129 Link Here
125
SvnOptionsPanel.browseJavahlButton.text=&Browse...
125
SvnOptionsPanel.browseJavahlButton.text=&Browse...
126
SvnOptionsPanel.lblRestartWarning.text=Restart may be needed!
126
SvnOptionsPanel.lblRestartWarning.text=Restart may be needed!
127
SvnOptionsPanel.textPaneClient.contentType=text/html
127
SvnOptionsPanel.textPaneClient.contentType=text/html
128
OptionsPanel.textPaneClient.text=<html><body>For more information on different kinds of Subversion clients<br>see the <a href="http://wiki.netbeans.org/FaqSubversionClients">Supported Clients FAQ</a></body></html>
128
OptionsPanel.textPaneClient.text=<html><body>For more information on different kinds of Subversion clients see the <a href="http://wiki.netbeans.org/FaqSubversionClients">Supported Clients FAQ</a></body></html>
129
KW_Colors=colors
129
KW_Colors=colors
(-)a/subversion/src/org/netbeans/modules/subversion/options/SvnOptionsPanel.form (-89 / +102 lines)
Lines 16-102 Link Here
16
    <DimensionLayout dim="0">
16
    <DimensionLayout dim="0">
17
      <Group type="103" groupAlignment="0" attributes="0">
17
      <Group type="103" groupAlignment="0" attributes="0">
18
          <Group type="102" attributes="0">
18
          <Group type="102" attributes="0">
19
              <EmptySpace min="-2" max="-2" attributes="0"/>
19
              <Component id="jLabel9" min="-2" max="-2" attributes="0"/>
20
              <EmptySpace max="-2" attributes="0"/>
21
              <Component id="jSeparator4" max="32767" attributes="0"/>
22
          </Group>
23
          <Group type="102" attributes="0">
24
              <Component id="jLabel4" min="-2" max="-2" attributes="0"/>
25
              <EmptySpace max="-2" attributes="0"/>
26
              <Component id="jSeparator2" max="32767" attributes="0"/>
27
          </Group>
28
          <Group type="102" attributes="0">
29
              <Component id="jLabel8" min="-2" max="-2" attributes="0"/>
30
              <EmptySpace max="-2" attributes="0"/>
31
              <Component id="jSeparator3" max="32767" attributes="0"/>
32
          </Group>
33
          <Group type="102" attributes="0">
34
              <Component id="jLabel3" min="-2" max="-2" attributes="0"/>
35
              <EmptySpace max="-2" attributes="0"/>
36
              <Component id="jSeparator1" max="32767" attributes="0"/>
37
          </Group>
38
          <Component id="panelCLI" alignment="0" max="32767" attributes="0"/>
39
          <Component id="panelJavahl" alignment="0" max="32767" attributes="0"/>
40
          <Group type="102" attributes="0">
41
              <Group type="103" groupAlignment="0" attributes="0">
42
                  <Group type="102" alignment="0" attributes="0">
43
                      <Component id="jLabel10" min="-2" pref="88" max="-2" attributes="0"/>
44
                      <EmptySpace max="-2" attributes="0"/>
45
                      <Component id="cmbPreferredClient" min="-2" max="-2" attributes="0"/>
46
                      <EmptySpace max="-2" attributes="0"/>
47
                      <Component id="lblRestartWarning" min="-2" max="-2" attributes="0"/>
48
                  </Group>
49
                  <Group type="102" alignment="0" attributes="0">
50
                      <EmptySpace min="-2" pref="73" max="-2" attributes="0"/>
51
                      <Component id="jScrollPane2" min="-2" pref="301" max="-2" attributes="0"/>
52
                  </Group>
53
                  <Group type="102" alignment="0" attributes="0">
54
                      <EmptySpace max="-2" attributes="0"/>
55
                      <Component id="panelSvnkit" min="-2" max="-2" attributes="0"/>
56
                  </Group>
57
              </Group>
58
              <EmptySpace max="32767" attributes="0"/>
59
          </Group>
60
          <Group type="102" attributes="0">
61
              <EmptySpace max="-2" attributes="0"/>
20
              <Group type="103" groupAlignment="0" attributes="0">
62
              <Group type="103" groupAlignment="0" attributes="0">
21
                  <Group type="102" attributes="0">
63
                  <Group type="102" attributes="0">
22
                      <Group type="103" groupAlignment="0" attributes="0">
64
                      <Group type="103" groupAlignment="0" attributes="0">
23
                          <Group type="102" alignment="0" attributes="0">
65
                          <Group type="102" alignment="0" attributes="0">
24
                              <Component id="jLabel10" min="-2" max="-2" attributes="0"/>
66
                              <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
25
                              <EmptySpace max="-2" attributes="0"/>
67
                              <EmptySpace max="-2" attributes="0"/>
26
                              <Component id="cmbPreferredClient" min="-2" max="-2" attributes="0"/>
68
                              <Component id="annotationTextField" max="32767" attributes="0"/>
27
                              <EmptySpace max="-2" attributes="0"/>
28
                              <Component id="lblRestartWarning" min="-2" max="-2" attributes="0"/>
29
                          </Group>
69
                          </Group>
30
                          <Component id="cbGetRemoteLocks" alignment="0" min="-2" max="-2" attributes="0"/>
70
                          <Component id="jLabel7" min="-2" pref="395" max="-2" attributes="0"/>
31
                          <Component id="cbAutoLockFiles" alignment="0" min="-2" max="-2" attributes="0"/>
71
                      </Group>
72
                      <EmptySpace max="-2" attributes="0"/>
73
                      <Group type="103" groupAlignment="0" attributes="0">
74
                          <Component id="addButton" alignment="1" min="-2" pref="129" max="-2" attributes="1"/>
75
                          <Component id="manageLabelsButton" alignment="1" min="-2" pref="129" max="-2" attributes="1"/>
76
                      </Group>
77
                  </Group>
78
                  <Group type="102" attributes="0">
79
                      <Component id="textPaneClient" min="-2" max="-2" attributes="0"/>
80
                      <EmptySpace max="32767" attributes="0"/>
81
                  </Group>
82
                  <Group type="102" alignment="0" attributes="0">
83
                      <Component id="jLabel6" min="-2" max="-2" attributes="0"/>
84
                      <EmptySpace pref="47" max="32767" attributes="0"/>
85
                      <Component id="manageConnSettingsButton" min="-2" max="-2" attributes="0"/>
86
                  </Group>
87
                  <Group type="102" attributes="0">
88
                      <Group type="103" groupAlignment="0" attributes="0">
32
                          <Component id="cbOpenOutputWindow" alignment="0" min="-2" max="-2" attributes="0"/>
89
                          <Component id="cbOpenOutputWindow" alignment="0" min="-2" max="-2" attributes="0"/>
33
                          <Component id="excludeNewFiles" alignment="0" min="-2" max="-2" attributes="0"/>
90
                          <Component id="excludeNewFiles" alignment="0" min="-2" max="-2" attributes="0"/>
91
                          <Component id="prefixRepositoryPath" alignment="0" min="-2" max="-2" attributes="0"/>
92
                          <Component id="cbAutoLockFiles" alignment="0" min="-2" max="-2" attributes="0"/>
93
                          <Component id="cbGetRemoteLocks" alignment="0" min="-2" max="-2" attributes="0"/>
34
                      </Group>
94
                      </Group>
35
                      <EmptySpace min="71" pref="71" max="-2" attributes="0"/>
95
                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
36
                  </Group>
37
                  <Group type="102" alignment="0" attributes="0">
38
                      <Component id="jLabel2" min="-2" max="-2" attributes="0"/>
39
                      <EmptySpace min="-2" max="-2" attributes="0"/>
40
                      <Component id="annotationTextField" max="32767" attributes="0"/>
41
                      <EmptySpace min="-2" max="-2" attributes="0"/>
42
                      <Group type="103" groupAlignment="0" attributes="0">
43
                          <Component id="manageLabelsButton" min="-2" max="-2" attributes="1"/>
44
                          <Component id="addButton" min="-2" pref="127" max="-2" attributes="1"/>
45
                      </Group>
46
                      <EmptySpace min="-2" pref="2" max="-2" attributes="0"/>
47
                  </Group>
96
                  </Group>
48
              </Group>
97
              </Group>
49
          </Group>
98
          </Group>
50
          <Group type="103" alignment="0" groupAlignment="1" max="-2" attributes="0">
51
              <Group type="102" alignment="0" attributes="0">
52
                  <Component id="jLabel8" min="-2" max="-2" attributes="0"/>
53
                  <EmptySpace max="-2" attributes="0"/>
54
                  <Component id="jSeparator3" max="32767" attributes="0"/>
55
              </Group>
56
              <Group type="102" alignment="0" attributes="0">
57
                  <Component id="jLabel9" min="-2" max="-2" attributes="0"/>
58
                  <EmptySpace max="-2" attributes="0"/>
59
                  <Component id="jSeparator4" min="-2" pref="414" max="-2" attributes="0"/>
60
              </Group>
61
          </Group>
62
          <Group type="103" groupAlignment="0" max="-2" attributes="0">
63
              <Group type="102" alignment="0" attributes="0">
64
                  <EmptySpace min="-2" max="-2" attributes="0"/>
65
                  <Group type="103" groupAlignment="0" attributes="0">
66
                      <Component id="textPaneClient" min="-2" max="-2" attributes="0"/>
67
                      <Component id="jLabel7" min="-2" pref="395" max="-2" attributes="0"/>
68
                      <Group type="102" attributes="0">
69
                          <Component id="jLabel6" min="-2" max="-2" attributes="0"/>
70
                          <EmptySpace min="-2" max="-2" attributes="0"/>
71
                          <Component id="manageConnSettingsButton" min="-2" max="-2" attributes="0"/>
72
                      </Group>
73
                  </Group>
74
              </Group>
75
              <Group type="102" alignment="0" attributes="0">
76
                  <EmptySpace min="-2" pref="73" max="-2" attributes="0"/>
77
                  <Component id="jScrollPane2" min="-2" pref="301" max="-2" attributes="0"/>
78
              </Group>
79
              <Group type="102" alignment="0" attributes="0">
80
                  <EmptySpace max="-2" attributes="0"/>
81
                  <Component id="prefixRepositoryPath" min="-2" max="-2" attributes="0"/>
82
              </Group>
83
              <Group type="102" alignment="0" attributes="0">
84
                  <EmptySpace max="-2" attributes="0"/>
85
                  <Component id="panelSvnkit" min="-2" max="-2" attributes="0"/>
86
              </Group>
87
              <Group type="102" alignment="0" attributes="0">
88
                  <Component id="jLabel3" min="-2" max="-2" attributes="0"/>
89
                  <EmptySpace max="-2" attributes="0"/>
90
                  <Component id="jSeparator1" max="32767" attributes="0"/>
91
              </Group>
92
              <Group type="102" alignment="0" attributes="0">
93
                  <Component id="jLabel4" min="-2" max="-2" attributes="0"/>
94
                  <EmptySpace max="-2" attributes="0"/>
95
                  <Component id="jSeparator2" max="32767" attributes="0"/>
96
              </Group>
97
              <Component id="panelJavahl" alignment="0" max="32767" attributes="0"/>
98
              <Component id="panelCLI" alignment="0" max="32767" attributes="0"/>
99
          </Group>
100
      </Group>
99
      </Group>
101
    </DimensionLayout>
100
    </DimensionLayout>
102
    <DimensionLayout dim="1">
101
    <DimensionLayout dim="1">
Lines 120-134 Link Here
120
                  <Component id="jLabel3" min="-2" max="-2" attributes="0"/>
119
                  <Component id="jLabel3" min="-2" max="-2" attributes="0"/>
121
                  <Component id="jSeparator1" min="-2" max="-2" attributes="0"/>
120
                  <Component id="jSeparator1" min="-2" max="-2" attributes="0"/>
122
              </Group>
121
              </Group>
123
              <EmptySpace max="-2" attributes="0"/>
122
              <EmptySpace min="-2" pref="6" max="-2" attributes="0"/>
124
              <Group type="103" groupAlignment="1" attributes="0">
123
              <Group type="103" groupAlignment="1" attributes="0">
125
                  <Component id="manageConnSettingsButton" min="-2" max="-2" attributes="0"/>
124
                  <Group type="102" alignment="1" attributes="0">
126
                  <Component id="jLabel6" min="-2" max="-2" attributes="0"/>
125
                      <Group type="103" groupAlignment="3" attributes="0">
127
              </Group>
126
                          <Component id="jLabel6" alignment="3" min="-2" max="-2" attributes="0"/>
128
              <EmptySpace type="separate" max="-2" attributes="0"/>
127
                          <Component id="manageConnSettingsButton" alignment="3" min="-2" max="-2" attributes="0"/>
129
              <Group type="103" groupAlignment="1" attributes="0">
128
                      </Group>
130
                  <Component id="jLabel4" min="-2" max="-2" attributes="0"/>
129
                      <EmptySpace type="separate" max="-2" attributes="0"/>
131
                  <Component id="jSeparator2" min="-2" max="-2" attributes="0"/>
130
                      <Component id="jLabel4" min="-2" max="-2" attributes="0"/>
131
                  </Group>
132
                  <Component id="jSeparator2" alignment="1" min="-2" max="-2" attributes="0"/>
132
              </Group>
133
              </Group>
133
              <EmptySpace max="-2" attributes="0"/>
134
              <EmptySpace max="-2" attributes="0"/>
134
              <Group type="103" groupAlignment="3" attributes="0">
135
              <Group type="103" groupAlignment="3" attributes="0">
Lines 136-147 Link Here
136
                  <Component id="annotationTextField" alignment="3" min="-2" max="-2" attributes="0"/>
137
                  <Component id="annotationTextField" alignment="3" min="-2" max="-2" attributes="0"/>
137
                  <Component id="addButton" alignment="3" min="-2" max="-2" attributes="0"/>
138
                  <Component id="addButton" alignment="3" min="-2" max="-2" attributes="0"/>
138
              </Group>
139
              </Group>
139
              <EmptySpace min="-2" pref="16" max="-2" attributes="0"/>
140
              <EmptySpace max="-2" attributes="0"/>
140
              <Group type="103" groupAlignment="3" attributes="0">
141
              <Group type="103" groupAlignment="3" attributes="0">
141
                  <Component id="jLabel7" alignment="3" min="-2" pref="33" max="-2" attributes="0"/>
142
                  <Component id="jLabel7" alignment="3" min="-2" pref="33" max="-2" attributes="0"/>
142
                  <Component id="manageLabelsButton" alignment="3" min="-2" max="-2" attributes="0"/>
143
                  <Component id="manageLabelsButton" alignment="3" min="-2" max="-2" attributes="0"/>
143
              </Group>
144
              </Group>
144
              <EmptySpace max="-2" attributes="0"/>
145
              <EmptySpace min="0" pref="0" max="-2" attributes="0"/>
145
              <Component id="jScrollPane2" min="-2" max="-2" attributes="0"/>
146
              <Component id="jScrollPane2" min="-2" max="-2" attributes="0"/>
146
              <EmptySpace type="separate" max="-2" attributes="0"/>
147
              <EmptySpace type="separate" max="-2" attributes="0"/>
147
              <Group type="103" groupAlignment="1" attributes="0">
148
              <Group type="103" groupAlignment="1" attributes="0">
Lines 163-169 Link Here
163
              <Component id="excludeNewFiles" min="-2" max="-2" attributes="0"/>
164
              <Component id="excludeNewFiles" min="-2" max="-2" attributes="0"/>
164
              <EmptySpace max="-2" attributes="0"/>
165
              <EmptySpace max="-2" attributes="0"/>
165
              <Component id="prefixRepositoryPath" min="-2" max="-2" attributes="0"/>
166
              <Component id="prefixRepositoryPath" min="-2" max="-2" attributes="0"/>
166
              <EmptySpace max="32767" attributes="0"/>
167
              <EmptySpace pref="17" max="32767" attributes="0"/>
167
          </Group>
168
          </Group>
168
      </Group>
169
      </Group>
169
    </DimensionLayout>
170
    </DimensionLayout>
Lines 397-402 Link Here
397
        <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
398
        <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
398
          <ResourceString bundle="org/netbeans/modules/subversion/options/Bundle.properties" key="SvnOptionsPanel.cbGetRemoteLocks.TTtext" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
399
          <ResourceString bundle="org/netbeans/modules/subversion/options/Bundle.properties" key="SvnOptionsPanel.cbGetRemoteLocks.TTtext" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
399
        </Property>
400
        </Property>
401
        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
402
          <Border info="null"/>
403
        </Property>
400
      </Properties>
404
      </Properties>
401
      <AuxValues>
405
      <AuxValues>
402
        <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="16"/>
406
        <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="16"/>
Lines 410-415 Link Here
410
        <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
414
        <Property name="toolTipText" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
411
          <ResourceString bundle="org/netbeans/modules/subversion/options/Bundle.properties" key="SvnOptionsPanel.cbAutoLockFiles.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
415
          <ResourceString bundle="org/netbeans/modules/subversion/options/Bundle.properties" key="SvnOptionsPanel.cbAutoLockFiles.toolTipText" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
412
        </Property>
416
        </Property>
417
        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
418
          <Border info="null"/>
419
        </Property>
413
      </Properties>
420
      </Properties>
414
      <AuxValues>
421
      <AuxValues>
415
        <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="16"/>
422
        <AuxValue name="JavaCodeGenerator_VariableModifier" type="java.lang.Integer" value="16"/>
Lines 426-441 Link Here
426
              <Group type="102" attributes="0">
433
              <Group type="102" attributes="0">
427
                  <EmptySpace min="-2" max="-2" attributes="0"/>
434
                  <EmptySpace min="-2" max="-2" attributes="0"/>
428
                  <Group type="103" groupAlignment="0" attributes="0">
435
                  <Group type="103" groupAlignment="0" attributes="0">
436
                      <Component id="jLabel5" max="32767" attributes="0"/>
429
                      <Group type="102" alignment="0" attributes="0">
437
                      <Group type="102" alignment="0" attributes="0">
430
                          <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
438
                          <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
431
                          <EmptySpace max="-2" attributes="0"/>
439
                          <EmptySpace max="32767" attributes="0"/>
432
                      </Group>
440
                      </Group>
433
                      <Group type="102" alignment="0" attributes="0">
441
                      <Group type="102" alignment="0" attributes="0">
434
                          <Component id="executablePathTextField" max="32767" attributes="0"/>
442
                          <Component id="executablePathTextField" max="32767" attributes="0"/>
435
                          <EmptySpace min="-2" max="-2" attributes="0"/>
443
                          <EmptySpace max="-2" attributes="0"/>
436
                          <Component id="browseButton" min="-2" max="-2" attributes="0"/>
444
                          <Component id="browseButton" min="-2" max="-2" attributes="0"/>
437
                      </Group>
445
                      </Group>
438
                      <Component id="jLabel5" alignment="0" max="32767" attributes="0"/>
439
                  </Group>
446
                  </Group>
440
              </Group>
447
              </Group>
441
          </Group>
448
          </Group>
Lines 518-533 Link Here
518
      <Layout>
525
      <Layout>
519
        <DimensionLayout dim="0">
526
        <DimensionLayout dim="0">
520
          <Group type="103" groupAlignment="0" attributes="0">
527
          <Group type="103" groupAlignment="0" attributes="0">
521
              <Group type="102" alignment="0" attributes="0">
528
              <Group type="102" attributes="0">
522
                  <EmptySpace min="-2" max="-2" attributes="0"/>
529
                  <EmptySpace max="-2" attributes="0"/>
523
                  <Group type="103" groupAlignment="0" attributes="0">
530
                  <Group type="103" groupAlignment="0" attributes="0">
524
                      <Group type="102" alignment="0" attributes="0">
531
                      <Group type="102" alignment="0" attributes="0">
532
                          <Component id="jLabel12" min="-2" max="-2" attributes="0"/>
533
                          <EmptySpace max="32767" attributes="0"/>
534
                      </Group>
535
                      <Group type="102" alignment="1" attributes="0">
536
                          <Component id="jLabel11" max="32767" attributes="0"/>
537
                          <EmptySpace min="-2" pref="2" max="-2" attributes="0"/>
538
                      </Group>
539
                      <Group type="102" alignment="1" attributes="0">
525
                          <Component id="javahlPathTextField" max="32767" attributes="0"/>
540
                          <Component id="javahlPathTextField" max="32767" attributes="0"/>
526
                          <EmptySpace min="-2" max="-2" attributes="0"/>
541
                          <EmptySpace max="-2" attributes="0"/>
527
                          <Component id="browseJavahlButton" min="-2" max="-2" attributes="0"/>
542
                          <Component id="browseJavahlButton" min="-2" max="-2" attributes="0"/>
528
                      </Group>
543
                      </Group>
529
                      <Component id="jLabel12" alignment="0" min="-2" max="-2" attributes="0"/>
530
                      <Component id="jLabel11" alignment="0" min="-2" pref="498" max="-2" attributes="0"/>
531
                  </Group>
544
                  </Group>
532
              </Group>
545
              </Group>
533
          </Group>
546
          </Group>
Lines 631-636 Link Here
631
    </Component>
644
    </Component>
632
    <Component class="javax.swing.JTextPane" name="textPaneClient">
645
    <Component class="javax.swing.JTextPane" name="textPaneClient">
633
      <Properties>
646
      <Properties>
647
        <Property name="editable" type="boolean" value="false"/>
634
        <Property name="background" type="java.awt.Color" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
648
        <Property name="background" type="java.awt.Color" editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
635
          <Connection component="jLabel1" name="getBackground" type="method"/>
649
          <Connection component="jLabel1" name="getBackground" type="method"/>
636
        </Property>
650
        </Property>
Lines 642-648 Link Here
642
        <Property name="contentType" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
656
        <Property name="contentType" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
643
          <ResourceString bundle="org/netbeans/modules/subversion/options/Bundle.properties" key="SvnOptionsPanel.textPaneClient.contentType" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
657
          <ResourceString bundle="org/netbeans/modules/subversion/options/Bundle.properties" key="SvnOptionsPanel.textPaneClient.contentType" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
644
        </Property>
658
        </Property>
645
        <Property name="editable" type="boolean" value="false"/>
646
        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
659
        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
647
          <ResourceString bundle="org/netbeans/modules/subversion/options/Bundle.properties" key="OptionsPanel.textPaneClient.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
660
          <ResourceString bundle="org/netbeans/modules/subversion/options/Bundle.properties" key="OptionsPanel.textPaneClient.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
648
        </Property>
661
        </Property>
(-)a/subversion/src/org/netbeans/modules/subversion/options/SvnOptionsPanel.java (-69 / +75 lines)
Lines 178-186 Link Here
178
178
179
        org.openide.awt.Mnemonics.setLocalizedText(cbGetRemoteLocks, org.openide.util.NbBundle.getMessage(SvnOptionsPanel.class, "SvnOptionsPanel.cbGetRemoteLocks.text")); // NOI18N
179
        org.openide.awt.Mnemonics.setLocalizedText(cbGetRemoteLocks, org.openide.util.NbBundle.getMessage(SvnOptionsPanel.class, "SvnOptionsPanel.cbGetRemoteLocks.text")); // NOI18N
180
        cbGetRemoteLocks.setToolTipText(org.openide.util.NbBundle.getMessage(SvnOptionsPanel.class, "SvnOptionsPanel.cbGetRemoteLocks.TTtext")); // NOI18N
180
        cbGetRemoteLocks.setToolTipText(org.openide.util.NbBundle.getMessage(SvnOptionsPanel.class, "SvnOptionsPanel.cbGetRemoteLocks.TTtext")); // NOI18N
181
        cbGetRemoteLocks.setBorder(null);
181
182
182
        org.openide.awt.Mnemonics.setLocalizedText(cbAutoLockFiles, org.openide.util.NbBundle.getMessage(SvnOptionsPanel.class, "SvnOptionsPanel.cbAutoLockFiles.text")); // NOI18N
183
        org.openide.awt.Mnemonics.setLocalizedText(cbAutoLockFiles, org.openide.util.NbBundle.getMessage(SvnOptionsPanel.class, "SvnOptionsPanel.cbAutoLockFiles.text")); // NOI18N
183
        cbAutoLockFiles.setToolTipText(org.openide.util.NbBundle.getMessage(SvnOptionsPanel.class, "SvnOptionsPanel.cbAutoLockFiles.toolTipText")); // NOI18N
184
        cbAutoLockFiles.setToolTipText(org.openide.util.NbBundle.getMessage(SvnOptionsPanel.class, "SvnOptionsPanel.cbAutoLockFiles.toolTipText")); // NOI18N
185
        cbAutoLockFiles.setBorder(null);
184
186
185
        org.openide.awt.Mnemonics.setLocalizedText(browseButton, org.openide.util.NbBundle.getMessage(SvnOptionsPanel.class, "SvnOptionsPanel.browseButton.text")); // NOI18N
187
        org.openide.awt.Mnemonics.setLocalizedText(browseButton, org.openide.util.NbBundle.getMessage(SvnOptionsPanel.class, "SvnOptionsPanel.browseButton.text")); // NOI18N
186
188
Lines 196-209 Link Here
196
            .addGroup(panelCLILayout.createSequentialGroup()
198
            .addGroup(panelCLILayout.createSequentialGroup()
197
                .addContainerGap()
199
                .addContainerGap()
198
                .addGroup(panelCLILayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
200
                .addGroup(panelCLILayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
201
                    .addComponent(jLabel5, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
199
                    .addGroup(panelCLILayout.createSequentialGroup()
202
                    .addGroup(panelCLILayout.createSequentialGroup()
200
                        .addComponent(jLabel1)
203
                        .addComponent(jLabel1)
201
                        .addContainerGap())
204
                        .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
202
                    .addGroup(panelCLILayout.createSequentialGroup()
205
                    .addGroup(panelCLILayout.createSequentialGroup()
203
                        .addComponent(executablePathTextField)
206
                        .addComponent(executablePathTextField)
204
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
207
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
205
                        .addComponent(browseButton))
208
                        .addComponent(browseButton))))
206
                    .addComponent(jLabel5, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
207
        );
209
        );
208
        panelCLILayout.setVerticalGroup(
210
        panelCLILayout.setVerticalGroup(
209
            panelCLILayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
211
            panelCLILayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
Lines 237-247 Link Here
237
                .addContainerGap()
239
                .addContainerGap()
238
                .addGroup(panelJavahlLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
240
                .addGroup(panelJavahlLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
239
                    .addGroup(panelJavahlLayout.createSequentialGroup()
241
                    .addGroup(panelJavahlLayout.createSequentialGroup()
242
                        .addComponent(jLabel12)
243
                        .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
244
                    .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelJavahlLayout.createSequentialGroup()
245
                        .addComponent(jLabel11, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
246
                        .addGap(2, 2, 2))
247
                    .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, panelJavahlLayout.createSequentialGroup()
240
                        .addComponent(javahlPathTextField)
248
                        .addComponent(javahlPathTextField)
241
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
249
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
242
                        .addComponent(browseJavahlButton))
250
                        .addComponent(browseJavahlButton))))
243
                    .addComponent(jLabel12)
244
                    .addComponent(jLabel11, javax.swing.GroupLayout.PREFERRED_SIZE, 498, javax.swing.GroupLayout.PREFERRED_SIZE)))
245
        );
251
        );
246
        panelJavahlLayout.setVerticalGroup(
252
        panelJavahlLayout.setVerticalGroup(
247
            panelJavahlLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
253
            panelJavahlLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
Lines 271-280 Link Here
271
277
272
        org.openide.awt.Mnemonics.setLocalizedText(lblRestartWarning, org.openide.util.NbBundle.getMessage(SvnOptionsPanel.class, "SvnOptionsPanel.lblRestartWarning.text")); // NOI18N
278
        org.openide.awt.Mnemonics.setLocalizedText(lblRestartWarning, org.openide.util.NbBundle.getMessage(SvnOptionsPanel.class, "SvnOptionsPanel.lblRestartWarning.text")); // NOI18N
273
279
280
        textPaneClient.setEditable(false);
274
        textPaneClient.setBackground(jLabel1.getBackground());
281
        textPaneClient.setBackground(jLabel1.getBackground());
275
        textPaneClient.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));
282
        textPaneClient.setBorder(javax.swing.BorderFactory.createEmptyBorder(1, 1, 1, 1));
276
        textPaneClient.setContentType(org.openide.util.NbBundle.getMessage(SvnOptionsPanel.class, "SvnOptionsPanel.textPaneClient.contentType")); // NOI18N
283
        textPaneClient.setContentType(org.openide.util.NbBundle.getMessage(SvnOptionsPanel.class, "SvnOptionsPanel.textPaneClient.contentType")); // NOI18N
277
        textPaneClient.setEditable(false);
278
        textPaneClient.setText(org.openide.util.NbBundle.getMessage(SvnOptionsPanel.class, "OptionsPanel.textPaneClient.text")); // NOI18N
284
        textPaneClient.setText(org.openide.util.NbBundle.getMessage(SvnOptionsPanel.class, "OptionsPanel.textPaneClient.text")); // NOI18N
279
285
280
        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
286
        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
Lines 282-349 Link Here
282
        layout.setHorizontalGroup(
288
        layout.setHorizontalGroup(
283
            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
289
            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
284
            .addGroup(layout.createSequentialGroup()
290
            .addGroup(layout.createSequentialGroup()
291
                .addComponent(jLabel9)
292
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
293
                .addComponent(jSeparator4))
294
            .addGroup(layout.createSequentialGroup()
295
                .addComponent(jLabel4)
296
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
297
                .addComponent(jSeparator2))
298
            .addGroup(layout.createSequentialGroup()
299
                .addComponent(jLabel8)
300
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
301
                .addComponent(jSeparator3))
302
            .addGroup(layout.createSequentialGroup()
303
                .addComponent(jLabel3)
304
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
305
                .addComponent(jSeparator1))
306
            .addComponent(panelCLI, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
307
            .addComponent(panelJavahl, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
308
            .addGroup(layout.createSequentialGroup()
309
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
310
                    .addGroup(layout.createSequentialGroup()
311
                        .addComponent(jLabel10, javax.swing.GroupLayout.PREFERRED_SIZE, 88, javax.swing.GroupLayout.PREFERRED_SIZE)
312
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
313
                        .addComponent(cmbPreferredClient, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
314
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
315
                        .addComponent(lblRestartWarning))
316
                    .addGroup(layout.createSequentialGroup()
317
                        .addGap(73, 73, 73)
318
                        .addComponent(jScrollPane2, javax.swing.GroupLayout.PREFERRED_SIZE, 301, javax.swing.GroupLayout.PREFERRED_SIZE))
319
                    .addGroup(layout.createSequentialGroup()
320
                        .addContainerGap()
321
                        .addComponent(panelSvnkit, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
322
                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
323
            .addGroup(layout.createSequentialGroup()
285
                .addContainerGap()
324
                .addContainerGap()
286
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
325
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
287
                    .addGroup(layout.createSequentialGroup()
326
                    .addGroup(layout.createSequentialGroup()
288
                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
327
                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
289
                            .addGroup(layout.createSequentialGroup()
328
                            .addGroup(layout.createSequentialGroup()
290
                                .addComponent(jLabel10)
329
                                .addComponent(jLabel2)
291
                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
330
                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
292
                                .addComponent(cmbPreferredClient, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
331
                                .addComponent(annotationTextField))
293
                                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
332
                            .addComponent(jLabel7, javax.swing.GroupLayout.PREFERRED_SIZE, 395, javax.swing.GroupLayout.PREFERRED_SIZE))
294
                                .addComponent(lblRestartWarning))
295
                            .addComponent(cbGetRemoteLocks)
296
                            .addComponent(cbAutoLockFiles)
297
                            .addComponent(cbOpenOutputWindow)
298
                            .addComponent(excludeNewFiles))
299
                        .addGap(71, 71, 71))
300
                    .addGroup(layout.createSequentialGroup()
301
                        .addComponent(jLabel2)
302
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
303
                        .addComponent(annotationTextField)
304
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
333
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
305
                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
334
                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
306
                            .addComponent(manageLabelsButton)
335
                            .addComponent(addButton, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 129, javax.swing.GroupLayout.PREFERRED_SIZE)
307
                            .addComponent(addButton, javax.swing.GroupLayout.PREFERRED_SIZE, 127, javax.swing.GroupLayout.PREFERRED_SIZE))
336
                            .addComponent(manageLabelsButton, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 129, javax.swing.GroupLayout.PREFERRED_SIZE)))
308
                        .addGap(2, 2, 2))))
337
                    .addGroup(layout.createSequentialGroup()
309
            .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
310
                .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
311
                    .addComponent(jLabel8)
312
                    .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
313
                    .addComponent(jSeparator3))
314
                .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
315
                    .addComponent(jLabel9)
316
                    .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
317
                    .addComponent(jSeparator4, javax.swing.GroupLayout.PREFERRED_SIZE, 414, javax.swing.GroupLayout.PREFERRED_SIZE)))
318
            .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
319
                .addGroup(layout.createSequentialGroup()
320
                    .addContainerGap()
321
                    .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
322
                        .addComponent(textPaneClient, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
338
                        .addComponent(textPaneClient, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
323
                        .addComponent(jLabel7, javax.swing.GroupLayout.PREFERRED_SIZE, 395, javax.swing.GroupLayout.PREFERRED_SIZE)
339
                        .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
324
                        .addGroup(layout.createSequentialGroup()
340
                    .addGroup(layout.createSequentialGroup()
325
                            .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
341
                        .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
326
                            .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
342
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 47, Short.MAX_VALUE)
327
                            .addComponent(manageConnSettingsButton))))
343
                        .addComponent(manageConnSettingsButton))
328
                .addGroup(layout.createSequentialGroup()
344
                    .addGroup(layout.createSequentialGroup()
329
                    .addGap(73, 73, 73)
345
                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
330
                    .addComponent(jScrollPane2, javax.swing.GroupLayout.PREFERRED_SIZE, 301, javax.swing.GroupLayout.PREFERRED_SIZE))
346
                            .addComponent(cbOpenOutputWindow)
331
                .addGroup(layout.createSequentialGroup()
347
                            .addComponent(excludeNewFiles)
332
                    .addContainerGap()
348
                            .addComponent(prefixRepositoryPath)
333
                    .addComponent(prefixRepositoryPath))
349
                            .addComponent(cbAutoLockFiles)
334
                .addGroup(layout.createSequentialGroup()
350
                            .addComponent(cbGetRemoteLocks))
335
                    .addContainerGap()
351
                        .addGap(0, 0, Short.MAX_VALUE))))
336
                    .addComponent(panelSvnkit, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
337
                .addGroup(layout.createSequentialGroup()
338
                    .addComponent(jLabel3)
339
                    .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
340
                    .addComponent(jSeparator1))
341
                .addGroup(layout.createSequentialGroup()
342
                    .addComponent(jLabel4)
343
                    .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
344
                    .addComponent(jSeparator2))
345
                .addComponent(panelJavahl, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
346
                .addComponent(panelCLI, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
347
        );
352
        );
348
        layout.setVerticalGroup(
353
        layout.setVerticalGroup(
349
            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
354
            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
Lines 364-387 Link Here
364
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
369
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
365
                    .addComponent(jLabel3)
370
                    .addComponent(jLabel3)
366
                    .addComponent(jSeparator1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
371
                    .addComponent(jSeparator1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
367
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
372
                .addGap(6, 6, 6)
368
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
373
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
369
                    .addComponent(manageConnSettingsButton)
374
                    .addGroup(layout.createSequentialGroup()
370
                    .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
375
                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
371
                .addGap(18, 18, 18)
376
                            .addComponent(jLabel6, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
372
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
377
                            .addComponent(manageConnSettingsButton))
373
                    .addComponent(jLabel4)
378
                        .addGap(18, 18, 18)
379
                        .addComponent(jLabel4))
374
                    .addComponent(jSeparator2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
380
                    .addComponent(jSeparator2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
375
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
381
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
376
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
382
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
377
                    .addComponent(jLabel2)
383
                    .addComponent(jLabel2)
378
                    .addComponent(annotationTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
384
                    .addComponent(annotationTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
379
                    .addComponent(addButton))
385
                    .addComponent(addButton))
380
                .addGap(16, 16, 16)
386
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
381
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
387
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
382
                    .addComponent(jLabel7, javax.swing.GroupLayout.PREFERRED_SIZE, 33, javax.swing.GroupLayout.PREFERRED_SIZE)
388
                    .addComponent(jLabel7, javax.swing.GroupLayout.PREFERRED_SIZE, 33, javax.swing.GroupLayout.PREFERRED_SIZE)
383
                    .addComponent(manageLabelsButton))
389
                    .addComponent(manageLabelsButton))
384
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
390
                .addGap(0, 0, 0)
385
                .addComponent(jScrollPane2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
391
                .addComponent(jScrollPane2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
386
                .addGap(18, 18, 18)
392
                .addGap(18, 18, 18)
387
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
393
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
Lines 401-407 Link Here
401
                .addComponent(excludeNewFiles)
407
                .addComponent(excludeNewFiles)
402
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
408
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
403
                .addComponent(prefixRepositoryPath)
409
                .addComponent(prefixRepositoryPath)
404
                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
410
                .addContainerGap(17, Short.MAX_VALUE))
405
        );
411
        );
406
412
407
        manageConnSettingsButton.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(SvnOptionsPanel.class, "ACSN_SvnOptionsPanel.manageConnSettingsButton.text")); // NOI18N
413
        manageConnSettingsButton.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(SvnOptionsPanel.class, "ACSN_SvnOptionsPanel.manageConnSettingsButton.text")); // NOI18N

Return to bug 226366