This is an automated email from the ASF dual-hosted git repository.
ehsavoie 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 4b15499490 some small UI fixes for the Wildfly/TomEE settings windows.
new efe2ec968a Merge pull request #5608 from mbien/server-settings-ui-fixes
4b15499490 is described below
commit 4b154994900ff0da5a4d1018929307544afad1db
Author: Michael Bien <[email protected]>
AuthorDate: Sun Mar 5 00:14:35 2023 +0100
some small UI fixes for the Wildfly/TomEE settings windows.
- consistent gaps/margins etc
- wildfly settings panel had two tabs with the same name
---
.../javaee/wildfly/customizer/Bundle.properties | 2 +
.../javaee/wildfly/customizer/Customizer.java | 9 +--
.../wildfly/customizer/WildflyTabVisualPanel.form | 70 +++++++++++-------
.../wildfly/customizer/WildflyTabVisualPanel.java | 84 +++++++++++-----------
.../modules/tomcat5/customizer/Customizer.java | 1 -
.../modules/tomcat5/customizer/CustomizerJVM.form | 27 +++----
.../modules/tomcat5/customizer/CustomizerJVM.java | 11 ++-
7 files changed, 102 insertions(+), 102 deletions(-)
diff --git
a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/Bundle.properties
b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/Bundle.properties
index f1ba07fee7..37c117d893 100644
---
a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/Bundle.properties
+++
b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/Bundle.properties
@@ -19,6 +19,8 @@
TXT_Tab_Classes=Classes
TXT_Tab_Sources=Sources
TXT_Tab_Javadoc=Javadoc
+TXT_Tab_Platform=Platform
+TXT_Tab_Common=Common
TXT_JVM=&Java Platform\:
TXT_ManagePlatforms=&Manage Platforms...
diff --git
a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/Customizer.java
b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/Customizer.java
index 8fc181a9f1..3d322c9759 100644
---
a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/Customizer.java
+++
b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/Customizer.java
@@ -25,7 +25,6 @@ import javax.swing.JTabbedPane;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import org.openide.util.NbBundle;
-import org.netbeans.modules.j2ee.deployment.common.api.J2eeLibraryTypeProvider;
import org.netbeans.modules.j2ee.deployment.plugins.spi.J2eePlatformImpl;
@@ -36,10 +35,6 @@ import
org.netbeans.modules.j2ee.deployment.plugins.spi.J2eePlatformImpl;
*/
public class Customizer extends JTabbedPane {
- private static final String CLASSPATH =
J2eeLibraryTypeProvider.VOLUME_TYPE_CLASSPATH;
- private static final String SOURCES =
J2eeLibraryTypeProvider.VOLUME_TYPE_SRC;
- private static final String JAVADOC =
J2eeLibraryTypeProvider.VOLUME_TYPE_JAVADOC;
-
private final J2eePlatformImpl platform;
private final CustomizerDataSupport custData;
private final DeploymentManager dmp;
@@ -75,8 +70,8 @@ public class Customizer extends JTabbedPane {
putClientProperty("HelpID", helpID); // NOI18N
}
});
- addTab(NbBundle.getMessage(Customizer.class,"TXT_Platform"), new
WildflyTabVisualPanel(this.dmp));
- addTab(NbBundle.getMessage(Customizer.class,"TXT_Platform"), new
CustomizerJVM(custData));
+ addTab(NbBundle.getMessage(Customizer.class,"TXT_Tab_Common"), new
WildflyTabVisualPanel(this.dmp));
+ addTab(NbBundle.getMessage(Customizer.class,"TXT_Tab_Platform"), new
CustomizerJVM(custData));
addTab(NbBundle.getMessage(Customizer.class,"TXT_Tab_Classes"),
CustomizerSupport.createClassesCustomizer(custData.getClassModel()));
addTab(NbBundle.getMessage(Customizer.class,"TXT_Tab_Sources"),
diff --git
a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/WildflyTabVisualPanel.form
b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/WildflyTabVisualPanel.form
index 11996c0f49..89d21669dd 100644
---
a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/WildflyTabVisualPanel.form
+++
b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/WildflyTabVisualPanel.form
@@ -28,13 +28,54 @@
<AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean"
value="true"/>
<AuxValue name="FormSettings_generateMnemonicsCode"
type="java.lang.Boolean" value="false"/>
<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,0,93,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">
+ <Group type="102" attributes="0">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Component id="spaceHack" min="-2" max="-2" attributes="0"/>
+ <Group type="102" attributes="0">
+ <EmptySpace max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Group type="102" alignment="0" attributes="0">
+ <Component id="parentDirectoryLabel" min="-2"
max="-2" attributes="0"/>
+ <EmptySpace min="-2" max="-2" attributes="0"/>
+ <Component id="configFile" pref="187"
max="32767" attributes="0"/>
+ <EmptySpace min="-2" max="-2" attributes="0"/>
+ <Component id="openInstanceDirectorySelector"
min="-2" max="-2" attributes="0"/>
+ <EmptySpace min="12" pref="12" max="-2"
attributes="0"/>
+ </Group>
+ <Component id="description" alignment="0" min="-2"
pref="400" max="-2" attributes="0"/>
+ </Group>
+ </Group>
+ </Group>
+ <EmptySpace max="-2" attributes="0"/>
+ </Group>
+ </Group>
+ </DimensionLayout>
+ <DimensionLayout dim="1">
+ <Group type="103" groupAlignment="0" attributes="0">
+ <Group type="102" attributes="0">
+ <Component id="spaceHack" min="-2" max="-2" attributes="0"/>
+ <EmptySpace type="unrelated" max="-2" attributes="0"/>
+ <Component id="description" min="-2" max="-2" attributes="0"/>
+ <EmptySpace type="unrelated" max="-2" attributes="0"/>
+ <Group type="103" groupAlignment="3" attributes="0">
+ <Component id="parentDirectoryLabel" alignment="3" min="-2"
pref="23" max="-2" attributes="0"/>
+ <Component id="configFile" alignment="3" min="-2" max="-2"
attributes="0"/>
+ <Component id="openInstanceDirectorySelector" alignment="3"
min="-2" max="-2" attributes="0"/>
+ </Group>
+ <EmptySpace max="32767" attributes="0"/>
+ </Group>
+ </Group>
+ </DimensionLayout>
+ </Layout>
<SubComponents>
<Component class="javax.swing.JLabel" name="description">
<Properties>
@@ -44,11 +85,6 @@
<Property name="enabled" type="boolean" value="false"/>
<Property name="focusable" type="boolean" value="false"/>
</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="4" gridHeight="2"
fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="5"
insetsRight="0" anchor="10" weightX="1.0" weightY="0.0"/>
- </Constraint>
- </Constraints>
</Component>
<Component class="javax.swing.JLabel" name="parentDirectoryLabel">
<Properties>
@@ -62,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="1" ipadX="0" ipadY="0" insetsTop="5" insetsLeft="0" insetsBottom="6"
insetsRight="6" anchor="10" weightX="0.0" weightY="0.0"/>
- </Constraint>
- </Constraints>
</Component>
<Component class="javax.swing.JTextField" name="configFile">
<AccessibilityProperties>
@@ -74,11 +105,6 @@
<ResourceString
bundle="org/netbeans/modules/javaee/wildfly/customizer/Bundle.properties"
key="DSC_instanceDirectory"
replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}")"/>
</Property>
</AccessibilityProperties>
- <Constraints>
- <Constraint
layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"
value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="1" gridY="2" gridWidth="2" gridHeight="1"
fill="2" ipadX="0" ipadY="0" insetsTop="5" insetsLeft="6" insetsBottom="6"
insetsRight="6" anchor="10" weightX="1.0" weightY="0.0"/>
- </Constraint>
- </Constraints>
</Component>
<Component class="javax.swing.JButton"
name="openInstanceDirectorySelector">
<Properties>
@@ -97,22 +123,12 @@
<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="3" gridY="2" gridWidth="1" gridHeight="1"
fill="2" ipadX="0" ipadY="0" insetsTop="5" insetsLeft="6" insetsBottom="6"
insetsRight="0" anchor="10" weightX="0.0" weightY="0.0"/>
- </Constraint>
- </Constraints>
</Component>
<Component class="javax.swing.JLabel" name="spaceHack">
<Properties>
<Property name="enabled" type="boolean" value="false"/>
<Property name="focusable" type="boolean" value="false"/>
</Properties>
- <Constraints>
- <Constraint
layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"
value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
- <GridBagConstraints gridX="0" gridY="4" gridWidth="1" gridHeight="1"
fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0"
insetsRight="0" anchor="10" weightX="0.0" weightY="1.0"/>
- </Constraint>
- </Constraints>
</Component>
</SubComponents>
</Form>
diff --git
a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/WildflyTabVisualPanel.java
b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/WildflyTabVisualPanel.java
index e82c0d54a7..2c5e8275c6 100644
---
a/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/WildflyTabVisualPanel.java
+++
b/enterprise/javaee.wildfly/src/org/netbeans/modules/javaee/wildfly/customizer/WildflyTabVisualPanel.java
@@ -85,7 +85,7 @@ public final class WildflyTabVisualPanel extends JPanel {
// Event handling
//
- private final Set/*<ChangeListener>*/ listeners = new
HashSet/*<ChangeListener>*/(1);
+ private final Set<ChangeListener> listeners = new HashSet<>(1);
public final void addChangeListener(ChangeListener l) {
synchronized (listeners) {
listeners.add(l);
@@ -97,13 +97,13 @@ public final class WildflyTabVisualPanel extends JPanel {
}
}
protected final void fireChangeEvent() {
- Iterator/*<ChangeListener>*/ it;
+ Iterator<ChangeListener> it;
synchronized (listeners) {
- it = new HashSet/*<ChangeListener>*/(listeners).iterator();
+ it = new HashSet<>(listeners).iterator();
}
ChangeEvent ev = new ChangeEvent(this);
while (it.hasNext()) {
- ((ChangeListener)it.next()).stateChanged(ev);
+ it.next().stateChanged(ev);
}
}
@@ -177,7 +177,6 @@ public final class WildflyTabVisualPanel extends JPanel {
*/
// <editor-fold defaultstate="collapsed" desc="Generated
Code">//GEN-BEGIN:initComponents
private void initComponents() {
- java.awt.GridBagConstraints gridBagConstraints;
description = new javax.swing.JLabel();
parentDirectoryLabel = new javax.swing.JLabel();
@@ -185,39 +184,13 @@ public final class WildflyTabVisualPanel extends JPanel {
openInstanceDirectorySelector = new javax.swing.JButton();
spaceHack = new javax.swing.JLabel();
- setLayout(new java.awt.GridBagLayout());
-
java.util.ResourceBundle bundle =
java.util.ResourceBundle.getBundle("org/netbeans/modules/javaee/wildfly/customizer/Bundle");
// NOI18N
description.setText(bundle.getString("TXT_instanceDirectoryDescription2")); //
NOI18N
description.setEnabled(false);
description.setFocusable(false);
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 0;
- gridBagConstraints.gridwidth = 4;
- gridBagConstraints.gridheight = 2;
- gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
- gridBagConstraints.weightx = 1.0;
- gridBagConstraints.insets = new java.awt.Insets(0, 0, 5, 0);
- add(description, gridBagConstraints);
parentDirectoryLabel.setLabelFor(configFile);
org.openide.awt.Mnemonics.setLocalizedText(parentDirectoryLabel,
org.openide.util.NbBundle.getMessage(WildflyTabVisualPanel.class,
"LBL_ParentFolder")); // NOI18N
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 2;
- gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
- gridBagConstraints.insets = new java.awt.Insets(5, 0, 6, 6);
- add(parentDirectoryLabel, gridBagConstraints);
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 1;
- gridBagConstraints.gridy = 2;
- gridBagConstraints.gridwidth = 2;
- gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
- gridBagConstraints.weightx = 1.0;
- gridBagConstraints.insets = new java.awt.Insets(5, 6, 6, 6);
- add(configFile, gridBagConstraints);
-
configFile.getAccessibleContext().setAccessibleDescription(bundle.getString("DSC_instanceDirectory"));
// NOI18N
org.openide.awt.Mnemonics.setLocalizedText(openInstanceDirectorySelector,
org.openide.util.NbBundle.getMessage(WildflyTabVisualPanel.class,
"LBL_openInstanceDirectorySelector")); // NOI18N
openInstanceDirectorySelector.addActionListener(new
java.awt.event.ActionListener() {
@@ -225,21 +198,46 @@ public final class WildflyTabVisualPanel extends JPanel {
openInstanceDirectorySelectorActionPerformed(evt);
}
});
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 3;
- gridBagConstraints.gridy = 2;
- gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
- gridBagConstraints.insets = new java.awt.Insets(5, 6, 6, 0);
- add(openInstanceDirectorySelector, gridBagConstraints);
-
openInstanceDirectorySelector.getAccessibleContext().setAccessibleDescription(bundle.getString("DSC_openInstanceDirectorySelector"));
// NOI18N
spaceHack.setEnabled(false);
spaceHack.setFocusable(false);
- gridBagConstraints = new java.awt.GridBagConstraints();
- gridBagConstraints.gridx = 0;
- gridBagConstraints.gridy = 4;
- gridBagConstraints.weighty = 1.0;
- add(spaceHack, gridBagConstraints);
+
+ javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
+ this.setLayout(layout);
+ layout.setHorizontalGroup(
+
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(spaceHack)
+ .addGroup(layout.createSequentialGroup()
+ .addContainerGap()
+
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(parentDirectoryLabel)
+
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(configFile,
javax.swing.GroupLayout.DEFAULT_SIZE, 187, Short.MAX_VALUE)
+
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(openInstanceDirectorySelector)
+ .addGap(12, 12, 12))
+ .addComponent(description,
javax.swing.GroupLayout.PREFERRED_SIZE, 400,
javax.swing.GroupLayout.PREFERRED_SIZE))))
+ .addContainerGap())
+ );
+ layout.setVerticalGroup(
+
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(spaceHack)
+
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addComponent(description)
+
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(parentDirectoryLabel,
javax.swing.GroupLayout.PREFERRED_SIZE, 23,
javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(configFile,
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE,
javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(openInstanceDirectorySelector))
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE,
Short.MAX_VALUE))
+ );
+
+
configFile.getAccessibleContext().setAccessibleDescription(bundle.getString("DSC_instanceDirectory"));
// NOI18N
+
openInstanceDirectorySelector.getAccessibleContext().setAccessibleDescription(bundle.getString("DSC_openInstanceDirectorySelector"));
// NOI18N
}// </editor-fold>//GEN-END:initComponents
private void
openInstanceDirectorySelectorActionPerformed(java.awt.event.ActionEvent evt)
{//GEN-FIRST:event_openInstanceDirectorySelectorActionPerformed
diff --git
a/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/customizer/Customizer.java
b/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/customizer/Customizer.java
index e12effedb1..abe1d91faa 100644
---
a/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/customizer/Customizer.java
+++
b/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/customizer/Customizer.java
@@ -20,7 +20,6 @@ package org.netbeans.modules.tomcat5.customizer;
import javax.swing.JTabbedPane;
import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
import org.openide.util.NbBundle;
import org.netbeans.modules.tomcat5.deploy.TomcatManager;
diff --git
a/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/customizer/CustomizerJVM.form
b/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/customizer/CustomizerJVM.form
index dfb59158cd..92bb841e2f 100644
---
a/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/customizer/CustomizerJVM.form
+++
b/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/customizer/CustomizerJVM.form
@@ -21,9 +21,11 @@
-->
-<Form version="1.2" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
+<Form version="1.2" maxVersion="1.2"
type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
<AuxValues>
<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer"
value="0"/>
+ <AuxValue name="FormSettings_autoSetComponentName"
type="java.lang.Boolean" value="false"/>
+ <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_listenerGenerationStyle"
type="java.lang.Integer" value="0"/>
@@ -106,13 +108,12 @@
</Component>
<Component class="javax.swing.JCheckBox" name="jCheckBox1">
<Properties>
- <Property name="text" type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString
bundle="org/netbeans/modules/tomcat5/customizer/Bundle.properties"
key="TXT_SecurityMan"
replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class,
"{key}")"/>
- </Property>
- <Property name="iconTextGap" type="int" value="5"/>
<Property name="model" type="javax.swing.ButtonModel"
editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="custData.getSecManagerModel()" type="code"/>
</Property>
+ <Property name="text" type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString
bundle="org/netbeans/modules/tomcat5/customizer/Bundle.properties"
key="TXT_SecurityMan"
replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class,
"{key}")"/>
+ </Property>
</Properties>
<AccessibilityProperties>
<Property name="AccessibleContext.accessibleName"
type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
@@ -209,20 +210,12 @@
</Component>
<Component class="javax.swing.JCheckBox" name="proxyCheckBox">
<Properties>
- <Property name="text" type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
- <ResourceString
bundle="org/netbeans/modules/tomcat5/customizer/Bundle.properties"
key="LBL_HttpProxy"
replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class,
"{key}", {arguments})"/>
- </Property>
- <Property name="border" type="javax.swing.border.Border"
editor="org.netbeans.modules.form.editors2.BorderEditor">
- <Border
info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">
- <EmptyBorder bottom="0" left="0" right="0" top="0"/>
- </Border>
- </Property>
- <Property name="margin" type="java.awt.Insets"
editor="org.netbeans.beaninfo.editors.InsetsEditor">
- <Insets value="[0, 0, 0, 0]"/>
- </Property>
<Property name="model" type="javax.swing.ButtonModel"
editor="org.netbeans.modules.form.RADConnectionPropertyEditor">
<Connection code="custData.getProxyModel()" type="code"/>
</Property>
+ <Property name="text" type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
+ <ResourceString
bundle="org/netbeans/modules/tomcat5/customizer/Bundle.properties"
key="LBL_HttpProxy"
replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class,
"{key}", {arguments})"/>
+ </Property>
</Properties>
<AccessibilityProperties>
<Property name="AccessibleContext.accessibleName"
type="java.lang.String"
editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
@@ -234,7 +227,7 @@
</AccessibilityProperties>
<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="0"
gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="11" insetsLeft="12"
insetsBottom="0" insetsRight="0" anchor="18" weightX="1.0" weightY="0.0"/>
+ <GridBagConstraints gridX="0" gridY="3" gridWidth="0"
gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="5" insetsLeft="8"
insetsBottom="0" insetsRight="0" anchor="18" weightX="1.0" weightY="0.0"/>
</Constraint>
</Constraints>
</Component>
diff --git
a/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/customizer/CustomizerJVM.java
b/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/customizer/CustomizerJVM.java
index 347338d32f..720aa8d3d4 100644
---
a/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/customizer/CustomizerJVM.java
+++
b/enterprise/tomcat5/src/org/netbeans/modules/tomcat5/customizer/CustomizerJVM.java
@@ -49,7 +49,7 @@ public class CustomizerJVM extends javax.swing.JPanel {
* WARNING: Do NOT modify this code. The content of this method is
* always regenerated by the Form Editor.
*/
- // <editor-fold defaultstate="collapsed" desc=" Generated Code
">//GEN-BEGIN:initComponents
+ // <editor-fold defaultstate="collapsed" desc="Generated
Code">//GEN-BEGIN:initComponents
private void initComponents() {
java.awt.GridBagConstraints gridBagConstraints;
@@ -104,9 +104,8 @@ public class CustomizerJVM extends javax.swing.JPanel {
gridBagConstraints.insets = new java.awt.Insets(12, 5, 0, 0);
jPanel1.add(jvmComboBox, gridBagConstraints);
- org.openide.awt.Mnemonics.setLocalizedText(jCheckBox1,
org.openide.util.NbBundle.getMessage(CustomizerJVM.class, "TXT_SecurityMan"));
// NOI18N
- jCheckBox1.setIconTextGap(5);
jCheckBox1.setModel(custData.getSecManagerModel());
+ org.openide.awt.Mnemonics.setLocalizedText(jCheckBox1,
org.openide.util.NbBundle.getMessage(CustomizerJVM.class, "TXT_SecurityMan"));
// NOI18N
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 4;
@@ -163,17 +162,15 @@ public class CustomizerJVM extends javax.swing.JPanel {
jLabel3.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(CustomizerJVM.class,
"ASCN_Note")); // NOI18N
jLabel3.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(CustomizerJVM.class,
"ASCD_Note")); // NOI18N
- org.openide.awt.Mnemonics.setLocalizedText(proxyCheckBox,
org.openide.util.NbBundle.getMessage(CustomizerJVM.class, "LBL_HttpProxy", new
Object[] {})); // NOI18N
- proxyCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0,
0, 0, 0));
- proxyCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0));
proxyCheckBox.setModel(custData.getProxyModel());
+ org.openide.awt.Mnemonics.setLocalizedText(proxyCheckBox,
org.openide.util.NbBundle.getMessage(CustomizerJVM.class, "LBL_HttpProxy", new
Object[] {})); // NOI18N
gridBagConstraints = new java.awt.GridBagConstraints();
gridBagConstraints.gridx = 0;
gridBagConstraints.gridy = 3;
gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
gridBagConstraints.weightx = 1.0;
- gridBagConstraints.insets = new java.awt.Insets(11, 12, 0, 0);
+ gridBagConstraints.insets = new java.awt.Insets(5, 8, 0, 0);
jPanel1.add(proxyCheckBox, gridBagConstraints);
proxyCheckBox.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(CustomizerJVM.class,
"ACCSName_HttpProxy", new Object[] {})); // NOI18N
proxyCheckBox.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(CustomizerJVM.class,
"ACCSDesc_HttpProxy", new Object[] {})); // NOI18N
---------------------------------------------------------------------
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
