Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
NetBeans
Apache NetBeans
Commits
d77f0692
Unverified
Commit
d77f0692
authored
Jan 19, 2022
by
Neil C Smith
Committed by
GitHub
Jan 19, 2022
Browse files
Merge pull request #3473 from apache/delivery
Sync delivery to release130 for 13-rc1
parents
a46aa48a
8df36f8d
Changes
48
Hide whitespace changes
Inline
Side-by-side
ide/code.analysis/src/org/netbeans/modules/analysis/RunAnalysisPanel.form
View file @
d77f0692
...
...
@@ -36,7 +36,7 @@
<AuxValue
name=
"FormSettings_listenerGenerationStyle"
type=
"java.lang.Integer"
value=
"0"
/>
<AuxValue
name=
"FormSettings_variablesLocal"
type=
"java.lang.Boolean"
value=
"false"
/>
<AuxValue
name=
"FormSettings_variablesModifier"
type=
"java.lang.Integer"
value=
"2"
/>
<AuxValue
name=
"designerSize"
type=
"java.awt.Dimension"
value=
"-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,0,-1
09
,0,0,
2,71
"
/>
<AuxValue
name=
"designerSize"
type=
"java.awt.Dimension"
value=
"-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,0,-1
25
,0,0,
1,-96
"
/>
</AuxValues>
<Layout
class=
"org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"
/>
...
...
@@ -47,6 +47,10 @@
<ResourceString
bundle=
"org/netbeans/modules/analysis/Bundle.properties"
key=
"RunAnalysisPanel.jLabel1.text"
replaceFormat=
"org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"
/>
</Property>
</Properties>
<AuxValues>
<AuxValue
name=
"JavaCodeGenerator_VariableLocal"
type=
"java.lang.Boolean"
value=
"true"
/>
<AuxValue
name=
"JavaCodeGenerator_VariableModifier"
type=
"java.lang.Integer"
value=
"0"
/>
</AuxValues>
<Constraints>
<Constraint
layoutClass=
"org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"
value=
"org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"
>
<GridBagConstraints
gridX=
"0"
gridY=
"0"
gridWidth=
"1"
gridHeight=
"1"
fill=
"0"
ipadX=
"0"
ipadY=
"0"
insetsTop=
"0"
insetsLeft=
"0"
insetsBottom=
"0"
insetsRight=
"0"
anchor=
"1280"
weightX=
"0.0"
weightY=
"0.0"
/>
...
...
@@ -61,7 +65,7 @@
</Properties>
<Constraints>
<Constraint
layoutClass=
"org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"
value=
"org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"
>
<GridBagConstraints
gridX=
"1"
gridY=
"0"
gridWidth=
"3"
gridHeight=
"1"
fill=
"2"
ipadX=
"0"
ipadY=
"0"
insetsTop=
"0"
insetsLeft=
"12"
insetsBottom=
"0"
insetsRight=
"0"
anchor=
"1280"
weightX=
"
0
.0"
weightY=
"0.0"
/>
<GridBagConstraints
gridX=
"1"
gridY=
"0"
gridWidth=
"3"
gridHeight=
"1"
fill=
"2"
ipadX=
"0"
ipadY=
"0"
insetsTop=
"0"
insetsLeft=
"12"
insetsBottom=
"0"
insetsRight=
"0"
anchor=
"1280"
weightX=
"
1
.0"
weightY=
"0.0"
/>
</Constraint>
</Constraints>
</Component>
...
...
@@ -71,6 +75,10 @@
<ResourceString
bundle=
"org/netbeans/modules/analysis/Bundle.properties"
key=
"RunAnalysisPanel.jLabel2.text"
replaceFormat=
"org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"
/>
</Property>
</Properties>
<AuxValues>
<AuxValue
name=
"JavaCodeGenerator_VariableLocal"
type=
"java.lang.Boolean"
value=
"true"
/>
<AuxValue
name=
"JavaCodeGenerator_VariableModifier"
type=
"java.lang.Integer"
value=
"0"
/>
</AuxValues>
<Constraints>
<Constraint
layoutClass=
"org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"
value=
"org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"
>
<GridBagConstraints
gridX=
"0"
gridY=
"1"
gridWidth=
"1"
gridHeight=
"1"
fill=
"0"
ipadX=
"0"
ipadY=
"0"
insetsTop=
"12"
insetsLeft=
"0"
insetsBottom=
"0"
insetsRight=
"0"
anchor=
"1280"
weightX=
"0.0"
weightY=
"0.0"
/>
...
...
@@ -88,7 +96,7 @@
</Events>
<Constraints>
<Constraint
layoutClass=
"org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"
value=
"org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"
>
<GridBagConstraints
gridX=
"2"
gridY=
"1"
gridWidth=
"1"
gridHeight=
"1"
fill=
"2"
ipadX=
"0"
ipadY=
"0"
insetsTop=
"12"
insetsLeft=
"12"
insetsBottom=
"0"
insetsRight=
"0"
anchor=
"1280"
weightX=
"
0
.0"
weightY=
"0.0"
/>
<GridBagConstraints
gridX=
"2"
gridY=
"1"
gridWidth=
"1"
gridHeight=
"1"
fill=
"2"
ipadX=
"0"
ipadY=
"0"
insetsTop=
"12"
insetsLeft=
"12"
insetsBottom=
"0"
insetsRight=
"0"
anchor=
"1280"
weightX=
"
1
.0"
weightY=
"0.0"
/>
</Constraint>
</Constraints>
</Component>
...
...
@@ -154,7 +162,7 @@
</Properties>
<Constraints>
<Constraint
layoutClass=
"org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"
value=
"org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"
>
<GridBagConstraints
gridX=
"2"
gridY=
"2"
gridWidth=
"1"
gridHeight=
"1"
fill=
"2"
ipadX=
"0"
ipadY=
"0"
insetsTop=
"12"
insetsLeft=
"12"
insetsBottom=
"0"
insetsRight=
"0"
anchor=
"256"
weightX=
"
0
.0"
weightY=
"0.0"
/>
<GridBagConstraints
gridX=
"2"
gridY=
"2"
gridWidth=
"1"
gridHeight=
"1"
fill=
"2"
ipadX=
"0"
ipadY=
"0"
insetsTop=
"12"
insetsLeft=
"12"
insetsBottom=
"0"
insetsRight=
"0"
anchor=
"256"
weightX=
"
1
.0"
weightY=
"0.0"
/>
</Constraint>
</Constraints>
</Component>
...
...
@@ -173,5 +181,18 @@
</Constraint>
</Constraints>
</Component>
<Container
class=
"javax.swing.JPanel"
name=
"emptyPanel"
>
<AuxValues>
<AuxValue
name=
"JavaCodeGenerator_VariableLocal"
type=
"java.lang.Boolean"
value=
"true"
/>
<AuxValue
name=
"JavaCodeGenerator_VariableModifier"
type=
"java.lang.Integer"
value=
"0"
/>
</AuxValues>
<Constraints>
<Constraint
layoutClass=
"org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"
value=
"org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription"
>
<GridBagConstraints
gridX=
"-1"
gridY=
"3"
gridWidth=
"4"
gridHeight=
"1"
fill=
"1"
ipadX=
"0"
ipadY=
"0"
insetsTop=
"0"
insetsLeft=
"0"
insetsBottom=
"0"
insetsRight=
"0"
anchor=
"10"
weightX=
"0.0"
weightY=
"1.0"
/>
</Constraint>
</Constraints>
<Layout
class=
"org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"
/>
</Container>
</SubComponents>
</Form>
ide/code.analysis/src/org/netbeans/modules/analysis/RunAnalysisPanel.java
View file @
d77f0692
...
...
@@ -21,6 +21,7 @@ package org.netbeans.modules.analysis;
import
java.awt.CardLayout
;
import
java.awt.Color
;
import
java.awt.Component
;
import
java.awt.Dimension
;
import
java.awt.Font
;
import
java.awt.Graphics
;
import
java.awt.GridBagConstraints
;
...
...
@@ -101,7 +102,7 @@ import org.openide.util.RequestProcessor;
*/
public
final
class
RunAnalysisPanel
extends
javax
.
swing
.
JPanel
implements
LookupListener
{
private
static
final
String
COMBO_PROTOTYPE
=
"999999999999999999999999999999999999
999999999999999999999999
"
;
private
static
final
String
COMBO_PROTOTYPE
=
"999999999999999999999999999999999999"
;
private
static
final
RequestProcessor
WORKER
=
new
RequestProcessor
(
RunAnalysisPanel
.
class
.
getName
(),
1
,
false
,
false
);
private
final
JPanel
progress
;
private
final
RequiredPluginsPanel
requiredPlugins
;
...
...
@@ -543,15 +544,16 @@ public final class RunAnalysisPanel extends javax.swing.JPanel implements Lookup
java
.
awt
.
GridBagConstraints
gridBagConstraints
;
radioButtons
=
new
javax
.
swing
.
ButtonGroup
();
jLabel1
=
new
javax
.
swing
.
JLabel
();
javax
.
swing
.
JLabel
jLabel1
=
new
javax
.
swing
.
JLabel
();
scopeCombo
=
new
javax
.
swing
.
JComboBox
();
jLabel2
=
new
javax
.
swing
.
JLabel
();
javax
.
swing
.
JLabel
jLabel2
=
new
javax
.
swing
.
JLabel
();
configurationCombo
=
new
javax
.
swing
.
JComboBox
();
manage
=
new
javax
.
swing
.
JButton
();
configurationRadio
=
new
javax
.
swing
.
JRadioButton
();
singleInspectionRadio
=
new
javax
.
swing
.
JRadioButton
();
inspectionCombo
=
new
javax
.
swing
.
JComboBox
();
browse
=
new
javax
.
swing
.
JButton
();
javax
.
swing
.
JPanel
emptyPanel
=
new
javax
.
swing
.
JPanel
();
setLayout
(
new
java
.
awt
.
GridBagLayout
());
...
...
@@ -568,6 +570,7 @@ public final class RunAnalysisPanel extends javax.swing.JPanel implements Lookup
gridBagConstraints
.
gridwidth
=
3
;
gridBagConstraints
.
fill
=
java
.
awt
.
GridBagConstraints
.
HORIZONTAL
;
gridBagConstraints
.
anchor
=
java
.
awt
.
GridBagConstraints
.
ABOVE_BASELINE_LEADING
;
gridBagConstraints
.
weightx
=
1.0
;
gridBagConstraints
.
insets
=
new
java
.
awt
.
Insets
(
0
,
12
,
0
,
0
);
add
(
scopeCombo
,
gridBagConstraints
);
...
...
@@ -590,6 +593,7 @@ public final class RunAnalysisPanel extends javax.swing.JPanel implements Lookup
gridBagConstraints
.
gridy
=
1
;
gridBagConstraints
.
fill
=
java
.
awt
.
GridBagConstraints
.
HORIZONTAL
;
gridBagConstraints
.
anchor
=
java
.
awt
.
GridBagConstraints
.
ABOVE_BASELINE_LEADING
;
gridBagConstraints
.
weightx
=
1.0
;
gridBagConstraints
.
insets
=
new
java
.
awt
.
Insets
(
12
,
12
,
0
,
0
);
add
(
configurationCombo
,
gridBagConstraints
);
...
...
@@ -640,6 +644,7 @@ public final class RunAnalysisPanel extends javax.swing.JPanel implements Lookup
gridBagConstraints
.
gridy
=
2
;
gridBagConstraints
.
fill
=
java
.
awt
.
GridBagConstraints
.
HORIZONTAL
;
gridBagConstraints
.
anchor
=
java
.
awt
.
GridBagConstraints
.
BASELINE
;
gridBagConstraints
.
weightx
=
1.0
;
gridBagConstraints
.
insets
=
new
java
.
awt
.
Insets
(
12
,
12
,
0
,
0
);
add
(
inspectionCombo
,
gridBagConstraints
);
...
...
@@ -656,6 +661,12 @@ public final class RunAnalysisPanel extends javax.swing.JPanel implements Lookup
gridBagConstraints
.
anchor
=
java
.
awt
.
GridBagConstraints
.
BASELINE
;
gridBagConstraints
.
insets
=
new
java
.
awt
.
Insets
(
12
,
12
,
0
,
0
);
add
(
browse
,
gridBagConstraints
);
gridBagConstraints
=
new
java
.
awt
.
GridBagConstraints
();
gridBagConstraints
.
gridy
=
3
;
gridBagConstraints
.
gridwidth
=
4
;
gridBagConstraints
.
fill
=
java
.
awt
.
GridBagConstraints
.
BOTH
;
gridBagConstraints
.
weighty
=
1.0
;
add
(
emptyPanel
,
gridBagConstraints
);
}
// </editor-fold>//GEN-END:initComponents
private
void
configurationComboActionPerformed
(
java
.
awt
.
event
.
ActionEvent
evt
)
{
//GEN-FIRST:event_configurationComboActionPerformed
...
...
@@ -672,6 +683,7 @@ public final class RunAnalysisPanel extends javax.swing.JPanel implements Lookup
}
};
AdjustConfigurationPanel
panel
=
new
AdjustConfigurationPanel
(
analyzers
,
preselectedAnalyzer
,
preselected
,
configurationToSelect
,
errorListener
);
panel
.
setPreferredSize
(
new
Dimension
(
700
,
300
));
DialogDescriptor
nd
=
new
DialogDescriptor
(
panel
,
Bundle
.
LBL_Configurations
(),
true
,
NotifyDescriptor
.
OK_CANCEL_OPTION
,
NotifyDescriptor
.
OK_OPTION
,
null
);
nls
[
0
]
=
nd
.
createNotificationLineSupport
();
...
...
@@ -727,8 +739,6 @@ public final class RunAnalysisPanel extends javax.swing.JPanel implements Lookup
private
javax
.
swing
.
JComboBox
configurationCombo
;
private
javax
.
swing
.
JRadioButton
configurationRadio
;
private
javax
.
swing
.
JComboBox
inspectionCombo
;
private
javax
.
swing
.
JLabel
jLabel1
;
private
javax
.
swing
.
JLabel
jLabel2
;
private
javax
.
swing
.
JButton
manage
;
private
javax
.
swing
.
ButtonGroup
radioButtons
;
private
javax
.
swing
.
JComboBox
scopeCombo
;
...
...
ide/code.analysis/src/org/netbeans/modules/analysis/ui/AdjustConfigurationPanel.form
View file @
d77f0692
...
...
@@ -48,7 +48,7 @@
</Group>
<EmptySpace
max=
"-2"
attributes=
"0"
/>
<Group
type=
"103"
groupAlignment=
"0"
attributes=
"0"
>
<Component
id=
"configurationCombo"
pref=
"2
54
"
max=
"32767"
attributes=
"0"
/>
<Component
id=
"configurationCombo"
pref=
"2
20
"
max=
"32767"
attributes=
"0"
/>
<Component
id=
"analyzerCombo"
max=
"32767"
attributes=
"0"
/>
</Group>
</Group>
...
...
@@ -70,8 +70,8 @@
<Component
id=
"jLabel2"
alignment=
"3"
min=
"-2"
max=
"-2"
attributes=
"0"
/>
<Component
id=
"analyzerCombo"
alignment=
"3"
min=
"-2"
max=
"-2"
attributes=
"0"
/>
</Group>
<EmptySpace
type=
"separate"
max=
"-2"
attributes=
"0"
/>
<Component
id=
"analyzerPanel"
pref=
"1
9
8"
max=
"32767"
attributes=
"0"
/>
<EmptySpace
max=
"-2"
attributes=
"0"
/>
<Component
id=
"analyzerPanel"
pref=
"18
0
"
max=
"32767"
attributes=
"0"
/>
<EmptySpace
max=
"-2"
attributes=
"0"
/>
</Group>
</Group>
...
...
ide/code.analysis/src/org/netbeans/modules/analysis/ui/AdjustConfigurationPanel.java
View file @
d77f0692
...
...
@@ -20,7 +20,6 @@ package org.netbeans.modules.analysis.ui;
import
java.awt.BorderLayout
;
import
java.awt.Component
;
import
java.awt.Dimension
;
import
java.awt.Window
;
import
java.awt.event.ActionEvent
;
import
java.awt.event.ActionListener
;
...
...
@@ -41,7 +40,6 @@ import javax.swing.DefaultComboBoxModel;
import
javax.swing.DefaultListCellRenderer
;
import
javax.swing.JComponent
;
import
javax.swing.JList
;
import
javax.swing.JPanel
;
import
javax.swing.SwingUtilities
;
import
org.netbeans.modules.analysis.Configuration
;
import
org.netbeans.modules.analysis.ConfigurationsManager
;
...
...
@@ -281,7 +279,7 @@ public class AdjustConfigurationPanel extends javax.swing.JPanel implements Prop
.
addComponent
(
jLabel2
,
javax
.
swing
.
GroupLayout
.
DEFAULT_SIZE
,
javax
.
swing
.
GroupLayout
.
DEFAULT_SIZE
,
Short
.
MAX_VALUE
))
.
addPreferredGap
(
javax
.
swing
.
LayoutStyle
.
ComponentPlacement
.
RELATED
)
.
addGroup
(
layout
.
createParallelGroup
(
javax
.
swing
.
GroupLayout
.
Alignment
.
LEADING
)
.
addComponent
(
configurationCombo
,
0
,
2
54
,
Short
.
MAX_VALUE
)
.
addComponent
(
configurationCombo
,
0
,
2
20
,
Short
.
MAX_VALUE
)
.
addComponent
(
analyzerCombo
,
0
,
javax
.
swing
.
GroupLayout
.
DEFAULT_SIZE
,
Short
.
MAX_VALUE
))))
.
addContainerGap
())
);
...
...
@@ -296,8 +294,8 @@ public class AdjustConfigurationPanel extends javax.swing.JPanel implements Prop
.
addGroup
(
layout
.
createParallelGroup
(
javax
.
swing
.
GroupLayout
.
Alignment
.
BASELINE
)
.
addComponent
(
jLabel2
)
.
addComponent
(
analyzerCombo
,
javax
.
swing
.
GroupLayout
.
PREFERRED_SIZE
,
javax
.
swing
.
GroupLayout
.
DEFAULT_SIZE
,
javax
.
swing
.
GroupLayout
.
PREFERRED_SIZE
))
.
add
Gap
(
18
,
18
,
18
)
.
addComponent
(
analyzerPanel
,
javax
.
swing
.
GroupLayout
.
DEFAULT_SIZE
,
1
9
8
,
Short
.
MAX_VALUE
)
.
add
PreferredGap
(
javax
.
swing
.
LayoutStyle
.
ComponentPlacement
.
RELATED
)
.
addComponent
(
analyzerPanel
,
javax
.
swing
.
GroupLayout
.
DEFAULT_SIZE
,
18
0
,
Short
.
MAX_VALUE
)
.
addContainerGap
())
);
}
// </editor-fold>//GEN-END:initComponents
...
...
java/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/options/HintsPanel.form
View file @
d77f0692
...
...
@@ -47,16 +47,13 @@
<AuxValue
name=
"FormSettings_listenerGenerationStyle"
type=
"java.lang.Integer"
value=
"0"
/>
<AuxValue
name=
"FormSettings_variablesLocal"
type=
"java.lang.Boolean"
value=
"false"
/>
<AuxValue
name=
"FormSettings_variablesModifier"
type=
"java.lang.Integer"
value=
"2"
/>
<AuxValue
name=
"designerSize"
type=
"java.awt.Dimension"
value=
"-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,-
116
,0,0,3,
9
"
/>
<AuxValue
name=
"designerSize"
type=
"java.awt.Dimension"
value=
"-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,-
35
,0,0,3,
66
"
/>
</AuxValues>
<Layout
class=
"org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"
/>
<SubComponents>
<Container
class=
"javax.swing.JSplitPane"
name=
"jSplitPane1"
>
<Properties>
<Property
name=
"border"
type=
"javax.swing.border.Border"
editor=
"org.netbeans.modules.form.editors2.BorderEditor"
>
<Border
info=
"null"
/>
</Property>
<Property
name=
"dividerLocation"
type=
"int"
value=
"320"
/>
</Properties>
<Constraints>
...
...
@@ -127,15 +124,15 @@
<DimensionLayout
dim=
"0"
>
<Group
type=
"103"
groupAlignment=
"0"
attributes=
"0"
>
<Component
id=
"optionsPanel"
max=
"32767"
attributes=
"0"
/>
<Component
id=
"descriptionPanel"
alignment=
"0"
pref=
"430"
max=
"32767"
attributes=
"0"
/>
<Component
id=
"descriptionPanel"
alignment=
"0"
max=
"32767"
attributes=
"0"
/>
</Group>
</DimensionLayout>
<DimensionLayout
dim=
"1"
>
<Group
type=
"103"
groupAlignment=
"0"
attributes=
"0"
>
<Group
type=
"102"
attributes=
"0"
>
<Component
id=
"optionsPanel"
pref=
"109
"
max=
"
32767
"
attributes=
"0"
/>
<EmptySpace
min=
"-2"
pref=
"12
"
max=
"-2"
attributes=
"0"
/>
<Component
id=
"descriptionPanel"
pref=
"
186
"
max=
"32767"
attributes=
"0"
/>
<Group
type=
"102"
alignment=
"0"
attributes=
"0"
>
<Component
id=
"optionsPanel"
min=
"-2
"
max=
"
-2
"
attributes=
"0"
/>
<EmptySpace
type=
"unrelated
"
max=
"-2"
attributes=
"0"
/>
<Component
id=
"descriptionPanel"
pref=
"
314
"
max=
"32767"
attributes=
"0"
/>
</Group>
</Group>
</DimensionLayout>
...
...
@@ -277,7 +274,7 @@
<Group
type=
"103"
groupAlignment=
"0"
attributes=
"0"
>
<Group
type=
"102"
alignment=
"1"
attributes=
"0"
>
<Component
id=
"openInEditor"
min=
"-2"
max=
"-2"
attributes=
"0"
/>
<EmptySpace
pref=
"
195
"
max=
"32767"
attributes=
"0"
/>
<EmptySpace
pref=
"
212
"
max=
"32767"
attributes=
"0"
/>
<Component
id=
"saveButton"
min=
"-2"
max=
"-2"
attributes=
"0"
/>
<EmptySpace
type=
"unrelated"
max=
"-2"
attributes=
"0"
/>
<Component
id=
"cancelEdit"
min=
"-2"
max=
"-2"
attributes=
"0"
/>
...
...
@@ -463,7 +460,7 @@
<Group
type=
"102"
alignment=
"0"
attributes=
"0"
>
<Component
id=
"configLabel"
min=
"-2"
max=
"-2"
attributes=
"0"
/>
<EmptySpace
max=
"-2"
attributes=
"0"
/>
<Component
id=
"configCombo"
pref=
"
683
"
max=
"32767"
attributes=
"0"
/>
<Component
id=
"configCombo"
pref=
"
719
"
max=
"32767"
attributes=
"0"
/>
</Group>
</Group>
</DimensionLayout>
...
...
@@ -503,7 +500,7 @@
<Group
type=
"103"
groupAlignment=
"0"
attributes=
"0"
>
<Group
type=
"102"
alignment=
"1"
attributes=
"0"
>
<Component
id=
"refactoringsLabel"
min=
"-2"
max=
"-2"
attributes=
"0"
/>
<EmptySpace
pref=
"5
40
"
max=
"32767"
attributes=
"0"
/>
<EmptySpace
pref=
"5
76
"
max=
"32767"
attributes=
"0"
/>
<Component
id=
"searchLabel"
min=
"-2"
max=
"-2"
attributes=
"0"
/>
<EmptySpace
max=
"-2"
attributes=
"0"
/>
<Component
id=
"searchTextField"
min=
"-2"
pref=
"121"
max=
"-2"
attributes=
"0"
/>
...
...
java/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/options/HintsPanel.java
View file @
d77f0692
...
...
@@ -39,16 +39,10 @@ import java.util.Collections;
import
java.util.Comparator
;
import
java.util.HashMap
;
import
java.util.IdentityHashMap
;
import
java.util.Iterator
;
import
java.util.LinkedList
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map.Entry
;
import
java.util.MissingResourceException
;
import
java.util.ResourceBundle
;
import
java.util.Set
;
import
java.util.TreeMap
;
import
java.util.TreeSet
;
import
java.util.concurrent.atomic.AtomicBoolean
;
import
java.util.prefs.Preferences
;
import
javax.swing.AbstractAction
;
...
...
@@ -355,7 +349,7 @@ public final class HintsPanel extends javax.swing.JPanel {
private
int
getDividerLocation
()
{
final
int
location
=
(
int
)
((
jSplitPane1
.
getWidth
()
-
jSplitPane1
.
getDividerSize
())
*
0.4f
);
return
Math
.
min
(
32
0
,
location
);
return
Math
.
min
(
40
0
,
location
);
}
/** This method is called from within the constructor to
...
...
@@ -405,7 +399,6 @@ public final class HintsPanel extends javax.swing.JPanel {
setBorder
(
javax
.
swing
.
BorderFactory
.
createEmptyBorder
(
8
,
8
,
8
,
8
));
setLayout
(
new
java
.
awt
.
GridBagLayout
());
jSplitPane1
.
setBorder
(
null
);
jSplitPane1
.
setDividerLocation
(
320
);
treePanel
.
setOpaque
(
false
);
...
...
@@ -516,7 +509,7 @@ public final class HintsPanel extends javax.swing.JPanel {
editingButtonsLayout
.
createParallelGroup
(
javax
.
swing
.
GroupLayout
.
Alignment
.
LEADING
)
.
addGroup
(
javax
.
swing
.
GroupLayout
.
Alignment
.
TRAILING
,
editingButtonsLayout
.
createSequentialGroup
()
.
addComponent
(
openInEditor
)
.
addPreferredGap
(
javax
.
swing
.
LayoutStyle
.
ComponentPlacement
.
RELATED
,
198
,
Short
.
MAX_VALUE
)
.
addPreferredGap
(
javax
.
swing
.
LayoutStyle
.
ComponentPlacement
.
RELATED
,
212
,
Short
.
MAX_VALUE
)
.
addComponent
(
saveButton
)
.
addPreferredGap
(
javax
.
swing
.
LayoutStyle
.
ComponentPlacement
.
UNRELATED
)
.
addComponent
(
cancelEdit
))
...
...
@@ -560,9 +553,9 @@ public final class HintsPanel extends javax.swing.JPanel {
detailsPanelLayout
.
setVerticalGroup
(
detailsPanelLayout
.
createParallelGroup
(
javax
.
swing
.
GroupLayout
.
Alignment
.
LEADING
)
.
addGroup
(
detailsPanelLayout
.
createSequentialGroup
()
.
addComponent
(
optionsPanel
,
javax
.
swing
.
GroupLayout
.
DEFAULT_SIZE
,
97
,
Short
.
MAX_VALU
E
)
.
add
Gap
(
12
,
12
,
12
)
.
addComponent
(
descriptionPanel
,
javax
.
swing
.
GroupLayout
.
DEFAULT_SIZE
,
175
,
Short
.
MAX_VALUE
))
.
addComponent
(
optionsPanel
,
javax
.
swing
.
GroupLayout
.
PREFERRED_SIZE
,
javax
.
swing
.
GroupLayout
.
DEFAULT_SIZE
,
javax
.
swing
.
GroupLayout
.
PREFERRED_SIZ
E
)
.
add
PreferredGap
(
javax
.
swing
.
LayoutStyle
.
ComponentPlacement
.
UNRELATED
)
.
addComponent
(
descriptionPanel
,
javax
.
swing
.
GroupLayout
.
DEFAULT_SIZE
,
314
,
Short
.
MAX_VALUE
))
);
jSplitPane1
.
setRightComponent
(
detailsPanel
);
...
...
@@ -618,7 +611,7 @@ public final class HintsPanel extends javax.swing.JPanel {
.
addComponent
(
importButton
)
.
addPreferredGap
(
javax
.
swing
.
LayoutStyle
.
ComponentPlacement
.
UNRELATED
)
.
addComponent
(
exportButton
)
.
addPreferredGap
(
javax
.
swing
.
LayoutStyle
.
ComponentPlacement
.
RELATED
,
3
29
,
Short
.
MAX_VALUE
)
.
addPreferredGap
(
javax
.
swing
.
LayoutStyle
.
ComponentPlacement
.
RELATED
,
29
2
,
Short
.
MAX_VALUE
)
.
addComponent
(
editScriptButton
)
.
addGap
(
35
,
35
,
35
)
.
addComponent
(
okButton
)
...
...
@@ -660,7 +653,7 @@ public final class HintsPanel extends javax.swing.JPanel {
.
addGroup
(
configurationsPanelLayout
.
createSequentialGroup
()
.
addComponent
(
configLabel
)
.
addPreferredGap
(
javax
.
swing
.
LayoutStyle
.
ComponentPlacement
.
RELATED
)
.
addComponent
(
configCombo
,
0
,
642
,
Short
.
MAX_VALUE
))
.
addComponent
(
configCombo
,
0
,
719
,
Short
.
MAX_VALUE
))
);
configurationsPanelLayout
.
setVerticalGroup
(
configurationsPanelLayout
.
createParallelGroup
(
javax
.
swing
.
GroupLayout
.
Alignment
.
LEADING
)
...
...
@@ -684,7 +677,7 @@ public final class HintsPanel extends javax.swing.JPanel {
searchPanelLayout
.
createParallelGroup
(
javax
.
swing
.
GroupLayout
.
Alignment
.
LEADING
)
.
addGroup
(
javax
.
swing
.
GroupLayout
.
Alignment
.
TRAILING
,
searchPanelLayout
.
createSequentialGroup
()
.
addComponent
(
refactoringsLabel
)
.
addPreferredGap
(
javax
.
swing
.
LayoutStyle
.
ComponentPlacement
.
RELATED
,
493
,
Short
.
MAX_VALUE
)
.
addPreferredGap
(
javax
.
swing
.
LayoutStyle
.
ComponentPlacement
.
RELATED
,
576
,
Short
.
MAX_VALUE
)
.
addComponent
(
searchLabel
)
.
addPreferredGap
(
javax
.
swing
.
LayoutStyle
.
ComponentPlacement
.
RELATED
)
.
addComponent
(
searchTextField
,
javax
.
swing
.
GroupLayout
.
PREFERRED_SIZE
,
121
,
javax
.
swing
.
GroupLayout
.
PREFERRED_SIZE
))
...
...
java/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/InspectAndRefactorPanel.form
View file @
d77f0692
...
...
@@ -50,27 +50,24 @@
<EmptySpace
max=
"-2"
attributes=
"0"
/>
<Group
type=
"103"
groupAlignment=
"0"
attributes=
"0"
>
<Group
type=
"102"
attributes=
"0"
>
<Group
type=
"103"
groupAlignment=
"0"
attributes=
"0"
>
<Component
id=
"configurationRadio"
alignment=
"0"
min=
"-2"
max=
"-2"
attributes=
"0"
/>
<Component
id=
"singleRefactorRadio"
alignment=
"0"
min=
"-2"
max=
"-2"
attributes=
"0"
/>
</Group>
<Component
id=
"singleRefactorRadio"
min=
"-2"
max=
"-2"
attributes=
"0"
/>
<EmptySpace
max=
"-2"
attributes=
"0"
/>
<Group
type=
"103"
groupAlignment=
"0"
attributes=
"0"
>
<Component
id=
"singleRefactoringCombo"
pref=
"196"
max=
"32767"
attributes=
"0"
/>
<Component
id=
"configurationCombo"
alignment=
"0"
pref=
"196"
max=
"32767"
attributes=
"0"
/>
</Group>
<Component
id=
"singleRefactoringCombo"
max=
"32767"
attributes=
"0"
/>
</Group>
<Component
id=
"scopeCombo"
alignment=
"1"
pref=
"346"
max=
"32767"
attributes=
"0"
/>
<Group
type=
"102"
attributes=
"0"
>
<Component
id=
"configurationRadio"
min=
"-2"
max=
"-2"
attributes=
"0"
/>
<EmptySpace
min=
"-2"
pref=
"25"
max=
"-2"
attributes=
"0"
/>
<Component
id=
"configurationCombo"
pref=
"242"
max=
"32767"
attributes=
"0"
/>
</Group>
<Component
id=
"scopeCombo"
alignment=
"1"
pref=
"377"
max=
"32767"
attributes=
"0"
/>
</Group>
<EmptySpace
type=
"unrelated"
max=
"-2"
attributes=
"0"
/>
<Group
type=
"103"
groupAlignment=
"0"
attributes=
"0"
>
<Group
type=
"103"
groupAlignment=
"0"
max=
"-2"
attributes=
"0"
>
<Component
id=
"manageSingleRefactoring"
alignment=
"1"
max=
"32767"
attributes=
"1"
/>
<Component
id=
"manageConfigurations"
alignment=
"1"
max=
"32767"
attributes=
"1"
/>
</Group>
<Group
type=
"103"
groupAlignment=
"0"
max=
"-2"
attributes=
"0"
>
<Component
id=
"manageConfigurations"
max=
"32767"
attributes=
"1"
/>
<Component
id=
"customScopeButton"
alignment=
"0"
min=
"-2"
max=
"-2"
attributes=
"0"
/>
<Component
id=
"manageSingleRefactoring"
alignment=
"0"
max=
"32767"
attributes=
"1"
/>
</Group>
<EmptySpace
max=
"-2"
attributes=
"0"
/>
<EmptySpace
min=
"-2"
max=
"-2"
attributes=
"0"
/>
</Group>
</Group>
</DimensionLayout>
...
...
@@ -90,12 +87,13 @@
<Component
id=
"manageConfigurations"
alignment=
"3"
min=
"-2"
max=
"-2"
attributes=
"0"
/>
<Component
id=
"refactorUsingLabel"
alignment=
"3"
min=
"-2"
max=
"-2"
attributes=
"0"
/>
</Group>
<EmptySpace
min=
"1"
pref=
"1
"
max=
"
1
"
attributes=
"0"
/>
<EmptySpace
type=
"unrelated
"
max=
"
-2
"
attributes=
"0"
/>
<Group
type=
"103"
groupAlignment=
"3"
attributes=
"0"
>
<Component
id=
"singleRefactorRadio"
alignment=
"3"
min=
"-2"
max=
"-2"
attributes=
"0"
/>
<Component
id=
"singleRefactoringCombo"
alignment=
"3"
min=
"-2"
max=
"-2"
attributes=
"0"
/>
<Component
id=
"manageSingleRefactoring"
alignment=
"3"
min=
"-2"
max=
"-2"
attributes=
"0"
/>
<Component
id=
"singleRefactorRadio"
alignment=
"3"
min=
"-2"
max=
"-2"
attributes=
"0"
/>
</Group>
<EmptySpace
max=
"32767"
attributes=
"0"
/>
</Group>
</Group>
</DimensionLayout>
...
...
java/java.hints.ui/src/org/netbeans/modules/java/hints/spiimpl/refactoring/InspectAndRefactorPanel.java
View file @
d77f0692
...
...
@@ -328,8 +328,7 @@ public class InspectAndRefactorPanel extends javax.swing.JPanel implements Popup
GroupLayout
layout
=
new
GroupLayout
(
this
);
this
.
setLayout
(
layout
);
layout
.
setHorizontalGroup
(
layout
.
createParallelGroup
(
Alignment
.
LEADING
)
layout
.
setHorizontalGroup
(
layout
.
createParallelGroup
(
Alignment
.
LEADING
)
.
addGroup
(
layout
.
createSequentialGroup
()
.
addContainerGap
()
.
addGroup
(
layout
.
createParallelGroup
(
Alignment
.
LEADING
)
...
...
@@ -338,24 +337,22 @@ public class InspectAndRefactorPanel extends javax.swing.JPanel implements Popup
.
addPreferredGap
(
ComponentPlacement
.
RELATED
)
.
addGroup
(
layout
.
createParallelGroup
(
Alignment
.
LEADING
)
.
addGroup
(
layout
.
createSequentialGroup
()
.
addGroup
(
layout
.
createParallelGroup
(
Alignment
.
LEADING
)
.
addComponent
(
configurationRadio
)
.
addComponent
(
singleRefactorRadio
))
.
addComponent
(
singleRefactorRadio
)
.
addPreferredGap
(
ComponentPlacement
.
RELATED
)
.
addGroup
(
layout
.
createParallelGroup
(
Alignment
.
LEADING
)
.
addComponent
(
singleRefactoringCombo
,
0
,
196
,
Short
.
MAX_VALUE
)
.
addComponent
(
configurationCombo
,
0
,
196
,
Short
.
MAX_VALUE
)))
.
addComponent
(
scopeCombo
,
Alignment
.
TRAILING
,
0
,
346
,
Short
.
MAX_VALUE
))
.
addComponent
(
singleRefactoringCombo
,
0
,
GroupLayout
.
DEFAULT_SIZE
,
Short
.
MAX_VALUE
))
.
addGroup
(
layout
.
createSequentialGroup
()
.
addComponent
(
configurationRadio
)
.
addGap
(
25
,
25
,
25
)
.
addComponent
(
configurationCombo
,
0
,
242
,
Short
.
MAX_VALUE
))
.
addComponent
(
scopeCombo
,
Alignment
.
TRAILING
,
0
,
377
,
Short
.
MAX_VALUE
))
.
addPreferredGap
(
ComponentPlacement
.
UNRELATED
)
.
addGroup
(
layout
.
createParallelGroup
(
Alignment
.
LEADING
)
.
addGroup
(
layout
.
createParallelGroup
(
Alignment
.
LEADING
,
false
)
.
addComponent
(
manageSingleRefactoring
,
Alignment
.
TRAILING
,
GroupLayout
.
DEFAULT_SIZE
,
GroupLayout
.
DEFAULT_SIZE
,
Short
.
MAX_VALUE
)
.
addComponent
(
manageConfigurations
,
Alignment
.
TRAILING
,
GroupLayout
.
DEFAULT_SIZE
,
GroupLayout
.
DEFAULT_SIZE
,
Short
.
MAX_VALUE
))
.
addComponent
(
customScopeButton
))
.
addGroup
(
layout
.
createParallelGroup
(
Alignment
.
LEADING
,
false
)
.
addComponent
(
manageConfigurations
,
GroupLayout
.
DEFAULT_SIZE
,
GroupLayout
.
DEFAULT_SIZE
,
Short
.
MAX_VALUE
)
.
addComponent
(
customScopeButton
)
.
addComponent
(
manageSingleRefactoring
,
GroupLayout
.
DEFAULT_SIZE
,
GroupLayout
.
DEFAULT_SIZE
,
Short
.
MAX_VALUE
))
.
addContainerGap
())
);
layout
.
setVerticalGroup
(
layout
.
createParallelGroup
(
Alignment
.
LEADING
)
layout
.
setVerticalGroup
(
layout
.
createParallelGroup
(
Alignment
.
LEADING
)
.
addGroup
(
layout
.
createSequentialGroup
()
.
addContainerGap
()
.
addGroup
(
layout
.
createParallelGroup
(
Alignment
.
BASELINE
)
...
...
@@ -368,11 +365,12 @@ public class InspectAndRefactorPanel extends javax.swing.JPanel implements Popup
.
addComponent
(
configurationCombo
,
GroupLayout
.
PREFERRED_SIZE
,
GroupLayout
.
DEFAULT_SIZE
,
GroupLayout
.
PREFERRED_SIZE
)
.
addComponent
(
manageConfigurations
)
.
addComponent
(
refactorUsingLabel
))
.
add
Gap
(
1
,
1
,
1
)
.
add
PreferredGap
(
ComponentPlacement
.
UNRELATED
)
.
addGroup
(
layout
.
createParallelGroup
(
Alignment
.
BASELINE
)
.
addComponent
(
singleRefactorRadio
)
.
addComponent
(
singleRefactoringCombo
,
GroupLayout
.
PREFERRED_SIZE
,
GroupLayout
.
DEFAULT_SIZE
,
GroupLayout
.
PREFERRED_SIZE
)
.
addComponent
(
manageSingleRefactoring
)
.
addCo
mponent
(
singleRefactorRadio
)
))
.
addComponent
(
manageSingleRefactoring
)
)
.
addCo
ntainerGap
(
GroupLayout
.
DEFAULT_SIZE
,
Short
.
MAX_VALUE
))
);
}
// </editor-fold>//GEN-END:initComponents
...
...
java/java.hints/src/org/netbeans/modules/java/hints/WrongStringComparisonCustomizer.form
View file @
d77f0692
...
...
@@ -45,8 +45,8 @@
<Group
type=
"102"
attributes=
"0"
>
<EmptySpace
max=
"-2"
attributes=
"0"
/>
<Group
type=
"103"
groupAlignment=
"0"
attributes=
"0"
>
<Component
id=
"ternaryNullCheck"
alignment=
"0"
min=
"-2"
pref=
"346"
max=
"-2"
attributes=
"0"
/>
<Component
id=
"stringLiteralsFirst"
alignment=
"0"
min=
"-2"
pref=
"3
46
"
max=
"-2"
attributes=
"0"
/>
<Component
id=
"ternaryNullCheck"
alignment=
"0"
min=
"-2"
max=
"-2"
attributes=
"0"
/>
<Component
id=
"stringLiteralsFirst"
alignment=
"0"
min=
"-2"
pref=
"3
15
"
max=
"-2"
attributes=
"0"
/>
</Group>
<EmptySpace
max=
"32767"
attributes=
"0"
/>
</Group>
...
...
@@ -56,9 +56,9 @@
<Group
type=
"103"
groupAlignment=
"0"
attributes=
"0"
>
<Group
type=
"102"
alignment=
"0"
attributes=
"0"
>
<EmptySpace
max=
"-2"
attributes=
"0"
/>
<Component
id=
"ternaryNullCheck"
min=
"-2"
pref=
"
30
"
max=
"-2"
attributes=
"0"
/>
<Component
id=
"ternaryNullCheck"
min=
"-2"
pref=
"
24
"
max=
"-2"
attributes=
"0"
/>
<EmptySpace
type=
"unrelated"
max=
"-2"
attributes=
"0"
/>
<Component
id=
"stringLiteralsFirst"
min=
"-2"
pref=
"30"
max=
"-2"
attributes=
"0"
/>
<Component
id=
"stringLiteralsFirst"
min=
"-2"
max=
"-2"
attributes=
"0"
/>
<EmptySpace
max=
"32767"
attributes=
"0"
/>
</Group>
</Group>
...
...
java/java.hints/src/org/netbeans/modules/java/hints/WrongStringComparisonCustomizer.java
View file @
d77f0692
...
...
@@ -29,7 +29,7 @@ import java.util.prefs.Preferences;
*/
public
class
WrongStringComparisonCustomizer
extends
javax
.
swing
.
JPanel
{
private
Preferences
p
;
private
final
Preferences
p
;
/** Creates new customizer WrongStringComparisonCustomizer */
public
WrongStringComparisonCustomizer
(
Preferences
p
)
{
...
...
@@ -73,17 +73,17 @@ public class WrongStringComparisonCustomizer extends javax.swing.JPanel {
.
addGroup
(
layout
.
createSequentialGroup
()
.
addContainerGap
()
.
addGroup
(
layout
.
createParallelGroup
(
javax
.
swing
.
GroupLayout
.
Alignment
.
LEADING
)
.
addComponent
(
ternaryNullCheck
,
javax
.
swing
.
GroupLayout
.
PREFERRED_SIZE
,
346
,
javax
.
swing
.
GroupLayout
.
PREFERRED_SIZE
)
.
addComponent
(
stringLiteralsFirst
,
javax
.
swing
.
GroupLayout
.
PREFERRED_SIZE
,
3
46
,
javax
.
swing
.
GroupLayout
.
PREFERRED_SIZE
))
.
addComponent
(
ternaryNullCheck
)
.
addComponent
(
stringLiteralsFirst
,
javax
.
swing
.
GroupLayout
.
PREFERRED_SIZE
,
3
15
,
javax
.
swing
.
GroupLayout
.
PREFERRED_SIZE
))
.
addContainerGap
(
javax
.
swing
.
GroupLayout
.
DEFAULT_SIZE
,
Short
.
MAX_VALUE
))
);
layout
.
setVerticalGroup
(
layout
.
createParallelGroup
(
javax
.
swing
.
GroupLayout
.
Alignment
.
LEADING
)
.
addGroup
(
layout
.
createSequentialGroup
()
.
addContainerGap
()
.
addComponent
(
ternaryNullCheck
,
javax
.
swing
.
GroupLayout
.
PREFERRED_SIZE
,
30
,
javax
.
swing
.
GroupLayout
.
PREFERRED_SIZE
)
.
addComponent
(
ternaryNullCheck
,
javax
.
swing
.
GroupLayout
.
PREFERRED_SIZE
,
24
,
javax
.
swing
.
GroupLayout
.
PREFERRED_SIZE
)
.
addPreferredGap
(
javax
.
swing
.
LayoutStyle
.
ComponentPlacement
.
UNRELATED
)
.
addComponent
(
stringLiteralsFirst
,
javax
.
swing
.
GroupLayout
.
PREFERRED_SIZE
,
30
,
javax
.
swing
.
GroupLayout
.
PREFERRED_SIZE
)
.
addComponent
(
stringLiteralsFirst
)
.
addContainerGap
(
javax
.
swing
.
GroupLayout
.
DEFAULT_SIZE
,
Short
.
MAX_VALUE
))
);
...
...
java/java.hints/src/org/netbeans/modules/java/hints/errors/FinalFieldsFromCtorCustomiser.form