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

(-)options.editor/src/org/netbeans/modules/options/generaleditor/Bundle.properties (-4 / +4 lines)
Lines 96-111 Link Here
96
CTL_Enable_Camel_Case_In_Java=&Enable Camel Case Navigation
96
CTL_Enable_Camel_Case_In_Java=&Enable Camel Case Navigation
97
AN_Enable_Camel_Case_In_Java=&Enable Camel Case Navigation
97
AN_Enable_Camel_Case_In_Java=&Enable Camel Case Navigation
98
AD_Enable_Camel_Case_In_Java=&Enable Camel Case Navigation
98
AD_Enable_Camel_Case_In_Java=&Enable Camel Case Navigation
99
CTL_Camel_Case_Behavior_Example=<html><i>(Example: Caret stops at S, T, N in "SomeTypeName"<br/>when using next/previous word actions)</i></html>
99
CTL_Camel_Case_Behavior_Example=<html>Example: Caret stops at S, T, N in "SomeTypeName" when using next/previous word actions
100
AN_Camel_Case_Behavior_Example=(Example: Caret stops at S, T, N in "SomeTypeName" when using next/previous word actions)
100
AN_Camel_Case_Behavior_Example=Example: Caret stops at S, T, N in "SomeTypeName" when using next/previous word actions
101
AD_Camel_Case_Behavior_Example=(Example: Caret stops at S, T, N in "SomeTypeName" when using next/previous word actions)
101
AD_Camel_Case_Behavior_Example=Example: Caret stops at S, T, N in "SomeTypeName" when using next/previous word actions
102
CTL_Javadoc_Next_To_CC=Display Documentation Next to Completion
102
CTL_Javadoc_Next_To_CC=Display Documentation Next to Completion
103
AN_Javadoc_Next_To_CC=Documentation Next To Completion Checkbox
103
AN_Javadoc_Next_To_CC=Documentation Next To Completion Checkbox
104
AD_Javadoc_Next_To_CC=Display Documentation Next To Completion
104
AD_Javadoc_Next_To_CC=Display Documentation Next To Completion
105
CTL_Search=Search
105
CTL_Search=Search
106
AN_Search=Search
106
AN_Search=Search
107
AD_Search=Search
107
AD_Search=Search
108
CTL_Editor_Search_Type=Editor Search Behavior
108
CTL_Editor_Search_Type=Editor &Search Behavior
109
AN_Editor_Search_Type=Editor Search Behavior
109
AN_Editor_Search_Type=Editor Search Behavior
110
AD_Editor_Search_Type=Editor Search Behavior
110
AD_Editor_Search_Type=Editor Search Behavior
111
EST_closing=Enter to finish search
111
EST_closing=Enter to finish search
(-)options.editor/src/org/netbeans/modules/options/generaleditor/GeneralEditorPanel.form (-32 / +30 lines)
Lines 27-49 Link Here
27
              <Component id="jSeparator5" max="32767" attributes="0"/>
27
              <Component id="jSeparator5" max="32767" attributes="0"/>
28
          </Group>
28
          </Group>
29
          <Group type="102" attributes="0">
29
          <Group type="102" attributes="0">
30
              <Group type="103" groupAlignment="0" attributes="0">
30
              <Component id="lBracesMatching" min="-2" max="-2" attributes="0"/>
31
              <EmptySpace max="-2" attributes="0"/>
32
              <Component id="jSeparator6" max="32767" attributes="0"/>
33
          </Group>
31
                  <Group type="102" alignment="0" attributes="0">
34
                  <Group type="102" alignment="0" attributes="0">
32
                      <EmptySpace min="-2" pref="163" max="-2" attributes="0"/>
35
              <Component id="lCamelCaseBehavior" min="-2" max="-2" attributes="0"/>
36
              <EmptySpace max="-2" attributes="0"/>
37
              <Component id="jSeparator3" max="32767" attributes="0"/>
38
          </Group>
39
          <Group type="102" alignment="0" attributes="0">
40
              <EmptySpace max="-2" attributes="0"/>
33
                      <Group type="103" groupAlignment="0" attributes="0">
41
                      <Group type="103" groupAlignment="0" attributes="0">
34
                          <Group type="102" alignment="0" attributes="0">
42
                          <Group type="102" alignment="0" attributes="0">
35
                              <EmptySpace min="-2" pref="175" max="-2" attributes="0"/>
43
                      <Group type="103" groupAlignment="0" attributes="0">
36
                              <Component id="cbBraceTooltip" min="-2" max="-2" attributes="0"/>
37
                          </Group>
