This is an automated email from the ASF dual-hosted git repository.
mbien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 9182094bbf Layout fixes for the project problems warning dialog.
new 659aa5ced2 Merge pull request #6575 from
mbien/tweak-project-problems-dialog-ui
9182094bbf is described below
commit 9182094bbfe0547095687633cb8af549abca107d
Author: Michael Bien <[email protected]>
AuthorDate: Mon Oct 16 17:55:56 2023 +0200
Layout fixes for the project problems warning dialog.
---
.../ui/problems/BrokenReferencesAlertPanel.form | 63 ++++++++++----------
.../ui/problems/BrokenReferencesAlertPanel.java | 68 ++++++++--------------
2 files changed, 56 insertions(+), 75 deletions(-)
diff --git
a/ide/projectui/src/org/netbeans/modules/project/ui/problems/BrokenReferencesAlertPanel.form
b/ide/projectui/src/org/netbeans/modules/project/ui/problems/BrokenReferencesAlertPanel.form
index 089a38b371..9d12e743ce 100644
---
a/ide/projectui/src/org/netbeans/modules/project/ui/problems/BrokenReferencesAlertPanel.form
+++
b/ide/projectui/src/org/netbeans/modules/project/ui/problems/BrokenReferencesAlertPanel.form
@@ -36,25 +36,44 @@
<AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean"
value="true"/>
<AuxValue name="FormSettings_generateMnemonicsCode"
type="java.lang.Boolean" value="true"/>
<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean"
value="false"/>
+ <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer"
value="1"/>
<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,44,0,0,1,-112"/>
</AuxValues>
- <Layout
class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
+ <Layout>
+ <DimensionLayout dim="0">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Component id="message" alignment="0" max="32767" attributes="0"/>
+ <Component id="problemLabel" min="-2" max="-2" attributes="0"/>
+ <Component id="notAgain" alignment="0" min="-2" max="-2"
attributes="0"/>
+ </Group>
+ </DimensionLayout>
+ <DimensionLayout dim="1">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Group type="102" attributes="0">
+ <Component id="problemLabel" min="-2" max="-2" attributes="0"/>
+ <EmptySpace type="unrelated" min="-2" max="-2" attributes="0"/>
+ <Component id="message" max="32767" attributes="0"/>
+ <EmptySpace type="separate" max="-2" attributes="0"/>
+ <Component id="notAgain" min="-2" max="-2" attributes="0"/>
+ <EmptySpace min="-2" max="-2" attributes="0"/>
+ </Group>
+ </Group>
+ </DimensionLayout>
+ </Layout>
<SubComponents>
- <Component class="javax.swing.JLabel" name="jLabel1">
+ <Component class="javax.swing.JLabel" name="problemLabel">
<Properties>
<Property name="text" type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString
bundle="org/netbeans/modules/project/ui/problems/Bundle.properties"
key="MSG_Broken_References_Label"
replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}")"/>
</Property>
</Properties>
- <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="2" ipadX="0" ipadY="0" insetsTop="11" insetsLeft="11" insetsBottom="0"
insetsRight="0" anchor="18" weightX="0.0" weightY="0.0"/>
- </Constraint>
- </Constraints>
+ <AuxValues>
+ <AuxValue name="JavaCodeGenerator_VariableLocal"
type="java.lang.Boolean" value="true"/>
+ <AuxValue name="JavaCodeGenerator_VariableModifier"
type="java.lang.Integer" value="0"/>
+ </AuxValues>
</Component>
<Component class="javax.swing.JCheckBox" name="notAgain">
<Properties>
@@ -79,11 +98,6 @@
<AuxValues>
<AuxValue name="generateMnemonicsCode" type="java.lang.Boolean"
value="true"/>
</AuxValues>
- <Constraints>
- <Constraint
layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"
value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="2" gridWidth="1" gridHeight="1"
fill="2" ipadX="0" ipadY="0" insetsTop="6" insetsLeft="11" insetsBottom="0"
insetsRight="0" anchor="18" weightX="0.0" weightY="0.0"/>
- </Constraint>
- </Constraints>
</Component>
<Component class="javax.swing.JLabel" name="message">
<Properties>
@@ -91,25 +105,10 @@
<ResourceString
bundle="org/netbeans/modules/java/project/Bundle.properties"
key="MSG_Broken_References"
replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class,
"{key}")"/>
</Property>
</Properties>
- <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="1" ipadX="0" ipadY="0" insetsTop="6" insetsLeft="11" insetsBottom="0"
insetsRight="0" anchor="18" weightX="1.0" weightY="0.0"/>
- </Constraint>
- </Constraints>
+ <AuxValues>
+ <AuxValue name="JavaCodeGenerator_VariableLocal"
type="java.lang.Boolean" value="true"/>
+ <AuxValue name="JavaCodeGenerator_VariableModifier"
type="java.lang.Integer" value="0"/>
+ </AuxValues>
</Component>
- <Container class="javax.swing.JPanel" name="jPanel1">
- <Properties>
- <Property name="minimumSize" type="java.awt.Dimension"
editor="org.netbeans.beaninfo.editors.DimensionEditor">
- <Dimension value="[0, 0]"/>
- </Property>
- </Properties>
- <Constraints>
- <Constraint
layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"
value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="3" gridWidth="1" gridHeight="1"
fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0"
insetsRight="0" anchor="10" weightX="1.0" weightY="1.0"/>
- </Constraint>
- </Constraints>
-
- <Layout
class="org.netbeans.modules.form.compat2.layouts.DesignFlowLayout"/>
- </Container>
</SubComponents>
</Form>
diff --git
a/ide/projectui/src/org/netbeans/modules/project/ui/problems/BrokenReferencesAlertPanel.java
b/ide/projectui/src/org/netbeans/modules/project/ui/problems/BrokenReferencesAlertPanel.java
index 758e87b4be..448fd72016 100644
---
a/ide/projectui/src/org/netbeans/modules/project/ui/problems/BrokenReferencesAlertPanel.java
+++
b/ide/projectui/src/org/netbeans/modules/project/ui/problems/BrokenReferencesAlertPanel.java
@@ -35,24 +35,13 @@ public class BrokenReferencesAlertPanel extends JPanel {
*/
// <editor-fold defaultstate="collapsed" desc="Generated
Code">//GEN-BEGIN:initComponents
private void initComponents() {
- java.awt.GridBagConstraints gridBagConstraints;
- jLabel1 = new javax.swing.JLabel();
+ javax.swing.JLabel problemLabel = new javax.swing.JLabel();
notAgain = new javax.swing.JCheckBox();
- message = new javax.swing.JLabel();
- jPanel1 = new javax.swing.JPanel();
-
- setLayout(new java.awt.GridBagLayout());
+ javax.swing.JLabel message = new javax.swing.JLabel();
java.util.ResourceBundle bundle =
java.util.ResourceBundle.getBundle("org/netbeans/modules/project/ui/problems/Bundle");
// NOI18N
- org.openide.awt.Mnemonics.setLocalizedText(jLabel1,
bundle.getString("MSG_Broken_References_Label")); // NOI18N
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 0;
- gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
- gridBagConstraints.insets = new java.awt.Insets(11, 11, 0, 0);
- add(jLabel1, gridBagConstraints);
+ org.openide.awt.Mnemonics.setLocalizedText(problemLabel,
bundle.getString("MSG_Broken_References_Label")); // NOI18N
org.openide.awt.Mnemonics.setLocalizedText(notAgain,
org.openide.util.NbBundle.getMessage(BrokenReferencesAlertPanel.class,
"MSG_BrokenReferencesAlertPanel_notAgain")); // NOI18N
notAgain.setMargin(new java.awt.Insets(0, 0, 0, 0));
@@ -61,34 +50,30 @@ public class BrokenReferencesAlertPanel extends JPanel {
notAgainActionPerformed(evt);
}
});
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 2;
- gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
- gridBagConstraints.insets = new java.awt.Insets(6, 11, 0, 0);
- add(notAgain, gridBagConstraints);
-
notAgain.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(BrokenReferencesAlertPanel.class,
"ACSN_BrokenReferencesAlertPanel_notAgain")); // NOI18N
-
notAgain.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(BrokenReferencesAlertPanel.class,
"ACSD_BrokenReferencesAlertPanel_notAgain")); // NOI18N
org.openide.awt.Mnemonics.setLocalizedText(message,
org.openide.util.NbBundle.getMessage(BrokenReferencesAlertPanel.class,
"MSG_Broken_References")); // NOI18N
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 1;
- gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
- gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
- gridBagConstraints.weightx = 1.0;
- gridBagConstraints.insets = new java.awt.Insets(6, 11, 0, 0);
- add(message, gridBagConstraints);
-
- jPanel1.setMinimumSize(new java.awt.Dimension(0, 0));
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 3;
- gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
- gridBagConstraints.weightx = 1.0;
- gridBagConstraints.weighty = 1.0;
- add(jPanel1, gridBagConstraints);
+
+ javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
+ this.setLayout(layout);
+ layout.setHorizontalGroup(
+
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(message, javax.swing.GroupLayout.DEFAULT_SIZE,
javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(problemLabel,
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(notAgain)
+ );
+ layout.setVerticalGroup(
+
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(problemLabel,
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
javax.swing.GroupLayout.PREFERRED_SIZE)
+
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addComponent(message, javax.swing.GroupLayout.DEFAULT_SIZE,
javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addGap(18, 18, 18)
+ .addComponent(notAgain)
+ .addContainerGap())
+ );
+
+
notAgain.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(BrokenReferencesAlertPanel.class,
"ACSN_BrokenReferencesAlertPanel_notAgain")); // NOI18N
+
notAgain.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(BrokenReferencesAlertPanel.class,
"ACSD_BrokenReferencesAlertPanel_notAgain")); // NOI18N
getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(BrokenReferencesAlertPanel.class,
"ACSN_BrokenReferencesAlertPanel")); // NOI18N
getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(BrokenReferencesAlertPanel.class,
"ACSD_BrokenReferencesAlertPanel")); // NOI18N
@@ -100,9 +85,6 @@ public class BrokenReferencesAlertPanel extends JPanel {
// Variables declaration - do not modify//GEN-BEGIN:variables
- private javax.swing.JLabel jLabel1;
- private javax.swing.JPanel jPanel1;
- private javax.swing.JLabel message;
private javax.swing.JCheckBox notAgain;
// End of variables declaration//GEN-END:variables
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
