You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by cm...@apache.org on 2012/08/20 03:40:47 UTC
svn commit: r1374893 [1/5] - in
/incubator/ooo/devtools/netbeansintegration/trunk: nbproject/
src/org/openoffice/extensions/config/
src/org/openoffice/extensions/filetypes/implobject/
src/org/openoffice/extensions/filetypes/oxt/window/ src/org/openoffi...
Author: cmarcum
Date: Mon Aug 20 01:40:43 2012
New Revision: 1374893
URL: http://svn.apache.org/viewvc?rev=1374893&view=rev
Log:
changed jpanel GroupLayout from org.jdesktop.layout to javax.swing using java 1.6
Modified:
incubator/ooo/devtools/netbeansintegration/trunk/nbproject/genfiles.properties
incubator/ooo/devtools/netbeansintegration/trunk/nbproject/project.properties
incubator/ooo/devtools/netbeansintegration/trunk/nbproject/project.xml
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/ConfigurationOptionsContainer.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/ConfigurationOptionsContainer.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/ConfigurationPanel.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/ConfigurationPanel.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/LogOutputSettingsDialog.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/LogOutputSettingsDialog.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/implobject/ImplObjectTypeBrowser.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/implobject/ImplObjectTypeBrowser.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/implobject/ImplObjectVisualPanel1.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/implobject/ImplObjectVisualPanel1.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/oxt/window/OxtWindowTopComponent.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/oxt/window/OxtWindowTopComponent.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/registry_ui/RegistryVisualPanel1.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/registry_ui/RegistryVisualPanel1.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/unoidl/IdlVisualPanel1.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/unoidl/IdlVisualPanel1.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/unoidl/IdlVisualPanel2.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/unoidl/IdlVisualPanel2.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/actions/panel/EditAndOpenPanel.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/actions/panel/EditAndOpenPanel.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/actions/panel/EditTextContentPanel.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/actions/panel/EditTextContentPanel.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/actions/panel/PropsPanel.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/actions/panel/PropsPanel.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/actions/panel/SimpleEditPanel.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/actions/panel/SimpleEditPanel.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/actions/panel/VersionPanel.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/actions/panel/VersionPanel.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual1Project.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual1Project.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual2Description.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual2Description.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual3Menubar.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual3Menubar.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual4Toolbar.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/AddOnPanelVisual4Toolbar.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/dialogs/AddDeletedCommandPanel.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/addon/dialogs/AddDeletedCommandPanel.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/calcaddin/AddinPanelVisual1Project.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/calcaddin/AddinPanelVisual1Project.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/calcaddin/AddinPanelVisual2Description.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/calcaddin/AddinPanelVisual2Description.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/calcaddin/LanguageHandlingDialog.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/calcaddin/LanguageHandlingDialog.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/component/ComponentPanelVisual1Project.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/component/ComponentPanelVisual1Project.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/component/ComponentPanelVisual2IdlFiles.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/component/ComponentPanelVisual2IdlFiles.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/component/NewTypeBrowserDialog.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/component/NewTypeBrowserDialog.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/component/datamodel/types/node/ComponentInterfaceTypeCustomEditor.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/component/datamodel/types/node/ComponentInterfaceTypeCustomEditor.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/component/datamodel/types/node/ComponentTypeCustomEditor.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/component/datamodel/types/node/ComponentTypeCustomEditor.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/component/datamodel/types/node/NewTemplateTypesDialog.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/component/datamodel/types/node/NewTemplateTypesDialog.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/component/dialogs/EnumDataTypePanel.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/component/dialogs/EnumDataTypePanel.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/component/dialogs/ExceptionDataTypePanel.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/component/dialogs/ExceptionDataTypePanel.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/component/dialogs/InterfaceDataTypePanel.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/component/dialogs/InterfaceDataTypePanel.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/component/dialogs/NewDataTypeBasePanel.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/component/dialogs/NewDataTypeBasePanel.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/component/dialogs/PolyStructDataTypePanel.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/component/dialogs/PolyStructDataTypePanel.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/component/dialogs/ServiceDataTypePanel.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/component/dialogs/ServiceDataTypePanel.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/component/dialogs/StructDataTypePanel.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/component/dialogs/StructDataTypePanel.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/unoclientapplication/UNOClientAppPanelVisual.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/projecttemplates/unoclientapplication/UNOClientAppPanelVisual.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/util/datamodel/properties/ExceptionCustomEditor.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/util/datamodel/properties/ExceptionCustomEditor.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/util/typebrowser/TypeBrowserNotActiveJPanel.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/util/typebrowser/TypeBrowserNotActiveJPanel.java
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/util/typebrowser/UnoIdlTypeBrowserTopComponent.form
incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/util/typebrowser/UnoIdlTypeBrowserTopComponent.java
Modified: incubator/ooo/devtools/netbeansintegration/trunk/nbproject/genfiles.properties
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/netbeansintegration/trunk/nbproject/genfiles.properties?rev=1374893&r1=1374892&r2=1374893&view=diff
==============================================================================
--- incubator/ooo/devtools/netbeansintegration/trunk/nbproject/genfiles.properties (original)
+++ incubator/ooo/devtools/netbeansintegration/trunk/nbproject/genfiles.properties Mon Aug 20 01:40:43 2012
@@ -3,6 +3,6 @@ build.xml.script.CRC32=71d946a9
build.xml.stylesheet.CRC32=1101b4cf
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=7fd08485
+nbproject/build-impl.xml.data.CRC32=0253561d
nbproject/build-impl.xml.script.CRC32=0f0c9cde
nbproject/build-impl.xml.stylesheet.CRC32=68e521fc@2.50.1
Modified: incubator/ooo/devtools/netbeansintegration/trunk/nbproject/project.properties
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/netbeansintegration/trunk/nbproject/project.properties?rev=1374893&r1=1374892&r2=1374893&view=diff
==============================================================================
--- incubator/ooo/devtools/netbeansintegration/trunk/nbproject/project.properties (original)
+++ incubator/ooo/devtools/netbeansintegration/trunk/nbproject/project.properties Mon Aug 20 01:40:43 2012
@@ -1,5 +1,5 @@
javac.compilerargs=-Xlint:unchecked
-javac.source=1.5
+javac.source=1.6
javahelp.hs=extensions-hs.xml
license.file=license.txt
nbm.homepage=http://wiki.services.openoffice.org/wiki/OpenOffice_NetBeans_Integration
Modified: incubator/ooo/devtools/netbeansintegration/trunk/nbproject/project.xml
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/netbeansintegration/trunk/nbproject/project.xml?rev=1374893&r1=1374892&r2=1374893&view=diff
==============================================================================
--- incubator/ooo/devtools/netbeansintegration/trunk/nbproject/project.xml (original)
+++ incubator/ooo/devtools/netbeansintegration/trunk/nbproject/project.xml Mon Aug 20 01:40:43 2012
@@ -12,7 +12,7 @@
<compile-dependency/>
<run-dependency>
<release-version>3</release-version>
- <specification-version>3.24.1.1</specification-version>
+ <specification-version>3.57.1.2</specification-version>
</run-dependency>
</dependency>
<dependency>
@@ -96,6 +96,15 @@
</run-dependency>
</dependency>
<dependency>
+ <code-name-base>org.netbeans.modules.project.ant</code-name-base>
+ <build-prerequisite/>
+ <compile-dependency/>
+ <run-dependency>
+ <release-version>1</release-version>
+ <specification-version>1.48.1</specification-version>
+ </run-dependency>
+ </dependency>
+ <dependency>
<code-name-base>org.netbeans.modules.projectapi</code-name-base>
<build-prerequisite/>
<compile-dependency/>
Modified: incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/ConfigurationOptionsContainer.form
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/ConfigurationOptionsContainer.form?rev=1374893&r1=1374892&r2=1374893&view=diff
==============================================================================
--- incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/ConfigurationOptionsContainer.form (original)
+++ incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/ConfigurationOptionsContainer.form Mon Aug 20 01:40:43 2012
@@ -4,9 +4,10 @@
<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="false"/>
<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
- <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
+ <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"/>
Modified: incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/ConfigurationOptionsContainer.java
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/ConfigurationOptionsContainer.java?rev=1374893&r1=1374892&r2=1374893&view=diff
==============================================================================
--- incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/ConfigurationOptionsContainer.java (original)
+++ incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/ConfigurationOptionsContainer.java Mon Aug 20 01:40:43 2012
@@ -55,20 +55,20 @@ public class ConfigurationOptionsContain
m_ConfigurationTabs.setBackground(new java.awt.Color(238, 238, 238));
- org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
+ javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout);
layout.setHorizontalGroup(
- layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
.addContainerGap()
- .add(m_ConfigurationTabs, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 376, Short.MAX_VALUE)
+ .addComponent(m_ConfigurationTabs, javax.swing.GroupLayout.DEFAULT_SIZE, 376, Short.MAX_VALUE)
.addContainerGap())
);
layout.setVerticalGroup(
- layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
.addContainerGap()
- .add(m_ConfigurationTabs, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 276, Short.MAX_VALUE)
+ .addComponent(m_ConfigurationTabs, javax.swing.GroupLayout.DEFAULT_SIZE, 276, Short.MAX_VALUE)
.addContainerGap())
);
}// </editor-fold>//GEN-END:initComponents
Modified: incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/ConfigurationPanel.form
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/ConfigurationPanel.form?rev=1374893&r1=1374892&r2=1374893&view=diff
==============================================================================
--- incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/ConfigurationPanel.form (original)
+++ incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/ConfigurationPanel.form Mon Aug 20 01:40:43 2012
@@ -4,9 +4,10 @@
<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_layoutCodeTarget" type="java.lang.Integer" value="2"/>
+ <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"/>
@@ -49,7 +50,7 @@
</Group>
<EmptySpace max="-2" attributes="0"/>
<Component id="settingsPanel" min="-2" max="-2" attributes="0"/>
- <EmptySpace pref="15" max="32767" attributes="0"/>
+ <EmptySpace max="32767" attributes="0"/>
</Group>
</Group>
</DimensionLayout>
@@ -62,7 +63,7 @@
</Property>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
- <TitledBorder title="OpenOffice.org Settings">
+ <TitledBorder title="Apache OpenOffice Settings">
<ResourceString PropertyName="titleX" bundle="org/openoffice/extensions/config/Bundle.properties" key="ConfigurationPanel_Title" replaceFormat="NbBundle.getMessage(ConfigurationPanel.class, "{key}")"/>
<Color PropertyName="color" blue="0" green="0" red="0" type="rgb"/>
</TitledBorder>
@@ -222,10 +223,10 @@
</Container>
<Component class="javax.swing.JTextPane" name="descriptionTextPane">
<Properties>
+ <Property name="editable" type="boolean" value="false"/>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="null"/>
</Property>
- <Property name="editable" type="boolean" value="false"/>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="org/openoffice/extensions/config/Bundle.properties" key="TP_InitialSettings_Description" replaceFormat="NbBundle.getMessage(ConfigurationPanel.class, "{key}")"/>
</Property>
Modified: incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/ConfigurationPanel.java
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/ConfigurationPanel.java?rev=1374893&r1=1374892&r2=1374893&view=diff
==============================================================================
--- incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/ConfigurationPanel.java (original)
+++ incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/ConfigurationPanel.java Mon Aug 20 01:40:43 2012
@@ -89,7 +89,7 @@ final class ConfigurationPanel extends j
jTextPane1 = new javax.swing.JTextPane();
settingsPanel.setBackground(new java.awt.Color(255, 255, 255));
- settingsPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(null, NbBundle.getMessage(ConfigurationPanel.class, "ConfigurationPanel_Title"), javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Dialog", 0, 11), new java.awt.Color(0, 0, 0))); // NOI18N
+ settingsPanel.setBorder(javax.swing.BorderFactory.createTitledBorder(null, NbBundle.getMessage(ConfigurationPanel.class, "ConfigurationPanel_Title"), javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, null, new java.awt.Color(0, 0, 0))); // NOI18N
settingsPanel.setOpaque(false);
officeLabel.setLabelFor(officeTextField);
@@ -131,45 +131,45 @@ final class ConfigurationPanel extends j
errorTextPane.setRequestFocusEnabled(false);
jScrollPane1.setViewportView(errorTextPane);
- org.jdesktop.layout.GroupLayout settingsPanelLayout = new org.jdesktop.layout.GroupLayout(settingsPanel);
+ javax.swing.GroupLayout settingsPanelLayout = new javax.swing.GroupLayout(settingsPanel);
settingsPanel.setLayout(settingsPanelLayout);
settingsPanelLayout.setHorizontalGroup(
- settingsPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, settingsPanelLayout.createSequentialGroup()
+ settingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, settingsPanelLayout.createSequentialGroup()
.addContainerGap()
- .add(settingsPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
- .add(jScrollPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 573, Short.MAX_VALUE)
- .add(settingsPanelLayout.createSequentialGroup()
- .add(settingsPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(officeLabel)
- .add(sdkLabel))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(settingsPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(settingsPanelLayout.createSequentialGroup()
- .add(sdkTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 296, Short.MAX_VALUE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(browseButtonSDK))
- .add(org.jdesktop.layout.GroupLayout.TRAILING, settingsPanelLayout.createSequentialGroup()
- .add(officeTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 296, Short.MAX_VALUE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(browseButtonOffice)))))
+ .addGroup(settingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 573, Short.MAX_VALUE)
+ .addGroup(settingsPanelLayout.createSequentialGroup()
+ .addGroup(settingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(officeLabel)
+ .addComponent(sdkLabel))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(settingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(settingsPanelLayout.createSequentialGroup()
+ .addComponent(sdkTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 296, Short.MAX_VALUE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(browseButtonSDK))
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, settingsPanelLayout.createSequentialGroup()
+ .addComponent(officeTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 296, Short.MAX_VALUE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(browseButtonOffice)))))
.addContainerGap())
);
settingsPanelLayout.setVerticalGroup(
- settingsPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(settingsPanelLayout.createSequentialGroup()
+ settingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(settingsPanelLayout.createSequentialGroup()
.addContainerGap()
- .add(settingsPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(browseButtonOffice)
- .add(officeTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(officeLabel))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(settingsPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(browseButtonSDK)
- .add(sdkLabel)
- .add(sdkTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 15, Short.MAX_VALUE)
- .add(jScrollPane1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+ .addGroup(settingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(browseButtonOffice)
+ .addComponent(officeTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(officeLabel))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(settingsPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(browseButtonSDK)
+ .addComponent(sdkLabel)
+ .addComponent(sdkTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 15, Short.MAX_VALUE)
+ .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
.addContainerGap())
);
@@ -185,53 +185,53 @@ final class ConfigurationPanel extends j
sunLogoPanel.setOpaque(false);
- org.jdesktop.layout.GroupLayout sunLogoPanelLayout = new org.jdesktop.layout.GroupLayout(sunLogoPanel);
+ javax.swing.GroupLayout sunLogoPanelLayout = new javax.swing.GroupLayout(sunLogoPanel);
sunLogoPanel.setLayout(sunLogoPanelLayout);
sunLogoPanelLayout.setHorizontalGroup(
- sunLogoPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 108, Short.MAX_VALUE)
+ sunLogoPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 108, Short.MAX_VALUE)
);
sunLogoPanelLayout.setVerticalGroup(
- sunLogoPanelLayout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 112, Short.MAX_VALUE)
+ sunLogoPanelLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 112, Short.MAX_VALUE)
);
jTextPane1.setEditable(false);
jTextPane1.setText(NbBundle.getMessage(ConfigurationPanel.class, "TP_LegalNotice")); // NOI18N
jTextPane1.setOpaque(false);
- org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
+ javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout);
layout.setHorizontalGroup(
- layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
.addContainerGap()
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jTextPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 487, Short.MAX_VALUE)
- .add(descriptionTextPane, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 487, Short.MAX_VALUE)
- .add(sunLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 487, Short.MAX_VALUE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(sunLogoPanel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .add(settingsPanel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(jTextPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 487, Short.MAX_VALUE)
+ .addComponent(descriptionTextPane, javax.swing.GroupLayout.DEFAULT_SIZE, 487, Short.MAX_VALUE)
+ .addComponent(sunLabel, javax.swing.GroupLayout.PREFERRED_SIZE, 487, Short.MAX_VALUE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(sunLogoPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addComponent(settingsPanel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
.addContainerGap())
);
layout.setVerticalGroup(
- layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
.addContainerGap()
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
- .add(sunLabel)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(descriptionTextPane, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jTextPane1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 51, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .add(sunLogoPanel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(settingsPanel, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addContainerGap(15, Short.MAX_VALUE))
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addComponent(sunLabel)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(descriptionTextPane, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jTextPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 51, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addComponent(sunLogoPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(settingsPanel, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
}// </editor-fold>//GEN-END:initComponents
Modified: incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/LogOutputSettingsDialog.form
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/LogOutputSettingsDialog.form?rev=1374893&r1=1374892&r2=1374893&view=diff
==============================================================================
--- incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/LogOutputSettingsDialog.form (original)
+++ incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/LogOutputSettingsDialog.form Mon Aug 20 01:40:43 2012
@@ -4,9 +4,10 @@
<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="false"/>
<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
- <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
+ <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"/>
@@ -54,10 +55,6 @@
<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="opaque" type="boolean" value="false"/>
</Properties>
</Component>
<Container class="javax.swing.JPanel" name="jPanel1">
Modified: incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/LogOutputSettingsDialog.java
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/LogOutputSettingsDialog.java?rev=1374893&r1=1374892&r2=1374893&view=diff
==============================================================================
--- incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/LogOutputSettingsDialog.java (original)
+++ incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/config/LogOutputSettingsDialog.java Mon Aug 20 01:40:43 2012
@@ -78,10 +78,8 @@ public class LogOutputSettingsDialog ext
enableLoggingCheckBox.setBackground(new java.awt.Color(255, 255, 255));
enableLoggingCheckBox.setText(NbBundle.getMessage(LogOutputSettingsDialog.class, "LBL_Log_Checkbox")); // NOI18N
enableLoggingCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
- enableLoggingCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0));
- enableLoggingCheckBox.setOpaque(false);
- jPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(184, 207, 229)), NbBundle.getMessage(LogOutputSettingsDialog.class, "LBL_LogProperties"), javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Dialog", 0, 11), new java.awt.Color(0, 0, 0))); // NOI18N
+ jPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createLineBorder(new java.awt.Color(184, 207, 229)), NbBundle.getMessage(LogOutputSettingsDialog.class, "LBL_LogProperties"), javax.swing.border.TitledBorder.DEFAULT_JUSTIFICATION, javax.swing.border.TitledBorder.DEFAULT_POSITION, null, new java.awt.Color(0, 0, 0))); // NOI18N
jLabel4.setLabelFor(fileNameTextField);
jLabel4.setText(NbBundle.getMessage(LogOutputSettingsDialog.class, "LBL_FileName")); // NOI18N
@@ -120,51 +118,51 @@ public class LogOutputSettingsDialog ext
fileNameTextField.setText("jTextField2");
- org.jdesktop.layout.GroupLayout jPanel1Layout = new org.jdesktop.layout.GroupLayout(jPanel1);
+ javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
jPanel1.setLayout(jPanel1Layout);
jPanel1Layout.setHorizontalGroup(
- jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, jPanel1Layout.createSequentialGroup()
+ jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel1Layout.createSequentialGroup()
.addContainerGap()
- .add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
- .add(org.jdesktop.layout.GroupLayout.LEADING, jLabel2, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 124, Short.MAX_VALUE)
- .add(jLabel1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 124, Short.MAX_VALUE)
- .add(org.jdesktop.layout.GroupLayout.LEADING, jLabel3, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 124, Short.MAX_VALUE)
- .add(org.jdesktop.layout.GroupLayout.LEADING, jLabel4, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 124, Short.MAX_VALUE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, jPanel1Layout.createSequentialGroup()
- .add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(fileNameTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 227, Short.MAX_VALUE)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, directoryTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 227, Short.MAX_VALUE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
- .add(browseButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(clearButton, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
- .add(logLevelFileName, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 321, Short.MAX_VALUE)
- .add(logLevelComboBox, 0, 321, Short.MAX_VALUE))
+ .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(jLabel2, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.PREFERRED_SIZE, 124, Short.MAX_VALUE)
+ .addComponent(jLabel1, javax.swing.GroupLayout.DEFAULT_SIZE, 124, Short.MAX_VALUE)
+ .addComponent(jLabel3, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 124, Short.MAX_VALUE)
+ .addComponent(jLabel4, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 124, Short.MAX_VALUE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel1Layout.createSequentialGroup()
+ .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(fileNameTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 227, Short.MAX_VALUE)
+ .addComponent(directoryTextField, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 227, Short.MAX_VALUE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
+ .addComponent(browseButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(clearButton, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
+ .addComponent(logLevelFileName, javax.swing.GroupLayout.DEFAULT_SIZE, 321, Short.MAX_VALUE)
+ .addComponent(logLevelComboBox, 0, 321, Short.MAX_VALUE))
.addContainerGap())
);
jPanel1Layout.setVerticalGroup(
- jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jPanel1Layout.createSequentialGroup()
- .add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(jLabel1)
- .add(logLevelComboBox, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(jLabel3)
- .add(browseButton)
- .add(directoryTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(jLabel4)
- .add(clearButton)
- .add(fileNameTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(jLabel2)
- .add(logLevelFileName, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 29, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+ jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(jPanel1Layout.createSequentialGroup()
+ .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jLabel1)
+ .addComponent(logLevelComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jLabel3)
+ .addComponent(browseButton)
+ .addComponent(directoryTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jLabel4)
+ .addComponent(clearButton)
+ .addComponent(fileNameTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jLabel2)
+ .addComponent(logLevelFileName, javax.swing.GroupLayout.PREFERRED_SIZE, 29, javax.swing.GroupLayout.PREFERRED_SIZE))
.addContainerGap(13, Short.MAX_VALUE))
);
@@ -176,28 +174,28 @@ public class LogOutputSettingsDialog ext
errorTextPane.setForeground(new java.awt.Color(255, 0, 0));
jScrollPane1.setViewportView(errorTextPane);
- org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
+ javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout);
layout.setHorizontalGroup(
- layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
.addContainerGap()
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, jPanel1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, enableLoggingCheckBox, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 491, Short.MAX_VALUE)
- .add(jScrollPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 491, Short.MAX_VALUE))
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(jPanel1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(enableLoggingCheckBox, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 491, Short.MAX_VALUE)
+ .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 491, Short.MAX_VALUE))
.addContainerGap())
);
layout.setVerticalGroup(
- layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
.addContainerGap()
- .add(enableLoggingCheckBox, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 16, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(19, 19, 19)
- .add(jPanel1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jScrollPane1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
+ .addComponent(enableLoggingCheckBox, javax.swing.GroupLayout.PREFERRED_SIZE, 16, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(19, 19, 19)
+ .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jScrollPane1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
);
}// </editor-fold>//GEN-END:initComponents
Modified: incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/implobject/ImplObjectTypeBrowser.form
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/implobject/ImplObjectTypeBrowser.form?rev=1374893&r1=1374892&r2=1374893&view=diff
==============================================================================
--- incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/implobject/ImplObjectTypeBrowser.form (original)
+++ incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/implobject/ImplObjectTypeBrowser.form Mon Aug 20 01:40:43 2012
@@ -1,9 +1,13 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<Form version="1.3" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
+<Form version="1.3" maxVersion="1.3" 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="false"/>
- <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
+ <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"/>
Modified: incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/implobject/ImplObjectTypeBrowser.java
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/implobject/ImplObjectTypeBrowser.java?rev=1374893&r1=1374892&r2=1374893&view=diff
==============================================================================
--- incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/implobject/ImplObjectTypeBrowser.java (original)
+++ incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/implobject/ImplObjectTypeBrowser.java Mon Aug 20 01:40:43 2012
@@ -64,24 +64,25 @@ public class ImplObjectTypeBrowser exten
* 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() {
+
jScrollPane1 = new BeanTreeView();
- org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
+ javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout);
layout.setHorizontalGroup(
- layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
.addContainerGap()
- .add(jScrollPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 299, Short.MAX_VALUE)
+ .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 299, Short.MAX_VALUE)
.addContainerGap())
);
layout.setVerticalGroup(
- layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
.addContainerGap()
- .add(jScrollPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 207, Short.MAX_VALUE)
+ .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 207, Short.MAX_VALUE)
.addContainerGap())
);
}// </editor-fold>//GEN-END:initComponents
Modified: incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/implobject/ImplObjectVisualPanel1.form
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/implobject/ImplObjectVisualPanel1.form?rev=1374893&r1=1374892&r2=1374893&view=diff
==============================================================================
--- incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/implobject/ImplObjectVisualPanel1.form (original)
+++ incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/implobject/ImplObjectVisualPanel1.form Mon Aug 20 01:40:43 2012
@@ -7,7 +7,7 @@
<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="2"/>
+ <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"/>
Modified: incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/implobject/ImplObjectVisualPanel1.java
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/implobject/ImplObjectVisualPanel1.java?rev=1374893&r1=1374892&r2=1374893&view=diff
==============================================================================
--- incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/implobject/ImplObjectVisualPanel1.java (original)
+++ incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/implobject/ImplObjectVisualPanel1.java Mon Aug 20 01:40:43 2012
@@ -159,66 +159,66 @@ public final class ImplObjectVisualPanel
}
});
- org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
+ javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout);
layout.setHorizontalGroup(
- layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
.addContainerGap()
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
- .add(jSeparator1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 404, Short.MAX_VALUE)
- .add(layout.createSequentialGroup()
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jLabel5, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 83, Short.MAX_VALUE)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, jLabel4, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 83, Short.MAX_VALUE)
- .add(jLabel3, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 83, Short.MAX_VALUE)
- .add(jLabel6, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 83, Short.MAX_VALUE)
- .add(jLabel2, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 83, Short.MAX_VALUE)
- .add(jLabel1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 83, Short.MAX_VALUE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(locationTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 309, Short.MAX_VALUE)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, packageComboBox, 0, 309, Short.MAX_VALUE)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, nameTextField1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 309, Short.MAX_VALUE)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, createdFileTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 309, Short.MAX_VALUE)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, projectTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 309, Short.MAX_VALUE)
- .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
- .add(serviceTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 224, Short.MAX_VALUE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jBrowsButton)))))
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+ .addComponent(jSeparator1, javax.swing.GroupLayout.DEFAULT_SIZE, 404, Short.MAX_VALUE)
+ .addGroup(layout.createSequentialGroup()
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(jLabel5, javax.swing.GroupLayout.PREFERRED_SIZE, 83, Short.MAX_VALUE)
+ .addComponent(jLabel4, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 83, Short.MAX_VALUE)
+ .addComponent(jLabel3, javax.swing.GroupLayout.DEFAULT_SIZE, 83, Short.MAX_VALUE)
+ .addComponent(jLabel6, javax.swing.GroupLayout.DEFAULT_SIZE, 83, Short.MAX_VALUE)
+ .addComponent(jLabel2, javax.swing.GroupLayout.DEFAULT_SIZE, 83, Short.MAX_VALUE)
+ .addComponent(jLabel1, javax.swing.GroupLayout.PREFERRED_SIZE, 83, Short.MAX_VALUE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(locationTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 309, Short.MAX_VALUE)
+ .addComponent(packageComboBox, javax.swing.GroupLayout.Alignment.TRAILING, 0, 309, Short.MAX_VALUE)
+ .addComponent(nameTextField1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 309, Short.MAX_VALUE)
+ .addComponent(createdFileTextField, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 309, Short.MAX_VALUE)
+ .addComponent(projectTextField, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 309, Short.MAX_VALUE)
+ .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
+ .addComponent(serviceTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 224, Short.MAX_VALUE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jBrowsButton)))))
.addContainerGap())
);
layout.setVerticalGroup(
- layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
.addContainerGap()
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(nameTextField1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(jLabel1))
- .add(40, 40, 40)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(jLabel6)
- .add(jBrowsButton)
- .add(serviceTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(jLabel2)
- .add(projectTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(jLabel3)
- .add(locationTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(packageComboBox, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(jLabel4))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(jLabel5)
- .add(createdFileTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jSeparator1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 12, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .add(114, 114, 114))
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addComponent(nameTextField1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(jLabel1))
+ .addGap(40, 40, 40)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jLabel6)
+ .addComponent(jBrowsButton)
+ .addComponent(serviceTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jLabel2)
+ .addComponent(projectTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jLabel3)
+ .addComponent(locationTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(packageComboBox, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addComponent(jLabel4))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jLabel5)
+ .addComponent(createdFileTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jSeparator1, javax.swing.GroupLayout.PREFERRED_SIZE, 12, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addGap(114, 114, 114))
);
}// </editor-fold>//GEN-END:initComponents
Modified: incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/oxt/window/OxtWindowTopComponent.form
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/oxt/window/OxtWindowTopComponent.form?rev=1374893&r1=1374892&r2=1374893&view=diff
==============================================================================
--- incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/oxt/window/OxtWindowTopComponent.form (original)
+++ incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/oxt/window/OxtWindowTopComponent.form Mon Aug 20 01:40:43 2012
@@ -1,8 +1,13 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<Form version="1.3" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
+<Form version="1.3" maxVersion="1.3" 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_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"/>
Modified: incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/oxt/window/OxtWindowTopComponent.java
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/oxt/window/OxtWindowTopComponent.java?rev=1374893&r1=1374892&r2=1374893&view=diff
==============================================================================
--- incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/oxt/window/OxtWindowTopComponent.java (original)
+++ incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/oxt/window/OxtWindowTopComponent.java Mon Aug 20 01:40:43 2012
@@ -55,18 +55,18 @@ final class OxtWindowTopComponent extend
* 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() {
- org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
+ javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout);
layout.setHorizontalGroup(
- layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 400, Short.MAX_VALUE)
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 400, Short.MAX_VALUE)
);
layout.setVerticalGroup(
- layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(0, 300, Short.MAX_VALUE)
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGap(0, 300, Short.MAX_VALUE)
);
}// </editor-fold>//GEN-END:initComponents
Modified: incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/registry_ui/RegistryVisualPanel1.form
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/registry_ui/RegistryVisualPanel1.form?rev=1374893&r1=1374892&r2=1374893&view=diff
==============================================================================
--- incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/registry_ui/RegistryVisualPanel1.form (original)
+++ incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/registry_ui/RegistryVisualPanel1.form Mon Aug 20 01:40:43 2012
@@ -7,7 +7,7 @@
<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="true"/>
- <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
+ <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"/>
Modified: incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/registry_ui/RegistryVisualPanel1.java
URL: http://svn.apache.org/viewvc/incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/registry_ui/RegistryVisualPanel1.java?rev=1374893&r1=1374892&r2=1374893&view=diff
==============================================================================
--- incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/registry_ui/RegistryVisualPanel1.java (original)
+++ incubator/ooo/devtools/netbeansintegration/trunk/src/org/openoffice/extensions/filetypes/registry_ui/RegistryVisualPanel1.java Mon Aug 20 01:40:43 2012
@@ -149,7 +149,7 @@ public final class RegistryVisualPanel1
jCreatedFileLabel.setLabelFor(jCreatedFileTextField);
org.openide.awt.Mnemonics.setLocalizedText(jCreatedFileLabel, org.openide.util.NbBundle.getMessage(RegistryVisualPanel1.class, "RegistryVisualPanel1.jCreatedFileLabel.text")); // NOI18N
- jErrorLabel.setFont(new java.awt.Font("Dialog", 0, 12));
+ jErrorLabel.setFont(new java.awt.Font("Dialog", 0, 12)); // NOI18N
jErrorLabel.setForeground(new java.awt.Color(255, 0, 0));
org.openide.awt.Mnemonics.setLocalizedText(jBrowseButton, org.openide.util.NbBundle.getMessage(RegistryVisualPanel1.class, "RegistryVisualPanel1.jBrowseButton.text")); // NOI18N
@@ -170,50 +170,50 @@ public final class RegistryVisualPanel1
jCreatedFileTextField.setEditable(false);
jCreatedFileTextField.setText("jTextField4"); // NOI18N
- org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
+ javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
this.setLayout(layout);
layout.setHorizontalGroup(
- layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
- .add(jFileNameLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 89, Short.MAX_VALUE)
- .add(jProjectLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(jFolderLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
- .add(jCreatedFileLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(jCreatedFileTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 273, Short.MAX_VALUE)
- .add(jProjectTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 273, Short.MAX_VALUE)
- .add(jFileNameTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 273, Short.MAX_VALUE)
- .add(jFolderTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 273, Short.MAX_VALUE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(jBrowseButton))
- .add(jSeparator1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 473, Short.MAX_VALUE)
- .add(jErrorLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 473, Short.MAX_VALUE)
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
+ .addComponent(jFileNameLabel, javax.swing.GroupLayout.DEFAULT_SIZE, 89, Short.MAX_VALUE)
+ .addComponent(jProjectLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(jFolderLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+ .addComponent(jCreatedFileLabel, 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(jCreatedFileTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 273, Short.MAX_VALUE)
+ .addComponent(jProjectTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 273, Short.MAX_VALUE)
+ .addComponent(jFileNameTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 273, Short.MAX_VALUE)
+ .addComponent(jFolderTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 273, Short.MAX_VALUE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addComponent(jBrowseButton))
+ .addComponent(jSeparator1, javax.swing.GroupLayout.DEFAULT_SIZE, 473, Short.MAX_VALUE)
+ .addComponent(jErrorLabel, javax.swing.GroupLayout.DEFAULT_SIZE, 473, Short.MAX_VALUE)
);
layout.setVerticalGroup(
- layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
- .add(layout.createSequentialGroup()
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(jFileNameLabel)
- .add(jFileNameTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .add(18, 18, 18)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(jProjectLabel)
- .add(jProjectTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(jFolderLabel)
- .add(jBrowseButton)
- .add(jFolderTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
- .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
- .add(jCreatedFileLabel)
- .add(jCreatedFileTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
- .add(jSeparator1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 10, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
- .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 150, Short.MAX_VALUE)
- .add(jErrorLabel))
+ layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+ .addGroup(layout.createSequentialGroup()
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jFileNameLabel)
+ .addComponent(jFileNameTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addGap(18, 18, 18)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jProjectLabel)
+ .addComponent(jProjectTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jFolderLabel)
+ .addComponent(jBrowseButton)
+ .addComponent(jFolderTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+ .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+ .addComponent(jCreatedFileLabel)
+ .addComponent(jCreatedFileTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+ .addComponent(jSeparator1, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE)
+ .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 150, Short.MAX_VALUE)
+ .addComponent(jErrorLabel))
);
}// </editor-fold>//GEN-END:initComponents