38
                          <Component id="cbCamelCaseBehavior" alignment="0" min="-2" max="-2" attributes="0"/>
39
                          <Group type="102" attributes="0">
44
                          <Group type="102" attributes="0">
40
                              <EmptySpace min="21" pref="21" max="-2" attributes="0"/>
45
                              <EmptySpace min="21" pref="21" max="-2" attributes="0"/>
41
                              <Component id="lCamelCaseBehaviorExample" min="-2" max="-2" attributes="0"/>
46
                              <Component id="lCamelCaseBehaviorExample" min="-2" pref="471" max="-2" attributes="0"/>
42
                          </Group>
47
                          </Group>
48
                          <Component id="cbCamelCaseBehavior" min="-2" max="-2" attributes="0"/>
43
                      </Group>
49
                      </Group>
50
                      <EmptySpace max="32767" attributes="0"/>
44
                  </Group>
51
                  </Group>
52
                  <Group type="102" attributes="0">
53
                      <Group type="103" groupAlignment="0" attributes="0">
54
                          <Component id="cbShowBraceOutline" min="-2" max="-2" attributes="0"/>
45
                  <Group type="102" alignment="0" attributes="0">
55
                  <Group type="102" alignment="0" attributes="0">
46
                      <EmptySpace max="-2" attributes="0"/>
47
                      <Component id="lEditorSearchType" min="-2" max="-2" attributes="0"/>
56
                      <Component id="lEditorSearchType" min="-2" max="-2" attributes="0"/>
48
                      <EmptySpace max="-2" attributes="0"/>
57
                      <EmptySpace max="-2" attributes="0"/>
49
                      <Group type="103" groupAlignment="0" attributes="0">
58
                      <Group type="103" groupAlignment="0" attributes="0">
Lines 51-76 Link Here
51
                          <Component id="cboEditorSearchType" min="-2" max="-2" attributes="0"/>
60
                          <Component id="cboEditorSearchType" min="-2" max="-2" attributes="0"/>
52
                      </Group>
61
                      </Group>
53
                  </Group>
62
                  </Group>
63
                          <Component id="cbBraceTooltip" alignment="0" min="-2" max="-2" attributes="0"/>
54
              </Group>
64
              </Group>
55
              <EmptySpace min="0" pref="12" max="32767" attributes="0"/>
65
              <EmptySpace min="0" pref="12" max="32767" attributes="0"/>
56
          </Group>
66
          </Group>
57
          <Group type="102" attributes="0">
58
              <Component id="lBracesMatching" min="-2" max="-2" attributes="0"/>
59
              <EmptySpace max="-2" attributes="0"/>
60
              <Component id="jSeparator6" max="32767" attributes="0"/>
61
          </Group>
67
          </Group>
62
          <Group type="102" alignment="0" attributes="0">
63
              <Component id="lCamelCaseBehavior" min="-2" max="-2" attributes="0"/>
64
              <EmptySpace max="-2" attributes="0"/>
65
              <Group type="103" groupAlignment="0" attributes="0">
66
                  <Group type="102" attributes="0">
67
                      <Component id="cbShowBraceOutline" min="-2" max="-2" attributes="0"/>
68
                      <EmptySpace min="0" pref="0" max="32767" attributes="0"/>
69
                  </Group>
68
                  </Group>
70
                  <Component id="jSeparator3" max="32767" attributes="0"/>
71
              </Group>
69
              </Group>
72
          </Group>
73
      </Group>
74
    </DimensionLayout>
70
    </DimensionLayout>
75
    <DimensionLayout dim="1">
71
    <DimensionLayout dim="1">
76
      <Group type="103" groupAlignment="0" attributes="0">
72
      <Group type="103" groupAlignment="0" attributes="0">
Lines 79-93 Link Here
79
                  <Component id="lBracesMatching" min="-2" max="-2" attributes="0"/>
75
                  <Component id="lBracesMatching" min="-2" max="-2" attributes="0"/>
80
                  <Component id="jSeparator6" min="-2" pref="10" max="-2" attributes="0"/>
76
                  <Component id="jSeparator6" min="-2" pref="10" max="-2" attributes="0"/>
81
              </Group>
77
              </Group>
82
              <EmptySpace min="-2" pref="3" max="-2" attributes="0"/>
78
              <EmptySpace max="-2" attributes="0"/>
83
              <Group type="103" groupAlignment="3" attributes="0">
79
              <Component id="cbShowBraceOutline" min="-2" max="-2" attributes="0"/>
84
                  <Component id="cbBraceTooltip" alignment="3" min="-2" max="-2" attributes="0"/>
