1.1 --- a/python.editor/build.xml Wed Dec 12 18:02:29 2012 +0100
1.2 +++ b/python.editor/build.xml Wed Dec 12 19:12:46 2012 +0100
1.3 @@ -26,6 +26,13 @@
1.4 <include name="pythonstubs/"/>
1.5 <include name="jython-2.5.1/**/netbeans-index-*.zip"/>
1.6 </patternset>
1.7 + <property name="locales" value=""/>
1.8 + <locfiles
1.9 + cluster="${cluster.dir}" locales="${locales}" src="${nb_all}/l10n/src"
1.10 + codenamebase="${code.name.base}"
1.11 + patternset="module.l10n.files"
1.12 + basefilesref="module.files"
1.13 + />
1.14 </target>
1.15
1.16 <target name="release" depends="init">
2.1 --- a/python.editor/nbproject/project.xml Wed Dec 12 18:02:29 2012 +0100
2.2 +++ b/python.editor/nbproject/project.xml Wed Dec 12 19:12:46 2012 +0100
2.3 @@ -6,15 +6,6 @@
2.4 <code-name-base>org.netbeans.modules.python.editor</code-name-base>
2.5 <module-dependencies>
2.6 <dependency>
2.7 - <code-name-base>org.jdesktop.layout</code-name-base>
2.8 - <build-prerequisite/>
2.9 - <compile-dependency/>
2.10 - <run-dependency>
2.11 - <release-version>1</release-version>
2.12 - <specification-version>1.24</specification-version>
2.13 - </run-dependency>
2.14 - </dependency>
2.15 - <dependency>
2.16 <code-name-base>org.jython</code-name-base>
2.17 <build-prerequisite/>
2.18 <compile-dependency/>
3.1 --- a/python.editor/src/org/netbeans/modules/python/editor/codegen/ClassCodeGenPanel.form Wed Dec 12 18:02:29 2012 +0100
3.2 +++ b/python.editor/src/org/netbeans/modules/python/editor/codegen/ClassCodeGenPanel.form Wed Dec 12 19:12:46 2012 +0100
3.3 @@ -7,7 +7,7 @@
3.4 <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
3.5 <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
3.6 <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
3.7 - <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
3.8 + <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
3.9 <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
3.10 <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
3.11 <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
4.1 --- a/python.editor/src/org/netbeans/modules/python/editor/codegen/ClassCodeGenPanel.java Wed Dec 12 18:02:29 2012 +0100
4.2 +++ b/python.editor/src/org/netbeans/modules/python/editor/codegen/ClassCodeGenPanel.java Wed Dec 12 19:12:46 2012 +0100
4.3 @@ -74,33 +74,33 @@
4.4
4.5 txtExtends.setText(org.openide.util.NbBundle.getMessage(ClassCodeGenPanel.class, "ClassCodeGenPanel.txtExtends.text")); // NOI18N
4.6
4.7 - org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
4.8 + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
4.9 this.setLayout(layout);
4.10 layout.setHorizontalGroup(
4.11 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
4.12 - .add(layout.createSequentialGroup()
4.13 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
4.14 + .addGroup(layout.createSequentialGroup()
4.15 .addContainerGap()
4.16 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
4.17 - .add(jLabel2)
4.18 - .add(jLabel1))
4.19 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
4.20 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
4.21 - .add(txtExtends, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 288, Short.MAX_VALUE)
4.22 - .add(txtClassName, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 288, Short.MAX_VALUE))
4.23 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
4.24 + .addComponent(jLabel2)
4.25 + .addComponent(jLabel1))
4.26 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
4.27 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
4.28 + .addComponent(txtExtends, javax.swing.GroupLayout.DEFAULT_SIZE, 288, Short.MAX_VALUE)
4.29 + .addComponent(txtClassName, javax.swing.GroupLayout.DEFAULT_SIZE, 288, Short.MAX_VALUE))
4.30 .addContainerGap())
4.31 );
4.32 layout.setVerticalGroup(
4.33 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
4.34 - .add(layout.createSequentialGroup()
4.35 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
4.36 + .addGroup(layout.createSequentialGroup()
4.37 .addContainerGap()
4.38 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
4.39 - .add(jLabel1)
4.40 - .add(txtClassName, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
4.41 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
4.42 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
4.43 - .add(jLabel2)
4.44 - .add(txtExtends, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
4.45 - .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
4.46 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
4.47 + .addComponent(jLabel1)
4.48 + .addComponent(txtClassName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
4.49 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
4.50 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
4.51 + .addComponent(jLabel2)
4.52 + .addComponent(txtExtends, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
4.53 + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
4.54 );
4.55 }// </editor-fold>//GEN-END:initComponents
4.56 // Variables declaration - do not modify//GEN-BEGIN:variables
5.1 --- a/python.editor/src/org/netbeans/modules/python/editor/codegen/MethodCodeGenPanel.form Wed Dec 12 18:02:29 2012 +0100
5.2 +++ b/python.editor/src/org/netbeans/modules/python/editor/codegen/MethodCodeGenPanel.form Wed Dec 12 19:12:46 2012 +0100
5.3 @@ -7,7 +7,7 @@
5.4 <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
5.5 <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
5.6 <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
5.7 - <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
5.8 + <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
5.9 <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
5.10 <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
5.11 <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
5.12 @@ -26,8 +26,8 @@
5.13 </Group>
5.14 <EmptySpace max="-2" attributes="0"/>
5.15 <Group type="103" groupAlignment="0" attributes="0">
5.16 - <Component id="txtParameterNames" pref="281" max="32767" attributes="0"/>
5.17 - <Component id="txtMethodName" alignment="0" pref="281" max="32767" attributes="0"/>
5.18 + <Component id="txtParameterNames" max="32767" attributes="0"/>
5.19 + <Component id="txtMethodName" alignment="0" max="32767" attributes="0"/>
5.20 </Group>
5.21 </Group>
5.22 <Group type="102" alignment="0" attributes="0">
6.1 --- a/python.editor/src/org/netbeans/modules/python/editor/codegen/MethodCodeGenPanel.java Wed Dec 12 18:02:29 2012 +0100
6.2 +++ b/python.editor/src/org/netbeans/modules/python/editor/codegen/MethodCodeGenPanel.java Wed Dec 12 19:12:46 2012 +0100
6.3 @@ -77,39 +77,39 @@
6.4
6.5 jLabel3.setText(org.openide.util.NbBundle.getMessage(MethodCodeGenPanel.class, "MethodCodeGenPanel.jLabel3.text")); // NOI18N
6.6
6.7 - org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
6.8 + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
6.9 this.setLayout(layout);
6.10 layout.setHorizontalGroup(
6.11 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
6.12 - .add(layout.createSequentialGroup()
6.13 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
6.14 - .add(layout.createSequentialGroup()
6.15 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
6.16 + .addGroup(layout.createSequentialGroup()
6.17 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
6.18 + .addGroup(layout.createSequentialGroup()
6.19 .addContainerGap()
6.20 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
6.21 - .add(jLabel1)
6.22 - .add(jLabel2))
6.23 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
6.24 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
6.25 - .add(txtParameterNames, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 275, Short.MAX_VALUE)
6.26 - .add(txtMethodName, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 275, Short.MAX_VALUE)))
6.27 - .add(layout.createSequentialGroup()
6.28 - .add(64, 64, 64)
6.29 - .add(jLabel3)))
6.30 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
6.31 + .addComponent(jLabel1)
6.32 + .addComponent(jLabel2))
6.33 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
6.34 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
6.35 + .addComponent(txtParameterNames)
6.36 + .addComponent(txtMethodName)))
6.37 + .addGroup(layout.createSequentialGroup()
6.38 + .addGap(64, 64, 64)
6.39 + .addComponent(jLabel3)))
6.40 .addContainerGap())
6.41 );
6.42 layout.setVerticalGroup(
6.43 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
6.44 - .add(layout.createSequentialGroup()
6.45 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
6.46 + .addGroup(layout.createSequentialGroup()
6.47 .addContainerGap()
6.48 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
6.49 - .add(jLabel1)
6.50 - .add(txtMethodName, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
6.51 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
6.52 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
6.53 - .add(jLabel2)
6.54 - .add(txtParameterNames, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
6.55 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
6.56 - .add(jLabel3))
6.57 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
6.58 + .addComponent(jLabel1)
6.59 + .addComponent(txtMethodName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
6.60 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
6.61 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
6.62 + .addComponent(jLabel2)
6.63 + .addComponent(txtParameterNames, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
6.64 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
6.65 + .addComponent(jLabel3))
6.66 );
6.67 }// </editor-fold>//GEN-END:initComponents
6.68 // Variables declaration - do not modify//GEN-BEGIN:variables
7.1 --- a/python.editor/src/org/netbeans/modules/python/editor/codegen/PropertyCodeGenPanel.form Wed Dec 12 18:02:29 2012 +0100
7.2 +++ b/python.editor/src/org/netbeans/modules/python/editor/codegen/PropertyCodeGenPanel.form Wed Dec 12 19:12:46 2012 +0100
7.3 @@ -7,7 +7,7 @@
7.4 <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
7.5 <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
7.6 <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
7.7 - <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
7.8 + <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
7.9 <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
7.10 <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
7.11 <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
8.1 --- a/python.editor/src/org/netbeans/modules/python/editor/codegen/PropertyCodeGenPanel.java Wed Dec 12 18:02:29 2012 +0100
8.2 +++ b/python.editor/src/org/netbeans/modules/python/editor/codegen/PropertyCodeGenPanel.java Wed Dec 12 19:12:46 2012 +0100
8.3 @@ -72,29 +72,29 @@
8.4
8.5 readOnlyCb.setText(org.openide.util.NbBundle.getMessage(PropertyCodeGenPanel.class, "PropertyCodeGenPanel.readOnlyCb.text")); // NOI18N
8.6
8.7 - org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
8.8 + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
8.9 this.setLayout(layout);
8.10 layout.setHorizontalGroup(
8.11 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
8.12 - .add(layout.createSequentialGroup()
8.13 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
8.14 + .addGroup(layout.createSequentialGroup()
8.15 .addContainerGap()
8.16 - .add(nameLabel)
8.17 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
8.18 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
8.19 - .add(readOnlyCb)
8.20 - .add(nameField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 286, Short.MAX_VALUE))
8.21 + .addComponent(nameLabel)
8.22 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
8.23 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
8.24 + .addComponent(readOnlyCb)
8.25 + .addComponent(nameField, javax.swing.GroupLayout.DEFAULT_SIZE, 286, Short.MAX_VALUE))
8.26 .addContainerGap())
8.27 );
8.28 layout.setVerticalGroup(
8.29 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
8.30 - .add(layout.createSequentialGroup()
8.31 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
8.32 + .addGroup(layout.createSequentialGroup()
8.33 .addContainerGap()
8.34 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
8.35 - .add(nameLabel)
8.36 - .add(nameField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
8.37 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
8.38 - .add(readOnlyCb)
8.39 - .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
8.40 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
8.41 + .addComponent(nameLabel)
8.42 + .addComponent(nameField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
8.43 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
8.44 + .addComponent(readOnlyCb)
8.45 + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
8.46 );
8.47 }// </editor-fold>//GEN-END:initComponents
8.48
9.1 --- a/python.editor/src/org/netbeans/modules/python/editor/hints/NameRulePrefs.form Wed Dec 12 18:02:29 2012 +0100
9.2 +++ b/python.editor/src/org/netbeans/modules/python/editor/hints/NameRulePrefs.form Wed Dec 12 19:12:46 2012 +0100
9.3 @@ -7,7 +7,7 @@
9.4 <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
9.5 <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
9.6 <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
9.7 - <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
9.8 + <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
9.9 <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
9.10 <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
9.11 <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
9.12 @@ -38,7 +38,7 @@
9.13 <Group type="102" alignment="0" attributes="0">
9.14 <Component id="ignoreLabel" min="-2" max="-2" attributes="0"/>
9.15 <EmptySpace max="-2" attributes="0"/>
9.16 - <Component id="ignoredText" pref="256" max="32767" attributes="0"/>
9.17 + <Component id="ignoredText" max="32767" attributes="0"/>
9.18 </Group>
9.19 </Group>
9.20 <EmptySpace max="-2" attributes="0"/>
10.1 --- a/python.editor/src/org/netbeans/modules/python/editor/hints/NameRulePrefs.java Wed Dec 12 18:02:29 2012 +0100
10.2 +++ b/python.editor/src/org/netbeans/modules/python/editor/hints/NameRulePrefs.java Wed Dec 12 19:12:46 2012 +0100
10.3 @@ -188,59 +188,59 @@
10.4
10.5 ignoreLabel.setText(org.openide.util.NbBundle.getMessage(NameRulePrefs.class, "NameRulePrefs.ignoreLabel.text")); // NOI18N
10.6
10.7 - org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
10.8 + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
10.9 this.setLayout(layout);
10.10 layout.setHorizontalGroup(
10.11 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
10.12 - .add(layout.createSequentialGroup()
10.13 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
10.14 - .add(layout.createSequentialGroup()
10.15 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
10.16 - .add(moduleLabel)
10.17 - .add(classLabel)
10.18 - .add(functionLabel)
10.19 - .add(variableLabel))
10.20 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
10.21 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
10.22 - .add(org.jdesktop.layout.GroupLayout.LEADING, variableCombo, 0, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
10.23 - .add(org.jdesktop.layout.GroupLayout.LEADING, classCombo, 0, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
10.24 - .add(org.jdesktop.layout.GroupLayout.LEADING, moduleCombo, 0, 234, Short.MAX_VALUE)
10.25 - .add(functionCombo, 0, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
10.26 - .add(parameterLabel)
10.27 - .add(selfCb)
10.28 - .add(layout.createSequentialGroup()
10.29 - .add(ignoreLabel)
10.30 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
10.31 - .add(ignoredText, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 256, Short.MAX_VALUE)))
10.32 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
10.33 + .addGroup(layout.createSequentialGroup()
10.34 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
10.35 + .addGroup(layout.createSequentialGroup()
10.36 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
10.37 + .addComponent(moduleLabel)
10.38 + .addComponent(classLabel)
10.39 + .addComponent(functionLabel)
10.40 + .addComponent(variableLabel))
10.41 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
10.42 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
10.43 + .addComponent(variableCombo, javax.swing.GroupLayout.Alignment.LEADING, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
10.44 + .addComponent(classCombo, javax.swing.GroupLayout.Alignment.LEADING, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
10.45 + .addComponent(moduleCombo, javax.swing.GroupLayout.Alignment.LEADING, 0, 234, Short.MAX_VALUE)
10.46 + .addComponent(functionCombo, 0, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
10.47 + .addComponent(parameterLabel)
10.48 + .addComponent(selfCb)
10.49 + .addGroup(layout.createSequentialGroup()
10.50 + .addComponent(ignoreLabel)
10.51 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
10.52 + .addComponent(ignoredText)))
10.53 .addContainerGap())
10.54 );
10.55 layout.setVerticalGroup(
10.56 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
10.57 - .add(layout.createSequentialGroup()
10.58 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
10.59 - .add(moduleLabel)
10.60 - .add(moduleCombo, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
10.61 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
10.62 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
10.63 - .add(classLabel)
10.64 - .add(classCombo, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
10.65 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
10.66 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
10.67 - .add(functionLabel)
10.68 - .add(functionCombo, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
10.69 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
10.70 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
10.71 - .add(variableLabel)
10.72 - .add(variableCombo, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
10.73 - .add(18, 18, 18)
10.74 - .add(parameterLabel)
10.75 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
10.76 - .add(selfCb)
10.77 - .add(18, 18, 18)
10.78 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
10.79 - .add(ignoreLabel)
10.80 - .add(ignoredText, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
10.81 - .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
10.82 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
10.83 + .addGroup(layout.createSequentialGroup()
10.84 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
10.85 + .addComponent(moduleLabel)
10.86 + .addComponent(moduleCombo, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
10.87 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
10.88 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
10.89 + .addComponent(classLabel)
10.90 + .addComponent(classCombo, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
10.91 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
10.92 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
10.93 + .addComponent(functionLabel)
10.94 + .addComponent(functionCombo, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
10.95 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
10.96 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
10.97 + .addComponent(variableLabel)
10.98 + .addComponent(variableCombo, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
10.99 + .addGap(18, 18, 18)
10.100 + .addComponent(parameterLabel)
10.101 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
10.102 + .addComponent(selfCb)
10.103 + .addGap(18, 18, 18)
10.104 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
10.105 + .addComponent(ignoreLabel)
10.106 + .addComponent(ignoredText, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
10.107 + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
10.108 );
10.109 }// </editor-fold>//GEN-END:initComponents
10.110
11.1 --- a/python.editor/src/org/netbeans/modules/python/editor/hints/UnusedDetectorPrefs.form Wed Dec 12 18:02:29 2012 +0100
11.2 +++ b/python.editor/src/org/netbeans/modules/python/editor/hints/UnusedDetectorPrefs.form Wed Dec 12 19:12:46 2012 +0100
11.3 @@ -7,7 +7,7 @@
11.4 <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
11.5 <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
11.6 <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
11.7 - <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
11.8 + <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
11.9 <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="2"/>
11.10 <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
11.11 <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
12.1 --- a/python.editor/src/org/netbeans/modules/python/editor/hints/UnusedDetectorPrefs.java Wed Dec 12 18:02:29 2012 +0100
12.2 +++ b/python.editor/src/org/netbeans/modules/python/editor/hints/UnusedDetectorPrefs.java Wed Dec 12 19:12:46 2012 +0100
12.3 @@ -92,28 +92,28 @@
12.4 ignoredLabel.setLabelFor(ignoredNames);
12.5 ignoredLabel.setText(org.openide.util.NbBundle.getMessage(UnusedDetectorPrefs.class, "UnusedDetectorPrefs.ignoredLabel.text")); // NOI18N
12.6
12.7 - org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
12.8 + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
12.9 this.setLayout(layout);
12.10 layout.setHorizontalGroup(
12.11 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
12.12 - .add(skipParams)
12.13 - .add(skipTupleAssignments)
12.14 - .add(layout.createSequentialGroup()
12.15 - .add(ignoredLabel)
12.16 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
12.17 - .add(ignoredNames, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
12.18 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
12.19 + .addComponent(skipParams)
12.20 + .addComponent(skipTupleAssignments)
12.21 + .addGroup(layout.createSequentialGroup()
12.22 + .addComponent(ignoredLabel)
12.23 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
12.24 + .addComponent(ignoredNames, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
12.25 );
12.26 layout.setVerticalGroup(
12.27 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
12.28 - .add(layout.createSequentialGroup()
12.29 - .add(skipParams)
12.30 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
12.31 - .add(skipTupleAssignments)
12.32 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
12.33 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
12.34 - .add(ignoredLabel)
12.35 - .add(ignoredNames, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
12.36 - .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
12.37 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
12.38 + .addGroup(layout.createSequentialGroup()
12.39 + .addComponent(skipParams)
12.40 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
12.41 + .addComponent(skipTupleAssignments)
12.42 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
12.43 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
12.44 + .addComponent(ignoredLabel)
12.45 + .addComponent(ignoredNames, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
12.46 + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
12.47 );
12.48 }
12.49
13.1 --- a/python.editor/src/org/netbeans/modules/python/editor/imports/ImportModulePanel.form Wed Dec 12 18:02:29 2012 +0100
13.2 +++ b/python.editor/src/org/netbeans/modules/python/editor/imports/ImportModulePanel.form Wed Dec 12 19:12:46 2012 +0100
13.3 @@ -15,7 +15,7 @@
13.4 <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
13.5 <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
13.6 <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
13.7 - <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
13.8 + <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
13.9 <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
13.10 <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
13.11 <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="1"/>
14.1 --- a/python.editor/src/org/netbeans/modules/python/editor/imports/ImportModulePanel.java Wed Dec 12 18:02:29 2012 +0100
14.2 +++ b/python.editor/src/org/netbeans/modules/python/editor/imports/ImportModulePanel.java Wed Dec 12 19:12:46 2012 +0100
14.3 @@ -193,23 +193,23 @@
14.4
14.5 importPreviewLabel.setText(" ");
14.6
14.7 - org.jdesktop.layout.GroupLayout jPanel1Layout = new org.jdesktop.layout.GroupLayout(jPanel1);
14.8 + javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
14.9 jPanel1.setLayout(jPanel1Layout);
14.10 jPanel1Layout.setHorizontalGroup(
14.11 - jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
14.12 - .add(ctrlLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 390, Short.MAX_VALUE)
14.13 - .add(importPreviewLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 390, Short.MAX_VALUE)
14.14 - .add(org.jdesktop.layout.GroupLayout.TRAILING, jSeparator1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 390, Short.MAX_VALUE)
14.15 + jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
14.16 + .addComponent(ctrlLabel, javax.swing.GroupLayout.DEFAULT_SIZE, 390, Short.MAX_VALUE)
14.17 + .addComponent(importPreviewLabel, javax.swing.GroupLayout.DEFAULT_SIZE, 390, Short.MAX_VALUE)
14.18 + .addComponent(jSeparator1, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 390, Short.MAX_VALUE)
14.19 );
14.20 jPanel1Layout.setVerticalGroup(
14.21 - jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
14.22 - .add(jPanel1Layout.createSequentialGroup()
14.23 - .add(ctrlLabel)
14.24 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
14.25 - .add(jSeparator1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 10, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
14.26 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
14.27 - .add(importPreviewLabel)
14.28 - .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
14.29 + jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
14.30 + .addGroup(jPanel1Layout.createSequentialGroup()
14.31 + .addComponent(ctrlLabel)
14.32 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
14.33 + .addComponent(jSeparator1, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE)
14.34 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
14.35 + .addComponent(importPreviewLabel)
14.36 + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
14.37 );
14.38
14.39 add(jPanel1, java.awt.BorderLayout.PAGE_END);
15.1 --- a/python.editor/src/org/netbeans/modules/python/editor/options/FmtAlignment.form Wed Dec 12 18:02:29 2012 +0100
15.2 +++ b/python.editor/src/org/netbeans/modules/python/editor/options/FmtAlignment.form Wed Dec 12 19:12:46 2012 +0100
15.3 @@ -10,9 +10,10 @@
15.4 <AuxValues>
15.5 <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
15.6 <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
15.7 + <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
15.8 <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
15.9 <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
15.10 - <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
15.11 + <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
15.12 <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
15.13 <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
15.14 <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
15.15 @@ -152,10 +153,6 @@
15.16 <EmptyBorder bottom="0" left="0" right="0" top="0"/>
15.17 </Border>
15.18 </Property>
15.19 - <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
15.20 - <Insets value="[0, 0, 0, 0]"/>
15.21 - </Property>
15.22 - <Property name="opaque" type="boolean" value="false"/>
15.23 </Properties>
15.24 </Component>
15.25 <Component class="javax.swing.JCheckBox" name="nlWhileCheckBox">
15.26 @@ -168,10 +165,6 @@
15.27 <EmptyBorder bottom="0" left="0" right="0" top="0"/>
15.28 </Border>
15.29 </Property>
15.30 - <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
15.31 - <Insets value="[0, 0, 0, 0]"/>
15.32 - </Property>
15.33 - <Property name="opaque" type="boolean" value="false"/>
15.34 </Properties>
15.35 </Component>
15.36 <Component class="javax.swing.JCheckBox" name="nlCatchCheckBox">
15.37 @@ -184,10 +177,6 @@
15.38 <EmptyBorder bottom="0" left="0" right="0" top="0"/>
15.39 </Border>
15.40 </Property>
15.41 - <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
15.42 - <Insets value="[0, 0, 0, 0]"/>
15.43 - </Property>
15.44 - <Property name="opaque" type="boolean" value="false"/>
15.45 </Properties>
15.46 </Component>
15.47 <Component class="javax.swing.JCheckBox" name="nlFinallyCheckBox">
15.48 @@ -200,10 +189,6 @@
15.49 <EmptyBorder bottom="0" left="0" right="0" top="0"/>
15.50 </Border>
15.51 </Property>
15.52 - <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
15.53 - <Insets value="[0, 0, 0, 0]"/>
15.54 - </Property>
15.55 - <Property name="opaque" type="boolean" value="false"/>
15.56 </Properties>
15.57 </Component>
15.58 <Component class="javax.swing.JCheckBox" name="nlModifiersCheckBox">
15.59 @@ -216,10 +201,6 @@
15.60 <EmptyBorder bottom="0" left="0" right="0" top="0"/>
15.61 </Border>
15.62 </Property>
15.63 - <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
15.64 - <Insets value="[0, 0, 0, 0]"/>
15.65 - </Property>
15.66 - <Property name="opaque" type="boolean" value="false"/>
15.67 </Properties>
15.68 </Component>
15.69 <Component class="javax.swing.JLabel" name="multilineAlignmentLabel">
15.70 @@ -239,10 +220,6 @@
15.71 <EmptyBorder bottom="0" left="0" right="0" top="0"/>
15.72 </Border>
15.73 </Property>
15.74 - <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
15.75 - <Insets value="[0, 0, 0, 0]"/>
15.76 - </Property>
15.77 - <Property name="opaque" type="boolean" value="false"/>
15.78 </Properties>
15.79 </Component>
15.80 <Component class="javax.swing.JCheckBox" name="amCallArgsCheckBox">
15.81 @@ -255,10 +232,6 @@
15.82 <EmptyBorder bottom="0" left="0" right="0" top="0"/>
15.83 </Border>
15.84 </Property>
15.85 - <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
15.86 - <Insets value="[0, 0, 0, 0]"/>
15.87 - </Property>
15.88 - <Property name="opaque" type="boolean" value="false"/>
15.89 </Properties>
15.90 </Component>
15.91 <Component class="javax.swing.JCheckBox" name="amAnnotationArgsCheckBox">
15.92 @@ -271,10 +244,6 @@
15.93 <EmptyBorder bottom="0" left="0" right="0" top="0"/>
15.94 </Border>
15.95 </Property>
15.96 - <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
15.97 - <Insets value="[0, 0, 0, 0]"/>
15.98 - </Property>
15.99 - <Property name="opaque" type="boolean" value="false"/>
15.100 </Properties>
15.101 </Component>
15.102 <Component class="javax.swing.JCheckBox" name="amImplementsCheckBox1">
15.103 @@ -287,10 +256,6 @@
15.104 <EmptyBorder bottom="0" left="0" right="0" top="0"/>
15.105 </Border>
15.106 </Property>
15.107 - <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
15.108 - <Insets value="[0, 0, 0, 0]"/>
15.109 - </Property>
15.110 - <Property name="opaque" type="boolean" value="false"/>
15.111 </Properties>
15.112 </Component>
15.113 <Component class="javax.swing.JCheckBox" name="amThrowsCheckBox1">
15.114 @@ -303,10 +268,6 @@
15.115 <EmptyBorder bottom="0" left="0" right="0" top="0"/>
15.116 </Border>
15.117 </Property>
15.118 - <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
15.119 - <Insets value="[0, 0, 0, 0]"/>
15.120 - </Property>
15.121 - <Property name="opaque" type="boolean" value="false"/>
15.122 </Properties>
15.123 </Component>
15.124 <Component class="javax.swing.JCheckBox" name="amArrayInitCheckBox1">
15.125 @@ -319,10 +280,6 @@
15.126 <EmptyBorder bottom="0" left="0" right="0" top="0"/>
15.127 </Border>
15.128 </Property>
15.129 - <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
15.130 - <Insets value="[0, 0, 0, 0]"/>
15.131 - </Property>
15.132 - <Property name="opaque" type="boolean" value="false"/>
15.133 </Properties>
15.134 </Component>
15.135 <Component class="javax.swing.JCheckBox" name="amBinaryOpCheckBox1">
15.136 @@ -335,10 +292,6 @@
15.137 <EmptyBorder bottom="0" left="0" right="0" top="0"/>
15.138 </Border>
15.139 </Property>
15.140 - <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
15.141 - <Insets value="[0, 0, 0, 0]"/>
15.142 - </Property>
15.143 - <Property name="opaque" type="boolean" value="false"/>
15.144 </Properties>
15.145 </Component>
15.146 <Component class="javax.swing.JCheckBox" name="amTernaryOpCheckBox1">
15.147 @@ -351,10 +304,6 @@
15.148 <EmptyBorder bottom="0" left="0" right="0" top="0"/>
15.149 </Border>
15.150 </Property>
15.151 - <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
15.152 - <Insets value="[0, 0, 0, 0]"/>
15.153 - </Property>
15.154 - <Property name="opaque" type="boolean" value="false"/>
15.155 </Properties>
15.156 </Component>
15.157 <Component class="javax.swing.JCheckBox" name="amAssignCheckBox1">
15.158 @@ -367,10 +316,6 @@
15.159 <EmptyBorder bottom="0" left="0" right="0" top="0"/>
15.160 </Border>
15.161 </Property>
15.162 - <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
15.163 - <Insets value="[0, 0, 0, 0]"/>
15.164 - </Property>
15.165 - <Property name="opaque" type="boolean" value="false"/>
15.166 </Properties>
15.167 </Component>
15.168 <Component class="javax.swing.JCheckBox" name="amForCheckBox1">
15.169 @@ -383,10 +328,6 @@
15.170 <EmptyBorder bottom="0" left="0" right="0" top="0"/>
15.171 </Border>
15.172 </Property>
15.173 - <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
15.174 - <Insets value="[0, 0, 0, 0]"/>
15.175 - </Property>
15.176 - <Property name="opaque" type="boolean" value="false"/>
15.177 </Properties>
15.178 </Component>
15.179 <Component class="javax.swing.JCheckBox" name="amParenthesizedCheckBox1">
15.180 @@ -399,10 +340,6 @@
15.181 <EmptyBorder bottom="0" left="0" right="0" top="0"/>
15.182 </Border>
15.183 </Property>
15.184 - <Property name="margin" type="java.awt.Insets" editor="org.netbeans.beaninfo.editors.InsetsEditor">
15.185 - <Insets value="[0, 0, 0, 0]"/>
15.186 - </Property>
15.187 - <Property name="opaque" type="boolean" value="false"/>
15.188 </Properties>
15.189 </Component>
15.190 <Component class="javax.swing.JSeparator" name="jSeparator1">
16.1 --- a/python.editor/src/org/netbeans/modules/python/editor/options/FmtAlignment.java Wed Dec 12 18:02:29 2012 +0100
16.2 +++ b/python.editor/src/org/netbeans/modules/python/editor/options/FmtAlignment.java Wed Dec 12 19:12:46 2012 +0100
16.3 @@ -141,176 +141,144 @@
16.4
16.5 org.openide.awt.Mnemonics.setLocalizedText(nlElseCheckBox, org.openide.util.NbBundle.getMessage(FmtAlignment.class, "LBL_nl_Else")); // NOI18N
16.6 nlElseCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
16.7 - nlElseCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0));
16.8 - nlElseCheckBox.setOpaque(false);
16.9
16.10 org.openide.awt.Mnemonics.setLocalizedText(nlWhileCheckBox, org.openide.util.NbBundle.getMessage(FmtAlignment.class, "LBL_nl_While")); // NOI18N
16.11 nlWhileCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
16.12 - nlWhileCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0));
16.13 - nlWhileCheckBox.setOpaque(false);
16.14
16.15 org.openide.awt.Mnemonics.setLocalizedText(nlCatchCheckBox, org.openide.util.NbBundle.getMessage(FmtAlignment.class, "LBL_nl_Catch")); // NOI18N
16.16 nlCatchCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
16.17 - nlCatchCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0));
16.18 - nlCatchCheckBox.setOpaque(false);
16.19
16.20 org.openide.awt.Mnemonics.setLocalizedText(nlFinallyCheckBox, org.openide.util.NbBundle.getMessage(FmtAlignment.class, "LBL_nl_Finally")); // NOI18N
16.21 nlFinallyCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
16.22 - nlFinallyCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0));
16.23 - nlFinallyCheckBox.setOpaque(false);
16.24
16.25 org.openide.awt.Mnemonics.setLocalizedText(nlModifiersCheckBox, org.openide.util.NbBundle.getMessage(FmtAlignment.class, "LBL_nl_Modifiers")); // NOI18N
16.26 nlModifiersCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
16.27 - nlModifiersCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0));
16.28 - nlModifiersCheckBox.setOpaque(false);
16.29
16.30 org.openide.awt.Mnemonics.setLocalizedText(multilineAlignmentLabel, org.openide.util.NbBundle.getMessage(FmtAlignment.class, "LBL_al_multilineAlignment")); // NOI18N
16.31
16.32 org.openide.awt.Mnemonics.setLocalizedText(amMethodParamsCheckBox, org.openide.util.NbBundle.getMessage(FmtAlignment.class, "LBL_am_MethodParams")); // NOI18N
16.33 amMethodParamsCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
16.34 - amMethodParamsCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0));
16.35 - amMethodParamsCheckBox.setOpaque(false);
16.36
16.37 org.openide.awt.Mnemonics.setLocalizedText(amCallArgsCheckBox, org.openide.util.NbBundle.getMessage(FmtAlignment.class, "LBL_am_CallArgs")); // NOI18N
16.38 amCallArgsCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
16.39 - amCallArgsCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0));
16.40 - amCallArgsCheckBox.setOpaque(false);
16.41
16.42 org.openide.awt.Mnemonics.setLocalizedText(amAnnotationArgsCheckBox, org.openide.util.NbBundle.getMessage(FmtAlignment.class, "LBL_am_AnnotationArgs")); // NOI18N
16.43 amAnnotationArgsCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
16.44 - amAnnotationArgsCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0));
16.45 - amAnnotationArgsCheckBox.setOpaque(false);
16.46
16.47 org.openide.awt.Mnemonics.setLocalizedText(amImplementsCheckBox1, org.openide.util.NbBundle.getMessage(FmtAlignment.class, "LBL_an_Implements")); // NOI18N
16.48 amImplementsCheckBox1.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
16.49 - amImplementsCheckBox1.setMargin(new java.awt.Insets(0, 0, 0, 0));
16.50 - amImplementsCheckBox1.setOpaque(false);
16.51
16.52 org.openide.awt.Mnemonics.setLocalizedText(amThrowsCheckBox1, org.openide.util.NbBundle.getMessage(FmtAlignment.class, "LBL_am_Throws")); // NOI18N
16.53 amThrowsCheckBox1.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
16.54 - amThrowsCheckBox1.setMargin(new java.awt.Insets(0, 0, 0, 0));
16.55 - amThrowsCheckBox1.setOpaque(false);
16.56
16.57 org.openide.awt.Mnemonics.setLocalizedText(amArrayInitCheckBox1, org.openide.util.NbBundle.getMessage(FmtAlignment.class, "LBL_am_ArrayInit")); // NOI18N
16.58 amArrayInitCheckBox1.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
16.59 - amArrayInitCheckBox1.setMargin(new java.awt.Insets(0, 0, 0, 0));
16.60 - amArrayInitCheckBox1.setOpaque(false);
16.61
16.62 org.openide.awt.Mnemonics.setLocalizedText(amBinaryOpCheckBox1, org.openide.util.NbBundle.getMessage(FmtAlignment.class, "LBL_am_BinaryOp")); // NOI18N
16.63 amBinaryOpCheckBox1.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
16.64 - amBinaryOpCheckBox1.setMargin(new java.awt.Insets(0, 0, 0, 0));
16.65 - amBinaryOpCheckBox1.setOpaque(false);
16.66
16.67 org.openide.awt.Mnemonics.setLocalizedText(amTernaryOpCheckBox1, org.openide.util.NbBundle.getMessage(FmtAlignment.class, "LBL_am_TernaryOp")); // NOI18N
16.68 amTernaryOpCheckBox1.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
16.69 - amTernaryOpCheckBox1.setMargin(new java.awt.Insets(0, 0, 0, 0));
16.70 - amTernaryOpCheckBox1.setOpaque(false);
16.71
16.72 org.openide.awt.Mnemonics.setLocalizedText(amAssignCheckBox1, org.openide.util.NbBundle.getMessage(FmtAlignment.class, "LBL_am_Assign")); // NOI18N
16.73 amAssignCheckBox1.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
16.74 - amAssignCheckBox1.setMargin(new java.awt.Insets(0, 0, 0, 0));
16.75 - amAssignCheckBox1.setOpaque(false);
16.76
16.77 org.openide.awt.Mnemonics.setLocalizedText(amForCheckBox1, org.openide.util.NbBundle.getMessage(FmtAlignment.class, "LBL_am_For")); // NOI18N
16.78 amForCheckBox1.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
16.79 - amForCheckBox1.setMargin(new java.awt.Insets(0, 0, 0, 0));
16.80 - amForCheckBox1.setOpaque(false);
16.81
16.82 org.openide.awt.Mnemonics.setLocalizedText(amParenthesizedCheckBox1, org.openide.util.NbBundle.getMessage(FmtAlignment.class, "LBL_am_Paren")); // NOI18N
16.83 amParenthesizedCheckBox1.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
16.84 - amParenthesizedCheckBox1.setMargin(new java.awt.Insets(0, 0, 0, 0));
16.85 - amParenthesizedCheckBox1.setOpaque(false);
16.86
16.87 - org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
16.88 + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
16.89 this.setLayout(layout);
16.90 layout.setHorizontalGroup(
16.91 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
16.92 - .add(layout.createSequentialGroup()
16.93 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
16.94 - .add(layout.createSequentialGroup()
16.95 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
16.96 + .addGroup(layout.createSequentialGroup()
16.97 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
16.98 + .addGroup(layout.createSequentialGroup()
16.99 .addContainerGap()
16.100 - .add(amParenthesizedCheckBox1))
16.101 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, false)
16.102 - .add(org.jdesktop.layout.GroupLayout.LEADING, layout.createSequentialGroup()
16.103 - .add(newLinesLabel)
16.104 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
16.105 - .add(jSeparator1))
16.106 - .add(org.jdesktop.layout.GroupLayout.LEADING, layout.createSequentialGroup()
16.107 - .add(multilineAlignmentLabel)
16.108 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
16.109 - .add(jSeparator2))
16.110 - .add(org.jdesktop.layout.GroupLayout.LEADING, layout.createSequentialGroup()
16.111 + .addComponent(amParenthesizedCheckBox1))
16.112 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING, false)
16.113 + .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
16.114 + .addComponent(newLinesLabel)
16.115 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
16.116 + .addComponent(jSeparator1))
16.117 + .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
16.118 + .addComponent(multilineAlignmentLabel)
16.119 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
16.120 + .addComponent(jSeparator2))
16.121 + .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
16.122 .addContainerGap()
16.123 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
16.124 - .add(amThrowsCheckBox1)
16.125 - .add(amBinaryOpCheckBox1)
16.126 - .add(amAssignCheckBox1)
16.127 - .add(amAnnotationArgsCheckBox)
16.128 - .add(nlElseCheckBox)
16.129 - .add(nlWhileCheckBox)
16.130 - .add(nlCatchCheckBox)
16.131 - .add(amMethodParamsCheckBox))
16.132 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
16.133 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
16.134 - .add(amCallArgsCheckBox)
16.135 - .add(nlModifiersCheckBox)
16.136 - .add(nlFinallyCheckBox)
16.137 - .add(amImplementsCheckBox1)
16.138 - .add(amArrayInitCheckBox1)
16.139 - .add(amTernaryOpCheckBox1)
16.140 - .add(amForCheckBox1)))))
16.141 - .add(0, 0, 0))
16.142 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
16.143 + .addComponent(amThrowsCheckBox1)
16.144 + .addComponent(amBinaryOpCheckBox1)
16.145 + .addComponent(amAssignCheckBox1)
16.146 + .addComponent(amAnnotationArgsCheckBox)
16.147 + .addComponent(nlElseCheckBox)
16.148 + .addComponent(nlWhileCheckBox)
16.149 + .addComponent(nlCatchCheckBox)
16.150 + .addComponent(amMethodParamsCheckBox))
16.151 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
16.152 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
16.153 + .addComponent(amCallArgsCheckBox)
16.154 + .addComponent(nlModifiersCheckBox)
16.155 + .addComponent(nlFinallyCheckBox)
16.156 + .addComponent(amImplementsCheckBox1)
16.157 + .addComponent(amArrayInitCheckBox1)
16.158 + .addComponent(amTernaryOpCheckBox1)
16.159 + .addComponent(amForCheckBox1)))))
16.160 + .addGap(0, 0, 0))
16.161 );
16.162 layout.setVerticalGroup(
16.163 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
16.164 - .add(layout.createSequentialGroup()
16.165 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
16.166 - .add(layout.createSequentialGroup()
16.167 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
16.168 + .addGroup(layout.createSequentialGroup()
16.169 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
16.170 + .addGroup(layout.createSequentialGroup()
16.171 .addContainerGap()
16.172 - .add(newLinesLabel))
16.173 - .add(layout.createSequentialGroup()
16.174 - .add(17, 17, 17)
16.175 - .add(jSeparator1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 10, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
16.176 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
16.177 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
16.178 - .add(nlElseCheckBox)
16.179 - .add(nlFinallyCheckBox))
16.180 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
16.181 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
16.182 - .add(nlWhileCheckBox)
16.183 - .add(nlModifiersCheckBox))
16.184 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
16.185 - .add(layout.createSequentialGroup()
16.186 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
16.187 - .add(nlCatchCheckBox)
16.188 - .add(18, 18, 18)
16.189 - .add(multilineAlignmentLabel))
16.190 - .add(layout.createSequentialGroup()
16.191 - .add(44, 44, 44)
16.192 - .add(jSeparator2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 10, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
16.193 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
16.194 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
16.195 - .add(amMethodParamsCheckBox)
16.196 - .add(amCallArgsCheckBox))
16.197 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
16.198 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
16.199 - .add(amAnnotationArgsCheckBox)
16.200 - .add(amImplementsCheckBox1))
16.201 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
16.202 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
16.203 - .add(amThrowsCheckBox1)
16.204 - .add(amArrayInitCheckBox1))
16.205 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
16.206 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
16.207 - .add(amBinaryOpCheckBox1)
16.208 - .add(amTernaryOpCheckBox1))
16.209 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
16.210 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
16.211 - .add(amAssignCheckBox1)
16.212 - .add(amForCheckBox1))
16.213 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
16.214 - .add(amParenthesizedCheckBox1)
16.215 - .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
16.216 + .addComponent(newLinesLabel))
16.217 + .addGroup(layout.createSequentialGroup()
16.218 + .addGap(17, 17, 17)
16.219 + .addComponent(jSeparator1, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE)))
16.220 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
16.221 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
16.222 + .addComponent(nlElseCheckBox)
16.223 + .addComponent(nlFinallyCheckBox))
16.224 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
16.225 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
16.226 + .addComponent(nlWhileCheckBox)
16.227 + .addComponent(nlModifiersCheckBox))
16.228 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
16.229 + .addGroup(layout.createSequentialGroup()
16.230 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
16.231 + .addComponent(nlCatchCheckBox)
16.232 + .addGap(18, 18, 18)
16.233 + .addComponent(multilineAlignmentLabel))
16.234 + .addGroup(layout.createSequentialGroup()
16.235 + .addGap(44, 44, 44)
16.236 + .addComponent(jSeparator2, javax.swing.GroupLayout.PREFERRED_SIZE, 10, javax.swing.GroupLayout.PREFERRED_SIZE)))
16.237 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
16.238 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
16.239 + .addComponent(amMethodParamsCheckBox)
16.240 + .addComponent(amCallArgsCheckBox))
16.241 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
16.242 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
16.243 + .addComponent(amAnnotationArgsCheckBox)
16.244 + .addComponent(amImplementsCheckBox1))
16.245 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
16.246 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
16.247 + .addComponent(amThrowsCheckBox1)
16.248 + .addComponent(amArrayInitCheckBox1))
16.249 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
16.250 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
16.251 + .addComponent(amBinaryOpCheckBox1)
16.252 + .addComponent(amTernaryOpCheckBox1))
16.253 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
16.254 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
16.255 + .addComponent(amAssignCheckBox1)
16.256 + .addComponent(amForCheckBox1))
16.257 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
16.258 + .addComponent(amParenthesizedCheckBox1)
16.259 + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
16.260 );
16.261 }// </editor-fold>//GEN-END:initComponents
16.262
17.1 --- a/python.editor/src/org/netbeans/modules/python/editor/options/FmtBlankLines.form Wed Dec 12 18:02:29 2012 +0100
17.2 +++ b/python.editor/src/org/netbeans/modules/python/editor/options/FmtBlankLines.form Wed Dec 12 19:12:46 2012 +0100
17.3 @@ -10,9 +10,10 @@
17.4 <AuxValues>
17.5 <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
17.6 <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
17.7 + <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
17.8 <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
17.9 <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
17.10 - <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
17.11 + <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
17.12 <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
17.13 <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
17.14 <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
18.1 --- a/python.editor/src/org/netbeans/modules/python/editor/options/FmtBlankLines.java Wed Dec 12 18:02:29 2012 +0100
18.2 +++ b/python.editor/src/org/netbeans/modules/python/editor/options/FmtBlankLines.java Wed Dec 12 19:12:46 2012 +0100
18.3 @@ -180,89 +180,89 @@
18.4
18.5 aMethodsField.setColumns(5);
18.6
18.7 - org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
18.8 + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
18.9 this.setLayout(layout);
18.10 layout.setHorizontalGroup(
18.11 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
18.12 - .add(layout.createSequentialGroup()
18.13 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
18.14 - .add(bPackageLabel)
18.15 - .add(aPackageLabel)
18.16 - .add(bImportsLabel)
18.17 - .add(aImports)
18.18 - .add(bClassLabel)
18.19 - .add(aClassLabel)
18.20 - .add(aClassHeaderLabel)
18.21 - .add(bFieldsLabel)
18.22 - .add(aFieldsLabel)
18.23 - .add(bMethodsLabel)
18.24 - .add(aMethodsLabel))
18.25 - .add(6, 6, 6)
18.26 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
18.27 - .add(aMethodsField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
18.28 - .add(bMethodsField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
18.29 - .add(aFieldsField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
18.30 - .add(bFieldsField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
18.31 - .add(aClassHeaderField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
18.32 - .add(aClassField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
18.33 - .add(bClassField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
18.34 - .add(aImportsField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
18.35 - .add(bImportsField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
18.36 - .add(aPackageField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
18.37 - .add(bPackageField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
18.38 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
18.39 + .addGroup(layout.createSequentialGroup()
18.40 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
18.41 + .addComponent(bPackageLabel)
18.42 + .addComponent(aPackageLabel)
18.43 + .addComponent(bImportsLabel)
18.44 + .addComponent(aImports)
18.45 + .addComponent(bClassLabel)
18.46 + .addComponent(aClassLabel)
18.47 + .addComponent(aClassHeaderLabel)
18.48 + .addComponent(bFieldsLabel)
18.49 + .addComponent(aFieldsLabel)
18.50 + .addComponent(bMethodsLabel)
18.51 + .addComponent(aMethodsLabel))
18.52 + .addGap(6, 6, 6)
18.53 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
18.54 + .addComponent(aMethodsField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
18.55 + .addComponent(bMethodsField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
18.56 + .addComponent(aFieldsField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
18.57 + .addComponent(bFieldsField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
18.58 + .addComponent(aClassHeaderField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
18.59 + .addComponent(aClassField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
18.60 + .addComponent(bClassField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
18.61 + .addComponent(aImportsField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
18.62 + .addComponent(bImportsField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
18.63 + .addComponent(aPackageField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
18.64 + .addComponent(bPackageField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
18.65 );
18.66
18.67 - layout.linkSize(new java.awt.Component[] {aClassField, aClassHeaderField, aFieldsField, aImportsField, aMethodsField, aPackageField, bClassField, bFieldsField, bImportsField, bMethodsField, bPackageField}, org.jdesktop.layout.GroupLayout.HORIZONTAL);
18.68 + layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {aClassField, aClassHeaderField, aFieldsField, aImportsField, aMethodsField, aPackageField, bClassField, bFieldsField, bImportsField, bMethodsField, bPackageField});
18.69
18.70 layout.setVerticalGroup(
18.71 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
18.72 - .add(layout.createSequentialGroup()
18.73 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
18.74 - .add(bPackageField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
18.75 - .add(bPackageLabel))
18.76 - .add(4, 4, 4)
18.77 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
18.78 - .add(aPackageField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
18.79 - .add(aPackageLabel))
18.80 - .add(4, 4, 4)
18.81 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
18.82 - .add(bImportsField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
18.83 - .add(bImportsLabel))
18.84 - .add(4, 4, 4)
18.85 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
18.86 - .add(aImportsField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
18.87 - .add(aImports))
18.88 - .add(4, 4, 4)
18.89 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
18.90 - .add(bClassField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
18.91 - .add(bClassLabel))
18.92 - .add(4, 4, 4)
18.93 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
18.94 - .add(aClassField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
18.95 - .add(aClassLabel))
18.96 - .add(4, 4, 4)
18.97 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
18.98 - .add(aClassHeaderField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
18.99 - .add(aClassHeaderLabel))
18.100 - .add(4, 4, 4)
18.101 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
18.102 - .add(bFieldsField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
18.103 - .add(bFieldsLabel))
18.104 - .add(4, 4, 4)
18.105 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
18.106 - .add(aFieldsField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
18.107 - .add(aFieldsLabel))
18.108 - .add(4, 4, 4)
18.109 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
18.110 - .add(bMethodsField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
18.111 - .add(bMethodsLabel))
18.112 - .add(4, 4, 4)
18.113 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
18.114 - .add(aMethodsField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
18.115 - .add(aMethodsLabel)))
18.116 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
18.117 + .addGroup(layout.createSequentialGroup()
18.118 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
18.119 + .addComponent(bPackageField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
18.120 + .addComponent(bPackageLabel))
18.121 + .addGap(4, 4, 4)
18.122 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
18.123 + .addComponent(aPackageField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
18.124 + .addComponent(aPackageLabel))
18.125 + .addGap(4, 4, 4)
18.126 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
18.127 + .addComponent(bImportsField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
18.128 + .addComponent(bImportsLabel))
18.129 + .addGap(4, 4, 4)
18.130 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
18.131 + .addComponent(aImportsField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
18.132 + .addComponent(aImports))
18.133 + .addGap(4, 4, 4)
18.134 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
18.135 + .addComponent(bClassField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
18.136 + .addComponent(bClassLabel))
18.137 + .addGap(4, 4, 4)
18.138 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
18.139 + .addComponent(aClassField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
18.140 + .addComponent(aClassLabel))
18.141 + .addGap(4, 4, 4)
18.142 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
18.143 + .addComponent(aClassHeaderField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
18.144 + .addComponent(aClassHeaderLabel))
18.145 + .addGap(4, 4, 4)
18.146 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
18.147 + .addComponent(bFieldsField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
18.148 + .addComponent(bFieldsLabel))
18.149 + .addGap(4, 4, 4)
18.150 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
18.151 + .addComponent(aFieldsField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
18.152 + .addComponent(aFieldsLabel))
18.153 + .addGap(4, 4, 4)
18.154 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
18.155 + .addComponent(bMethodsField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
18.156 + .addComponent(bMethodsLabel))
18.157 + .addGap(4, 4, 4)
18.158 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
18.159 + .addComponent(aMethodsField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
18.160 + .addComponent(aMethodsLabel)))
18.161 );
18.162
18.163 - layout.linkSize(new java.awt.Component[] {aClassField, aClassHeaderField, aFieldsField, aImportsField, aMethodsField, aPackageField, bClassField, bFieldsField, bImportsField, bMethodsField, bPackageField}, org.jdesktop.layout.GroupLayout.VERTICAL);
18.164 + layout.linkSize(javax.swing.SwingConstants.VERTICAL, new java.awt.Component[] {aClassField, aClassHeaderField, aFieldsField, aImportsField, aMethodsField, aPackageField, bClassField, bFieldsField, bImportsField, bMethodsField, bPackageField});
18.165
18.166 }// </editor-fold>//GEN-END:initComponents
18.167
19.1 --- a/python.editor/src/org/netbeans/modules/python/editor/options/FmtImports.form Wed Dec 12 18:02:29 2012 +0100
19.2 +++ b/python.editor/src/org/netbeans/modules/python/editor/options/FmtImports.form Wed Dec 12 19:12:46 2012 +0100
19.3 @@ -12,7 +12,7 @@
19.4 <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
19.5 <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
19.6 <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
19.7 - <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
19.8 + <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
19.9 <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
19.10 <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
19.11 <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
20.1 --- a/python.editor/src/org/netbeans/modules/python/editor/options/FmtImports.java Wed Dec 12 18:02:29 2012 +0100
20.2 +++ b/python.editor/src/org/netbeans/modules/python/editor/options/FmtImports.java Wed Dec 12 19:12:46 2012 +0100
20.3 @@ -110,46 +110,46 @@
20.4
20.5 org.openide.awt.Mnemonics.setLocalizedText(sepFromImpCb, org.openide.util.NbBundle.getMessage(FmtImports.class, "FmtImports.sepFromImpCb.text")); // NOI18N
20.6
20.7 - org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
20.8 + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
20.9 this.setLayout(layout);
20.10 layout.setHorizontalGroup(
20.11 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
20.12 - .add(layout.createSequentialGroup()
20.13 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
20.14 - .add(formatImportsCb)
20.15 - .add(onePerLineCb)
20.16 - .add(systemLibsCb)
20.17 - .add(sortImportsCb)
20.18 - .add(sepFromImpCb)
20.19 - .add(removeDuplicateCb)
20.20 - .add(preferSymbols)
20.21 - .add(layout.createSequentialGroup()
20.22 - .add(cleanupLabel)
20.23 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
20.24 - .add(cleanupCombo, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
20.25 - .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
20.26 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
20.27 + .addGroup(layout.createSequentialGroup()
20.28 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
20.29 + .addComponent(formatImportsCb)
20.30 + .addComponent(onePerLineCb)
20.31 + .addComponent(systemLibsCb)
20.32 + .addComponent(sortImportsCb)
20.33 + .addComponent(sepFromImpCb)
20.34 + .addComponent(removeDuplicateCb)
20.35 + .addComponent(preferSymbols)
20.36 + .addGroup(layout.createSequentialGroup()
20.37 + .addComponent(cleanupLabel)
20.38 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
20.39 + .addComponent(cleanupCombo, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
20.40 + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
20.41 );
20.42 layout.setVerticalGroup(
20.43 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
20.44 - .add(layout.createSequentialGroup()
20.45 - .add(formatImportsCb)
20.46 - .add(18, 18, 18)
20.47 - .add(onePerLineCb)
20.48 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
20.49 - .add(systemLibsCb)
20.50 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
20.51 - .add(sortImportsCb)
20.52 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
20.53 - .add(sepFromImpCb)
20.54 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
20.55 - .add(removeDuplicateCb)
20.56 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
20.57 - .add(preferSymbols)
20.58 - .add(18, 18, 18)
20.59 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
20.60 - .add(cleanupLabel)
20.61 - .add(cleanupCombo, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
20.62 - .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
20.63 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
20.64 + .addGroup(layout.createSequentialGroup()
20.65 + .addComponent(formatImportsCb)
20.66 + .addGap(18, 18, 18)
20.67 + .addComponent(onePerLineCb)
20.68 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
20.69 + .addComponent(systemLibsCb)
20.70 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
20.71 + .addComponent(sortImportsCb)
20.72 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
20.73 + .addComponent(sepFromImpCb)
20.74 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
20.75 + .addComponent(removeDuplicateCb)
20.76 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
20.77 + .addComponent(preferSymbols)
20.78 + .addGap(18, 18, 18)
20.79 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
20.80 + .addComponent(cleanupLabel)
20.81 + .addComponent(cleanupCombo, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
20.82 + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
20.83 );
20.84 }// </editor-fold>//GEN-END:initComponents
20.85
21.1 --- a/python.editor/src/org/netbeans/modules/python/editor/options/FmtSpaces.form Wed Dec 12 18:02:29 2012 +0100
21.2 +++ b/python.editor/src/org/netbeans/modules/python/editor/options/FmtSpaces.form Wed Dec 12 19:12:46 2012 +0100
21.3 @@ -13,7 +13,7 @@
21.4 <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
21.5 <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
21.6 <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
21.7 - <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
21.8 + <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
21.9 <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
21.10 <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
21.11 <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
22.1 --- a/python.editor/src/org/netbeans/modules/python/editor/options/FmtSpaces.java Wed Dec 12 18:02:29 2012 +0100
22.2 +++ b/python.editor/src/org/netbeans/modules/python/editor/options/FmtSpaces.java Wed Dec 12 19:12:46 2012 +0100
22.3 @@ -96,37 +96,37 @@
22.4
22.5 org.openide.awt.Mnemonics.setLocalizedText(collapseSpacesCb, org.openide.util.NbBundle.getMessage(FmtSpaces.class, "FmtSpaces.collapseSpacesCb.text")); // NOI18N
22.6
22.7 - org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
22.8 + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
22.9 this.setLayout(layout);
22.10 layout.setHorizontalGroup(
22.11 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
22.12 - .add(layout.createSequentialGroup()
22.13 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
22.14 - .add(addAroundOp)
22.15 - .add(layout.createSequentialGroup()
22.16 - .add(27, 27, 27)
22.17 - .add(removeInParam))
22.18 - .add(removeInParen)
22.19 - .add(addAfterComma)
22.20 - .add(removeBeforeSep)
22.21 - .add(collapseSpacesCb))
22.22 - .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
22.23 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
22.24 + .addGroup(layout.createSequentialGroup()
22.25 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
22.26 + .addComponent(addAroundOp)
22.27 + .addGroup(layout.createSequentialGroup()
22.28 + .addGap(27, 27, 27)
22.29 + .addComponent(removeInParam))
22.30 + .addComponent(removeInParen)
22.31 + .addComponent(addAfterComma)
22.32 + .addComponent(removeBeforeSep)
22.33 + .addComponent(collapseSpacesCb))
22.34 + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
22.35 );
22.36 layout.setVerticalGroup(
22.37 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
22.38 - .add(layout.createSequentialGroup()
22.39 - .add(addAroundOp)
22.40 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
22.41 - .add(removeInParam)
22.42 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
22.43 - .add(removeInParen)
22.44 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
22.45 - .add(addAfterComma)
22.46 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
22.47 - .add(removeBeforeSep)
22.48 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
22.49 - .add(collapseSpacesCb)
22.50 - .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
22.51 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
22.52 + .addGroup(layout.createSequentialGroup()
22.53 + .addComponent(addAroundOp)
22.54 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
22.55 + .addComponent(removeInParam)
22.56 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
22.57 + .addComponent(removeInParen)
22.58 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
22.59 + .addComponent(addAfterComma)
22.60 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
22.61 + .addComponent(removeBeforeSep)
22.62 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
22.63 + .addComponent(collapseSpacesCb)
22.64 + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
22.65 );
22.66 }// </editor-fold>//GEN-END:initComponents
22.67
23.1 --- a/python.editor/src/org/netbeans/modules/python/editor/options/FmtTabsIndents.form Wed Dec 12 18:02:29 2012 +0100
23.2 +++ b/python.editor/src/org/netbeans/modules/python/editor/options/FmtTabsIndents.form Wed Dec 12 19:12:46 2012 +0100
23.3 @@ -13,7 +13,7 @@
23.4 <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
23.5 <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
23.6 <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
23.7 - <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
23.8 + <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
23.9 <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
23.10 <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
23.11 <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
23.12 @@ -24,7 +24,7 @@
23.13 <Group type="103" groupAlignment="0" attributes="0">
23.14 <Group type="102" alignment="0" attributes="0">
23.15 <Group type="103" groupAlignment="0" attributes="0">
23.16 - <Component id="continuationIndentSizeLabel" pref="200" max="32767" attributes="0"/>
23.17 + <Component id="continuationIndentSizeLabel" max="32767" attributes="0"/>
23.18 <Component id="labelIndentLabel" min="-2" max="-2" attributes="0"/>
23.19 </Group>
23.20 <EmptySpace max="-2" attributes="0"/>
24.1 --- a/python.editor/src/org/netbeans/modules/python/editor/options/FmtTabsIndents.java Wed Dec 12 18:02:29 2012 +0100
24.2 +++ b/python.editor/src/org/netbeans/modules/python/editor/options/FmtTabsIndents.java Wed Dec 12 19:12:46 2012 +0100
24.3 @@ -142,50 +142,49 @@
24.4 org.openide.awt.Mnemonics.setLocalizedText(indentCasesFromSwitchCheckBox, org.openide.util.NbBundle.getMessage(FmtTabsIndents.class, "LBL_IndentCasesFromSwitch")); // NOI18N
24.5 indentCasesFromSwitchCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 0));
24.6
24.7 - org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
24.8 + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
24.9 this.setLayout(layout);
24.10 layout.setHorizontalGroup(
24.11 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
24.12 - .add(layout.createSequentialGroup()
24.13 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
24.14 - .add(continuationIndentSizeLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 200, Short.MAX_VALUE)
24.15 - .add(labelIndentLabel))
24.16 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
24.17 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
24.18 - .add(continuationIndentSizeField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 36, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
24.19 - .add(labelIndentField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 36, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
24.20 - .add(indentCasesFromSwitchCheckBox)
24.21 - .add(indentTopLevelClassMembersCheckBox)
24.22 - .add(absoluteLabelIndentCheckBox)
24.23 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
24.24 + .addGroup(layout.createSequentialGroup()
24.25 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
24.26 + .addComponent(continuationIndentSizeLabel, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
24.27 + .addComponent(labelIndentLabel))
24.28 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
24.29 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
24.30 + .addComponent(continuationIndentSizeField, javax.swing.GroupLayout.PREFERRED_SIZE, 36, javax.swing.GroupLayout.PREFERRED_SIZE)
24.31 + .addComponent(labelIndentField, javax.swing.GroupLayout.PREFERRED_SIZE, 36, javax.swing.GroupLayout.PREFERRED_SIZE)))
24.32 + .addComponent(indentCasesFromSwitchCheckBox)
24.33 + .addComponent(indentTopLevelClassMembersCheckBox)
24.34 + .addComponent(absoluteLabelIndentCheckBox)
24.35 );
24.36
24.37 - layout.linkSize(new java.awt.Component[] {continuationIndentSizeField, labelIndentField}, org.jdesktop.layout.GroupLayout.HORIZONTAL);
24.38 + layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new java.awt.Component[] {continuationIndentSizeField, labelIndentField});
24.39
24.40 layout.setVerticalGroup(
24.41 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
24.42 - .add(layout.createSequentialGroup()
24.43 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
24.44 + .addGroup(layout.createSequentialGroup()
24.45 .addContainerGap()
24.46 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
24.47 - .add(continuationIndentSizeLabel)
24.48 - .add(continuationIndentSizeField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
24.49 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
24.50 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
24.51 - .add(labelIndentLabel)
24.52 - .add(labelIndentField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
24.53 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
24.54 - .add(absoluteLabelIndentCheckBox)
24.55 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
24.56 - .add(indentTopLevelClassMembersCheckBox)
24.57 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
24.58 - .add(indentCasesFromSwitchCheckBox)
24.59 - .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
24.60 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
24.61 + .addComponent(continuationIndentSizeLabel)
24.62 + .addComponent(continuationIndentSizeField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
24.63 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
24.64 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
24.65 + .addComponent(labelIndentLabel)
24.66 + .addComponent(labelIndentField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
24.67 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
24.68 + .addComponent(absoluteLabelIndentCheckBox)
24.69 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
24.70 + .addComponent(indentTopLevelClassMembersCheckBox)
24.71 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
24.72 + .addComponent(indentCasesFromSwitchCheckBox)
24.73 + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
24.74 );
24.75 }// </editor-fold>//GEN-END:initComponents
24.76
24.77
24.78 // Variables declaration - do not modify//GEN-BEGIN:variables
24.79 private javax.swing.JCheckBox absoluteLabelIndentCheckBox;
24.80 - private javax.swing.JCheckBox addLeadingStarInCommentCheckBox;
24.81 private javax.swing.JTextField continuationIndentSizeField;
24.82 private javax.swing.JLabel continuationIndentSizeLabel;
24.83 private javax.swing.JCheckBox indentCasesFromSwitchCheckBox;
25.1 --- a/python.editor/src/org/netbeans/modules/python/editor/wizards/pypackage/PythonPackageVisualPanel1.form Wed Dec 12 18:02:29 2012 +0100
25.2 +++ b/python.editor/src/org/netbeans/modules/python/editor/wizards/pypackage/PythonPackageVisualPanel1.form Wed Dec 12 19:12:46 2012 +0100
25.3 @@ -1,13 +1,13 @@
25.4 <?xml version="1.0" encoding="UTF-8" ?>
25.5
25.6 -<Form version="1.3" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
25.7 +<Form version="1.4" maxVersion="1.7" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
25.8 <AuxValues>
25.9 <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
25.10 <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
25.11 <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
25.12 <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
25.13 <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
25.14 - <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
25.15 + <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
25.16 <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
25.17 <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
25.18 <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
26.1 --- a/python.editor/src/org/netbeans/modules/python/editor/wizards/pypackage/PythonPackageVisualPanel1.java Wed Dec 12 18:02:29 2012 +0100
26.2 +++ b/python.editor/src/org/netbeans/modules/python/editor/wizards/pypackage/PythonPackageVisualPanel1.java Wed Dec 12 19:12:46 2012 +0100
26.3 @@ -25,15 +25,15 @@
26.4 // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
26.5 private void initComponents() {
26.6
26.7 - org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
26.8 + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
26.9 this.setLayout(layout);
26.10 layout.setHorizontalGroup(
26.11 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
26.12 - .add(0, 400, Short.MAX_VALUE)
26.13 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
26.14 + .addGap(0, 400, Short.MAX_VALUE)
26.15 );
26.16 layout.setVerticalGroup(
26.17 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
26.18 - .add(0, 300, Short.MAX_VALUE)
26.19 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
26.20 + .addGap(0, 300, Short.MAX_VALUE)
26.21 );
26.22 }// </editor-fold>//GEN-END:initComponents
26.23 // Variables declaration - do not modify//GEN-BEGIN:variables
27.1 --- a/python.options/nbproject/project.xml Wed Dec 12 18:02:29 2012 +0100
27.2 +++ b/python.options/nbproject/project.xml Wed Dec 12 19:12:46 2012 +0100
27.3 @@ -6,15 +6,6 @@
27.4 <code-name-base>org.netbeans.modules.python.options</code-name-base>
27.5 <module-dependencies>
27.6 <dependency>
27.7 - <code-name-base>org.jdesktop.layout</code-name-base>
27.8 - <build-prerequisite/>
27.9 - <compile-dependency/>
27.10 - <run-dependency>
27.11 - <release-version>1</release-version>
27.12 - <specification-version>1.4.1</specification-version>
27.13 - </run-dependency>
27.14 - </dependency>
27.15 - <dependency>
27.16 <code-name-base>org.netbeans.modules.options.api</code-name-base>
27.17 <build-prerequisite/>
27.18 <compile-dependency/>
28.1 --- a/python.options/src/org/netbeans/modules/python/options/OptionsPanel.form Wed Dec 12 18:02:29 2012 +0100
28.2 +++ b/python.options/src/org/netbeans/modules/python/options/OptionsPanel.form Wed Dec 12 19:12:46 2012 +0100
28.3 @@ -7,7 +7,7 @@
28.4 <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
28.5 <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
28.6 <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
28.7 - <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
28.8 + <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
28.9 <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
28.10 <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
28.11 <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
28.12 @@ -47,7 +47,7 @@
28.13 <Group type="102" alignment="0" attributes="0">
28.14 <EmptySpace max="-2" attributes="0"/>
28.15 <Component id="chkPrompt" min="-2" max="-2" attributes="0"/>
28.16 - <EmptySpace pref="202" max="32767" attributes="0"/>
28.17 + <EmptySpace pref="179" max="32767" attributes="0"/>
28.18 </Group>
28.19 </Group>
28.20 </DimensionLayout>
28.21 @@ -118,7 +118,7 @@
28.22 <Component id="jLayeredPane1" min="-2" pref="161" max="-2" attributes="0"/>
28.23 <EmptySpace type="unrelated" max="-2" attributes="0"/>
28.24 <Component id="stopAtFLineCheck" min="-2" max="-2" attributes="0"/>
28.25 - <EmptySpace pref="25" max="32767" attributes="0"/>
28.26 + <EmptySpace pref="23" max="32767" attributes="0"/>
28.27 </Group>
28.28 </Group>
28.29 </DimensionLayout>
29.1 --- a/python.options/src/org/netbeans/modules/python/options/OptionsPanel.java Wed Dec 12 18:02:29 2012 +0100
29.2 +++ b/python.options/src/org/netbeans/modules/python/options/OptionsPanel.java Wed Dec 12 19:12:46 2012 +0100
29.3 @@ -152,160 +152,160 @@
29.4 * always regenerated by the Form Editor.
29.5 */
29.6 @SuppressWarnings("unchecked")
29.7 - // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
29.8 - private void initComponents() {
29.9 + // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
29.10 + private void initComponents() {
29.11
29.12 - jTabbedPane6 = new javax.swing.JTabbedPane();
29.13 - jPanel3 = new javax.swing.JPanel();
29.14 - chkPrompt = new javax.swing.JCheckBox();
29.15 - jPanel4 = new javax.swing.JPanel();
29.16 - jLabel1 = new javax.swing.JLabel();
29.17 - dbgLstnPortStartField = new javax.swing.JTextField();
29.18 - jLayeredPane1 = new javax.swing.JLayeredPane();
29.19 - errorColorBtn = new javax.swing.JButton();
29.20 - fontBtn = new javax.swing.JButton();
29.21 - backgroundColorBtn = new javax.swing.JButton();
29.22 - infoColorBtn = new javax.swing.JButton();
29.23 - headerColorBtn = new javax.swing.JButton();
29.24 - warningColorBtn = new javax.swing.JButton();
29.25 - stopAtFLineCheck = new javax.swing.JCheckBox();
29.26 + jTabbedPane6 = new javax.swing.JTabbedPane();
29.27 + jPanel3 = new javax.swing.JPanel();
29.28 + chkPrompt = new javax.swing.JCheckBox();
29.29 + jPanel4 = new javax.swing.JPanel();
29.30 + jLabel1 = new javax.swing.JLabel();
29.31 + dbgLstnPortStartField = new javax.swing.JTextField();
29.32 + jLayeredPane1 = new javax.swing.JLayeredPane();
29.33 + errorColorBtn = new javax.swing.JButton();
29.34 + fontBtn = new javax.swing.JButton();
29.35 + backgroundColorBtn = new javax.swing.JButton();
29.36 + infoColorBtn = new javax.swing.JButton();
29.37 + headerColorBtn = new javax.swing.JButton();
29.38 + warningColorBtn = new javax.swing.JButton();
29.39 + stopAtFLineCheck = new javax.swing.JCheckBox();
29.40
29.41 - chkPrompt.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class, "OptionsPanel.chkPrompt1.text")); // NOI18N
29.42 + chkPrompt.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class, "OptionsPanel.chkPrompt1.text")); // NOI18N
29.43
29.44 - org.jdesktop.layout.GroupLayout jPanel3Layout = new org.jdesktop.layout.GroupLayout(jPanel3);
29.45 - jPanel3.setLayout(jPanel3Layout);
29.46 - jPanel3Layout.setHorizontalGroup(
29.47 - jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
29.48 - .add(jPanel3Layout.createSequentialGroup()
29.49 - .addContainerGap()
29.50 - .add(chkPrompt)
29.51 - .addContainerGap(202, Short.MAX_VALUE))
29.52 - );
29.53 - jPanel3Layout.setVerticalGroup(
29.54 - jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
29.55 - .add(jPanel3Layout.createSequentialGroup()
29.56 - .addContainerGap()
29.57 - .add(chkPrompt, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 22, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
29.58 - .addContainerGap(233, Short.MAX_VALUE))
29.59 - );
29.60 + javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(jPanel3);
29.61 + jPanel3.setLayout(jPanel3Layout);
29.62 + jPanel3Layout.setHorizontalGroup(
29.63 + jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
29.64 + .addGroup(jPanel3Layout.createSequentialGroup()
29.65 + .addContainerGap()
29.66 + .addComponent(chkPrompt)
29.67 + .addContainerGap(179, Short.MAX_VALUE))
29.68 + );
29.69 + jPanel3Layout.setVerticalGroup(
29.70 + jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
29.71 + .addGroup(jPanel3Layout.createSequentialGroup()
29.72 + .addContainerGap()
29.73 + .addComponent(chkPrompt, javax.swing.GroupLayout.PREFERRED_SIZE, 22, javax.swing.GroupLayout.PREFERRED_SIZE)
29.74 + .addContainerGap(233, Short.MAX_VALUE))
29.75 + );
29.76
29.77 - jTabbedPane6.addTab(org.openide.util.NbBundle.getMessage(OptionsPanel.class, "OptionsPanel.jPanel3.TabConstraints.tabTitle"), jPanel3); // NOI18N
29.78 + jTabbedPane6.addTab(org.openide.util.NbBundle.getMessage(OptionsPanel.class, "OptionsPanel.jPanel3.TabConstraints.tabTitle"), jPanel3); // NOI18N
29.79
29.80 - jLabel1.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class, "OptionsPanel.jLabel1.text")); // NOI18N
29.81 + jLabel1.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class, "OptionsPanel.jLabel1.text")); // NOI18N
29.82
29.83 - dbgLstnPortStartField.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class, "OptionsPanel.dbgLstnPortStartField.text")); // NOI18N
29.84 + dbgLstnPortStartField.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class, "OptionsPanel.dbgLstnPortStartField.text")); // NOI18N
29.85
29.86 - jLayeredPane1.setBorder(javax.swing.BorderFactory.createTitledBorder(org.openide.util.NbBundle.getMessage(OptionsPanel.class, "OptionsPanel.jLayeredPane1.border.title"))); // NOI18N
29.87 + jLayeredPane1.setBorder(javax.swing.BorderFactory.createTitledBorder(org.openide.util.NbBundle.getMessage(OptionsPanel.class, "OptionsPanel.jLayeredPane1.border.title"))); // NOI18N
29.88
29.89 - errorColorBtn.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class, "OptionsPanel.errorColorBtn.text")); // NOI18N
29.90 - errorColorBtn.addActionListener(new java.awt.event.ActionListener() {
29.91 - public void actionPerformed(java.awt.event.ActionEvent evt) {
29.92 - errorColorBtnActionPerformed(evt);
29.93 - }
29.94 - });
29.95 - errorColorBtn.setBounds(20, 130, 320, 20);
29.96 - jLayeredPane1.add(errorColorBtn, javax.swing.JLayeredPane.DEFAULT_LAYER);
29.97 + errorColorBtn.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class, "OptionsPanel.errorColorBtn.text")); // NOI18N
29.98 + errorColorBtn.addActionListener(new java.awt.event.ActionListener() {
29.99 + public void actionPerformed(java.awt.event.ActionEvent evt) {
29.100 + errorColorBtnActionPerformed(evt);
29.101 + }
29.102 + });
29.103 + errorColorBtn.setBounds(20, 130, 320, 20);
29.104 + jLayeredPane1.add(errorColorBtn, javax.swing.JLayeredPane.DEFAULT_LAYER);
29.105
29.106 - fontBtn.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class, "OptionsPanel.fontBtn.text")); // NOI18N
29.107 - fontBtn.addActionListener(new java.awt.event.ActionListener() {
29.108 - public void actionPerformed(java.awt.event.ActionEvent evt) {
29.109 - fontBtnActionPerformed(evt);
29.110 - }
29.111 - });
29.112 - fontBtn.setBounds(20, 30, 320, 20);
29.113 - jLayeredPane1.add(fontBtn, javax.swing.JLayeredPane.DEFAULT_LAYER);
29.114 + fontBtn.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class, "OptionsPanel.fontBtn.text")); // NOI18N
29.115 + fontBtn.addActionListener(new java.awt.event.ActionListener() {
29.116 + public void actionPerformed(java.awt.event.ActionEvent evt) {
29.117 + fontBtnActionPerformed(evt);
29.118 + }
29.119 + });
29.120 + fontBtn.setBounds(20, 30, 320, 20);
29.121 + jLayeredPane1.add(fontBtn, javax.swing.JLayeredPane.DEFAULT_LAYER);
29.122
29.123 - backgroundColorBtn.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class, "OptionsPanel.backgroundColorBtn.text")); // NOI18N
29.124 - backgroundColorBtn.addActionListener(new java.awt.event.ActionListener() {
29.125 - public void actionPerformed(java.awt.event.ActionEvent evt) {
29.126 - backgroundColorBtnActionPerformed(evt);
29.127 - }
29.128 - });
29.129 - backgroundColorBtn.setBounds(20, 50, 320, 20);
29.130 - jLayeredPane1.add(backgroundColorBtn, javax.swing.JLayeredPane.DEFAULT_LAYER);
29.131 + backgroundColorBtn.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class, "OptionsPanel.backgroundColorBtn.text")); // NOI18N
29.132 + backgroundColorBtn.addActionListener(new java.awt.event.ActionListener() {
29.133 + public void actionPerformed(java.awt.event.ActionEvent evt) {
29.134 + backgroundColorBtnActionPerformed(evt);
29.135 + }
29.136 + });
29.137 + backgroundColorBtn.setBounds(20, 50, 320, 20);
29.138 + jLayeredPane1.add(backgroundColorBtn, javax.swing.JLayeredPane.DEFAULT_LAYER);
29.139
29.140 - infoColorBtn.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class, "OptionsPanel.infoColorBtn.text")); // NOI18N
29.141 - infoColorBtn.addActionListener(new java.awt.event.ActionListener() {
29.142 - public void actionPerformed(java.awt.event.ActionEvent evt) {
29.143 - infoColorBtnActionPerformed(evt);
29.144 - }
29.145 - });
29.146 - infoColorBtn.setBounds(20, 70, 320, 20);
29.147 - jLayeredPane1.add(infoColorBtn, javax.swing.JLayeredPane.DEFAULT_LAYER);
29.148 + infoColorBtn.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class, "OptionsPanel.infoColorBtn.text")); // NOI18N
29.149 + infoColorBtn.addActionListener(new java.awt.event.ActionListener() {
29.150 + public void actionPerformed(java.awt.event.ActionEvent evt) {
29.151 + infoColorBtnActionPerformed(evt);
29.152 + }
29.153 + });
29.154 + infoColorBtn.setBounds(20, 70, 320, 20);
29.155 + jLayeredPane1.add(infoColorBtn, javax.swing.JLayeredPane.DEFAULT_LAYER);
29.156
29.157 - headerColorBtn.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class, "OptionsPanel.headerColorBtn.text")); // NOI18N
29.158 - headerColorBtn.addActionListener(new java.awt.event.ActionListener() {
29.159 - public void actionPerformed(java.awt.event.ActionEvent evt) {
29.160 - headerColorBtnActionPerformed(evt);
29.161 - }
29.162 - });
29.163 - headerColorBtn.setBounds(20, 90, 320, 20);
29.164 - jLayeredPane1.add(headerColorBtn, javax.swing.JLayeredPane.DEFAULT_LAYER);
29.165 + headerColorBtn.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class, "OptionsPanel.headerColorBtn.text")); // NOI18N
29.166 + headerColorBtn.addActionListener(new java.awt.event.ActionListener() {
29.167 + public void actionPerformed(java.awt.event.ActionEvent evt) {
29.168 + headerColorBtnActionPerformed(evt);
29.169 + }
29.170 + });
29.171 + headerColorBtn.setBounds(20, 90, 320, 20);
29.172 + jLayeredPane1.add(headerColorBtn, javax.swing.JLayeredPane.DEFAULT_LAYER);
29.173
29.174 - warningColorBtn.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class, "OptionsPanel.warningColorBtn.text")); // NOI18N
29.175 - warningColorBtn.addActionListener(new java.awt.event.ActionListener() {
29.176 - public void actionPerformed(java.awt.event.ActionEvent evt) {
29.177 - warningColorBtnActionPerformed(evt);
29.178 - }
29.179 - });
29.180 - warningColorBtn.setBounds(20, 110, 320, 20);
29.181 - jLayeredPane1.add(warningColorBtn, javax.swing.JLayeredPane.DEFAULT_LAYER);
29.182 + warningColorBtn.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class, "OptionsPanel.warningColorBtn.text")); // NOI18N
29.183 + warningColorBtn.addActionListener(new java.awt.event.ActionListener() {
29.184 + public void actionPerformed(java.awt.event.ActionEvent evt) {
29.185 + warningColorBtnActionPerformed(evt);
29.186 + }
29.187 + });
29.188 + warningColorBtn.setBounds(20, 110, 320, 20);
29.189 + jLayeredPane1.add(warningColorBtn, javax.swing.JLayeredPane.DEFAULT_LAYER);
29.190
29.191 - stopAtFLineCheck.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class, "OptionsPanel.stopAtFLineCheck.text")); // NOI18N
29.192 - stopAtFLineCheck.addActionListener(new java.awt.event.ActionListener() {
29.193 - public void actionPerformed(java.awt.event.ActionEvent evt) {
29.194 - stopAtFLineCheckActionPerformed(evt);
29.195 - }
29.196 - });
29.197 + stopAtFLineCheck.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class, "OptionsPanel.stopAtFLineCheck.text")); // NOI18N
29.198 + stopAtFLineCheck.addActionListener(new java.awt.event.ActionListener() {
29.199 + public void actionPerformed(java.awt.event.ActionEvent evt) {
29.200 + stopAtFLineCheckActionPerformed(evt);
29.201 + }
29.202 + });
29.203
29.204 - org.jdesktop.layout.GroupLayout jPanel4Layout = new org.jdesktop.layout.GroupLayout(jPanel4);
29.205 - jPanel4.setLayout(jPanel4Layout);
29.206 - jPanel4Layout.setHorizontalGroup(
29.207 - jPanel4Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
29.208 - .add(jPanel4Layout.createSequentialGroup()
29.209 - .add(jPanel4Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
29.210 - .add(jPanel4Layout.createSequentialGroup()
29.211 - .add(11, 11, 11)
29.212 - .add(jLayeredPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 464, Short.MAX_VALUE))
29.213 - .add(jPanel4Layout.createSequentialGroup()
29.214 - .addContainerGap()
29.215 - .add(jLabel1)
29.216 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
29.217 - .add(dbgLstnPortStartField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 155, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
29.218 - .add(jPanel4Layout.createSequentialGroup()
29.219 - .addContainerGap()
29.220 - .add(stopAtFLineCheck, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 292, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
29.221 - .addContainerGap())
29.222 - );
29.223 - jPanel4Layout.setVerticalGroup(
29.224 - jPanel4Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
29.225 - .add(jPanel4Layout.createSequentialGroup()
29.226 - .add(16, 16, 16)
29.227 - .add(jPanel4Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
29.228 - .add(dbgLstnPortStartField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 25, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
29.229 - .add(jLabel1))
29.230 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
29.231 - .add(jLayeredPane1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 161, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
29.232 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
29.233 - .add(stopAtFLineCheck)
29.234 - .addContainerGap(25, Short.MAX_VALUE))
29.235 - );
29.236 + javax.swing.GroupLayout jPanel4Layout = new javax.swing.GroupLayout(jPanel4);
29.237 + jPanel4.setLayout(jPanel4Layout);
29.238 + jPanel4Layout.setHorizontalGroup(
29.239 + jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
29.240 + .addGroup(jPanel4Layout.createSequentialGroup()
29.241 + .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
29.242 + .addGroup(jPanel4Layout.createSequentialGroup()
29.243 + .addGap(11, 11, 11)
29.244 + .addComponent(jLayeredPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 464, Short.MAX_VALUE))
29.245 + .addGroup(jPanel4Layout.createSequentialGroup()
29.246 + .addContainerGap()
29.247 + .addComponent(jLabel1)
29.248 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
29.249 + .addComponent(dbgLstnPortStartField, javax.swing.GroupLayout.PREFERRED_SIZE, 155, javax.swing.GroupLayout.PREFERRED_SIZE))
29.250 + .addGroup(jPanel4Layout.createSequentialGroup()
29.251 + .addContainerGap()
29.252 + .addComponent(stopAtFLineCheck, javax.swing.GroupLayout.PREFERRED_SIZE, 292, javax.swing.GroupLayout.PREFERRED_SIZE)))
29.253 + .addContainerGap())
29.254 + );
29.255 + jPanel4Layout.setVerticalGroup(
29.256 + jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
29.257 + .addGroup(jPanel4Layout.createSequentialGroup()
29.258 + .addGap(16, 16, 16)
29.259 + .addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
29.260 + .addComponent(dbgLstnPortStartField, javax.swing.GroupLayout.PREFERRED_SIZE, 25, javax.swing.GroupLayout.PREFERRED_SIZE)
29.261 + .addComponent(jLabel1))
29.262 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
29.263 + .addComponent(jLayeredPane1, javax.swing.GroupLayout.PREFERRED_SIZE, 161, javax.swing.GroupLayout.PREFERRED_SIZE)
29.264 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
29.265 + .addComponent(stopAtFLineCheck)
29.266 + .addContainerGap(23, Short.MAX_VALUE))
29.267 + );
29.268
29.269 - jLayeredPane1.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(OptionsPanel.class, "OptionsPanel.jLayeredPane1.AccessibleContext.accessibleName")); // NOI18N
29.270 + jLayeredPane1.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(OptionsPanel.class, "OptionsPanel.jLayeredPane1.AccessibleContext.accessibleName")); // NOI18N
29.271
29.272 - jTabbedPane6.addTab(org.openide.util.NbBundle.getMessage(OptionsPanel.class, "OptionsPanel.jPanel4.TabConstraints.tabTitle"), jPanel4); // NOI18N
29.273 + jTabbedPane6.addTab(org.openide.util.NbBundle.getMessage(OptionsPanel.class, "OptionsPanel.jPanel4.TabConstraints.tabTitle"), jPanel4); // NOI18N
29.274
29.275 - org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
29.276 - this.setLayout(layout);
29.277 - layout.setHorizontalGroup(
29.278 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
29.279 - .add(jTabbedPane6, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 495, Short.MAX_VALUE)
29.280 - );
29.281 - layout.setVerticalGroup(
29.282 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
29.283 - .add(jTabbedPane6, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 304, Short.MAX_VALUE)
29.284 - );
29.285 - }// </editor-fold>//GEN-END:initComponents
29.286 + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
29.287 + this.setLayout(layout);
29.288 + layout.setHorizontalGroup(
29.289 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
29.290 + .addComponent(jTabbedPane6, javax.swing.GroupLayout.DEFAULT_SIZE, 495, Short.MAX_VALUE)
29.291 + );
29.292 + layout.setVerticalGroup(
29.293 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
29.294 + .addComponent(jTabbedPane6, javax.swing.GroupLayout.DEFAULT_SIZE, 304, Short.MAX_VALUE)
29.295 + );
29.296 + }// </editor-fold>//GEN-END:initComponents
29.297
29.298 private void errorColorBtnActionPerformed(java.awt.event.ActionEvent evt)//GEN-FIRST:event_errorColorBtnActionPerformed
29.299 {//GEN-HEADEREND:event_errorColorBtnActionPerformed
29.300 @@ -349,21 +349,21 @@
29.301 }//GEN-LAST:event_fontBtnActionPerformed
29.302
29.303
29.304 - // Variables declaration - do not modify//GEN-BEGIN:variables
29.305 - private javax.swing.JButton backgroundColorBtn;
29.306 - private javax.swing.JCheckBox chkPrompt;
29.307 - private javax.swing.JTextField dbgLstnPortStartField;
29.308 - private javax.swing.JButton errorColorBtn;
29.309 - private javax.swing.JButton fontBtn;
29.310 - private javax.swing.JButton headerColorBtn;
29.311 - private javax.swing.JButton infoColorBtn;
29.312 - private javax.swing.JLabel jLabel1;
29.313 - private javax.swing.JLayeredPane jLayeredPane1;
29.314 - private javax.swing.JPanel jPanel3;
29.315 - private javax.swing.JPanel jPanel4;
29.316 - private javax.swing.JTabbedPane jTabbedPane6;
29.317 - private javax.swing.JCheckBox stopAtFLineCheck;
29.318 - private javax.swing.JButton warningColorBtn;
29.319 - // End of variables declaration//GEN-END:variables
29.320 + // Variables declaration - do not modify//GEN-BEGIN:variables
29.321 + private javax.swing.JButton backgroundColorBtn;
29.322 + private javax.swing.JCheckBox chkPrompt;
29.323 + private javax.swing.JTextField dbgLstnPortStartField;
29.324 + private javax.swing.JButton errorColorBtn;
29.325 + private javax.swing.JButton fontBtn;
29.326 + private javax.swing.JButton headerColorBtn;
29.327 + private javax.swing.JButton infoColorBtn;
29.328 + private javax.swing.JLabel jLabel1;
29.329 + private javax.swing.JLayeredPane jLayeredPane1;
29.330 + private javax.swing.JPanel jPanel3;
29.331 + private javax.swing.JPanel jPanel4;
29.332 + private javax.swing.JTabbedPane jTabbedPane6;
29.333 + private javax.swing.JCheckBox stopAtFLineCheck;
29.334 + private javax.swing.JButton warningColorBtn;
29.335 + // End of variables declaration//GEN-END:variables
29.336
29.337 }
30.1 --- a/python.platform/nbproject/project.xml Wed Dec 12 18:02:29 2012 +0100
30.2 +++ b/python.platform/nbproject/project.xml Wed Dec 12 19:12:46 2012 +0100
30.3 @@ -14,15 +14,6 @@
30.4 </run-dependency>
30.5 </dependency>
30.6 <dependency>
30.7 - <code-name-base>org.jdesktop.layout</code-name-base>
30.8 - <build-prerequisite/>
30.9 - <compile-dependency/>
30.10 - <run-dependency>
30.11 - <release-version>1</release-version>
30.12 - <specification-version>1.6</specification-version>
30.13 - </run-dependency>
30.14 - </dependency>
30.15 - <dependency>
30.16 <code-name-base>org.openide.awt</code-name-base>
30.17 <build-prerequisite/>
30.18 <compile-dependency/>
31.1 --- a/python.platform/src/org/netbeans/modules/python/platform/panels/PythonPlatformPanel.form Wed Dec 12 18:02:29 2012 +0100
31.2 +++ b/python.platform/src/org/netbeans/modules/python/platform/panels/PythonPlatformPanel.form Wed Dec 12 19:12:46 2012 +0100
31.3 @@ -10,16 +10,13 @@
31.4 </Properties>
31.5 </Component>
31.6 </NonVisualComponents>
31.7 - <SyntheticProperties>
31.8 - <SyntheticProperty name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,96,0,0,3,73"/>
31.9 - </SyntheticProperties>
31.10 <AuxValues>
31.11 <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
31.12 <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
31.13 <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
31.14 <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
31.15 <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
31.16 - <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
31.17 + <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
31.18 <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
31.19 <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
31.20 <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
31.21 @@ -163,7 +160,7 @@
31.22 <Group type="103" groupAlignment="0" attributes="0">
31.23 <Component id="platformName" pref="446" max="32767" attributes="0"/>
31.24 <Group type="102" alignment="1" attributes="0">
31.25 - <Component id="console" pref="351" max="32767" attributes="0"/>
31.26 + <Component id="console" pref="345" max="32767" attributes="0"/>
31.27 <EmptySpace max="-2" attributes="0"/>
31.28 <Component id="btnConsoleBrowse" min="-2" max="-2" attributes="0"/>
31.29 </Group>
31.30 @@ -198,7 +195,7 @@
31.31 <Component id="jLabel8" alignment="3" min="-2" max="-2" attributes="0"/>
31.32 <Component id="commandArgs" alignment="3" min="-2" max="-2" attributes="0"/>
31.33 </Group>
31.34 - <EmptySpace pref="201" max="32767" attributes="0"/>
31.35 + <EmptySpace pref="177" max="32767" attributes="0"/>
31.36 </Group>
31.37 </Group>
31.38 </DimensionLayout>
31.39 @@ -290,10 +287,10 @@
31.40 <EmptySpace max="-2" attributes="0"/>
31.41 <Group type="103" groupAlignment="0" attributes="0">
31.42 <Group type="102" attributes="0">
31.43 - <Component id="jScrollPane2" pref="481" max="32767" attributes="0"/>
31.44 + <Component id="jScrollPane2" pref="479" max="32767" attributes="0"/>
31.45 <EmptySpace max="-2" attributes="0"/>
31.46 <Group type="103" groupAlignment="0" attributes="0">
31.47 - <Component id="moveDownPythonPath" pref="120" max="32767" attributes="0"/>
31.48 + <Component id="moveDownPythonPath" pref="119" max="32767" attributes="0"/>
31.49 <Component id="moveUpPythonPath" pref="120" max="32767" attributes="1"/>
31.50 <Component id="removePythonPath" pref="120" max="32767" attributes="1"/>
31.51 <Component id="addPythonPath" pref="120" max="32767" attributes="1"/>
31.52 @@ -320,7 +317,7 @@
31.53 <EmptySpace max="-2" attributes="0"/>
31.54 <Component id="moveDownPythonPath" min="-2" max="-2" attributes="0"/>
31.55 </Group>
31.56 - <Component id="jScrollPane2" alignment="0" pref="280" max="32767" attributes="0"/>
31.57 + <Component id="jScrollPane2" alignment="0" pref="282" max="32767" attributes="0"/>
31.58 </Group>
31.59 <EmptySpace max="-2" attributes="0"/>
31.60 </Group>
31.61 @@ -411,15 +408,15 @@
31.62 <Group type="102" alignment="0" attributes="0">
31.63 <EmptySpace max="-2" attributes="0"/>
31.64 <Component id="jLabel7" min="-2" max="-2" attributes="0"/>
31.65 - <EmptySpace pref="466" max="32767" attributes="0"/>
31.66 + <EmptySpace pref="446" max="32767" attributes="0"/>
31.67 </Group>
31.68 <Group type="103" rootIndex="1" groupAlignment="0" attributes="0">
31.69 <Group type="102" alignment="0" attributes="0">
31.70 <EmptySpace max="-2" attributes="0"/>
31.71 - <Component id="jScrollPane3" pref="480" max="32767" attributes="0"/>
31.72 + <Component id="jScrollPane3" pref="478" max="32767" attributes="0"/>
31.73 <EmptySpace max="-2" attributes="0"/>
31.74 <Group type="103" groupAlignment="0" attributes="0">
31.75 - <Component id="moveDownJavaPath" pref="122" max="32767" attributes="0"/>
31.76 + <Component id="moveDownJavaPath" pref="121" max="32767" attributes="0"/>
31.77 <Component id="removeJavaPath" alignment="0" pref="122" max="32767" attributes="1"/>
31.78 <Component id="addJavaPath" alignment="0" pref="122" max="32767" attributes="1"/>
31.79 <Component id="moveUpJavaPath" alignment="0" pref="122" max="32767" attributes="1"/>
31.80 @@ -433,13 +430,13 @@
31.81 <Group type="103" groupAlignment="0" attributes="0">
31.82 <Group type="102" alignment="0" attributes="0">
31.83 <Component id="jLabel7" min="-2" max="-2" attributes="0"/>
31.84 - <EmptySpace pref="298" max="32767" attributes="0"/>
31.85 + <EmptySpace pref="300" max="32767" attributes="0"/>
31.86 </Group>
31.87 <Group type="103" rootIndex="1" groupAlignment="0" attributes="0">
31.88 <Group type="102" alignment="0" attributes="0">
31.89 <EmptySpace min="-2" pref="22" max="-2" attributes="0"/>
31.90 <Group type="103" groupAlignment="0" attributes="0">
31.91 - <Component id="jScrollPane3" alignment="0" pref="279" max="32767" attributes="0"/>
31.92 + <Component id="jScrollPane3" alignment="0" pref="283" max="32767" attributes="0"/>
31.93 <Group type="102" alignment="0" attributes="0">
31.94 <Component id="addJavaPath" min="-2" max="-2" attributes="0"/>
31.95 <EmptySpace max="-2" attributes="0"/>
32.1 --- a/python.platform/src/org/netbeans/modules/python/platform/panels/PythonPlatformPanel.java Wed Dec 12 18:02:29 2012 +0100
32.2 +++ b/python.platform/src/org/netbeans/modules/python/platform/panels/PythonPlatformPanel.java Wed Dec 12 19:12:46 2012 +0100
32.3 @@ -178,49 +178,49 @@
32.4
32.5 commandArgs.setText(org.openide.util.NbBundle.getMessage(PythonPlatformPanel.class, "PythonPlatformPanel.commandArgs.text")); // NOI18N
32.6
32.7 - org.jdesktop.layout.GroupLayout jPanel1Layout = new org.jdesktop.layout.GroupLayout(jPanel1);
32.8 + javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
32.9 jPanel1.setLayout(jPanel1Layout);
32.10 jPanel1Layout.setHorizontalGroup(
32.11 - jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
32.12 - .add(jPanel1Layout.createSequentialGroup()
32.13 + jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
32.14 + .addGroup(jPanel1Layout.createSequentialGroup()
32.15 .addContainerGap()
32.16 - .add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
32.17 - .add(jLabel8)
32.18 - .add(jLabel4)
32.19 - .add(jLabel3)
32.20 - .add(jLabel2))
32.21 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
32.22 - .add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
32.23 - .add(platformName, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 460, Short.MAX_VALUE)
32.24 - .add(org.jdesktop.layout.GroupLayout.TRAILING, jPanel1Layout.createSequentialGroup()
32.25 - .add(console, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 354, Short.MAX_VALUE)
32.26 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
32.27 - .add(btnConsoleBrowse))
32.28 - .add(commandArgs, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 460, Short.MAX_VALUE)
32.29 - .add(command, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 460, Short.MAX_VALUE))
32.30 - .add(24, 24, 24))
32.31 + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
32.32 + .addComponent(jLabel8)
32.33 + .addComponent(jLabel4)
32.34 + .addComponent(jLabel3)
32.35 + .addComponent(jLabel2))
32.36 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
32.37 + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
32.38 + .addComponent(platformName, javax.swing.GroupLayout.DEFAULT_SIZE, 446, Short.MAX_VALUE)
32.39 + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, jPanel1Layout.createSequentialGroup()
32.40 + .addComponent(console, javax.swing.GroupLayout.DEFAULT_SIZE, 345, Short.MAX_VALUE)
32.41 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
32.42 + .addComponent(btnConsoleBrowse))
32.43 + .addComponent(commandArgs, javax.swing.GroupLayout.DEFAULT_SIZE, 446, Short.MAX_VALUE)
32.44 + .addComponent(command, javax.swing.GroupLayout.DEFAULT_SIZE, 446, Short.MAX_VALUE))
32.45 + .addGap(24, 24, 24))
32.46 );
32.47 jPanel1Layout.setVerticalGroup(
32.48 - jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
32.49 - .add(jPanel1Layout.createSequentialGroup()
32.50 + jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
32.51 + .addGroup(jPanel1Layout.createSequentialGroup()
32.52 .addContainerGap()
32.53 - .add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
32.54 - .add(jLabel2)
32.55 - .add(platformName, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
32.56 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
32.57 - .add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
32.58 - .add(jLabel3)
32.59 - .add(command, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
32.60 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
32.61 - .add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
32.62 - .add(jLabel4)
32.63 - .add(console, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
32.64 - .add(btnConsoleBrowse))
32.65 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
32.66 - .add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
32.67 - .add(jLabel8)
32.68 - .add(commandArgs, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
32.69 - .addContainerGap(157, Short.MAX_VALUE))
32.70 + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
32.71 + .addComponent(jLabel2)
32.72 + .addComponent(platformName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
32.73 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
32.74 + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
32.75 + .addComponent(jLabel3)
32.76 + .addComponent(command, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
32.77 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
32.78 + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
32.79 + .addComponent(jLabel4)
32.80 + .addComponent(console, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
32.81 + .addComponent(btnConsoleBrowse))
32.82 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
32.83 + .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
32.84 + .addComponent(jLabel8)
32.85 + .addComponent(commandArgs, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
32.86 + .addContainerGap(177, Short.MAX_VALUE))
32.87 );
32.88
32.89 jTabbedPane1.addTab(org.openide.util.NbBundle.getMessage(PythonPlatformPanel.class, "PythonPlatformPanel.jPanel1.TabConstraints.tabTitle"), jPanel1); // NOI18N
32.90 @@ -259,39 +259,39 @@
32.91 }
32.92 });
32.93
32.94 - org.jdesktop.layout.GroupLayout jPanel2Layout = new org.jdesktop.layout.GroupLayout(jPanel2);
32.95 + javax.swing.GroupLayout jPanel2Layout = new javax.swing.GroupLayout(jPanel2);
32.96 jPanel2.setLayout(jPanel2Layout);
32.97 jPanel2Layout.setHorizontalGroup(
32.98 - jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
32.99 - .add(jPanel2Layout.createSequentialGroup()
32.100 + jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
32.101 + .addGroup(jPanel2Layout.createSequentialGroup()
32.102 .addContainerGap()
32.103 - .add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
32.104 - .add(jPanel2Layout.createSequentialGroup()
32.105 - .add(jScrollPane2, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 480, Short.MAX_VALUE)
32.106 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
32.107 - .add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
32.108 - .add(moveDownPythonPath, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
32.109 - .add(moveUpPythonPath, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 117, Short.MAX_VALUE)
32.110 - .add(removePythonPath, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 117, Short.MAX_VALUE)
32.111 - .add(addPythonPath, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 117, Short.MAX_VALUE)))
32.112 - .add(jLabel5))
32.113 + .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
32.114 + .addGroup(jPanel2Layout.createSequentialGroup()
32.115 + .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 479, Short.MAX_VALUE)
32.116 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
32.117 + .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
32.118 + .addComponent(moveDownPythonPath, javax.swing.GroupLayout.DEFAULT_SIZE, 119, Short.MAX_VALUE)
32.119 + .addComponent(moveUpPythonPath, javax.swing.GroupLayout.DEFAULT_SIZE, 120, Short.MAX_VALUE)
32.120 + .addComponent(removePythonPath, javax.swing.GroupLayout.DEFAULT_SIZE, 120, Short.MAX_VALUE)
32.121 + .addComponent(addPythonPath, javax.swing.GroupLayout.DEFAULT_SIZE, 120, Short.MAX_VALUE)))
32.122 + .addComponent(jLabel5))
32.123 .addContainerGap())
32.124 );
32.125 jPanel2Layout.setVerticalGroup(
32.126 - jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
32.127 - .add(jPanel2Layout.createSequentialGroup()
32.128 - .add(jLabel5)
32.129 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
32.130 - .add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
32.131 - .add(org.jdesktop.layout.GroupLayout.LEADING, jPanel2Layout.createSequentialGroup()
32.132 - .add(addPythonPath)
32.133 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
32.134 - .add(removePythonPath)
32.135 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
32.136 - .add(moveUpPythonPath)
32.137 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
32.138 - .add(moveDownPythonPath))
32.139 - .add(org.jdesktop.layout.GroupLayout.LEADING, jScrollPane2, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 266, Short.MAX_VALUE))
32.140 + jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
32.141 + .addGroup(jPanel2Layout.createSequentialGroup()
32.142 + .addComponent(jLabel5)
32.143 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
32.144 + .addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
32.145 + .addGroup(javax.swing.GroupLayout.Alignment.LEADING, jPanel2Layout.createSequentialGroup()
32.146 + .addComponent(addPythonPath)
32.147 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
32.148 + .addComponent(removePythonPath)
32.149 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
32.150 + .addComponent(moveUpPythonPath)
32.151 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
32.152 + .addComponent(moveDownPythonPath))
32.153 + .addComponent(jScrollPane2, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 282, Short.MAX_VALUE))
32.154 .addContainerGap())
32.155 );
32.156
32.157 @@ -331,44 +331,44 @@
32.158
32.159 jLabel7.setText(org.openide.util.NbBundle.getMessage(PythonPlatformPanel.class, "PythonPlatformPanel.jLabel7.text")); // NOI18N
32.160
32.161 - org.jdesktop.layout.GroupLayout jPanel3Layout = new org.jdesktop.layout.GroupLayout(jPanel3);
32.162 + javax.swing.GroupLayout jPanel3Layout = new javax.swing.GroupLayout(jPanel3);
32.163 jPanel3.setLayout(jPanel3Layout);
32.164 jPanel3Layout.setHorizontalGroup(
32.165 - jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
32.166 - .add(jPanel3Layout.createSequentialGroup()
32.167 + jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
32.168 + .addGroup(jPanel3Layout.createSequentialGroup()
32.169 .addContainerGap()
32.170 - .add(jLabel7)
32.171 - .addContainerGap(456, Short.MAX_VALUE))
32.172 - .add(jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
32.173 - .add(jPanel3Layout.createSequentialGroup()
32.174 + .addComponent(jLabel7)
32.175 + .addContainerGap(446, Short.MAX_VALUE))
32.176 + .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
32.177 + .addGroup(jPanel3Layout.createSequentialGroup()
32.178 .addContainerGap()
32.179 - .add(jScrollPane3, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 475, Short.MAX_VALUE)
32.180 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
32.181 - .add(jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
32.182 - .add(moveDownJavaPath, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
32.183 - .add(removeJavaPath, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 117, Short.MAX_VALUE)
32.184 - .add(addJavaPath, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 117, Short.MAX_VALUE)
32.185 - .add(moveUpJavaPath, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 117, Short.MAX_VALUE))
32.186 - .add(11, 11, 11)))
32.187 + .addComponent(jScrollPane3, javax.swing.GroupLayout.DEFAULT_SIZE, 478, Short.MAX_VALUE)
32.188 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
32.189 + .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
32.190 + .addComponent(moveDownJavaPath, javax.swing.GroupLayout.DEFAULT_SIZE, 121, Short.MAX_VALUE)
32.191 + .addComponent(removeJavaPath, javax.swing.GroupLayout.DEFAULT_SIZE, 122, Short.MAX_VALUE)
32.192 + .addComponent(addJavaPath, javax.swing.GroupLayout.DEFAULT_SIZE, 122, Short.MAX_VALUE)
32.193 + .addComponent(moveUpJavaPath, javax.swing.GroupLayout.DEFAULT_SIZE, 122, Short.MAX_VALUE))
32.194 + .addGap(11, 11, 11)))
32.195 );
32.196 jPanel3Layout.setVerticalGroup(
32.197 - jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
32.198 - .add(jPanel3Layout.createSequentialGroup()
32.199 - .add(jLabel7)
32.200 - .addContainerGap(278, Short.MAX_VALUE))
32.201 - .add(jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
32.202 - .add(jPanel3Layout.createSequentialGroup()
32.203 - .add(22, 22, 22)
32.204 - .add(jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
32.205 - .add(jScrollPane3, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 266, Short.MAX_VALUE)
32.206 - .add(jPanel3Layout.createSequentialGroup()
32.207 - .add(addJavaPath)
32.208 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
32.209 - .add(removeJavaPath)
32.210 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
32.211 - .add(moveUpJavaPath)
32.212 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
32.213 - .add(moveDownJavaPath)))
32.214 + jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
32.215 + .addGroup(jPanel3Layout.createSequentialGroup()
32.216 + .addComponent(jLabel7)
32.217 + .addContainerGap(300, Short.MAX_VALUE))
32.218 + .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
32.219 + .addGroup(jPanel3Layout.createSequentialGroup()
32.220 + .addGap(22, 22, 22)
32.221 + .addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
32.222 + .addComponent(jScrollPane3, javax.swing.GroupLayout.DEFAULT_SIZE, 283, Short.MAX_VALUE)
32.223 + .addGroup(jPanel3Layout.createSequentialGroup()
32.224 + .addComponent(addJavaPath)
32.225 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
32.226 + .addComponent(removeJavaPath)
32.227 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
32.228 + .addComponent(moveUpJavaPath)
32.229 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
32.230 + .addComponent(moveDownJavaPath)))
32.231 .addContainerGap()))
32.232 );
32.233
32.234 @@ -381,43 +381,43 @@
32.235 }
32.236 });
32.237
32.238 - org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
32.239 + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
32.240 this.setLayout(layout);
32.241 layout.setHorizontalGroup(
32.242 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
32.243 - .add(layout.createSequentialGroup()
32.244 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
32.245 + .addGroup(layout.createSequentialGroup()
32.246 .addContainerGap()
32.247 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
32.248 - .add(org.jdesktop.layout.GroupLayout.LEADING, makePlatformDefault, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 174, Short.MAX_VALUE)
32.249 - .add(org.jdesktop.layout.GroupLayout.LEADING, autoDetectPlatform, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 174, Short.MAX_VALUE)
32.250 - .add(org.jdesktop.layout.GroupLayout.LEADING, layout.createSequentialGroup()
32.251 - .add(newPlatform, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
32.252 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
32.253 - .add(removePlatform, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
32.254 - .add(org.jdesktop.layout.GroupLayout.LEADING, jLabel1)
32.255 - .add(org.jdesktop.layout.GroupLayout.LEADING, jScrollPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 174, Short.MAX_VALUE))
32.256 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
32.257 - .add(jTabbedPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 636, Short.MAX_VALUE)
32.258 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
32.259 + .addComponent(makePlatformDefault, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 175, Short.MAX_VALUE)
32.260 + .addComponent(autoDetectPlatform, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 175, Short.MAX_VALUE)
32.261 + .addGroup(javax.swing.GroupLayout.Alignment.LEADING, layout.createSequentialGroup()
32.262 + .addComponent(newPlatform, javax.swing.GroupLayout.DEFAULT_SIZE, 74, Short.MAX_VALUE)
32.263 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
32.264 + .addComponent(removePlatform, javax.swing.GroupLayout.DEFAULT_SIZE, 95, Short.MAX_VALUE))
32.265 + .addComponent(jLabel1, javax.swing.GroupLayout.Alignment.LEADING)
32.266 + .addComponent(jScrollPane1, javax.swing.GroupLayout.Alignment.LEADING, javax.swing.GroupLayout.DEFAULT_SIZE, 175, Short.MAX_VALUE))
32.267 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
32.268 + .addComponent(jTabbedPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 636, Short.MAX_VALUE)
32.269 .addContainerGap())
32.270 );
32.271 layout.setVerticalGroup(
32.272 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
32.273 - .add(layout.createSequentialGroup()
32.274 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
32.275 + .addGroup(layout.createSequentialGroup()
32.276 .addContainerGap()
32.277 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
32.278 - .add(jTabbedPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 340, Short.MAX_VALUE)
32.279 - .add(layout.createSequentialGroup()
32.280 - .add(jLabel1)
32.281 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
32.282 - .add(jScrollPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 213, Short.MAX_VALUE)
32.283 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
32.284 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
32.285 - .add(removePlatform)
32.286 - .add(newPlatform))
32.287 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
32.288 - .add(autoDetectPlatform)
32.289 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
32.290 - .add(makePlatformDefault))))
32.291 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
32.292 + .addComponent(jTabbedPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 340, Short.MAX_VALUE)
32.293 + .addGroup(layout.createSequentialGroup()
32.294 + .addComponent(jLabel1)
32.295 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
32.296 + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 226, Short.MAX_VALUE)
32.297 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
32.298 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
32.299 + .addComponent(removePlatform)
32.300 + .addComponent(newPlatform))
32.301 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
32.302 + .addComponent(autoDetectPlatform)
32.303 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
32.304 + .addComponent(makePlatformDefault))))
32.305 );
32.306 }// </editor-fold>//GEN-END:initComponents
32.307
33.1 --- a/python.project/nbproject/project.xml Wed Dec 12 18:02:29 2012 +0100
33.2 +++ b/python.project/nbproject/project.xml Wed Dec 12 19:12:46 2012 +0100
33.3 @@ -6,15 +6,6 @@
33.4 <code-name-base>org.netbeans.modules.python.project</code-name-base>
33.5 <module-dependencies>
33.6 <dependency>
33.7 - <code-name-base>org.jdesktop.layout</code-name-base>
33.8 - <build-prerequisite/>
33.9 - <compile-dependency/>
33.10 - <run-dependency>
33.11 - <release-version>1</release-version>
33.12 - <specification-version>1.4.1</specification-version>
33.13 - </run-dependency>
33.14 - </dependency>
33.15 - <dependency>
33.16 <code-name-base>org.netbeans.api.progress</code-name-base>
33.17 <build-prerequisite/>
33.18 <compile-dependency/>
34.1 --- a/python.project/src/org/netbeans/modules/python/project/templates/EmptyPythonProjectPanelVisual.form Wed Dec 12 18:02:29 2012 +0100
34.2 +++ b/python.project/src/org/netbeans/modules/python/project/templates/EmptyPythonProjectPanelVisual.form Wed Dec 12 19:12:46 2012 +0100
34.3 @@ -4,9 +4,10 @@
34.4 <AuxValues>
34.5 <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
34.6 <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
34.7 + <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
34.8 <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
34.9 <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
34.10 - <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
34.11 + <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
34.12 <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
34.13 <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
34.14 <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
35.1 --- a/python.project/src/org/netbeans/modules/python/project/templates/EmptyPythonProjectPanelVisual.java Wed Dec 12 18:02:29 2012 +0100
35.2 +++ b/python.project/src/org/netbeans/modules/python/project/templates/EmptyPythonProjectPanelVisual.java Wed Dec 12 19:12:46 2012 +0100
35.3 @@ -67,40 +67,40 @@
35.4
35.5 createdFolderTextField.setEditable(false);
35.6
35.7 - org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
35.8 + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
35.9 this.setLayout(layout);
35.10 layout.setHorizontalGroup(
35.11 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
35.12 - .add(layout.createSequentialGroup()
35.13 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
35.14 - .add(projectLocationLabel)
35.15 - .add(createdFolderLabel)
35.16 - .add(projectNameLabel))
35.17 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
35.18 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
35.19 - .add(layout.createSequentialGroup()
35.20 - .add(projectLocationTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 238, Short.MAX_VALUE)
35.21 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
35.22 - .add(browseButton))
35.23 - .add(projectNameTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 343, Short.MAX_VALUE)
35.24 - .add(createdFolderTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 343, Short.MAX_VALUE)))
35.25 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
35.26 + .addGroup(layout.createSequentialGroup()
35.27 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
35.28 + .addComponent(projectLocationLabel)
35.29 + .addComponent(createdFolderLabel)
35.30 + .addComponent(projectNameLabel))
35.31 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
35.32 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
35.33 + .addGroup(layout.createSequentialGroup()
35.34 + .addComponent(projectLocationTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 238, Short.MAX_VALUE)
35.35 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
35.36 + .addComponent(browseButton))
35.37 + .addComponent(projectNameTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 343, Short.MAX_VALUE)
35.38 + .addComponent(createdFolderTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 343, Short.MAX_VALUE)))
35.39 );
35.40 layout.setVerticalGroup(
35.41 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
35.42 - .add(layout.createSequentialGroup()
35.43 - .add(20, 20, 20)
35.44 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
35.45 - .add(projectNameLabel)
35.46 - .add(projectNameTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
35.47 - .add(8, 8, 8)
35.48 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
35.49 - .add(projectLocationLabel)
35.50 - .add(browseButton)
35.51 - .add(projectLocationTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
35.52 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
35.53 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
35.54 - .add(createdFolderLabel)
35.55 - .add(createdFolderTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
35.56 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
35.57 + .addGroup(layout.createSequentialGroup()
35.58 + .addGap(20, 20, 20)
35.59 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
35.60 + .addComponent(projectNameLabel)
35.61 + .addComponent(projectNameTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
35.62 + .addGap(8, 8, 8)
35.63 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
35.64 + .addComponent(projectLocationLabel)
35.65 + .addComponent(browseButton)
35.66 + .addComponent(projectLocationTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
35.67 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
35.68 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
35.69 + .addComponent(createdFolderLabel)
35.70 + .addComponent(createdFolderTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
35.71 .addContainerGap(31, Short.MAX_VALUE))
35.72 );
35.73 }// </editor-fold>//GEN-END:initComponents
36.1 --- a/python.project/src/org/netbeans/modules/python/project/templates/ExistingPythonProjectPanelVisual.form Wed Dec 12 18:02:29 2012 +0100
36.2 +++ b/python.project/src/org/netbeans/modules/python/project/templates/ExistingPythonProjectPanelVisual.form Wed Dec 12 19:12:46 2012 +0100
36.3 @@ -7,7 +7,7 @@
36.4 <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
36.5 <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
36.6 <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
36.7 - <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
36.8 + <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
36.9 <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
36.10 <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
36.11 <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
37.1 --- a/python.project/src/org/netbeans/modules/python/project/templates/ExistingPythonProjectPanelVisual.java Wed Dec 12 18:02:29 2012 +0100
37.2 +++ b/python.project/src/org/netbeans/modules/python/project/templates/ExistingPythonProjectPanelVisual.java Wed Dec 12 19:12:46 2012 +0100
37.3 @@ -73,35 +73,35 @@
37.4 }
37.5 });
37.6
37.7 - org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
37.8 + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
37.9 this.setLayout(layout);
37.10 layout.setHorizontalGroup(
37.11 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
37.12 - .add(layout.createSequentialGroup()
37.13 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
37.14 - .add(jLabel2)
37.15 - .add(jLabel1))
37.16 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
37.17 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
37.18 - .add(layout.createSequentialGroup()
37.19 - .add(projectFolder, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 167, Short.MAX_VALUE)
37.20 - .add(1, 1, 1)
37.21 - .add(browse)
37.22 - .add(48, 48, 48))
37.23 - .add(projectName, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 300, Short.MAX_VALUE)))
37.24 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
37.25 + .addGroup(layout.createSequentialGroup()
37.26 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
37.27 + .addComponent(jLabel2)
37.28 + .addComponent(jLabel1))
37.29 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
37.30 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
37.31 + .addGroup(layout.createSequentialGroup()
37.32 + .addComponent(projectFolder, javax.swing.GroupLayout.DEFAULT_SIZE, 167, Short.MAX_VALUE)
37.33 + .addGap(1, 1, 1)
37.34 + .addComponent(browse)
37.35 + .addGap(48, 48, 48))
37.36 + .addComponent(projectName, javax.swing.GroupLayout.DEFAULT_SIZE, 300, Short.MAX_VALUE)))
37.37 );
37.38 layout.setVerticalGroup(
37.39 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
37.40 - .add(layout.createSequentialGroup()
37.41 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
37.42 + .addGroup(layout.createSequentialGroup()
37.43 .addContainerGap()
37.44 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
37.45 - .add(jLabel1)
37.46 - .add(projectName, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
37.47 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
37.48 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
37.49 - .add(jLabel2)
37.50 - .add(projectFolder, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
37.51 - .add(browse))
37.52 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
37.53 + .addComponent(jLabel1)
37.54 + .addComponent(projectName, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
37.55 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
37.56 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
37.57 + .addComponent(jLabel2)
37.58 + .addComponent(projectFolder, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
37.59 + .addComponent(browse))
37.60 .addContainerGap(29, Short.MAX_VALUE))
37.61 );
37.62 }// </editor-fold>//GEN-END:initComponents
38.1 --- a/python.project/src/org/netbeans/modules/python/project/templates/PanelConfigureSourcesVisual.form Wed Dec 12 18:02:29 2012 +0100
38.2 +++ b/python.project/src/org/netbeans/modules/python/project/templates/PanelConfigureSourcesVisual.form Wed Dec 12 19:12:46 2012 +0100
38.3 @@ -7,7 +7,7 @@
38.4 <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
38.5 <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
38.6 <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
38.7 - <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
38.8 + <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
38.9 <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
38.10 <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
38.11 <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
38.12 @@ -21,7 +21,7 @@
38.13 <Component id="jLabel1" alignment="0" min="-2" max="-2" attributes="0"/>
38.14 <Component id="jLabel2" alignment="0" min="-2" max="-2" attributes="0"/>
38.15 <Component id="jLabel3" alignment="0" min="-2" max="-2" attributes="0"/>
38.16 - <Component id="jScrollPane2" alignment="0" pref="307" max="32767" attributes="2"/>
38.17 + <Component id="jScrollPane2" alignment="0" pref="341" max="32767" attributes="2"/>
38.18 <Component id="jScrollPane1" alignment="0" pref="307" max="32767" attributes="2"/>
38.19 </Group>
38.20 <EmptySpace min="-2" max="-2" attributes="0"/>
39.1 --- a/python.project/src/org/netbeans/modules/python/project/templates/PanelConfigureSourcesVisual.java Wed Dec 12 18:02:29 2012 +0100
39.2 +++ b/python.project/src/org/netbeans/modules/python/project/templates/PanelConfigureSourcesVisual.java Wed Dec 12 19:12:46 2012 +0100
39.3 @@ -139,48 +139,48 @@
39.4 }
39.5 });
39.6
39.7 - org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
39.8 + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
39.9 this.setLayout(layout);
39.10 layout.setHorizontalGroup(
39.11 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
39.12 - .add(layout.createSequentialGroup()
39.13 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
39.14 - .add(jLabel1)
39.15 - .add(jLabel2)
39.16 - .add(jLabel3)
39.17 - .add(jScrollPane2, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 307, Short.MAX_VALUE)
39.18 - .add(jScrollPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 307, Short.MAX_VALUE))
39.19 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
39.20 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
39.21 - .add(removeTest, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
39.22 - .add(addTest, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
39.23 - .add(addSource, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 137, Short.MAX_VALUE)
39.24 - .add(removeSource, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
39.25 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
39.26 + .addGroup(layout.createSequentialGroup()
39.27 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
39.28 + .addComponent(jLabel1)
39.29 + .addComponent(jLabel2)
39.30 + .addComponent(jLabel3)
39.31 + .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 341, Short.MAX_VALUE)
39.32 + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 307, Short.MAX_VALUE))
39.33 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
39.34 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
39.35 + .addComponent(removeTest, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
39.36 + .addComponent(addTest, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
39.37 + .addComponent(addSource, javax.swing.GroupLayout.DEFAULT_SIZE, 137, Short.MAX_VALUE)
39.38 + .addComponent(removeSource, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
39.39 );
39.40 layout.setVerticalGroup(
39.41 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
39.42 - .add(layout.createSequentialGroup()
39.43 - .add(20, 20, 20)
39.44 - .add(jLabel1)
39.45 - .add(18, 18, 18)
39.46 - .add(jLabel2)
39.47 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
39.48 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
39.49 - .add(layout.createSequentialGroup()
39.50 - .add(jScrollPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 100, Short.MAX_VALUE)
39.51 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
39.52 - .add(jLabel3))
39.53 - .add(layout.createSequentialGroup()
39.54 - .add(addSource)
39.55 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
39.56 - .add(removeSource)))
39.57 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
39.58 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
39.59 - .add(layout.createSequentialGroup()
39.60 - .add(addTest)
39.61 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
39.62 - .add(removeTest))
39.63 - .add(jScrollPane2, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 100, Short.MAX_VALUE))
39.64 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
39.65 + .addGroup(layout.createSequentialGroup()
39.66 + .addGap(20, 20, 20)
39.67 + .addComponent(jLabel1)
39.68 + .addGap(18, 18, 18)
39.69 + .addComponent(jLabel2)
39.70 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
39.71 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
39.72 + .addGroup(layout.createSequentialGroup()
39.73 + .addComponent(jScrollPane1, javax.swing.GroupLayout.DEFAULT_SIZE, 100, Short.MAX_VALUE)
39.74 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
39.75 + .addComponent(jLabel3))
39.76 + .addGroup(layout.createSequentialGroup()
39.77 + .addComponent(addSource)
39.78 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
39.79 + .addComponent(removeSource)))
39.80 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
39.81 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
39.82 + .addGroup(layout.createSequentialGroup()
39.83 + .addComponent(addTest)
39.84 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
39.85 + .addComponent(removeTest))
39.86 + .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 100, Short.MAX_VALUE))
39.87 .addContainerGap())
39.88 );
39.89 }// </editor-fold>//GEN-END:initComponents
40.1 --- a/python.project/src/org/netbeans/modules/python/project/templates/PanelOptionsVisual.form Wed Dec 12 18:02:29 2012 +0100
40.2 +++ b/python.project/src/org/netbeans/modules/python/project/templates/PanelOptionsVisual.form Wed Dec 12 19:12:46 2012 +0100
40.3 @@ -15,7 +15,7 @@
40.4 <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
40.5 <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
40.6 <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
40.7 - <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
40.8 + <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
40.9 <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
40.10 <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
40.11 <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
41.1 --- a/python.project/src/org/netbeans/modules/python/project/templates/PanelOptionsVisual.java Wed Dec 12 18:02:29 2012 +0100
41.2 +++ b/python.project/src/org/netbeans/modules/python/project/templates/PanelOptionsVisual.java Wed Dec 12 19:12:46 2012 +0100
41.3 @@ -177,40 +177,40 @@
41.4 }
41.5 });
41.6
41.7 - org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
41.8 + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
41.9 this.setLayout(layout);
41.10 layout.setHorizontalGroup(
41.11 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
41.12 - .add(layout.createSequentialGroup()
41.13 - .add(setAsMainCheckBox)
41.14 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
41.15 + .addGroup(layout.createSequentialGroup()
41.16 + .addComponent(setAsMainCheckBox)
41.17 .addContainerGap(353, Short.MAX_VALUE))
41.18 - .add(layout.createSequentialGroup()
41.19 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
41.20 - .add(createMainCheckBox)
41.21 - .add(jLabel1))
41.22 - .add(18, 18, 18)
41.23 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
41.24 - .add(layout.createSequentialGroup()
41.25 - .add(platforms, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 233, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
41.26 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
41.27 - .add(manage)
41.28 - .add(4, 4, 4))
41.29 - .add(mainFileTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 353, Short.MAX_VALUE)))
41.30 + .addGroup(layout.createSequentialGroup()
41.31 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
41.32 + .addComponent(createMainCheckBox)
41.33 + .addComponent(jLabel1))
41.34 + .addGap(18, 18, 18)
41.35 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
41.36 + .addGroup(layout.createSequentialGroup()
41.37 + .addComponent(platforms, javax.swing.GroupLayout.PREFERRED_SIZE, 233, javax.swing.GroupLayout.PREFERRED_SIZE)
41.38 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
41.39 + .addComponent(manage)
41.40 + .addGap(4, 4, 4))
41.41 + .addComponent(mainFileTextField, javax.swing.GroupLayout.DEFAULT_SIZE, 353, Short.MAX_VALUE)))
41.42 );
41.43 layout.setVerticalGroup(
41.44 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
41.45 - .add(layout.createSequentialGroup()
41.46 - .add(setAsMainCheckBox)
41.47 - .add(5, 5, 5)
41.48 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
41.49 - .add(createMainCheckBox)
41.50 - .add(mainFileTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
41.51 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
41.52 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
41.53 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
41.54 - .add(jLabel1)
41.55 - .add(platforms, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
41.56 - .add(manage))
41.57 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
41.58 + .addGroup(layout.createSequentialGroup()
41.59 + .addComponent(setAsMainCheckBox)
41.60 + .addGap(5, 5, 5)
41.61 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
41.62 + .addComponent(createMainCheckBox)
41.63 + .addComponent(mainFileTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
41.64 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
41.65 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
41.66 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
41.67 + .addComponent(jLabel1)
41.68 + .addComponent(platforms, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
41.69 + .addComponent(manage))
41.70 .addContainerGap(50, Short.MAX_VALUE))
41.71 );
41.72
42.1 --- a/python.project/src/org/netbeans/modules/python/project/ui/customizer/CustomizerPythonPath.form Wed Dec 12 18:02:29 2012 +0100
42.2 +++ b/python.project/src/org/netbeans/modules/python/project/ui/customizer/CustomizerPythonPath.form Wed Dec 12 19:12:46 2012 +0100
42.3 @@ -7,7 +7,7 @@
42.4 <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
42.5 <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
42.6 <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
42.7 - <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
42.8 + <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
42.9 <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
42.10 <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
42.11 <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
43.1 --- a/python.project/src/org/netbeans/modules/python/project/ui/customizer/CustomizerPythonPath.java Wed Dec 12 18:02:29 2012 +0100
43.2 +++ b/python.project/src/org/netbeans/modules/python/project/ui/customizer/CustomizerPythonPath.java Wed Dec 12 19:12:46 2012 +0100
43.3 @@ -144,54 +144,54 @@
43.4
43.5 jLabel2.setText(org.openide.util.NbBundle.getMessage(CustomizerPythonPath.class, "CustomizerPythonPath.jLabel2.text")); // NOI18N
43.6
43.7 - org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
43.8 + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
43.9 this.setLayout(layout);
43.10 layout.setHorizontalGroup(
43.11 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
43.12 - .add(layout.createSequentialGroup()
43.13 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
43.14 + .addGroup(layout.createSequentialGroup()
43.15 .addContainerGap()
43.16 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
43.17 - .add(layout.createSequentialGroup()
43.18 - .add(jLabel1)
43.19 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
43.20 - .add(platforms, 0, 221, Short.MAX_VALUE)
43.21 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
43.22 - .add(manage)
43.23 - .add(30, 30, 30))
43.24 - .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
43.25 - .add(jScrollPane2, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 309, Short.MAX_VALUE)
43.26 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
43.27 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
43.28 - .add(moveDownPythonPath, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 156, Short.MAX_VALUE)
43.29 - .add(moveUpPythonPath, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 156, Short.MAX_VALUE)
43.30 - .add(removePythonPath, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 156, Short.MAX_VALUE)
43.31 - .add(addPythonPath, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 156, Short.MAX_VALUE)))
43.32 - .add(jLabel2))
43.33 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
43.34 + .addGroup(layout.createSequentialGroup()
43.35 + .addComponent(jLabel1)
43.36 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
43.37 + .addComponent(platforms, 0, 244, Short.MAX_VALUE)
43.38 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
43.39 + .addComponent(manage)
43.40 + .addGap(30, 30, 30))
43.41 + .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, layout.createSequentialGroup()
43.42 + .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 309, Short.MAX_VALUE)
43.43 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
43.44 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
43.45 + .addComponent(moveDownPythonPath, javax.swing.GroupLayout.DEFAULT_SIZE, 156, Short.MAX_VALUE)
43.46 + .addComponent(moveUpPythonPath, javax.swing.GroupLayout.DEFAULT_SIZE, 156, Short.MAX_VALUE)
43.47 + .addComponent(removePythonPath, javax.swing.GroupLayout.DEFAULT_SIZE, 156, Short.MAX_VALUE)
43.48 + .addComponent(addPythonPath, javax.swing.GroupLayout.DEFAULT_SIZE, 156, Short.MAX_VALUE)))
43.49 + .addComponent(jLabel2))
43.50 .addContainerGap())
43.51 );
43.52 layout.setVerticalGroup(
43.53 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
43.54 - .add(layout.createSequentialGroup()
43.55 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
43.56 + .addGroup(layout.createSequentialGroup()
43.57 .addContainerGap()
43.58 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, false)
43.59 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
43.60 - .add(platforms, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
43.61 - .add(jLabel1))
43.62 - .add(manage))
43.63 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
43.64 - .add(jLabel2, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 16, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
43.65 - .add(8, 8, 8)
43.66 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
43.67 - .add(layout.createSequentialGroup()
43.68 - .add(addPythonPath)
43.69 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
43.70 - .add(removePythonPath)
43.71 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
43.72 - .add(moveUpPythonPath)
43.73 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
43.74 - .add(moveDownPythonPath))
43.75 - .add(jScrollPane2, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 214, Short.MAX_VALUE))
43.76 - .add(19, 19, 19))
43.77 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING, false)
43.78 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
43.79 + .addComponent(platforms, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
43.80 + .addComponent(jLabel1))
43.81 + .addComponent(manage))
43.82 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
43.83 + .addComponent(jLabel2, javax.swing.GroupLayout.PREFERRED_SIZE, 16, javax.swing.GroupLayout.PREFERRED_SIZE)
43.84 + .addGap(8, 8, 8)
43.85 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
43.86 + .addGroup(layout.createSequentialGroup()
43.87 + .addComponent(addPythonPath)
43.88 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
43.89 + .addComponent(removePythonPath)
43.90 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
43.91 + .addComponent(moveUpPythonPath)
43.92 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
43.93 + .addComponent(moveDownPythonPath))
43.94 + .addComponent(jScrollPane2, javax.swing.GroupLayout.DEFAULT_SIZE, 214, Short.MAX_VALUE))
43.95 + .addGap(19, 19, 19))
43.96 );
43.97 }// </editor-fold>//GEN-END:initComponents
43.98
44.1 --- a/python.project/src/org/netbeans/modules/python/project/ui/customizer/CustomizerRun.form Wed Dec 12 18:02:29 2012 +0100
44.2 +++ b/python.project/src/org/netbeans/modules/python/project/ui/customizer/CustomizerRun.form Wed Dec 12 19:12:46 2012 +0100
44.3 @@ -7,7 +7,7 @@
44.4 <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
44.5 <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
44.6 <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
44.7 - <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
44.8 + <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
44.9 <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
44.10 <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
44.11 <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
45.1 --- a/python.project/src/org/netbeans/modules/python/project/ui/customizer/CustomizerRun.java Wed Dec 12 18:02:29 2012 +0100
45.2 +++ b/python.project/src/org/netbeans/modules/python/project/ui/customizer/CustomizerRun.java Wed Dec 12 19:12:46 2012 +0100
45.3 @@ -66,33 +66,33 @@
45.4 jLabel2.setLabelFor(appArgs);
45.5 org.openide.awt.Mnemonics.setLocalizedText(jLabel2, org.openide.util.NbBundle.getMessage(CustomizerRun.class, "CustomizerRun.appArgs.text")); // NOI18N
45.6
45.7 - org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
45.8 + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
45.9 this.setLayout(layout);
45.10 layout.setHorizontalGroup(
45.11 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
45.12 - .add(layout.createSequentialGroup()
45.13 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
45.14 - .add(jLabel2)
45.15 - .add(jLabel1))
45.16 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
45.17 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
45.18 - .add(mainModule, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 116, Short.MAX_VALUE)
45.19 - .add(appArgs, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 116, Short.MAX_VALUE))
45.20 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
45.21 - .add(jButton1)
45.22 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
45.23 + .addGroup(layout.createSequentialGroup()
45.24 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
45.25 + .addComponent(jLabel2)
45.26 + .addComponent(jLabel1))
45.27 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
45.28 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
45.29 + .addComponent(mainModule, javax.swing.GroupLayout.DEFAULT_SIZE, 116, Short.MAX_VALUE)
45.30 + .addComponent(appArgs, javax.swing.GroupLayout.DEFAULT_SIZE, 116, Short.MAX_VALUE))
45.31 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
45.32 + .addComponent(jButton1)
45.33 .addContainerGap())
45.34 );
45.35 layout.setVerticalGroup(
45.36 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
45.37 - .add(layout.createSequentialGroup()
45.38 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
45.39 - .add(jLabel1)
45.40 - .add(jButton1)
45.41 - .add(mainModule, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
45.42 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
45.43 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
45.44 - .add(jLabel2)
45.45 - .add(appArgs, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
45.46 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
45.47 + .addGroup(layout.createSequentialGroup()
45.48 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
45.49 + .addComponent(jLabel1)
45.50 + .addComponent(jButton1)
45.51 + .addComponent(mainModule, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
45.52 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
45.53 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
45.54 + .addComponent(jLabel2)
45.55 + .addComponent(appArgs, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
45.56 .addContainerGap(234, Short.MAX_VALUE))
45.57 );
45.58
46.1 --- a/python.qshell/nbproject/project.xml Wed Dec 12 18:02:29 2012 +0100
46.2 +++ b/python.qshell/nbproject/project.xml Wed Dec 12 19:12:46 2012 +0100
46.3 @@ -6,15 +6,6 @@
46.4 <code-name-base>org.netbeans.modules.python.qshell</code-name-base>
46.5 <module-dependencies>
46.6 <dependency>
46.7 - <code-name-base>org.jdesktop.layout</code-name-base>
46.8 - <build-prerequisite/>
46.9 - <compile-dependency/>
46.10 - <run-dependency>
46.11 - <release-version>1</release-version>
46.12 - <specification-version>1.7</specification-version>
46.13 - </run-dependency>
46.14 - </dependency>
46.15 - <dependency>
46.16 <code-name-base>org.netbeans.lib.terminalemulator</code-name-base>
46.17 <build-prerequisite/>
46.18 <compile-dependency/>
47.1 --- a/python.qshell/src/org/netbeans/modules/python/qshell/QShellConfigPanel.form Wed Dec 12 18:02:29 2012 +0100
47.2 +++ b/python.qshell/src/org/netbeans/modules/python/qshell/QShellConfigPanel.form Wed Dec 12 19:12:46 2012 +0100
47.3 @@ -7,7 +7,7 @@
47.4 <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
47.5 <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
47.6 <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
47.7 - <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
47.8 + <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
47.9 <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
47.10 <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
47.11 <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="0"/>
48.1 --- a/python.qshell/src/org/netbeans/modules/python/qshell/QShellConfigPanel.java Wed Dec 12 18:02:29 2012 +0100
48.2 +++ b/python.qshell/src/org/netbeans/modules/python/qshell/QShellConfigPanel.java Wed Dec 12 19:12:46 2012 +0100
48.3 @@ -82,30 +82,30 @@
48.4
48.5 path.setText(org.openide.util.NbBundle.getMessage(QShellConfigPanel.class, "QShellConfigPanel.path.text")); // NOI18N
48.6
48.7 - org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
48.8 + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
48.9 this.setLayout(layout);
48.10 layout.setHorizontalGroup(
48.11 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
48.12 - .add(layout.createSequentialGroup()
48.13 - .add(jLabel1)
48.14 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
48.15 - .add(command, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 272, Short.MAX_VALUE))
48.16 - .add(layout.createSequentialGroup()
48.17 - .add(jLabel2)
48.18 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
48.19 - .add(path, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 272, Short.MAX_VALUE))
48.20 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
48.21 + .addGroup(layout.createSequentialGroup()
48.22 + .addComponent(jLabel1)
48.23 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
48.24 + .addComponent(command, javax.swing.GroupLayout.DEFAULT_SIZE, 272, Short.MAX_VALUE))
48.25 + .addGroup(layout.createSequentialGroup()
48.26 + .addComponent(jLabel2)
48.27 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
48.28 + .addComponent(path, javax.swing.GroupLayout.DEFAULT_SIZE, 272, Short.MAX_VALUE))
48.29 );
48.30 layout.setVerticalGroup(
48.31 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
48.32 - .add(layout.createSequentialGroup()
48.33 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
48.34 - .add(jLabel1)
48.35 - .add(command, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
48.36 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
48.37 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
48.38 - .add(jLabel2)
48.39 - .add(path, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
48.40 - .addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
48.41 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
48.42 + .addGroup(layout.createSequentialGroup()
48.43 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
48.44 + .addComponent(jLabel1)
48.45 + .addComponent(command, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
48.46 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
48.47 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
48.48 + .addComponent(jLabel2)
48.49 + .addComponent(path, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
48.50 + .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
48.51 );
48.52 }// </editor-fold>//GEN-END:initComponents
48.53
49.1 --- a/python.samples/nbproject/project.xml Wed Dec 12 18:02:29 2012 +0100
49.2 +++ b/python.samples/nbproject/project.xml Wed Dec 12 19:12:46 2012 +0100
49.3 @@ -6,21 +6,6 @@
49.4 <code-name-base>org.netbeans.modules.python.samples</code-name-base>
49.5 <module-dependencies>
49.6 <dependency>
49.7 - <code-name-base>org.netbeans.modules.python.kit</code-name-base>
49.8 - <run-dependency>
49.9 - <release-version>1</release-version>
49.10 - </run-dependency>
49.11 - </dependency>
49.12 - <dependency>
49.13 - <code-name-base>org.jdesktop.layout</code-name-base>
49.14 - <build-prerequisite/>
49.15 - <compile-dependency/>
49.16 - <run-dependency>
49.17 - <release-version>1</release-version>
49.18 - <specification-version>1.7</specification-version>
49.19 - </run-dependency>
49.20 - </dependency>
49.21 - <dependency>
49.22 <code-name-base>org.netbeans.modules.projectapi</code-name-base>
49.23 <build-prerequisite/>
49.24 <compile-dependency/>
49.25 @@ -39,6 +24,12 @@
49.26 </run-dependency>
49.27 </dependency>
49.28 <dependency>
49.29 + <code-name-base>org.netbeans.modules.python.kit</code-name-base>
49.30 + <run-dependency>
49.31 + <release-version>1</release-version>
49.32 + </run-dependency>
49.33 + </dependency>
49.34 + <dependency>
49.35 <code-name-base>org.openide.awt</code-name-base>
49.36 <build-prerequisite/>
49.37 <compile-dependency/>
50.1 --- a/python.samples/src/org/netbeans/modules/python/samples/projects/JySwingPanelVisual.form Wed Dec 12 18:02:29 2012 +0100
50.2 +++ b/python.samples/src/org/netbeans/modules/python/samples/projects/JySwingPanelVisual.form Wed Dec 12 19:12:46 2012 +0100
50.3 @@ -7,7 +7,7 @@
50.4 <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
50.5 <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
50.6 <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
50.7 - <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
50.8 + <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
50.9 <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
50.10 <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
50.11 <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
51.1 --- a/python.samples/src/org/netbeans/modules/python/samples/projects/JySwingPanelVisual.java Wed Dec 12 18:02:29 2012 +0100
51.2 +++ b/python.samples/src/org/netbeans/modules/python/samples/projects/JySwingPanelVisual.java Wed Dec 12 19:12:46 2012 +0100
51.3 @@ -106,41 +106,41 @@
51.4
51.5 createdFolderTextField.setEditable(false);
51.6
51.7 - org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
51.8 + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
51.9 this.setLayout(layout);
51.10 layout.setHorizontalGroup(
51.11 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
51.12 - .add(layout.createSequentialGroup()
51.13 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
51.14 + .addGroup(layout.createSequentialGroup()
51.15 .addContainerGap()
51.16 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
51.17 - .add(projectNameLabel)
51.18 - .add(projectLocationLabel)
51.19 - .add(createdFolderLabel))
51.20 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
51.21 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
51.22 - .add(org.jdesktop.layout.GroupLayout.TRAILING, projectNameTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 191, Short.MAX_VALUE)
51.23 - .add(org.jdesktop.layout.GroupLayout.TRAILING, projectLocationTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 191, Short.MAX_VALUE)
51.24 - .add(org.jdesktop.layout.GroupLayout.TRAILING, createdFolderTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 191, Short.MAX_VALUE))
51.25 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
51.26 - .add(browseButton)
51.27 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
51.28 + .addComponent(projectNameLabel)
51.29 + .addComponent(projectLocationLabel)
51.30 + .addComponent(createdFolderLabel))
51.31 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
51.32 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
51.33 + .addComponent(projectNameTextField, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 191, Short.MAX_VALUE)
51.34 + .addComponent(projectLocationTextField, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 191, Short.MAX_VALUE)
51.35 + .addComponent(createdFolderTextField, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 191, Short.MAX_VALUE))
51.36 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
51.37 + .addComponent(browseButton)
51.38 .addContainerGap())
51.39 );
51.40 layout.setVerticalGroup(
51.41 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
51.42 - .add(layout.createSequentialGroup()
51.43 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
51.44 + .addGroup(layout.createSequentialGroup()
51.45 .addContainerGap()
51.46 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
51.47 - .add(projectNameLabel)
51.48 - .add(projectNameTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
51.49 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
51.50 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
51.51 - .add(projectLocationLabel)
51.52 - .add(projectLocationTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
51.53 - .add(browseButton))
51.54 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
51.55 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
51.56 - .add(createdFolderLabel)
51.57 - .add(createdFolderTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
51.58 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
51.59 + .addComponent(projectNameLabel)
51.60 + .addComponent(projectNameTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
51.61 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
51.62 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
51.63 + .addComponent(projectLocationLabel)
51.64 + .addComponent(projectLocationTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
51.65 + .addComponent(browseButton))
51.66 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
51.67 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
51.68 + .addComponent(createdFolderLabel)
51.69 + .addComponent(createdFolderTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
51.70 .addContainerGap(213, Short.MAX_VALUE))
51.71 );
51.72 }// </editor-fold>//GEN-END:initComponents
52.1 --- a/python.samples/src/org/netbeans/modules/python/samples/projects/PLYDemoPanelVisual.form Wed Dec 12 18:02:29 2012 +0100
52.2 +++ b/python.samples/src/org/netbeans/modules/python/samples/projects/PLYDemoPanelVisual.form Wed Dec 12 19:12:46 2012 +0100
52.3 @@ -7,7 +7,7 @@
52.4 <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
52.5 <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
52.6 <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
52.7 - <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
52.8 + <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
52.9 <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
52.10 <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
52.11 <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
53.1 --- a/python.samples/src/org/netbeans/modules/python/samples/projects/PLYDemoPanelVisual.java Wed Dec 12 18:02:29 2012 +0100
53.2 +++ b/python.samples/src/org/netbeans/modules/python/samples/projects/PLYDemoPanelVisual.java Wed Dec 12 19:12:46 2012 +0100
53.3 @@ -106,41 +106,41 @@
53.4
53.5 createdFolderTextField.setEditable(false);
53.6
53.7 - org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
53.8 + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
53.9 this.setLayout(layout);
53.10 layout.setHorizontalGroup(
53.11 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
53.12 - .add(layout.createSequentialGroup()
53.13 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
53.14 + .addGroup(layout.createSequentialGroup()
53.15 .addContainerGap()
53.16 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
53.17 - .add(projectNameLabel)
53.18 - .add(projectLocationLabel)
53.19 - .add(createdFolderLabel))
53.20 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
53.21 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
53.22 - .add(org.jdesktop.layout.GroupLayout.TRAILING, projectNameTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 191, Short.MAX_VALUE)
53.23 - .add(org.jdesktop.layout.GroupLayout.TRAILING, projectLocationTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 191, Short.MAX_VALUE)
53.24 - .add(org.jdesktop.layout.GroupLayout.TRAILING, createdFolderTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 191, Short.MAX_VALUE))
53.25 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
53.26 - .add(browseButton)
53.27 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
53.28 + .addComponent(projectNameLabel)
53.29 + .addComponent(projectLocationLabel)
53.30 + .addComponent(createdFolderLabel))
53.31 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
53.32 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
53.33 + .addComponent(projectNameTextField, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 191, Short.MAX_VALUE)
53.34 + .addComponent(projectLocationTextField, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 191, Short.MAX_VALUE)
53.35 + .addComponent(createdFolderTextField, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 191, Short.MAX_VALUE))
53.36 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
53.37 + .addComponent(browseButton)
53.38 .addContainerGap())
53.39 );
53.40 layout.setVerticalGroup(
53.41 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
53.42 - .add(layout.createSequentialGroup()
53.43 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
53.44 + .addGroup(layout.createSequentialGroup()
53.45 .addContainerGap()
53.46 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
53.47 - .add(projectNameLabel)
53.48 - .add(projectNameTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
53.49 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
53.50 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
53.51 - .add(projectLocationLabel)
53.52 - .add(projectLocationTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
53.53 - .add(browseButton))
53.54 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
53.55 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
53.56 - .add(createdFolderLabel)
53.57 - .add(createdFolderTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
53.58 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
53.59 + .addComponent(projectNameLabel)
53.60 + .addComponent(projectNameTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
53.61 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
53.62 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
53.63 + .addComponent(projectLocationLabel)
53.64 + .addComponent(projectLocationTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
53.65 + .addComponent(browseButton))
53.66 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
53.67 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
53.68 + .addComponent(createdFolderLabel)
53.69 + .addComponent(createdFolderTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
53.70 .addContainerGap(213, Short.MAX_VALUE))
53.71 );
53.72 }// </editor-fold>//GEN-END:initComponents
54.1 --- a/python.samples/src/org/netbeans/modules/python/samples/projects/PyThreadsPanelVisual.form Wed Dec 12 18:02:29 2012 +0100
54.2 +++ b/python.samples/src/org/netbeans/modules/python/samples/projects/PyThreadsPanelVisual.form Wed Dec 12 19:12:46 2012 +0100
54.3 @@ -7,7 +7,7 @@
54.4 <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" value="true"/>
54.5 <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
54.6 <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
54.7 - <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
54.8 + <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="1"/>
54.9 <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
54.10 <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
54.11 <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
55.1 --- a/python.samples/src/org/netbeans/modules/python/samples/projects/PyThreadsPanelVisual.java Wed Dec 12 18:02:29 2012 +0100
55.2 +++ b/python.samples/src/org/netbeans/modules/python/samples/projects/PyThreadsPanelVisual.java Wed Dec 12 19:12:46 2012 +0100
55.3 @@ -106,41 +106,41 @@
55.4
55.5 createdFolderTextField.setEditable(false);
55.6
55.7 - org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
55.8 + javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
55.9 this.setLayout(layout);
55.10 layout.setHorizontalGroup(
55.11 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
55.12 - .add(layout.createSequentialGroup()
55.13 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
55.14 + .addGroup(layout.createSequentialGroup()
55.15 .addContainerGap()
55.16 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
55.17 - .add(projectNameLabel)
55.18 - .add(projectLocationLabel)
55.19 - .add(createdFolderLabel))
55.20 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
55.21 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
55.22 - .add(org.jdesktop.layout.GroupLayout.TRAILING, projectNameTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 191, Short.MAX_VALUE)
55.23 - .add(org.jdesktop.layout.GroupLayout.TRAILING, projectLocationTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 191, Short.MAX_VALUE)
55.24 - .add(org.jdesktop.layout.GroupLayout.TRAILING, createdFolderTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 191, Short.MAX_VALUE))
55.25 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
55.26 - .add(browseButton)
55.27 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
55.28 + .addComponent(projectNameLabel)
55.29 + .addComponent(projectLocationLabel)
55.30 + .addComponent(createdFolderLabel))
55.31 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
55.32 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
55.33 + .addComponent(projectNameTextField, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 191, Short.MAX_VALUE)
55.34 + .addComponent(projectLocationTextField, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 191, Short.MAX_VALUE)
55.35 + .addComponent(createdFolderTextField, javax.swing.GroupLayout.Alignment.TRAILING, javax.swing.GroupLayout.DEFAULT_SIZE, 191, Short.MAX_VALUE))
55.36 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
55.37 + .addComponent(browseButton)
55.38 .addContainerGap())
55.39 );
55.40 layout.setVerticalGroup(
55.41 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
55.42 - .add(layout.createSequentialGroup()
55.43 + layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
55.44 + .addGroup(layout.createSequentialGroup()
55.45 .addContainerGap()
55.46 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
55.47 - .add(projectNameLabel)
55.48 - .add(projectNameTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
55.49 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
55.50 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
55.51 - .add(projectLocationLabel)
55.52 - .add(projectLocationTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
55.53 - .add(browseButton))
55.54 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
55.55 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
55.56 - .add(createdFolderLabel)
55.57 - .add(createdFolderTextField, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
55.58 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
55.59 + .addComponent(projectNameLabel)
55.60 + .addComponent(projectNameTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
55.61 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
55.62 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
55.63 + .addComponent(projectLocationLabel)
55.64 + .addComponent(projectLocationTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
55.65 + .addComponent(browseButton))
55.66 + .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
55.67 + .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
55.68 + .addComponent(createdFolderLabel)
55.69 + .addComponent(createdFolderTextField, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
55.70 .addContainerGap(213, Short.MAX_VALUE))
55.71 );
55.72 }// </editor-fold>//GEN-END:initComponents