80
              <EmptySpace max="-2" attributes="0"/>
85
                  <Component id="cbShowBraceOutline" alignment="3" min="-2" max="-2" attributes="0"/>
81
              <Component id="cbBraceTooltip" min="-2" max="-2" attributes="0"/>
86
              </Group>
82
              <EmptySpace type="unrelated" max="-2" attributes="0"/>
87
              <EmptySpace type="separate" max="-2" attributes="0"/>
83
              <Group type="103" groupAlignment="0" attributes="0">
88
              <Group type="103" groupAlignment="1" attributes="0">
89
                  <Component id="jSeparator3" alignment="1" min="-2" pref="10" max="-2" attributes="0"/>
90
                  <Component id="lCamelCaseBehavior" alignment="1" min="-2" max="-2" attributes="0"/>
84
                  <Component id="lCamelCaseBehavior" alignment="1" min="-2" max="-2" attributes="0"/>
85
                  <Component id="jSeparator3" alignment="1" min="-2" pref="10" max="-2" attributes="0"/>
91
              </Group>
86
              </Group>
92
              <EmptySpace max="-2" attributes="0"/>
87
              <EmptySpace max="-2" attributes="0"/>
93
              <Component id="cbCamelCaseBehavior" min="-2" max="-2" attributes="0"/>
88
              <Component id="cbCamelCaseBehavior" min="-2" max="-2" attributes="0"/>
Lines 105-111 Link Here
105
              </Group>
100
              </Group>
106
              <EmptySpace max="-2" attributes="0"/>
101
              <EmptySpace max="-2" attributes="0"/>
107
              <Component id="lSearchtypeTooltip" min="-2" max="-2" attributes="0"/>
102
              <Component id="lSearchtypeTooltip" min="-2" max="-2" attributes="0"/>
108
              <EmptySpace min="0" pref="12" max="32767" attributes="0"/>
103
              <EmptySpace min="0" pref="4" max="32767" attributes="0"/>
109
          </Group>
104
          </Group>
110
      </Group>
105
      </Group>
111
    </DimensionLayout>
106
    </DimensionLayout>
Lines 144-154 Link Here
144
    </Component>
139
    </Component>
145
    <Component class="javax.swing.JLabel" name="lCamelCaseBehaviorExample">
140
    <Component class="javax.swing.JLabel" name="lCamelCaseBehaviorExample">
146
      <Properties>
141
      <Properties>
147
        <Property name="text" type="java.lang.String" value="&lt;html&gt;Example: Caret stops at J, T, N in &quot;JavaTypeName&quot;&lt;br&gt;when using next/previous word acctions&lt;/html&gt;"/>
142
        <Property name="text" type="java.lang.String" value="&lt;html&gt;Example: Caret stops at J, T, N in &quot;JavaTypeName&quot; when using next/previous word actions&lt;/html&gt;"/>
148
      </Properties>
143
      </Properties>
149
    </Component>
144
    </Component>
150
    <Component class="javax.swing.JLabel" name="lEditorSearchType">
145
    <Component class="javax.swing.JLabel" name="lEditorSearchType">
151
      <Properties>
146
      <Properties>
147
        <Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">
148
          <ComponentRef name="cboEditorSearchType"/>
149
        </Property>
152
        <Property name="text" type="java.lang.String" value="Editor Search Type:"/>
150
        <Property name="text" type="java.lang.String" value="Editor Search Type:"/>
153
      </Properties>
151
      </Properties>
154
    </Component>
152
    </Component>
(-)options.editor/src/org/netbeans/modules/options/generaleditor/GeneralEditorPanel.java (-30 / +28 lines)
Lines 136-143 Link Here
136
136
137
        cbCamelCaseBehavior.setText("Enable Camel Case Navigation");
137
        cbCamelCaseBehavior.setText("Enable Camel Case Navigation");
138
138
139
        lCamelCaseBehaviorExample.setText("<html>Example: Caret stops at J, T, N in \"JavaTypeName\"<br>when using next/previous word acctions</html>");
139
        lCamelCaseBehaviorExample.setText("<html>Example: Caret stops at J, T, N in \"JavaTypeName\" when using next/previous word actions</html>");
140
140
141
        lEditorSearchType.setLabelFor(cboEditorSearchType);
141
        lEditorSearchType.setText("Editor Search Type:");
142
        lEditorSearchType.setText("Editor Search Type:");
142
143
143
        lSearch.setText("Search");
144
        lSearch.setText("Search");
Lines 153-189 Link Here
153
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
154
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
154
                .addComponent(jSeparator5))
155
                .addComponent(jSeparator5))
155
            .addGroup(layout.createSequentialGroup()
156
            .addGroup(layout.createSequentialGroup()
157
                .addComponent(lBracesMatching)
158
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
159
                .addComponent(jSeparator6))
160
            .addGroup(layout.createSequentialGroup()
161
                .addComponent(lCamelCaseBehavior)
162
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
163
                .addComponent(jSeparator3))
164
            .addGroup(layout.createSequentialGroup()
165
                .addContainerGap()
156
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
166
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
157
                    .addGroup(layout.createSequentialGroup()
167
                    .addGroup(layout.createSequentialGroup()
158
                        .addGap(163, 163, 163)
159
                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
168
                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
160
                            .addGroup(layout.createSequentialGroup()
169
                            .addGroup(layout.createSequentialGroup()
161
                                .addGap(175, 175, 175)
162
                                .addComponent(cbBraceTooltip))
163
                            .addComponent(cbCamelCaseBehavior)
164
                            .addGroup(layout.createSequentialGroup()
165
                                .addGap(21, 21, 21)
170
                                .addGap(21, 21, 21)
166
                                .addComponent(lCamelCaseBehaviorExample, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))))
171
                                .addComponent(lCamelCaseBehaviorExample, javax.swing.GroupLayout.PREFERRED_SIZE, 471, javax.swing.GroupLayout.PREFERRED_SIZE))
172
                            .addComponent(cbCamelCaseBehavior))
173
                        .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
167
                    .addGroup(layout.createSequentialGroup()
174
                    .addGroup(layout.createSequentialGroup()
168
                        .addContainerGap()
169
                        .addComponent(lEditorSearchType)
170
                        .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
171
                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
175
                        .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
172
                            .addComponent(lSearchtypeTooltip, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
176
                            .addComponent(cbShowBraceOutline)
173
                            .addComponent(cboEditorSearchType, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))))
174
                .addGap(0, 12, Short.MAX_VALUE))
175
            .addGroup(layout.createSequentialGroup()
177
            .addGroup(layout.createSequentialGroup()
176
                .addComponent(lBracesMatching)
178
                                .addComponent(lEditorSearchType)
177
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
179
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
178
                .addComponent(jSeparator6))
179
            .addGroup(layout.createSequentialGroup()
180
                .addComponent(lCamelCaseBehavior)
181
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
182
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
180
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
183
                    .addGroup(layout.createSequentialGroup()
181
                                    .addComponent(lSearchtypeTooltip, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
184
                        .addComponent(cbShowBraceOutline)
182
                                    .addComponent(cboEditorSearchType, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
185
                        .addGap(0, 0, Short.MAX_VALUE))
183
                            .addComponent(cbBraceTooltip))
186
                    .addComponent(jSeparator3)))
184
                        .addGap(0, 12, Short.MAX_VALUE))))
187
        );
185
        );
188
        layout.setVerticalGroup(
186
        layout.setVerticalGroup(
189
            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
187
            layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
Lines 191-204 Link Here
191
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
189
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
192
                    .addComponent(lBracesMatching)
190
                    .addComponent(lBracesMatching)
193
                    .addComponent(jSeparator6, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE))
191
                    .addComponent(jSeparator6, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE))
194
                .addGap(3, 3, 3)
192
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
195
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
193
                .addComponent(cbShowBraceOutline)
194
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
196
                    .addComponent(cbBraceTooltip)
195
                    .addComponent(cbBraceTooltip)
197
                    .addComponent(cbShowBraceOutline))
196
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
198
                .addGap(18, 18, 18)
197
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
199
                .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
198
                    .addComponent(lCamelCaseBehavior, javax.swing.GroupLayout.Alignment.TRAILING)
200
                    .addComponent(jSeparator3, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE)
199
                    .addComponent(jSeparator3, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE))
201
                    .addComponent(lCamelCaseBehavior))
202
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
200
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
203
                .addComponent(cbCamelCaseBehavior)
201
                .addComponent(cbCamelCaseBehavior)
204
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
202
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
Lines 213-219 Link Here
213
                    .addComponent(cboEditorSearchType, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
211
                    .addComponent(cboEditorSearchType, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
214
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
212
                .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
215
                .addComponent(lSearchtypeTooltip, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
213
                .addComponent(lSearchtypeTooltip, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
216
                .addGap(0, 12, Short.MAX_VALUE))
214
                .addGap(0, 4, Short.MAX_VALUE))
217
        );
215
        );
218
    }// </editor-fold>//GEN-END:initComponents
216
    }// </editor-fold>//GEN-END:initComponents
219
    
217
    

Return to bug 231180