[[nbpython-commits]] [hg] main/contrib: Remove dependency on deprecated org.jdesktop....

  • From: Milutin Kristofic < >
  • To:
  • Subject: [[nbpython-commits]] [hg] main/contrib: Remove dependency on deprecated org.jdesktop....
  • Date: Thu, 13 Dec 2012 03:46:31 -0800

changeset 2c4e579b1c58 in main/contrib ((none))
details: http://hg.netbeans.org/main/contrib/rev/2c4e579b1c58
description:
        Remove dependency on deprecated org.jdesktop.layout

diffstat:

 python.editor/build.xml                                                      
                          |    7 +
 python.editor/nbproject/project.xml                                          
                          |    9 -
 
python.editor/src/org/netbeans/modules/python/editor/codegen/ClassCodeGenPanel.form
                    |    2 +-
 
python.editor/src/org/netbeans/modules/python/editor/codegen/ClassCodeGenPanel.java
                    |   40 +-
 
python.editor/src/org/netbeans/modules/python/editor/codegen/MethodCodeGenPanel.form
                   |    6 +-
 
python.editor/src/org/netbeans/modules/python/editor/codegen/MethodCodeGenPanel.java
                   |   52 +-
 
python.editor/src/org/netbeans/modules/python/editor/codegen/PropertyCodeGenPanel.form
                 |    2 +-
 
python.editor/src/org/netbeans/modules/python/editor/codegen/PropertyCodeGenPanel.java
                 |   32 +-
 
python.editor/src/org/netbeans/modules/python/editor/hints/NameRulePrefs.form 
                         |    4 +-
 
python.editor/src/org/netbeans/modules/python/editor/hints/NameRulePrefs.java 
                         |   96 +-
 
python.editor/src/org/netbeans/modules/python/editor/hints/UnusedDetectorPrefs.form
                    |    2 +-
 
python.editor/src/org/netbeans/modules/python/editor/hints/UnusedDetectorPrefs.java
                    |   36 +-
 
python.editor/src/org/netbeans/modules/python/editor/imports/ImportModulePanel.form
                    |    2 +-
 
python.editor/src/org/netbeans/modules/python/editor/imports/ImportModulePanel.java
                    |   26 +-
 
python.editor/src/org/netbeans/modules/python/editor/options/FmtAlignment.form
                         |   67 +--
 
python.editor/src/org/netbeans/modules/python/editor/options/FmtAlignment.java
                         |  198 ++---
 
python.editor/src/org/netbeans/modules/python/editor/options/FmtBlankLines.form
                        |    3 +-
 
python.editor/src/org/netbeans/modules/python/editor/options/FmtBlankLines.java
                        |  150 ++--
 python.editor/src/org/netbeans/modules/python/editor/options/FmtImports.form 
                          |    2 +-
 python.editor/src/org/netbeans/modules/python/editor/options/FmtImports.java 
                          |   72 +-
 python.editor/src/org/netbeans/modules/python/editor/options/FmtSpaces.form  
                          |    2 +-
 python.editor/src/org/netbeans/modules/python/editor/options/FmtSpaces.java  
                          |   54 +-
 
python.editor/src/org/netbeans/modules/python/editor/options/FmtTabsIndents.form
                       |    4 +-
 
python.editor/src/org/netbeans/modules/python/editor/options/FmtTabsIndents.java
                       |   61 +-
 
python.editor/src/org/netbeans/modules/python/editor/wizards/pypackage/PythonPackageVisualPanel1.form
  |    4 +-
 
python.editor/src/org/netbeans/modules/python/editor/wizards/pypackage/PythonPackageVisualPanel1.java
  |   10 +-
 python.options/nbproject/project.xml                                         
                          |    9 -
 python.options/src/org/netbeans/modules/python/options/OptionsPanel.form     
                          |    6 +-
 python.options/src/org/netbeans/modules/python/options/OptionsPanel.java     
                          |  304 +++++-----
 python.platform/nbproject/project.xml                                        
                          |    9 -
 
python.platform/src/org/netbeans/modules/python/platform/panels/PythonPlatformPanel.form
               |   25 +-
 
python.platform/src/org/netbeans/modules/python/platform/panels/PythonPlatformPanel.java
               |  252 ++++----
 python.project/nbproject/project.xml                                         
                          |    9 -
 
python.project/src/org/netbeans/modules/python/project/templates/EmptyPythonProjectPanelVisual.form
    |    3 +-
 
python.project/src/org/netbeans/modules/python/project/templates/EmptyPythonProjectPanelVisual.java
    |   60 +-
 
python.project/src/org/netbeans/modules/python/project/templates/ExistingPythonProjectPanelVisual.form
 |    2 +-
 
python.project/src/org/netbeans/modules/python/project/templates/ExistingPythonProjectPanelVisual.java
 |   48 +-
 
python.project/src/org/netbeans/modules/python/project/templates/PanelConfigureSourcesVisual.form
      |    4 +-
 
python.project/src/org/netbeans/modules/python/project/templates/PanelConfigureSourcesVisual.java
      |   76 +-
 
python.project/src/org/netbeans/modules/python/project/templates/PanelOptionsVisual.form
               |    2 +-
 
python.project/src/org/netbeans/modules/python/project/templates/PanelOptionsVisual.java
               |   58 +-
 
python.project/src/org/netbeans/modules/python/project/ui/customizer/CustomizerPythonPath.form
         |    2 +-
 
python.project/src/org/netbeans/modules/python/project/ui/customizer/CustomizerPythonPath.java
         |   82 +-
 
python.project/src/org/netbeans/modules/python/project/ui/customizer/CustomizerRun.form
                |    2 +-
 
python.project/src/org/netbeans/modules/python/project/ui/customizer/CustomizerRun.java
                |   44 +-
 python.qshell/nbproject/project.xml                                          
                          |    9 -
 python.qshell/src/org/netbeans/modules/python/qshell/QShellConfigPanel.form  
                          |    2 +-
 python.qshell/src/org/netbeans/modules/python/qshell/QShellConfigPanel.java  
                          |   40 +-
 python.samples/nbproject/project.xml                                         
                          |   21 +-
 
python.samples/src/org/netbeans/modules/python/samples/projects/JySwingPanelVisual.form
                |    2 +-
 
python.samples/src/org/netbeans/modules/python/samples/projects/JySwingPanelVisual.java
                |   56 +-
 
python.samples/src/org/netbeans/modules/python/samples/projects/PLYDemoPanelVisual.form
                |    2 +-
 
python.samples/src/org/netbeans/modules/python/samples/projects/PLYDemoPanelVisual.java
                |   56 +-
 
python.samples/src/org/netbeans/modules/python/samples/projects/PyThreadsPanelVisual.form
              |    2 +-
 
python.samples/src/org/netbeans/modules/python/samples/projects/PyThreadsPanelVisual.java
              |   56 +-
 55 files changed, 1021 insertions(+), 1165 deletions(-)

diffs (truncated from 3216 to 3000 lines):

diff --git a/python.editor/build.xml b/python.editor/build.xml
--- a/python.editor/build.xml
+++ b/python.editor/build.xml
@@ -26,6 +26,13 @@
             <include name="pythonstubs/"/>
             <include name="jython-2.5.1/**/netbeans-index-*.zip"/>
         </patternset>
+        <property name="locales" value=""/>
+        <locfiles
+            cluster="${cluster.dir}" locales="${locales}" 
src="${nb_all}/l10n/src"
+            codenamebase="${code.name.base}"
+            patternset="module.l10n.files"
+            basefilesref="module.files"
+        />
     </target>   
 
     <target name="release" depends="init">
diff --git a/python.editor/nbproject/project.xml 
b/python.editor/nbproject/project.xml
--- a/python.editor/nbproject/project.xml
+++ b/python.editor/nbproject/project.xml
@@ -6,15 +6,6 @@
             
<code-name-base>org.netbeans.modules.python.editor</code-name-base>
             <module-dependencies>
                 <dependency>
-                    <code-name-base>org.jdesktop.layout</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.24</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
                     <code-name-base>org.jython</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
diff --git 
a/python.editor/src/org/netbeans/modules/python/editor/codegen/ClassCodeGenPanel.form
 
b/python.editor/src/org/netbeans/modules/python/editor/codegen/ClassCodeGenPanel.form
--- 
a/python.editor/src/org/netbeans/modules/python/editor/codegen/ClassCodeGenPanel.form
+++ 
b/python.editor/src/org/netbeans/modules/python/editor/codegen/ClassCodeGenPanel.form
@@ -7,7 +7,7 @@
     <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" 
value="true"/>
     <AuxValue name="FormSettings_generateMnemonicsCode" 
type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" 
value="true"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="2"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="1"/>
     <AuxValue name="FormSettings_listenerGenerationStyle" 
type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" 
value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" 
value="2"/>
diff --git 
a/python.editor/src/org/netbeans/modules/python/editor/codegen/ClassCodeGenPanel.java
 
b/python.editor/src/org/netbeans/modules/python/editor/codegen/ClassCodeGenPanel.java
--- 
a/python.editor/src/org/netbeans/modules/python/editor/codegen/ClassCodeGenPanel.java
+++ 
b/python.editor/src/org/netbeans/modules/python/editor/codegen/ClassCodeGenPanel.java
@@ -74,33 +74,33 @@
 
         
txtExtends.setText(org.openide.util.NbBundle.getMessage(ClassCodeGenPanel.class,
 "ClassCodeGenPanel.txtExtends.text")); // NOI18N
 
-        org.jdesktop.layout.GroupLayout layout = new 
org.jdesktop.layout.GroupLayout(this);
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
                 .addContainerGap()
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
-                    .add(jLabel2)
-                    .add(jLabel1))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(txtExtends, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 288, Short.MAX_VALUE)
-                    .add(txtClassName, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 288, Short.MAX_VALUE))
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+                    .addComponent(jLabel2)
+                    .addComponent(jLabel1))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(txtExtends, 
javax.swing.GroupLayout.DEFAULT_SIZE, 288, Short.MAX_VALUE)
+                    .addComponent(txtClassName, 
javax.swing.GroupLayout.DEFAULT_SIZE, 288, Short.MAX_VALUE))
                 .addContainerGap())
         );
         layout.setVerticalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
                 .addContainerGap()
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(jLabel1)
-                    .add(txtClassName, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(jLabel2)
-                    .add(txtExtends, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                
.addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
Short.MAX_VALUE))
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(jLabel1)
+                    .addComponent(txtClassName, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(jLabel2)
+                    .addComponent(txtExtends, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, 
Short.MAX_VALUE))
         );
     }// </editor-fold>//GEN-END:initComponents
     // Variables declaration - do not modify//GEN-BEGIN:variables
diff --git 
a/python.editor/src/org/netbeans/modules/python/editor/codegen/MethodCodeGenPanel.form
 
b/python.editor/src/org/netbeans/modules/python/editor/codegen/MethodCodeGenPanel.form
--- 
a/python.editor/src/org/netbeans/modules/python/editor/codegen/MethodCodeGenPanel.form
+++ 
b/python.editor/src/org/netbeans/modules/python/editor/codegen/MethodCodeGenPanel.form
@@ -7,7 +7,7 @@
     <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" 
value="true"/>
     <AuxValue name="FormSettings_generateMnemonicsCode" 
type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" 
value="true"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="2"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="1"/>
     <AuxValue name="FormSettings_listenerGenerationStyle" 
type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" 
value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" 
value="2"/>
@@ -26,8 +26,8 @@
                       </Group>
                       <EmptySpace max="-2" attributes="0"/>
                       <Group type="103" groupAlignment="0" attributes="0">
-                          <Component id="txtParameterNames" pref="281" 
max="32767" attributes="0"/>
-                          <Component id="txtMethodName" alignment="0" 
pref="281" max="32767" attributes="0"/>
+                          <Component id="txtParameterNames" max="32767" 
attributes="0"/>
+                          <Component id="txtMethodName" alignment="0" 
max="32767" attributes="0"/>
                       </Group>
                   </Group>
                   <Group type="102" alignment="0" attributes="0">
diff --git 
a/python.editor/src/org/netbeans/modules/python/editor/codegen/MethodCodeGenPanel.java
 
b/python.editor/src/org/netbeans/modules/python/editor/codegen/MethodCodeGenPanel.java
--- 
a/python.editor/src/org/netbeans/modules/python/editor/codegen/MethodCodeGenPanel.java
+++ 
b/python.editor/src/org/netbeans/modules/python/editor/codegen/MethodCodeGenPanel.java
@@ -77,39 +77,39 @@
 
         
jLabel3.setText(org.openide.util.NbBundle.getMessage(MethodCodeGenPanel.class,
 "MethodCodeGenPanel.jLabel3.text")); // NOI18N
 
-        org.jdesktop.layout.GroupLayout layout = new 
org.jdesktop.layout.GroupLayout(this);
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(layout.createSequentialGroup()
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(layout.createSequentialGroup()
                         .addContainerGap()
-                        
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
-                            .add(jLabel1)
-                            .add(jLabel2))
-                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                            .add(txtParameterNames, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 275, Short.MAX_VALUE)
-                            .add(txtMethodName, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 275, Short.MAX_VALUE)))
-                    .add(layout.createSequentialGroup()
-                        .add(64, 64, 64)
-                        .add(jLabel3)))
+                        
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+                            .addComponent(jLabel1)
+                            .addComponent(jLabel2))
+                        
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addComponent(txtParameterNames)
+                            .addComponent(txtMethodName)))
+                    .addGroup(layout.createSequentialGroup()
+                        .addGap(64, 64, 64)
+                        .addComponent(jLabel3)))
                 .addContainerGap())
         );
         layout.setVerticalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
                 .addContainerGap()
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(jLabel1)
-                    .add(txtMethodName, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(jLabel2)
-                    .add(txtParameterNames, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                .add(jLabel3))
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(jLabel1)
+                    .addComponent(txtMethodName, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(jLabel2)
+                    .addComponent(txtParameterNames, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, 
javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                .addComponent(jLabel3))
         );
     }// </editor-fold>//GEN-END:initComponents
     // Variables declaration - do not modify//GEN-BEGIN:variables
diff --git 
a/python.editor/src/org/netbeans/modules/python/editor/codegen/PropertyCodeGenPanel.form
 
b/python.editor/src/org/netbeans/modules/python/editor/codegen/PropertyCodeGenPanel.form
--- 
a/python.editor/src/org/netbeans/modules/python/editor/codegen/PropertyCodeGenPanel.form
+++ 
b/python.editor/src/org/netbeans/modules/python/editor/codegen/PropertyCodeGenPanel.form
@@ -7,7 +7,7 @@
     <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" 
value="true"/>
     <AuxValue name="FormSettings_generateMnemonicsCode" 
type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" 
value="true"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="2"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="1"/>
     <AuxValue name="FormSettings_listenerGenerationStyle" 
type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" 
value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" 
value="2"/>
diff --git 
a/python.editor/src/org/netbeans/modules/python/editor/codegen/PropertyCodeGenPanel.java
 
b/python.editor/src/org/netbeans/modules/python/editor/codegen/PropertyCodeGenPanel.java
--- 
a/python.editor/src/org/netbeans/modules/python/editor/codegen/PropertyCodeGenPanel.java
+++ 
b/python.editor/src/org/netbeans/modules/python/editor/codegen/PropertyCodeGenPanel.java
@@ -72,29 +72,29 @@
 
         
readOnlyCb.setText(org.openide.util.NbBundle.getMessage(PropertyCodeGenPanel.class,
 "PropertyCodeGenPanel.readOnlyCb.text")); // NOI18N
 
-        org.jdesktop.layout.GroupLayout layout = new 
org.jdesktop.layout.GroupLayout(this);
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
                 .addContainerGap()
-                .add(nameLabel)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(readOnlyCb)
-                    .add(nameField, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 286, Short.MAX_VALUE))
+                .addComponent(nameLabel)
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(readOnlyCb)
+                    .addComponent(nameField, 
javax.swing.GroupLayout.DEFAULT_SIZE, 286, Short.MAX_VALUE))
                 .addContainerGap())
         );
         layout.setVerticalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
                 .addContainerGap()
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(nameLabel)
-                    .add(nameField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(readOnlyCb)
-                
.addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
Short.MAX_VALUE))
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(nameLabel)
+                    .addComponent(nameField, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(readOnlyCb)
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, 
Short.MAX_VALUE))
         );
     }// </editor-fold>//GEN-END:initComponents
 
diff --git 
a/python.editor/src/org/netbeans/modules/python/editor/hints/NameRulePrefs.form
 
b/python.editor/src/org/netbeans/modules/python/editor/hints/NameRulePrefs.form
--- 
a/python.editor/src/org/netbeans/modules/python/editor/hints/NameRulePrefs.form
+++ 
b/python.editor/src/org/netbeans/modules/python/editor/hints/NameRulePrefs.form
@@ -7,7 +7,7 @@
     <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" 
value="true"/>
     <AuxValue name="FormSettings_generateMnemonicsCode" 
type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" 
value="true"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="2"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="1"/>
     <AuxValue name="FormSettings_listenerGenerationStyle" 
type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" 
value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" 
value="2"/>
@@ -38,7 +38,7 @@
                   <Group type="102" alignment="0" attributes="0">
                       <Component id="ignoreLabel" min="-2" max="-2" 
attributes="0"/>
                       <EmptySpace max="-2" attributes="0"/>
-                      <Component id="ignoredText" pref="256" max="32767" 
attributes="0"/>
+                      <Component id="ignoredText" max="32767" 
attributes="0"/>
                   </Group>
               </Group>
               <EmptySpace max="-2" attributes="0"/>
diff --git 
a/python.editor/src/org/netbeans/modules/python/editor/hints/NameRulePrefs.java
 
b/python.editor/src/org/netbeans/modules/python/editor/hints/NameRulePrefs.java
--- 
a/python.editor/src/org/netbeans/modules/python/editor/hints/NameRulePrefs.java
+++ 
b/python.editor/src/org/netbeans/modules/python/editor/hints/NameRulePrefs.java
@@ -188,59 +188,59 @@
 
         
ignoreLabel.setText(org.openide.util.NbBundle.getMessage(NameRulePrefs.class, 
"NameRulePrefs.ignoreLabel.text")); // NOI18N
 
-        org.jdesktop.layout.GroupLayout layout = new 
org.jdesktop.layout.GroupLayout(this);
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(layout.createSequentialGroup()
-                        
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                            .add(moduleLabel)
-                            .add(classLabel)
-                            .add(functionLabel)
-                            .add(variableLabel))
-                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, 
false)
-                            .add(org.jdesktop.layout.GroupLayout.LEADING, 
variableCombo, 0, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
Short.MAX_VALUE)
-                            .add(org.jdesktop.layout.GroupLayout.LEADING, 
classCombo, 0, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                            .add(org.jdesktop.layout.GroupLayout.LEADING, 
moduleCombo, 0, 234, Short.MAX_VALUE)
-                            .add(functionCombo, 0, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
-                    .add(parameterLabel)
-                    .add(selfCb)
-                    .add(layout.createSequentialGroup()
-                        .add(ignoreLabel)
-                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(ignoredText, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 256, Short.MAX_VALUE)))
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(layout.createSequentialGroup()
+                        
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addComponent(moduleLabel)
+                            .addComponent(classLabel)
+                            .addComponent(functionLabel)
+                            .addComponent(variableLabel))
+                        
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING,
 false)
+                            .addComponent(variableCombo, 
javax.swing.GroupLayout.Alignment.LEADING, 0, 
javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                            .addComponent(classCombo, 
javax.swing.GroupLayout.Alignment.LEADING, 0, 
javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                            .addComponent(moduleCombo, 
javax.swing.GroupLayout.Alignment.LEADING, 0, 234, Short.MAX_VALUE)
+                            .addComponent(functionCombo, 0, 
javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
+                    .addComponent(parameterLabel)
+                    .addComponent(selfCb)
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(ignoreLabel)
+                        
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(ignoredText)))
                 .addContainerGap())
         );
         layout.setVerticalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(moduleLabel)
-                    .add(moduleCombo, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(classLabel)
-                    .add(classCombo, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(functionLabel)
-                    .add(functionCombo, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(variableLabel)
-                    .add(variableCombo, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .add(18, 18, 18)
-                .add(parameterLabel)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(selfCb)
-                .add(18, 18, 18)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(ignoreLabel)
-                    .add(ignoredText, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                
.addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
Short.MAX_VALUE))
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(moduleLabel)
+                    .addComponent(moduleCombo, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(classLabel)
+                    .addComponent(classCombo, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(functionLabel)
+                    .addComponent(functionCombo, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(variableLabel)
+                    .addComponent(variableCombo, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addGap(18, 18, 18)
+                .addComponent(parameterLabel)
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(selfCb)
+                .addGap(18, 18, 18)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(ignoreLabel)
+                    .addComponent(ignoredText, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, 
Short.MAX_VALUE))
         );
     }// </editor-fold>//GEN-END:initComponents
 
diff --git 
a/python.editor/src/org/netbeans/modules/python/editor/hints/UnusedDetectorPrefs.form
 
b/python.editor/src/org/netbeans/modules/python/editor/hints/UnusedDetectorPrefs.form
--- 
a/python.editor/src/org/netbeans/modules/python/editor/hints/UnusedDetectorPrefs.form
+++ 
b/python.editor/src/org/netbeans/modules/python/editor/hints/UnusedDetectorPrefs.form
@@ -7,7 +7,7 @@
     <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" 
value="true"/>
     <AuxValue name="FormSettings_generateMnemonicsCode" 
type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" 
value="true"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="2"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="1"/>
     <AuxValue name="FormSettings_listenerGenerationStyle" 
type="java.lang.Integer" value="2"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" 
value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" 
value="2"/>
diff --git 
a/python.editor/src/org/netbeans/modules/python/editor/hints/UnusedDetectorPrefs.java
 
b/python.editor/src/org/netbeans/modules/python/editor/hints/UnusedDetectorPrefs.java
--- 
a/python.editor/src/org/netbeans/modules/python/editor/hints/UnusedDetectorPrefs.java
+++ 
b/python.editor/src/org/netbeans/modules/python/editor/hints/UnusedDetectorPrefs.java
@@ -92,28 +92,28 @@
         ignoredLabel.setLabelFor(ignoredNames);
         
ignoredLabel.setText(org.openide.util.NbBundle.getMessage(UnusedDetectorPrefs.class,
 "UnusedDetectorPrefs.ignoredLabel.text")); // NOI18N
 
-        org.jdesktop.layout.GroupLayout layout = new 
org.jdesktop.layout.GroupLayout(this);
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(skipParams)
-            .add(skipTupleAssignments)
-            .add(layout.createSequentialGroup()
-                .add(ignoredLabel)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(ignoredNames, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addComponent(skipParams)
+            .addComponent(skipTupleAssignments)
+            .addGroup(layout.createSequentialGroup()
+                .addComponent(ignoredLabel)
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(ignoredNames, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE))
         );
         layout.setVerticalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
-                .add(skipParams)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(skipTupleAssignments)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(ignoredLabel)
-                    .add(ignoredNames, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                
.addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
Short.MAX_VALUE))
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addComponent(skipParams)
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(skipTupleAssignments)
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(ignoredLabel)
+                    .addComponent(ignoredNames, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, 
Short.MAX_VALUE))
         );
     }
 
diff --git 
a/python.editor/src/org/netbeans/modules/python/editor/imports/ImportModulePanel.form
 
b/python.editor/src/org/netbeans/modules/python/editor/imports/ImportModulePanel.form
--- 
a/python.editor/src/org/netbeans/modules/python/editor/imports/ImportModulePanel.form
+++ 
b/python.editor/src/org/netbeans/modules/python/editor/imports/ImportModulePanel.form
@@ -15,7 +15,7 @@
     <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" 
value="true"/>
     <AuxValue name="FormSettings_generateMnemonicsCode" 
type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" 
value="true"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="2"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="1"/>
     <AuxValue name="FormSettings_listenerGenerationStyle" 
type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" 
value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" 
value="1"/>
diff --git 
a/python.editor/src/org/netbeans/modules/python/editor/imports/ImportModulePanel.java
 
b/python.editor/src/org/netbeans/modules/python/editor/imports/ImportModulePanel.java
--- 
a/python.editor/src/org/netbeans/modules/python/editor/imports/ImportModulePanel.java
+++ 
b/python.editor/src/org/netbeans/modules/python/editor/imports/ImportModulePanel.java
@@ -193,23 +193,23 @@
 
         importPreviewLabel.setText(" ");
 
-        org.jdesktop.layout.GroupLayout jPanel1Layout = new 
org.jdesktop.layout.GroupLayout(jPanel1);
+        javax.swing.GroupLayout jPanel1Layout = new 
javax.swing.GroupLayout(jPanel1);
         jPanel1.setLayout(jPanel1Layout);
         jPanel1Layout.setHorizontalGroup(
-            
jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(ctrlLabel, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
390, Short.MAX_VALUE)
-            .add(importPreviewLabel, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 390, Short.MAX_VALUE)
-            .add(org.jdesktop.layout.GroupLayout.TRAILING, jSeparator1, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 390, Short.MAX_VALUE)
+            
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addComponent(ctrlLabel, javax.swing.GroupLayout.DEFAULT_SIZE, 
390, Short.MAX_VALUE)
+            .addComponent(importPreviewLabel, 
javax.swing.GroupLayout.DEFAULT_SIZE, 390, Short.MAX_VALUE)
+            .addComponent(jSeparator1, 
javax.swing.GroupLayout.Alignment.TRAILING, 
javax.swing.GroupLayout.DEFAULT_SIZE, 390, Short.MAX_VALUE)
         );
         jPanel1Layout.setVerticalGroup(
-            
jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(jPanel1Layout.createSequentialGroup()
-                .add(ctrlLabel)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(jSeparator1, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 10, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(importPreviewLabel)
-                
.addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
Short.MAX_VALUE))
+            
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(jPanel1Layout.createSequentialGroup()
+                .addComponent(ctrlLabel)
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(jSeparator1, 
javax.swing.GroupLayout.PREFERRED_SIZE, 10, 
javax.swing.GroupLayout.PREFERRED_SIZE)
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(importPreviewLabel)
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, 
Short.MAX_VALUE))
         );
 
         add(jPanel1, java.awt.BorderLayout.PAGE_END);
diff --git 
a/python.editor/src/org/netbeans/modules/python/editor/options/FmtAlignment.form
 
b/python.editor/src/org/netbeans/modules/python/editor/options/FmtAlignment.form
--- 
a/python.editor/src/org/netbeans/modules/python/editor/options/FmtAlignment.form
+++ 
b/python.editor/src/org/netbeans/modules/python/editor/options/FmtAlignment.form
@@ -10,9 +10,10 @@
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" 
value="1"/>
     <AuxValue name="FormSettings_autoSetComponentName" 
type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" 
value="true"/>
     <AuxValue name="FormSettings_generateMnemonicsCode" 
type="java.lang.Boolean" value="true"/>
     <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" 
value="true"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="2"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="1"/>
     <AuxValue name="FormSettings_listenerGenerationStyle" 
type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" 
value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" 
value="2"/>
@@ -152,10 +153,6 @@
             <EmptyBorder bottom="0" left="0" right="0" top="0"/>
           </Border>
         </Property>
-        <Property name="margin" type="java.awt.Insets" 
editor="org.netbeans.beaninfo.editors.InsetsEditor">
-          <Insets value="[0, 0, 0, 0]"/>
-        </Property>
-        <Property name="opaque" type="boolean" value="false"/>
       </Properties>
     </Component>
     <Component class="javax.swing.JCheckBox" name="nlWhileCheckBox">
@@ -168,10 +165,6 @@
             <EmptyBorder bottom="0" left="0" right="0" top="0"/>
           </Border>
         </Property>
-        <Property name="margin" type="java.awt.Insets" 
editor="org.netbeans.beaninfo.editors.InsetsEditor">
-          <Insets value="[0, 0, 0, 0]"/>
-        </Property>
-        <Property name="opaque" type="boolean" value="false"/>
       </Properties>
     </Component>
     <Component class="javax.swing.JCheckBox" name="nlCatchCheckBox">
@@ -184,10 +177,6 @@
             <EmptyBorder bottom="0" left="0" right="0" top="0"/>
           </Border>
         </Property>
-        <Property name="margin" type="java.awt.Insets" 
editor="org.netbeans.beaninfo.editors.InsetsEditor">
-          <Insets value="[0, 0, 0, 0]"/>
-        </Property>
-        <Property name="opaque" type="boolean" value="false"/>
       </Properties>
     </Component>
     <Component class="javax.swing.JCheckBox" name="nlFinallyCheckBox">
@@ -200,10 +189,6 @@
             <EmptyBorder bottom="0" left="0" right="0" top="0"/>
           </Border>
         </Property>
-        <Property name="margin" type="java.awt.Insets" 
editor="org.netbeans.beaninfo.editors.InsetsEditor">
-          <Insets value="[0, 0, 0, 0]"/>
-        </Property>
-        <Property name="opaque" type="boolean" value="false"/>
       </Properties>
     </Component>
     <Component class="javax.swing.JCheckBox" name="nlModifiersCheckBox">
@@ -216,10 +201,6 @@
             <EmptyBorder bottom="0" left="0" right="0" top="0"/>
           </Border>
         </Property>
-        <Property name="margin" type="java.awt.Insets" 
editor="org.netbeans.beaninfo.editors.InsetsEditor">
-          <Insets value="[0, 0, 0, 0]"/>
-        </Property>
-        <Property name="opaque" type="boolean" value="false"/>
       </Properties>
     </Component>
     <Component class="javax.swing.JLabel" name="multilineAlignmentLabel">
@@ -239,10 +220,6 @@
             <EmptyBorder bottom="0" left="0" right="0" top="0"/>
           </Border>
         </Property>
-        <Property name="margin" type="java.awt.Insets" 
editor="org.netbeans.beaninfo.editors.InsetsEditor">
-          <Insets value="[0, 0, 0, 0]"/>
-        </Property>
-        <Property name="opaque" type="boolean" value="false"/>
       </Properties>
     </Component>
     <Component class="javax.swing.JCheckBox" name="amCallArgsCheckBox">
@@ -255,10 +232,6 @@
             <EmptyBorder bottom="0" left="0" right="0" top="0"/>
           </Border>
         </Property>
-        <Property name="margin" type="java.awt.Insets" 
editor="org.netbeans.beaninfo.editors.InsetsEditor">
-          <Insets value="[0, 0, 0, 0]"/>
-        </Property>
-        <Property name="opaque" type="boolean" value="false"/>
       </Properties>
     </Component>
     <Component class="javax.swing.JCheckBox" name="amAnnotationArgsCheckBox">
@@ -271,10 +244,6 @@
             <EmptyBorder bottom="0" left="0" right="0" top="0"/>
           </Border>
         </Property>
-        <Property name="margin" type="java.awt.Insets" 
editor="org.netbeans.beaninfo.editors.InsetsEditor">
-          <Insets value="[0, 0, 0, 0]"/>
-        </Property>
-        <Property name="opaque" type="boolean" value="false"/>
       </Properties>
     </Component>
     <Component class="javax.swing.JCheckBox" name="amImplementsCheckBox1">
@@ -287,10 +256,6 @@
             <EmptyBorder bottom="0" left="0" right="0" top="0"/>
           </Border>
         </Property>
-        <Property name="margin" type="java.awt.Insets" 
editor="org.netbeans.beaninfo.editors.InsetsEditor">
-          <Insets value="[0, 0, 0, 0]"/>
-        </Property>
-        <Property name="opaque" type="boolean" value="false"/>
       </Properties>
     </Component>
     <Component class="javax.swing.JCheckBox" name="amThrowsCheckBox1">
@@ -303,10 +268,6 @@
             <EmptyBorder bottom="0" left="0" right="0" top="0"/>
           </Border>
         </Property>
-        <Property name="margin" type="java.awt.Insets" 
editor="org.netbeans.beaninfo.editors.InsetsEditor">
-          <Insets value="[0, 0, 0, 0]"/>
-        </Property>
-        <Property name="opaque" type="boolean" value="false"/>
       </Properties>
     </Component>
     <Component class="javax.swing.JCheckBox" name="amArrayInitCheckBox1">
@@ -319,10 +280,6 @@
             <EmptyBorder bottom="0" left="0" right="0" top="0"/>
           </Border>
         </Property>
-        <Property name="margin" type="java.awt.Insets" 
editor="org.netbeans.beaninfo.editors.InsetsEditor">
-          <Insets value="[0, 0, 0, 0]"/>
-        </Property>
-        <Property name="opaque" type="boolean" value="false"/>
       </Properties>
     </Component>
     <Component class="javax.swing.JCheckBox" name="amBinaryOpCheckBox1">
@@ -335,10 +292,6 @@
             <EmptyBorder bottom="0" left="0" right="0" top="0"/>
           </Border>
         </Property>
-        <Property name="margin" type="java.awt.Insets" 
editor="org.netbeans.beaninfo.editors.InsetsEditor">
-          <Insets value="[0, 0, 0, 0]"/>
-        </Property>
-        <Property name="opaque" type="boolean" value="false"/>
       </Properties>
     </Component>
     <Component class="javax.swing.JCheckBox" name="amTernaryOpCheckBox1">
@@ -351,10 +304,6 @@
             <EmptyBorder bottom="0" left="0" right="0" top="0"/>
           </Border>
         </Property>
-        <Property name="margin" type="java.awt.Insets" 
editor="org.netbeans.beaninfo.editors.InsetsEditor">
-          <Insets value="[0, 0, 0, 0]"/>
-        </Property>
-        <Property name="opaque" type="boolean" value="false"/>
       </Properties>
     </Component>
     <Component class="javax.swing.JCheckBox" name="amAssignCheckBox1">
@@ -367,10 +316,6 @@
             <EmptyBorder bottom="0" left="0" right="0" top="0"/>
           </Border>
         </Property>
-        <Property name="margin" type="java.awt.Insets" 
editor="org.netbeans.beaninfo.editors.InsetsEditor">
-          <Insets value="[0, 0, 0, 0]"/>
-        </Property>
-        <Property name="opaque" type="boolean" value="false"/>
       </Properties>
     </Component>
     <Component class="javax.swing.JCheckBox" name="amForCheckBox1">
@@ -383,10 +328,6 @@
             <EmptyBorder bottom="0" left="0" right="0" top="0"/>
           </Border>
         </Property>
-        <Property name="margin" type="java.awt.Insets" 
editor="org.netbeans.beaninfo.editors.InsetsEditor">
-          <Insets value="[0, 0, 0, 0]"/>
-        </Property>
-        <Property name="opaque" type="boolean" value="false"/>
       </Properties>
     </Component>
     <Component class="javax.swing.JCheckBox" name="amParenthesizedCheckBox1">
@@ -399,10 +340,6 @@
             <EmptyBorder bottom="0" left="0" right="0" top="0"/>
           </Border>
         </Property>
-        <Property name="margin" type="java.awt.Insets" 
editor="org.netbeans.beaninfo.editors.InsetsEditor">
-          <Insets value="[0, 0, 0, 0]"/>
-        </Property>
-        <Property name="opaque" type="boolean" value="false"/>
       </Properties>
     </Component>
     <Component class="javax.swing.JSeparator" name="jSeparator1">
diff --git 
a/python.editor/src/org/netbeans/modules/python/editor/options/FmtAlignment.java
 
b/python.editor/src/org/netbeans/modules/python/editor/options/FmtAlignment.java
--- 
a/python.editor/src/org/netbeans/modules/python/editor/options/FmtAlignment.java
+++ 
b/python.editor/src/org/netbeans/modules/python/editor/options/FmtAlignment.java
@@ -141,176 +141,144 @@
 
         org.openide.awt.Mnemonics.setLocalizedText(nlElseCheckBox, 
org.openide.util.NbBundle.getMessage(FmtAlignment.class, "LBL_nl_Else")); // 
NOI18N
         
nlElseCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 
0));
-        nlElseCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0));
-        nlElseCheckBox.setOpaque(false);
 
         org.openide.awt.Mnemonics.setLocalizedText(nlWhileCheckBox, 
org.openide.util.NbBundle.getMessage(FmtAlignment.class, "LBL_nl_While")); // 
NOI18N
         
nlWhileCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 
0, 0));
-        nlWhileCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0));
-        nlWhileCheckBox.setOpaque(false);
 
         org.openide.awt.Mnemonics.setLocalizedText(nlCatchCheckBox, 
org.openide.util.NbBundle.getMessage(FmtAlignment.class, "LBL_nl_Catch")); // 
NOI18N
         
nlCatchCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 
0, 0));
-        nlCatchCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0));
-        nlCatchCheckBox.setOpaque(false);
 
         org.openide.awt.Mnemonics.setLocalizedText(nlFinallyCheckBox, 
org.openide.util.NbBundle.getMessage(FmtAlignment.class, "LBL_nl_Finally")); 
// NOI18N
         
nlFinallyCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 
0, 0));
-        nlFinallyCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0));
-        nlFinallyCheckBox.setOpaque(false);
 
         org.openide.awt.Mnemonics.setLocalizedText(nlModifiersCheckBox, 
org.openide.util.NbBundle.getMessage(FmtAlignment.class, 
"LBL_nl_Modifiers")); // NOI18N
         
nlModifiersCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 
0, 0, 0));
-        nlModifiersCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0));
-        nlModifiersCheckBox.setOpaque(false);
 
         org.openide.awt.Mnemonics.setLocalizedText(multilineAlignmentLabel, 
org.openide.util.NbBundle.getMessage(FmtAlignment.class, 
"LBL_al_multilineAlignment")); // NOI18N
 
         org.openide.awt.Mnemonics.setLocalizedText(amMethodParamsCheckBox, 
org.openide.util.NbBundle.getMessage(FmtAlignment.class, 
"LBL_am_MethodParams")); // NOI18N
         
amMethodParamsCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0,
 0, 0, 0));
-        amMethodParamsCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0));
-        amMethodParamsCheckBox.setOpaque(false);
 
         org.openide.awt.Mnemonics.setLocalizedText(amCallArgsCheckBox, 
org.openide.util.NbBundle.getMessage(FmtAlignment.class, "LBL_am_CallArgs")); 
// NOI18N
         
amCallArgsCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 
0, 0, 0));
-        amCallArgsCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0));
-        amCallArgsCheckBox.setOpaque(false);
 
         org.openide.awt.Mnemonics.setLocalizedText(amAnnotationArgsCheckBox, 
org.openide.util.NbBundle.getMessage(FmtAlignment.class, 
"LBL_am_AnnotationArgs")); // NOI18N
         
amAnnotationArgsCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0,
 0, 0, 0));
-        amAnnotationArgsCheckBox.setMargin(new java.awt.Insets(0, 0, 0, 0));
-        amAnnotationArgsCheckBox.setOpaque(false);
 
         org.openide.awt.Mnemonics.setLocalizedText(amImplementsCheckBox1, 
org.openide.util.NbBundle.getMessage(FmtAlignment.class, 
"LBL_an_Implements")); // NOI18N
         
amImplementsCheckBox1.setBorder(javax.swing.BorderFactory.createEmptyBorder(0,
 0, 0, 0));
-        amImplementsCheckBox1.setMargin(new java.awt.Insets(0, 0, 0, 0));
-        amImplementsCheckBox1.setOpaque(false);
 
         org.openide.awt.Mnemonics.setLocalizedText(amThrowsCheckBox1, 
org.openide.util.NbBundle.getMessage(FmtAlignment.class, "LBL_am_Throws")); 
// NOI18N
         
amThrowsCheckBox1.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 
0, 0));
-        amThrowsCheckBox1.setMargin(new java.awt.Insets(0, 0, 0, 0));
-        amThrowsCheckBox1.setOpaque(false);
 
         org.openide.awt.Mnemonics.setLocalizedText(amArrayInitCheckBox1, 
org.openide.util.NbBundle.getMessage(FmtAlignment.class, 
"LBL_am_ArrayInit")); // NOI18N
         
amArrayInitCheckBox1.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 
0, 0, 0));
-        amArrayInitCheckBox1.setMargin(new java.awt.Insets(0, 0, 0, 0));
-        amArrayInitCheckBox1.setOpaque(false);
 
         org.openide.awt.Mnemonics.setLocalizedText(amBinaryOpCheckBox1, 
org.openide.util.NbBundle.getMessage(FmtAlignment.class, "LBL_am_BinaryOp")); 
// NOI18N
         
amBinaryOpCheckBox1.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 
0, 0, 0));
-        amBinaryOpCheckBox1.setMargin(new java.awt.Insets(0, 0, 0, 0));
-        amBinaryOpCheckBox1.setOpaque(false);
 
         org.openide.awt.Mnemonics.setLocalizedText(amTernaryOpCheckBox1, 
org.openide.util.NbBundle.getMessage(FmtAlignment.class, 
"LBL_am_TernaryOp")); // NOI18N
         
amTernaryOpCheckBox1.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 
0, 0, 0));
-        amTernaryOpCheckBox1.setMargin(new java.awt.Insets(0, 0, 0, 0));
-        amTernaryOpCheckBox1.setOpaque(false);
 
         org.openide.awt.Mnemonics.setLocalizedText(amAssignCheckBox1, 
org.openide.util.NbBundle.getMessage(FmtAlignment.class, "LBL_am_Assign")); 
// NOI18N
         
amAssignCheckBox1.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 
0, 0));
-        amAssignCheckBox1.setMargin(new java.awt.Insets(0, 0, 0, 0));
-        amAssignCheckBox1.setOpaque(false);
 
         org.openide.awt.Mnemonics.setLocalizedText(amForCheckBox1, 
org.openide.util.NbBundle.getMessage(FmtAlignment.class, "LBL_am_For")); // 
NOI18N
         
amForCheckBox1.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 0, 0, 
0));
-        amForCheckBox1.setMargin(new java.awt.Insets(0, 0, 0, 0));
-        amForCheckBox1.setOpaque(false);
 
         org.openide.awt.Mnemonics.setLocalizedText(amParenthesizedCheckBox1, 
org.openide.util.NbBundle.getMessage(FmtAlignment.class, "LBL_am_Paren")); // 
NOI18N
         
amParenthesizedCheckBox1.setBorder(javax.swing.BorderFactory.createEmptyBorder(0,
 0, 0, 0));
-        amParenthesizedCheckBox1.setMargin(new java.awt.Insets(0, 0, 0, 0));
-        amParenthesizedCheckBox1.setOpaque(false);
 
-        org.jdesktop.layout.GroupLayout layout = new 
org.jdesktop.layout.GroupLayout(this);
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(layout.createSequentialGroup()
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(layout.createSequentialGroup()
                         .addContainerGap()
-                        .add(amParenthesizedCheckBox1))
-                    
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING, 
false)
-                        .add(org.jdesktop.layout.GroupLayout.LEADING, 
layout.createSequentialGroup()
-                            .add(newLinesLabel)
-                            
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                            .add(jSeparator1))
-                        .add(org.jdesktop.layout.GroupLayout.LEADING, 
layout.createSequentialGroup()
-                            .add(multilineAlignmentLabel)
-                            
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                            .add(jSeparator2))
-                        .add(org.jdesktop.layout.GroupLayout.LEADING, 
layout.createSequentialGroup()
+                        .addComponent(amParenthesizedCheckBox1))
+                    
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING,
 false)
+                        .addGroup(javax.swing.GroupLayout.Alignment.LEADING, 
layout.createSequentialGroup()
+                            .addComponent(newLinesLabel)
+                            
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                            .addComponent(jSeparator1))
+                        .addGroup(javax.swing.GroupLayout.Alignment.LEADING, 
layout.createSequentialGroup()
+                            .addComponent(multilineAlignmentLabel)
+                            
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                            .addComponent(jSeparator2))
+                        .addGroup(javax.swing.GroupLayout.Alignment.LEADING, 
layout.createSequentialGroup()
                             .addContainerGap()
-                            
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                                .add(amThrowsCheckBox1)
-                                .add(amBinaryOpCheckBox1)
-                                .add(amAssignCheckBox1)
-                                .add(amAnnotationArgsCheckBox)
-                                .add(nlElseCheckBox)
-                                .add(nlWhileCheckBox)
-                                .add(nlCatchCheckBox)
-                                .add(amMethodParamsCheckBox))
-                            
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                            
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                                .add(amCallArgsCheckBox)
-                                .add(nlModifiersCheckBox)
-                                .add(nlFinallyCheckBox)
-                                .add(amImplementsCheckBox1)
-                                .add(amArrayInitCheckBox1)
-                                .add(amTernaryOpCheckBox1)
-                                .add(amForCheckBox1)))))
-                .add(0, 0, 0))
+                            
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                                .addComponent(amThrowsCheckBox1)
+                                .addComponent(amBinaryOpCheckBox1)
+                                .addComponent(amAssignCheckBox1)
+                                .addComponent(amAnnotationArgsCheckBox)
+                                .addComponent(nlElseCheckBox)
+                                .addComponent(nlWhileCheckBox)
+                                .addComponent(nlCatchCheckBox)
+                                .addComponent(amMethodParamsCheckBox))
+                            
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                            
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                                .addComponent(amCallArgsCheckBox)
+                                .addComponent(nlModifiersCheckBox)
+                                .addComponent(nlFinallyCheckBox)
+                                .addComponent(amImplementsCheckBox1)
+                                .addComponent(amArrayInitCheckBox1)
+                                .addComponent(amTernaryOpCheckBox1)
+                                .addComponent(amForCheckBox1)))))
+                .addGap(0, 0, 0))
         );
         layout.setVerticalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(layout.createSequentialGroup()
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(layout.createSequentialGroup()
                         .addContainerGap()
-                        .add(newLinesLabel))
-                    .add(layout.createSequentialGroup()
-                        .add(17, 17, 17)
-                        .add(jSeparator1, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 10, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(nlElseCheckBox)
-                    .add(nlFinallyCheckBox))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(nlWhileCheckBox)
-                    .add(nlModifiersCheckBox))
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(layout.createSequentialGroup()
-                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(nlCatchCheckBox)
-                        .add(18, 18, 18)
-                        .add(multilineAlignmentLabel))
-                    .add(layout.createSequentialGroup()
-                        .add(44, 44, 44)
-                        .add(jSeparator2, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 10, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(amMethodParamsCheckBox)
-                    .add(amCallArgsCheckBox))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(amAnnotationArgsCheckBox)
-                    .add(amImplementsCheckBox1))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(amThrowsCheckBox1)
-                    .add(amArrayInitCheckBox1))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(amBinaryOpCheckBox1)
-                    .add(amTernaryOpCheckBox1))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(amAssignCheckBox1)
-                    .add(amForCheckBox1))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(amParenthesizedCheckBox1)
-                
.addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
Short.MAX_VALUE))
+                        .addComponent(newLinesLabel))
+                    .addGroup(layout.createSequentialGroup()
+                        .addGap(17, 17, 17)
+                        .addComponent(jSeparator1, 
javax.swing.GroupLayout.PREFERRED_SIZE, 10, 
javax.swing.GroupLayout.PREFERRED_SIZE)))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(nlElseCheckBox)
+                    .addComponent(nlFinallyCheckBox))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(nlWhileCheckBox)
+                    .addComponent(nlModifiersCheckBox))
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(layout.createSequentialGroup()
+                        
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(nlCatchCheckBox)
+                        .addGap(18, 18, 18)
+                        .addComponent(multilineAlignmentLabel))
+                    .addGroup(layout.createSequentialGroup()
+                        .addGap(44, 44, 44)
+                        .addComponent(jSeparator2, 
javax.swing.GroupLayout.PREFERRED_SIZE, 10, 
javax.swing.GroupLayout.PREFERRED_SIZE)))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(amMethodParamsCheckBox)
+                    .addComponent(amCallArgsCheckBox))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(amAnnotationArgsCheckBox)
+                    .addComponent(amImplementsCheckBox1))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(amThrowsCheckBox1)
+                    .addComponent(amArrayInitCheckBox1))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(amBinaryOpCheckBox1)
+                    .addComponent(amTernaryOpCheckBox1))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(amAssignCheckBox1)
+                    .addComponent(amForCheckBox1))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(amParenthesizedCheckBox1)
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, 
Short.MAX_VALUE))
         );
     }// </editor-fold>//GEN-END:initComponents
     
diff --git 
a/python.editor/src/org/netbeans/modules/python/editor/options/FmtBlankLines.form
 
b/python.editor/src/org/netbeans/modules/python/editor/options/FmtBlankLines.form
--- 
a/python.editor/src/org/netbeans/modules/python/editor/options/FmtBlankLines.form
+++ 
b/python.editor/src/org/netbeans/modules/python/editor/options/FmtBlankLines.form
@@ -10,9 +10,10 @@
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" 
value="1"/>
     <AuxValue name="FormSettings_autoSetComponentName" 
type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" 
value="true"/>
     <AuxValue name="FormSettings_generateMnemonicsCode" 
type="java.lang.Boolean" value="true"/>
     <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" 
value="true"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="2"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="1"/>
     <AuxValue name="FormSettings_listenerGenerationStyle" 
type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" 
value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" 
value="2"/>
diff --git 
a/python.editor/src/org/netbeans/modules/python/editor/options/FmtBlankLines.java
 
b/python.editor/src/org/netbeans/modules/python/editor/options/FmtBlankLines.java
--- 
a/python.editor/src/org/netbeans/modules/python/editor/options/FmtBlankLines.java
+++ 
b/python.editor/src/org/netbeans/modules/python/editor/options/FmtBlankLines.java
@@ -180,89 +180,89 @@
 
         aMethodsField.setColumns(5);
 
-        org.jdesktop.layout.GroupLayout layout = new 
org.jdesktop.layout.GroupLayout(this);
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(bPackageLabel)
-                    .add(aPackageLabel)
-                    .add(bImportsLabel)
-                    .add(aImports)
-                    .add(bClassLabel)
-                    .add(aClassLabel)
-                    .add(aClassHeaderLabel)
-                    .add(bFieldsLabel)
-                    .add(aFieldsLabel)
-                    .add(bMethodsLabel)
-                    .add(aMethodsLabel))
-                .add(6, 6, 6)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(aMethodsField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(bMethodsField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(aFieldsField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(bFieldsField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(aClassHeaderField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(aClassField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(bClassField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(aImportsField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(bImportsField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(aPackageField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(bPackageField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(bPackageLabel)
+                    .addComponent(aPackageLabel)
+                    .addComponent(bImportsLabel)
+                    .addComponent(aImports)
+                    .addComponent(bClassLabel)
+                    .addComponent(aClassLabel)
+                    .addComponent(aClassHeaderLabel)
+                    .addComponent(bFieldsLabel)
+                    .addComponent(aFieldsLabel)
+                    .addComponent(bMethodsLabel)
+                    .addComponent(aMethodsLabel))
+                .addGap(6, 6, 6)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(aMethodsField, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(bMethodsField, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(aFieldsField, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(bFieldsField, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(aClassHeaderField, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(aClassField, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(bClassField, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(aImportsField, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(bImportsField, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(aPackageField, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(bPackageField, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE)))
         );
 
-        layout.linkSize(new java.awt.Component[] {aClassField, 
aClassHeaderField, aFieldsField, aImportsField, aMethodsField, aPackageField, 
bClassField, bFieldsField, bImportsField, bMethodsField, bPackageField}, 
org.jdesktop.layout.GroupLayout.HORIZONTAL);
+        layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new 
java.awt.Component[] {aClassField, aClassHeaderField, aFieldsField, 
aImportsField, aMethodsField, aPackageField, bClassField, bFieldsField, 
bImportsField, bMethodsField, bPackageField});
 
         layout.setVerticalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(bPackageField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(bPackageLabel))
-                .add(4, 4, 4)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(aPackageField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(aPackageLabel))
-                .add(4, 4, 4)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(bImportsField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(bImportsLabel))
-                .add(4, 4, 4)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(aImportsField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(aImports))
-                .add(4, 4, 4)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(bClassField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(bClassLabel))
-                .add(4, 4, 4)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(aClassField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(aClassLabel))
-                .add(4, 4, 4)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(aClassHeaderField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(aClassHeaderLabel))
-                .add(4, 4, 4)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(bFieldsField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(bFieldsLabel))
-                .add(4, 4, 4)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(aFieldsField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(aFieldsLabel))
-                .add(4, 4, 4)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(bMethodsField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(bMethodsLabel))
-                .add(4, 4, 4)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(aMethodsField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(aMethodsLabel)))
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(bPackageField, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(bPackageLabel))
+                .addGap(4, 4, 4)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(aPackageField, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(aPackageLabel))
+                .addGap(4, 4, 4)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(bImportsField, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(bImportsLabel))
+                .addGap(4, 4, 4)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(aImportsField, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(aImports))
+                .addGap(4, 4, 4)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(bClassField, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(bClassLabel))
+                .addGap(4, 4, 4)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(aClassField, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(aClassLabel))
+                .addGap(4, 4, 4)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(aClassHeaderField, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(aClassHeaderLabel))
+                .addGap(4, 4, 4)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(bFieldsField, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(bFieldsLabel))
+                .addGap(4, 4, 4)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(aFieldsField, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(aFieldsLabel))
+                .addGap(4, 4, 4)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(bMethodsField, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(bMethodsLabel))
+                .addGap(4, 4, 4)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(aMethodsField, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(aMethodsLabel)))
         );
 
-        layout.linkSize(new java.awt.Component[] {aClassField, 
aClassHeaderField, aFieldsField, aImportsField, aMethodsField, aPackageField, 
bClassField, bFieldsField, bImportsField, bMethodsField, bPackageField}, 
org.jdesktop.layout.GroupLayout.VERTICAL);
+        layout.linkSize(javax.swing.SwingConstants.VERTICAL, new 
java.awt.Component[] {aClassField, aClassHeaderField, aFieldsField, 
aImportsField, aMethodsField, aPackageField, bClassField, bFieldsField, 
bImportsField, bMethodsField, bPackageField});
 
     }// </editor-fold>//GEN-END:initComponents
     
diff --git 
a/python.editor/src/org/netbeans/modules/python/editor/options/FmtImports.form
 
b/python.editor/src/org/netbeans/modules/python/editor/options/FmtImports.form
--- 
a/python.editor/src/org/netbeans/modules/python/editor/options/FmtImports.form
+++ 
b/python.editor/src/org/netbeans/modules/python/editor/options/FmtImports.form
@@ -12,7 +12,7 @@
     <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" 
value="true"/>
     <AuxValue name="FormSettings_generateMnemonicsCode" 
type="java.lang.Boolean" value="true"/>
     <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" 
value="true"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="2"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="1"/>
     <AuxValue name="FormSettings_listenerGenerationStyle" 
type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" 
value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" 
value="2"/>
diff --git 
a/python.editor/src/org/netbeans/modules/python/editor/options/FmtImports.java
 
b/python.editor/src/org/netbeans/modules/python/editor/options/FmtImports.java
--- 
a/python.editor/src/org/netbeans/modules/python/editor/options/FmtImports.java
+++ 
b/python.editor/src/org/netbeans/modules/python/editor/options/FmtImports.java
@@ -110,46 +110,46 @@
 
         org.openide.awt.Mnemonics.setLocalizedText(sepFromImpCb, 
org.openide.util.NbBundle.getMessage(FmtImports.class, 
"FmtImports.sepFromImpCb.text")); // NOI18N
 
-        org.jdesktop.layout.GroupLayout layout = new 
org.jdesktop.layout.GroupLayout(this);
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(formatImportsCb)
-                    .add(onePerLineCb)
-                    .add(systemLibsCb)
-                    .add(sortImportsCb)
-                    .add(sepFromImpCb)
-                    .add(removeDuplicateCb)
-                    .add(preferSymbols)
-                    .add(layout.createSequentialGroup()
-                        .add(cleanupLabel)
-                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(cleanupCombo, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
-                
.addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
Short.MAX_VALUE))
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(formatImportsCb)
+                    .addComponent(onePerLineCb)
+                    .addComponent(systemLibsCb)
+                    .addComponent(sortImportsCb)
+                    .addComponent(sepFromImpCb)
+                    .addComponent(removeDuplicateCb)
+                    .addComponent(preferSymbols)
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(cleanupLabel)
+                        
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(cleanupCombo, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE)))
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, 
Short.MAX_VALUE))
         );
         layout.setVerticalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
-                .add(formatImportsCb)
-                .add(18, 18, 18)
-                .add(onePerLineCb)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(systemLibsCb)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(sortImportsCb)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(sepFromImpCb)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(removeDuplicateCb)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(preferSymbols)
-                .add(18, 18, 18)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(cleanupLabel)
-                    .add(cleanupCombo, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                
.addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
Short.MAX_VALUE))
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addComponent(formatImportsCb)
+                .addGap(18, 18, 18)
+                .addComponent(onePerLineCb)
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(systemLibsCb)
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(sortImportsCb)
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(sepFromImpCb)
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(removeDuplicateCb)
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(preferSymbols)
+                .addGap(18, 18, 18)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(cleanupLabel)
+                    .addComponent(cleanupCombo, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, 
Short.MAX_VALUE))
         );
     }// </editor-fold>//GEN-END:initComponents
     
diff --git 
a/python.editor/src/org/netbeans/modules/python/editor/options/FmtSpaces.form 
b/python.editor/src/org/netbeans/modules/python/editor/options/FmtSpaces.form
--- 
a/python.editor/src/org/netbeans/modules/python/editor/options/FmtSpaces.form
+++ 
b/python.editor/src/org/netbeans/modules/python/editor/options/FmtSpaces.form
@@ -13,7 +13,7 @@
     <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" 
value="true"/>
     <AuxValue name="FormSettings_generateMnemonicsCode" 
type="java.lang.Boolean" value="true"/>
     <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" 
value="true"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="2"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="1"/>
     <AuxValue name="FormSettings_listenerGenerationStyle" 
type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" 
value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" 
value="2"/>
diff --git 
a/python.editor/src/org/netbeans/modules/python/editor/options/FmtSpaces.java 
b/python.editor/src/org/netbeans/modules/python/editor/options/FmtSpaces.java
--- 
a/python.editor/src/org/netbeans/modules/python/editor/options/FmtSpaces.java
+++ 
b/python.editor/src/org/netbeans/modules/python/editor/options/FmtSpaces.java
@@ -96,37 +96,37 @@
 
         org.openide.awt.Mnemonics.setLocalizedText(collapseSpacesCb, 
org.openide.util.NbBundle.getMessage(FmtSpaces.class, 
"FmtSpaces.collapseSpacesCb.text")); // NOI18N
 
-        org.jdesktop.layout.GroupLayout layout = new 
org.jdesktop.layout.GroupLayout(this);
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(addAroundOp)
-                    .add(layout.createSequentialGroup()
-                        .add(27, 27, 27)
-                        .add(removeInParam))
-                    .add(removeInParen)
-                    .add(addAfterComma)
-                    .add(removeBeforeSep)
-                    .add(collapseSpacesCb))
-                
.addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
Short.MAX_VALUE))
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(addAroundOp)
+                    .addGroup(layout.createSequentialGroup()
+                        .addGap(27, 27, 27)
+                        .addComponent(removeInParam))
+                    .addComponent(removeInParen)
+                    .addComponent(addAfterComma)
+                    .addComponent(removeBeforeSep)
+                    .addComponent(collapseSpacesCb))
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, 
Short.MAX_VALUE))
         );
         layout.setVerticalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
-                .add(addAroundOp)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(removeInParam)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(removeInParen)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(addAfterComma)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(removeBeforeSep)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(collapseSpacesCb)
-                
.addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
Short.MAX_VALUE))
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addComponent(addAroundOp)
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(removeInParam)
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(removeInParen)
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(addAfterComma)
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(removeBeforeSep)
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(collapseSpacesCb)
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, 
Short.MAX_VALUE))
         );
     }// </editor-fold>//GEN-END:initComponents
     
diff --git 
a/python.editor/src/org/netbeans/modules/python/editor/options/FmtTabsIndents.form
 
b/python.editor/src/org/netbeans/modules/python/editor/options/FmtTabsIndents.form
--- 
a/python.editor/src/org/netbeans/modules/python/editor/options/FmtTabsIndents.form
+++ 
b/python.editor/src/org/netbeans/modules/python/editor/options/FmtTabsIndents.form
@@ -13,7 +13,7 @@
     <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" 
value="true"/>
     <AuxValue name="FormSettings_generateMnemonicsCode" 
type="java.lang.Boolean" value="true"/>
     <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" 
value="true"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="2"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="1"/>
     <AuxValue name="FormSettings_listenerGenerationStyle" 
type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" 
value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" 
value="2"/>
@@ -24,7 +24,7 @@
       <Group type="103" groupAlignment="0" attributes="0">
           <Group type="102" alignment="0" attributes="0">
               <Group type="103" groupAlignment="0" attributes="0">
-                  <Component id="continuationIndentSizeLabel" pref="200" 
max="32767" attributes="0"/>
+                  <Component id="continuationIndentSizeLabel" max="32767" 
attributes="0"/>
                   <Component id="labelIndentLabel" min="-2" max="-2" 
attributes="0"/>
               </Group>
               <EmptySpace max="-2" attributes="0"/>
diff --git 
a/python.editor/src/org/netbeans/modules/python/editor/options/FmtTabsIndents.java
 
b/python.editor/src/org/netbeans/modules/python/editor/options/FmtTabsIndents.java
--- 
a/python.editor/src/org/netbeans/modules/python/editor/options/FmtTabsIndents.java
+++ 
b/python.editor/src/org/netbeans/modules/python/editor/options/FmtTabsIndents.java
@@ -142,50 +142,49 @@
         
org.openide.awt.Mnemonics.setLocalizedText(indentCasesFromSwitchCheckBox, 
org.openide.util.NbBundle.getMessage(FmtTabsIndents.class, 
"LBL_IndentCasesFromSwitch")); // NOI18N
         
indentCasesFromSwitchCheckBox.setBorder(javax.swing.BorderFactory.createEmptyBorder(0,
 0, 0, 0));
 
-        org.jdesktop.layout.GroupLayout layout = new 
org.jdesktop.layout.GroupLayout(this);
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(continuationIndentSizeLabel, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 200, Short.MAX_VALUE)
-                    .add(labelIndentLabel))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
-                    .add(continuationIndentSizeField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 36, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(labelIndentField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 36, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
-            .add(indentCasesFromSwitchCheckBox)
-            .add(indentTopLevelClassMembersCheckBox)
-            .add(absoluteLabelIndentCheckBox)
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(continuationIndentSizeLabel, 
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
Short.MAX_VALUE)
+                    .addComponent(labelIndentLabel))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+                    .addComponent(continuationIndentSizeField, 
javax.swing.GroupLayout.PREFERRED_SIZE, 36, 
javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(labelIndentField, 
javax.swing.GroupLayout.PREFERRED_SIZE, 36, 
javax.swing.GroupLayout.PREFERRED_SIZE)))
+            .addComponent(indentCasesFromSwitchCheckBox)
+            .addComponent(indentTopLevelClassMembersCheckBox)
+            .addComponent(absoluteLabelIndentCheckBox)
         );
 
-        layout.linkSize(new java.awt.Component[] 
{continuationIndentSizeField, labelIndentField}, 
org.jdesktop.layout.GroupLayout.HORIZONTAL);
+        layout.linkSize(javax.swing.SwingConstants.HORIZONTAL, new 
java.awt.Component[] {continuationIndentSizeField, labelIndentField});
 
         layout.setVerticalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
                 .addContainerGap()
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(continuationIndentSizeLabel)
-                    .add(continuationIndentSizeField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(labelIndentLabel)
-                    .add(labelIndentField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
-                .add(absoluteLabelIndentCheckBox)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(indentTopLevelClassMembersCheckBox)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(indentCasesFromSwitchCheckBox)
-                
.addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
Short.MAX_VALUE))
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(continuationIndentSizeLabel)
+                    .addComponent(continuationIndentSizeField, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(labelIndentLabel)
+                    .addComponent(labelIndentField, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addComponent(absoluteLabelIndentCheckBox)
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(indentTopLevelClassMembersCheckBox)
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(indentCasesFromSwitchCheckBox)
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, 
Short.MAX_VALUE))
         );
     }// </editor-fold>//GEN-END:initComponents
     
     
     // Variables declaration - do not modify//GEN-BEGIN:variables
     private javax.swing.JCheckBox absoluteLabelIndentCheckBox;
-    private javax.swing.JCheckBox addLeadingStarInCommentCheckBox;
     private javax.swing.JTextField continuationIndentSizeField;
     private javax.swing.JLabel continuationIndentSizeLabel;
     private javax.swing.JCheckBox indentCasesFromSwitchCheckBox;
diff --git 
a/python.editor/src/org/netbeans/modules/python/editor/wizards/pypackage/PythonPackageVisualPanel1.form
 
b/python.editor/src/org/netbeans/modules/python/editor/wizards/pypackage/PythonPackageVisualPanel1.form
--- 
a/python.editor/src/org/netbeans/modules/python/editor/wizards/pypackage/PythonPackageVisualPanel1.form
+++ 
b/python.editor/src/org/netbeans/modules/python/editor/wizards/pypackage/PythonPackageVisualPanel1.form
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 
-<Form version="1.3" maxVersion="1.7" 
type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
+<Form version="1.4" maxVersion="1.7" 
type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" 
value="1"/>
     <AuxValue name="FormSettings_autoSetComponentName" 
type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" 
value="true"/>
     <AuxValue name="FormSettings_generateMnemonicsCode" 
type="java.lang.Boolean" value="true"/>
     <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" 
value="true"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="2"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="1"/>
     <AuxValue name="FormSettings_listenerGenerationStyle" 
type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" 
value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" 
value="2"/>
diff --git 
a/python.editor/src/org/netbeans/modules/python/editor/wizards/pypackage/PythonPackageVisualPanel1.java
 
b/python.editor/src/org/netbeans/modules/python/editor/wizards/pypackage/PythonPackageVisualPanel1.java
--- 
a/python.editor/src/org/netbeans/modules/python/editor/wizards/pypackage/PythonPackageVisualPanel1.java
+++ 
b/python.editor/src/org/netbeans/modules/python/editor/wizards/pypackage/PythonPackageVisualPanel1.java
@@ -25,15 +25,15 @@
     // <editor-fold defaultstate="collapsed" desc="Generated 
Code">//GEN-BEGIN:initComponents
     private void initComponents() {
 
-        org.jdesktop.layout.GroupLayout layout = new 
org.jdesktop.layout.GroupLayout(this);
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(0, 400, Short.MAX_VALUE)
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGap(0, 400, Short.MAX_VALUE)
         );
         layout.setVerticalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(0, 300, Short.MAX_VALUE)
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGap(0, 300, Short.MAX_VALUE)
         );
     }// </editor-fold>//GEN-END:initComponents
     // Variables declaration - do not modify//GEN-BEGIN:variables
diff --git a/python.options/nbproject/project.xml 
b/python.options/nbproject/project.xml
--- a/python.options/nbproject/project.xml
+++ b/python.options/nbproject/project.xml
@@ -6,15 +6,6 @@
             
<code-name-base>org.netbeans.modules.python.options</code-name-base>
             <module-dependencies>
                 <dependency>
-                    <code-name-base>org.jdesktop.layout</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.4.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
                     
<code-name-base>org.netbeans.modules.options.api</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
diff --git 
a/python.options/src/org/netbeans/modules/python/options/OptionsPanel.form 
b/python.options/src/org/netbeans/modules/python/options/OptionsPanel.form
--- a/python.options/src/org/netbeans/modules/python/options/OptionsPanel.form
+++ b/python.options/src/org/netbeans/modules/python/options/OptionsPanel.form
@@ -7,7 +7,7 @@
     <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" 
value="true"/>
     <AuxValue name="FormSettings_generateMnemonicsCode" 
type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" 
value="true"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="2"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="1"/>
     <AuxValue name="FormSettings_listenerGenerationStyle" 
type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" 
value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" 
value="2"/>
@@ -47,7 +47,7 @@
                   <Group type="102" alignment="0" attributes="0">
                       <EmptySpace max="-2" attributes="0"/>
                       <Component id="chkPrompt" min="-2" max="-2" 
attributes="0"/>
-                      <EmptySpace pref="202" max="32767" attributes="0"/>
+                      <EmptySpace pref="179" max="32767" attributes="0"/>
                   </Group>
               </Group>
             </DimensionLayout>
@@ -118,7 +118,7 @@
                       <Component id="jLayeredPane1" min="-2" pref="161" 
max="-2" attributes="0"/>
                       <EmptySpace type="unrelated" max="-2" attributes="0"/>
                       <Component id="stopAtFLineCheck" min="-2" max="-2" 
attributes="0"/>
-                      <EmptySpace pref="25" max="32767" attributes="0"/>
+                      <EmptySpace pref="23" max="32767" attributes="0"/>
                   </Group>
               </Group>
             </DimensionLayout>
diff --git 
a/python.options/src/org/netbeans/modules/python/options/OptionsPanel.java 
b/python.options/src/org/netbeans/modules/python/options/OptionsPanel.java
--- a/python.options/src/org/netbeans/modules/python/options/OptionsPanel.java
+++ b/python.options/src/org/netbeans/modules/python/options/OptionsPanel.java
@@ -152,160 +152,160 @@
      * always regenerated by the Form Editor.
      */
     @SuppressWarnings("unchecked")
-  // <editor-fold defaultstate="collapsed" desc="Generated 
Code">//GEN-BEGIN:initComponents
-  private void initComponents() {
+    // <editor-fold defaultstate="collapsed" desc="Generated 
Code">//GEN-BEGIN:initComponents
+    private void initComponents() {
 
-    jTabbedPane6 = new javax.swing.JTabbedPane();
-    jPanel3 = new javax.swing.JPanel();
-    chkPrompt = new javax.swing.JCheckBox();
-    jPanel4 = new javax.swing.JPanel();
-    jLabel1 = new javax.swing.JLabel();
-    dbgLstnPortStartField = new javax.swing.JTextField();
-    jLayeredPane1 = new javax.swing.JLayeredPane();
-    errorColorBtn = new javax.swing.JButton();
-    fontBtn = new javax.swing.JButton();
-    backgroundColorBtn = new javax.swing.JButton();
-    infoColorBtn = new javax.swing.JButton();
-    headerColorBtn = new javax.swing.JButton();
-    warningColorBtn = new javax.swing.JButton();
-    stopAtFLineCheck = new javax.swing.JCheckBox();
+        jTabbedPane6 = new javax.swing.JTabbedPane();
+        jPanel3 = new javax.swing.JPanel();
+        chkPrompt = new javax.swing.JCheckBox();
+        jPanel4 = new javax.swing.JPanel();
+        jLabel1 = new javax.swing.JLabel();
+        dbgLstnPortStartField = new javax.swing.JTextField();
+        jLayeredPane1 = new javax.swing.JLayeredPane();
+        errorColorBtn = new javax.swing.JButton();
+        fontBtn = new javax.swing.JButton();
+        backgroundColorBtn = new javax.swing.JButton();
+        infoColorBtn = new javax.swing.JButton();
+        headerColorBtn = new javax.swing.JButton();
+        warningColorBtn = new javax.swing.JButton();
+        stopAtFLineCheck = new javax.swing.JCheckBox();
 
-    
chkPrompt.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class, 
"OptionsPanel.chkPrompt1.text")); // NOI18N
+        
chkPrompt.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class, 
"OptionsPanel.chkPrompt1.text")); // NOI18N
 
-    org.jdesktop.layout.GroupLayout jPanel3Layout = new 
org.jdesktop.layout.GroupLayout(jPanel3);
-    jPanel3.setLayout(jPanel3Layout);
-    jPanel3Layout.setHorizontalGroup(
-      
jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-      .add(jPanel3Layout.createSequentialGroup()
-        .addContainerGap()
-        .add(chkPrompt)
-        .addContainerGap(202, Short.MAX_VALUE))
-    );
-    jPanel3Layout.setVerticalGroup(
-      
jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-      .add(jPanel3Layout.createSequentialGroup()
-        .addContainerGap()
-        .add(chkPrompt, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 22, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-        .addContainerGap(233, Short.MAX_VALUE))
-    );
+        javax.swing.GroupLayout jPanel3Layout = new 
javax.swing.GroupLayout(jPanel3);
+        jPanel3.setLayout(jPanel3Layout);
+        jPanel3Layout.setHorizontalGroup(
+            
jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(jPanel3Layout.createSequentialGroup()
+                .addContainerGap()
+                .addComponent(chkPrompt)
+                .addContainerGap(179, Short.MAX_VALUE))
+        );
+        jPanel3Layout.setVerticalGroup(
+            
jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(jPanel3Layout.createSequentialGroup()
+                .addContainerGap()
+                .addComponent(chkPrompt, 
javax.swing.GroupLayout.PREFERRED_SIZE, 22, 
javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addContainerGap(233, Short.MAX_VALUE))
+        );
 
-    
jTabbedPane6.addTab(org.openide.util.NbBundle.getMessage(OptionsPanel.class, 
"OptionsPanel.jPanel3.TabConstraints.tabTitle"), jPanel3); // NOI18N
+        
jTabbedPane6.addTab(org.openide.util.NbBundle.getMessage(OptionsPanel.class, 
"OptionsPanel.jPanel3.TabConstraints.tabTitle"), jPanel3); // NOI18N
 
-    jLabel1.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class, 
"OptionsPanel.jLabel1.text")); // NOI18N
+        
jLabel1.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class, 
"OptionsPanel.jLabel1.text")); // NOI18N
 
-    
dbgLstnPortStartField.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class,
 "OptionsPanel.dbgLstnPortStartField.text")); // NOI18N
+        
dbgLstnPortStartField.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class,
 "OptionsPanel.dbgLstnPortStartField.text")); // NOI18N
 
-    
jLayeredPane1.setBorder(javax.swing.BorderFactory.createTitledBorder(org.openide.util.NbBundle.getMessage(OptionsPanel.class,
 "OptionsPanel.jLayeredPane1.border.title"))); // NOI18N
+        
jLayeredPane1.setBorder(javax.swing.BorderFactory.createTitledBorder(org.openide.util.NbBundle.getMessage(OptionsPanel.class,
 "OptionsPanel.jLayeredPane1.border.title"))); // NOI18N
 
-    
errorColorBtn.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class,
 "OptionsPanel.errorColorBtn.text")); // NOI18N
-    errorColorBtn.addActionListener(new java.awt.event.ActionListener() {
-      public void actionPerformed(java.awt.event.ActionEvent evt) {
-        errorColorBtnActionPerformed(evt);
-      }
-    });
-    errorColorBtn.setBounds(20, 130, 320, 20);
-    jLayeredPane1.add(errorColorBtn, javax.swing.JLayeredPane.DEFAULT_LAYER);
+        
errorColorBtn.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class,
 "OptionsPanel.errorColorBtn.text")); // NOI18N
+        errorColorBtn.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                errorColorBtnActionPerformed(evt);
+            }
+        });
+        errorColorBtn.setBounds(20, 130, 320, 20);
+        jLayeredPane1.add(errorColorBtn, 
javax.swing.JLayeredPane.DEFAULT_LAYER);
 
-    fontBtn.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class, 
"OptionsPanel.fontBtn.text")); // NOI18N
-    fontBtn.addActionListener(new java.awt.event.ActionListener() {
-      public void actionPerformed(java.awt.event.ActionEvent evt) {
-        fontBtnActionPerformed(evt);
-      }
-    });
-    fontBtn.setBounds(20, 30, 320, 20);
-    jLayeredPane1.add(fontBtn, javax.swing.JLayeredPane.DEFAULT_LAYER);
+        
fontBtn.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class, 
"OptionsPanel.fontBtn.text")); // NOI18N
+        fontBtn.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                fontBtnActionPerformed(evt);
+            }
+        });
+        fontBtn.setBounds(20, 30, 320, 20);
+        jLayeredPane1.add(fontBtn, javax.swing.JLayeredPane.DEFAULT_LAYER);
 
-    
backgroundColorBtn.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class,
 "OptionsPanel.backgroundColorBtn.text")); // NOI18N
-    backgroundColorBtn.addActionListener(new java.awt.event.ActionListener() 
{
-      public void actionPerformed(java.awt.event.ActionEvent evt) {
-        backgroundColorBtnActionPerformed(evt);
-      }
-    });
-    backgroundColorBtn.setBounds(20, 50, 320, 20);
-    jLayeredPane1.add(backgroundColorBtn, 
javax.swing.JLayeredPane.DEFAULT_LAYER);
+        
backgroundColorBtn.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class,
 "OptionsPanel.backgroundColorBtn.text")); // NOI18N
+        backgroundColorBtn.addActionListener(new 
java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                backgroundColorBtnActionPerformed(evt);
+            }
+        });
+        backgroundColorBtn.setBounds(20, 50, 320, 20);
+        jLayeredPane1.add(backgroundColorBtn, 
javax.swing.JLayeredPane.DEFAULT_LAYER);
 
-    
infoColorBtn.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class, 
"OptionsPanel.infoColorBtn.text")); // NOI18N
-    infoColorBtn.addActionListener(new java.awt.event.ActionListener() {
-      public void actionPerformed(java.awt.event.ActionEvent evt) {
-        infoColorBtnActionPerformed(evt);
-      }
-    });
-    infoColorBtn.setBounds(20, 70, 320, 20);
-    jLayeredPane1.add(infoColorBtn, javax.swing.JLayeredPane.DEFAULT_LAYER);
+        
infoColorBtn.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class, 
"OptionsPanel.infoColorBtn.text")); // NOI18N
+        infoColorBtn.addActionListener(new java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                infoColorBtnActionPerformed(evt);
+            }
+        });
+        infoColorBtn.setBounds(20, 70, 320, 20);
+        jLayeredPane1.add(infoColorBtn, 
javax.swing.JLayeredPane.DEFAULT_LAYER);
 
-    
headerColorBtn.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class,
 "OptionsPanel.headerColorBtn.text")); // NOI18N
-    headerColorBtn.addActionListener(new java.awt.event.ActionListener() {
-      public void actionPerformed(java.awt.event.ActionEvent evt) {
-        headerColorBtnActionPerformed(evt);
-      }
-    });
-    headerColorBtn.setBounds(20, 90, 320, 20);
-    jLayeredPane1.add(headerColorBtn, 
javax.swing.JLayeredPane.DEFAULT_LAYER);
+        
headerColorBtn.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class,
 "OptionsPanel.headerColorBtn.text")); // NOI18N
+        headerColorBtn.addActionListener(new java.awt.event.ActionListener() 
{
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                headerColorBtnActionPerformed(evt);
+            }
+        });
+        headerColorBtn.setBounds(20, 90, 320, 20);
+        jLayeredPane1.add(headerColorBtn, 
javax.swing.JLayeredPane.DEFAULT_LAYER);
 
-    
warningColorBtn.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class,
 "OptionsPanel.warningColorBtn.text")); // NOI18N
-    warningColorBtn.addActionListener(new java.awt.event.ActionListener() {
-      public void actionPerformed(java.awt.event.ActionEvent evt) {
-        warningColorBtnActionPerformed(evt);
-      }
-    });
-    warningColorBtn.setBounds(20, 110, 320, 20);
-    jLayeredPane1.add(warningColorBtn, 
javax.swing.JLayeredPane.DEFAULT_LAYER);
+        
warningColorBtn.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class,
 "OptionsPanel.warningColorBtn.text")); // NOI18N
+        warningColorBtn.addActionListener(new 
java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                warningColorBtnActionPerformed(evt);
+            }
+        });
+        warningColorBtn.setBounds(20, 110, 320, 20);
+        jLayeredPane1.add(warningColorBtn, 
javax.swing.JLayeredPane.DEFAULT_LAYER);
 
-    
stopAtFLineCheck.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class,
 "OptionsPanel.stopAtFLineCheck.text")); // NOI18N
-    stopAtFLineCheck.addActionListener(new java.awt.event.ActionListener() {
-      public void actionPerformed(java.awt.event.ActionEvent evt) {
-        stopAtFLineCheckActionPerformed(evt);
-      }
-    });
+        
stopAtFLineCheck.setText(org.openide.util.NbBundle.getMessage(OptionsPanel.class,
 "OptionsPanel.stopAtFLineCheck.text")); // NOI18N
+        stopAtFLineCheck.addActionListener(new 
java.awt.event.ActionListener() {
+            public void actionPerformed(java.awt.event.ActionEvent evt) {
+                stopAtFLineCheckActionPerformed(evt);
+            }
+        });
 
-    org.jdesktop.layout.GroupLayout jPanel4Layout = new 
org.jdesktop.layout.GroupLayout(jPanel4);
-    jPanel4.setLayout(jPanel4Layout);
-    jPanel4Layout.setHorizontalGroup(
-      
jPanel4Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-      .add(jPanel4Layout.createSequentialGroup()
-        
.add(jPanel4Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-          .add(jPanel4Layout.createSequentialGroup()
-            .add(11, 11, 11)
-            .add(jLayeredPane1, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 464, Short.MAX_VALUE))
-          .add(jPanel4Layout.createSequentialGroup()
-            .addContainerGap()
-            .add(jLabel1)
-            .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-            .add(dbgLstnPortStartField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 155, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-          .add(jPanel4Layout.createSequentialGroup()
-            .addContainerGap()
-            .add(stopAtFLineCheck, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 292, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)))
-        .addContainerGap())
-    );
-    jPanel4Layout.setVerticalGroup(
-      
jPanel4Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-      .add(jPanel4Layout.createSequentialGroup()
-        .add(16, 16, 16)
-        
.add(jPanel4Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-          .add(dbgLstnPortStartField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 25, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-          .add(jLabel1))
-        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-        .add(jLayeredPane1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
161, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-        .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
-        .add(stopAtFLineCheck)
-        .addContainerGap(25, Short.MAX_VALUE))
-    );
+        javax.swing.GroupLayout jPanel4Layout = new 
javax.swing.GroupLayout(jPanel4);
+        jPanel4.setLayout(jPanel4Layout);
+        jPanel4Layout.setHorizontalGroup(
+            
jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(jPanel4Layout.createSequentialGroup()
+                
.addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(jPanel4Layout.createSequentialGroup()
+                        .addGap(11, 11, 11)
+                        .addComponent(jLayeredPane1, 
javax.swing.GroupLayout.DEFAULT_SIZE, 464, Short.MAX_VALUE))
+                    .addGroup(jPanel4Layout.createSequentialGroup()
+                        .addContainerGap()
+                        .addComponent(jLabel1)
+                        
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(dbgLstnPortStartField, 
javax.swing.GroupLayout.PREFERRED_SIZE, 155, 
javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addGroup(jPanel4Layout.createSequentialGroup()
+                        .addContainerGap()
+                        .addComponent(stopAtFLineCheck, 
javax.swing.GroupLayout.PREFERRED_SIZE, 292, 
javax.swing.GroupLayout.PREFERRED_SIZE)))
+                .addContainerGap())
+        );
+        jPanel4Layout.setVerticalGroup(
+            
jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(jPanel4Layout.createSequentialGroup()
+                .addGap(16, 16, 16)
+                
.addGroup(jPanel4Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(dbgLstnPortStartField, 
javax.swing.GroupLayout.PREFERRED_SIZE, 25, 
javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(jLabel1))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(jLayeredPane1, 
javax.swing.GroupLayout.PREFERRED_SIZE, 161, 
javax.swing.GroupLayout.PREFERRED_SIZE)
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addComponent(stopAtFLineCheck)
+                .addContainerGap(23, Short.MAX_VALUE))
+        );
 
-    
jLayeredPane1.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(OptionsPanel.class,
 "OptionsPanel.jLayeredPane1.AccessibleContext.accessibleName")); // NOI18N
+        
jLayeredPane1.getAccessibleContext().setAccessibleName(org.openide.util.NbBundle.getMessage(OptionsPanel.class,
 "OptionsPanel.jLayeredPane1.AccessibleContext.accessibleName")); // NOI18N
 
-    
jTabbedPane6.addTab(org.openide.util.NbBundle.getMessage(OptionsPanel.class, 
"OptionsPanel.jPanel4.TabConstraints.tabTitle"), jPanel4); // NOI18N
+        
jTabbedPane6.addTab(org.openide.util.NbBundle.getMessage(OptionsPanel.class, 
"OptionsPanel.jPanel4.TabConstraints.tabTitle"), jPanel4); // NOI18N
 
-    org.jdesktop.layout.GroupLayout layout = new 
org.jdesktop.layout.GroupLayout(this);
-    this.setLayout(layout);
-    layout.setHorizontalGroup(
-      layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-      .add(jTabbedPane6, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 495, 
Short.MAX_VALUE)
-    );
-    layout.setVerticalGroup(
-      layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-      .add(jTabbedPane6, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 304, 
Short.MAX_VALUE)
-    );
-  }// </editor-fold>//GEN-END:initComponents
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
+        this.setLayout(layout);
+        layout.setHorizontalGroup(
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addComponent(jTabbedPane6, 
javax.swing.GroupLayout.DEFAULT_SIZE, 495, Short.MAX_VALUE)
+        );
+        layout.setVerticalGroup(
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addComponent(jTabbedPane6, 
javax.swing.GroupLayout.DEFAULT_SIZE, 304, Short.MAX_VALUE)
+        );
+    }// </editor-fold>//GEN-END:initComponents
 
     private void errorColorBtnActionPerformed(java.awt.event.ActionEvent 
evt)//GEN-FIRST:event_errorColorBtnActionPerformed
     {//GEN-HEADEREND:event_errorColorBtnActionPerformed
@@ -349,21 +349,21 @@
     }//GEN-LAST:event_fontBtnActionPerformed
 
 
-  // Variables declaration - do not modify//GEN-BEGIN:variables
-  private javax.swing.JButton backgroundColorBtn;
-  private javax.swing.JCheckBox chkPrompt;
-  private javax.swing.JTextField dbgLstnPortStartField;
-  private javax.swing.JButton errorColorBtn;
-  private javax.swing.JButton fontBtn;
-  private javax.swing.JButton headerColorBtn;
-  private javax.swing.JButton infoColorBtn;
-  private javax.swing.JLabel jLabel1;
-  private javax.swing.JLayeredPane jLayeredPane1;
-  private javax.swing.JPanel jPanel3;
-  private javax.swing.JPanel jPanel4;
-  private javax.swing.JTabbedPane jTabbedPane6;
-  private javax.swing.JCheckBox stopAtFLineCheck;
-  private javax.swing.JButton warningColorBtn;
-  // End of variables declaration//GEN-END:variables
+    // Variables declaration - do not modify//GEN-BEGIN:variables
+    private javax.swing.JButton backgroundColorBtn;
+    private javax.swing.JCheckBox chkPrompt;
+    private javax.swing.JTextField dbgLstnPortStartField;
+    private javax.swing.JButton errorColorBtn;
+    private javax.swing.JButton fontBtn;
+    private javax.swing.JButton headerColorBtn;
+    private javax.swing.JButton infoColorBtn;
+    private javax.swing.JLabel jLabel1;
+    private javax.swing.JLayeredPane jLayeredPane1;
+    private javax.swing.JPanel jPanel3;
+    private javax.swing.JPanel jPanel4;
+    private javax.swing.JTabbedPane jTabbedPane6;
+    private javax.swing.JCheckBox stopAtFLineCheck;
+    private javax.swing.JButton warningColorBtn;
+    // End of variables declaration//GEN-END:variables
 
 }
diff --git a/python.platform/nbproject/project.xml 
b/python.platform/nbproject/project.xml
--- a/python.platform/nbproject/project.xml
+++ b/python.platform/nbproject/project.xml
@@ -14,15 +14,6 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.jdesktop.layout</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.6</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
                     <code-name-base>org.openide.awt</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
diff --git 
a/python.platform/src/org/netbeans/modules/python/platform/panels/PythonPlatformPanel.form
 
b/python.platform/src/org/netbeans/modules/python/platform/panels/PythonPlatformPanel.form
--- 
a/python.platform/src/org/netbeans/modules/python/platform/panels/PythonPlatformPanel.form
+++ 
b/python.platform/src/org/netbeans/modules/python/platform/panels/PythonPlatformPanel.form
@@ -10,16 +10,13 @@
       </Properties>
     </Component>
   </NonVisualComponents>
-  <SyntheticProperties>
-    <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"/>
-  </SyntheticProperties>
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" 
value="1"/>
     <AuxValue name="FormSettings_autoSetComponentName" 
type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" 
value="true"/>
     <AuxValue name="FormSettings_generateMnemonicsCode" 
type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" 
value="true"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="2"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="1"/>
     <AuxValue name="FormSettings_listenerGenerationStyle" 
type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" 
value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" 
value="2"/>
@@ -163,7 +160,7 @@
                       <Group type="103" groupAlignment="0" attributes="0">
                           <Component id="platformName" pref="446" 
max="32767" attributes="0"/>
                           <Group type="102" alignment="1" attributes="0">
-                              <Component id="console" pref="351" max="32767" 
attributes="0"/>
+                              <Component id="console" pref="345" max="32767" 
attributes="0"/>
                               <EmptySpace max="-2" attributes="0"/>
                               <Component id="btnConsoleBrowse" min="-2" 
max="-2" attributes="0"/>
                           </Group>
@@ -198,7 +195,7 @@
                           <Component id="jLabel8" alignment="3" min="-2" 
max="-2" attributes="0"/>
                           <Component id="commandArgs" alignment="3" min="-2" 
max="-2" attributes="0"/>
                       </Group>
-                      <EmptySpace pref="201" max="32767" attributes="0"/>
+                      <EmptySpace pref="177" max="32767" attributes="0"/>
                   </Group>
               </Group>
             </DimensionLayout>
@@ -290,10 +287,10 @@
                       <EmptySpace max="-2" attributes="0"/>
                       <Group type="103" groupAlignment="0" attributes="0">
                           <Group type="102" attributes="0">
-                              <Component id="jScrollPane2" pref="481" 
max="32767" attributes="0"/>
+                              <Component id="jScrollPane2" pref="479" 
max="32767" attributes="0"/>
                               <EmptySpace max="-2" attributes="0"/>
                               <Group type="103" groupAlignment="0" 
attributes="0">
-                                  <Component id="moveDownPythonPath" 
pref="120" max="32767" attributes="0"/>
+                                  <Component id="moveDownPythonPath" 
pref="119" max="32767" attributes="0"/>
                                   <Component id="moveUpPythonPath" 
pref="120" max="32767" attributes="1"/>
                                   <Component id="removePythonPath" 
pref="120" max="32767" attributes="1"/>
                                   <Component id="addPythonPath" pref="120" 
max="32767" attributes="1"/>
@@ -320,7 +317,7 @@
                               <EmptySpace max="-2" attributes="0"/>
                               <Component id="moveDownPythonPath" min="-2" 
max="-2" attributes="0"/>
                           </Group>
-                          <Component id="jScrollPane2" alignment="0" 
pref="280" max="32767" attributes="0"/>
+                          <Component id="jScrollPane2" alignment="0" 
pref="282" max="32767" attributes="0"/>
                       </Group>
                       <EmptySpace max="-2" attributes="0"/>
                   </Group>
@@ -411,15 +408,15 @@
                   <Group type="102" alignment="0" attributes="0">
                       <EmptySpace max="-2" attributes="0"/>
                       <Component id="jLabel7" min="-2" max="-2" 
attributes="0"/>
-                      <EmptySpace pref="466" max="32767" attributes="0"/>
+                      <EmptySpace pref="446" max="32767" attributes="0"/>
                   </Group>
                   <Group type="103" rootIndex="1" groupAlignment="0" 
attributes="0">
                       <Group type="102" alignment="0" attributes="0">
                           <EmptySpace max="-2" attributes="0"/>
-                          <Component id="jScrollPane3" pref="480" 
max="32767" attributes="0"/>
+                          <Component id="jScrollPane3" pref="478" 
max="32767" attributes="0"/>
                           <EmptySpace max="-2" attributes="0"/>
                           <Group type="103" groupAlignment="0" 
attributes="0">
-                              <Component id="moveDownJavaPath" pref="122" 
max="32767" attributes="0"/>
+                              <Component id="moveDownJavaPath" pref="121" 
max="32767" attributes="0"/>
                               <Component id="removeJavaPath" alignment="0" 
pref="122" max="32767" attributes="1"/>
                               <Component id="addJavaPath" alignment="0" 
pref="122" max="32767" attributes="1"/>
                               <Component id="moveUpJavaPath" alignment="0" 
pref="122" max="32767" attributes="1"/>
@@ -433,13 +430,13 @@
               <Group type="103" groupAlignment="0" attributes="0">
                   <Group type="102" alignment="0" attributes="0">
                       <Component id="jLabel7" min="-2" max="-2" 
attributes="0"/>
-                      <EmptySpace pref="298" max="32767" attributes="0"/>
+                      <EmptySpace pref="300" max="32767" attributes="0"/>
                   </Group>
                   <Group type="103" rootIndex="1" groupAlignment="0" 
attributes="0">
                       <Group type="102" alignment="0" attributes="0">
                           <EmptySpace min="-2" pref="22" max="-2" 
attributes="0"/>
                           <Group type="103" groupAlignment="0" 
attributes="0">
-                              <Component id="jScrollPane3" alignment="0" 
pref="279" max="32767" attributes="0"/>
+                              <Component id="jScrollPane3" alignment="0" 
pref="283" max="32767" attributes="0"/>
                               <Group type="102" alignment="0" attributes="0">
                                   <Component id="addJavaPath" min="-2" 
max="-2" attributes="0"/>
                                   <EmptySpace max="-2" attributes="0"/>
diff --git 
a/python.platform/src/org/netbeans/modules/python/platform/panels/PythonPlatformPanel.java
 
b/python.platform/src/org/netbeans/modules/python/platform/panels/PythonPlatformPanel.java
--- 
a/python.platform/src/org/netbeans/modules/python/platform/panels/PythonPlatformPanel.java
+++ 
b/python.platform/src/org/netbeans/modules/python/platform/panels/PythonPlatformPanel.java
@@ -178,49 +178,49 @@
 
         
commandArgs.setText(org.openide.util.NbBundle.getMessage(PythonPlatformPanel.class,
 "PythonPlatformPanel.commandArgs.text")); // NOI18N
 
-        org.jdesktop.layout.GroupLayout jPanel1Layout = new 
org.jdesktop.layout.GroupLayout(jPanel1);
+        javax.swing.GroupLayout jPanel1Layout = new 
javax.swing.GroupLayout(jPanel1);
         jPanel1.setLayout(jPanel1Layout);
         jPanel1Layout.setHorizontalGroup(
-            
jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(jPanel1Layout.createSequentialGroup()
+            
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(jPanel1Layout.createSequentialGroup()
                 .addContainerGap()
-                
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
-                    .add(jLabel8)
-                    .add(jLabel4)
-                    .add(jLabel3)
-                    .add(jLabel2))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(platformName, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 460, Short.MAX_VALUE)
-                    .add(org.jdesktop.layout.GroupLayout.TRAILING, 
jPanel1Layout.createSequentialGroup()
-                        .add(console, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 354, Short.MAX_VALUE)
-                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(btnConsoleBrowse))
-                    .add(commandArgs, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 460, Short.MAX_VALUE)
-                    .add(command, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 460, Short.MAX_VALUE))
-                .add(24, 24, 24))
+                
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+                    .addComponent(jLabel8)
+                    .addComponent(jLabel4)
+                    .addComponent(jLabel3)
+                    .addComponent(jLabel2))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(platformName, 
javax.swing.GroupLayout.DEFAULT_SIZE, 446, Short.MAX_VALUE)
+                    .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, 
jPanel1Layout.createSequentialGroup()
+                        .addComponent(console, 
javax.swing.GroupLayout.DEFAULT_SIZE, 345, Short.MAX_VALUE)
+                        
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(btnConsoleBrowse))
+                    .addComponent(commandArgs, 
javax.swing.GroupLayout.DEFAULT_SIZE, 446, Short.MAX_VALUE)
+                    .addComponent(command, 
javax.swing.GroupLayout.DEFAULT_SIZE, 446, Short.MAX_VALUE))
+                .addGap(24, 24, 24))
         );
         jPanel1Layout.setVerticalGroup(
-            
jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(jPanel1Layout.createSequentialGroup()
+            
jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(jPanel1Layout.createSequentialGroup()
                 .addContainerGap()
-                
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(jLabel2)
-                    .add(platformName, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(jLabel3)
-                    .add(command, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(jLabel4)
-                    .add(console, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(btnConsoleBrowse))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                
.add(jPanel1Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(jLabel8)
-                    .add(commandArgs, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .addContainerGap(157, Short.MAX_VALUE))
+                
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(jLabel2)
+                    .addComponent(platformName, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(jLabel3)
+                    .addComponent(command, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(jLabel4)
+                    .addComponent(console, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(btnConsoleBrowse))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                
.addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(jLabel8)
+                    .addComponent(commandArgs, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addContainerGap(177, Short.MAX_VALUE))
         );
 
         
jTabbedPane1.addTab(org.openide.util.NbBundle.getMessage(PythonPlatformPanel.class,
 "PythonPlatformPanel.jPanel1.TabConstraints.tabTitle"), jPanel1); // NOI18N
@@ -259,39 +259,39 @@
             }
         });
 
-        org.jdesktop.layout.GroupLayout jPanel2Layout = new 
org.jdesktop.layout.GroupLayout(jPanel2);
+        javax.swing.GroupLayout jPanel2Layout = new 
javax.swing.GroupLayout(jPanel2);
         jPanel2.setLayout(jPanel2Layout);
         jPanel2Layout.setHorizontalGroup(
-            
jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(jPanel2Layout.createSequentialGroup()
+            
jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(jPanel2Layout.createSequentialGroup()
                 .addContainerGap()
-                
.add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(jPanel2Layout.createSequentialGroup()
-                        .add(jScrollPane2, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 480, Short.MAX_VALUE)
-                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        
.add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                            .add(moveDownPythonPath, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                            .add(moveUpPythonPath, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 117, Short.MAX_VALUE)
-                            .add(removePythonPath, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 117, Short.MAX_VALUE)
-                            .add(addPythonPath, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 117, Short.MAX_VALUE)))
-                    .add(jLabel5))
+                
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(jPanel2Layout.createSequentialGroup()
+                        .addComponent(jScrollPane2, 
javax.swing.GroupLayout.DEFAULT_SIZE, 479, Short.MAX_VALUE)
+                        
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addComponent(moveDownPythonPath, 
javax.swing.GroupLayout.DEFAULT_SIZE, 119, Short.MAX_VALUE)
+                            .addComponent(moveUpPythonPath, 
javax.swing.GroupLayout.DEFAULT_SIZE, 120, Short.MAX_VALUE)
+                            .addComponent(removePythonPath, 
javax.swing.GroupLayout.DEFAULT_SIZE, 120, Short.MAX_VALUE)
+                            .addComponent(addPythonPath, 
javax.swing.GroupLayout.DEFAULT_SIZE, 120, Short.MAX_VALUE)))
+                    .addComponent(jLabel5))
                 .addContainerGap())
         );
         jPanel2Layout.setVerticalGroup(
-            
jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(jPanel2Layout.createSequentialGroup()
-                .add(jLabel5)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                
.add(jPanel2Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
-                    .add(org.jdesktop.layout.GroupLayout.LEADING, 
jPanel2Layout.createSequentialGroup()
-                        .add(addPythonPath)
-                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(removePythonPath)
-                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(moveUpPythonPath)
-                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(moveDownPythonPath))
-                    .add(org.jdesktop.layout.GroupLayout.LEADING, 
jScrollPane2, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 266, 
Short.MAX_VALUE))
+            
jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(jPanel2Layout.createSequentialGroup()
+                .addComponent(jLabel5)
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                
.addGroup(jPanel2Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+                    .addGroup(javax.swing.GroupLayout.Alignment.LEADING, 
jPanel2Layout.createSequentialGroup()
+                        .addComponent(addPythonPath)
+                        
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(removePythonPath)
+                        
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(moveUpPythonPath)
+                        
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(moveDownPythonPath))
+                    .addComponent(jScrollPane2, 
javax.swing.GroupLayout.Alignment.LEADING, 
javax.swing.GroupLayout.DEFAULT_SIZE, 282, Short.MAX_VALUE))
                 .addContainerGap())
         );
 
@@ -331,44 +331,44 @@
 
         
jLabel7.setText(org.openide.util.NbBundle.getMessage(PythonPlatformPanel.class,
 "PythonPlatformPanel.jLabel7.text")); // NOI18N
 
-        org.jdesktop.layout.GroupLayout jPanel3Layout = new 
org.jdesktop.layout.GroupLayout(jPanel3);
+        javax.swing.GroupLayout jPanel3Layout = new 
javax.swing.GroupLayout(jPanel3);
         jPanel3.setLayout(jPanel3Layout);
         jPanel3Layout.setHorizontalGroup(
-            
jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(jPanel3Layout.createSequentialGroup()
+            
jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(jPanel3Layout.createSequentialGroup()
                 .addContainerGap()
-                .add(jLabel7)
-                .addContainerGap(456, Short.MAX_VALUE))
-            
.add(jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                .add(jPanel3Layout.createSequentialGroup()
+                .addComponent(jLabel7)
+                .addContainerGap(446, Short.MAX_VALUE))
+            
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                .addGroup(jPanel3Layout.createSequentialGroup()
                     .addContainerGap()
-                    .add(jScrollPane3, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 475, Short.MAX_VALUE)
-                    .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                    
.add(jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                        .add(moveDownJavaPath, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        .add(removeJavaPath, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 117, Short.MAX_VALUE)
-                        .add(addJavaPath, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 117, Short.MAX_VALUE)
-                        .add(moveUpJavaPath, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 117, Short.MAX_VALUE))
-                    .add(11, 11, 11)))
+                    .addComponent(jScrollPane3, 
javax.swing.GroupLayout.DEFAULT_SIZE, 478, Short.MAX_VALUE)
+                    
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                    
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                        .addComponent(moveDownJavaPath, 
javax.swing.GroupLayout.DEFAULT_SIZE, 121, Short.MAX_VALUE)
+                        .addComponent(removeJavaPath, 
javax.swing.GroupLayout.DEFAULT_SIZE, 122, Short.MAX_VALUE)
+                        .addComponent(addJavaPath, 
javax.swing.GroupLayout.DEFAULT_SIZE, 122, Short.MAX_VALUE)
+                        .addComponent(moveUpJavaPath, 
javax.swing.GroupLayout.DEFAULT_SIZE, 122, Short.MAX_VALUE))
+                    .addGap(11, 11, 11)))
         );
         jPanel3Layout.setVerticalGroup(
-            
jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(jPanel3Layout.createSequentialGroup()
-                .add(jLabel7)
-                .addContainerGap(278, Short.MAX_VALUE))
-            
.add(jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                .add(jPanel3Layout.createSequentialGroup()
-                    .add(22, 22, 22)
-                    
.add(jPanel3Layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                        .add(jScrollPane3, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 266, Short.MAX_VALUE)
-                        .add(jPanel3Layout.createSequentialGroup()
-                            .add(addJavaPath)
-                            
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                            .add(removeJavaPath)
-                            
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                            .add(moveUpJavaPath)
-                            
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                            .add(moveDownJavaPath)))
+            
jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(jPanel3Layout.createSequentialGroup()
+                .addComponent(jLabel7)
+                .addContainerGap(300, Short.MAX_VALUE))
+            
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                .addGroup(jPanel3Layout.createSequentialGroup()
+                    .addGap(22, 22, 22)
+                    
.addGroup(jPanel3Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                        .addComponent(jScrollPane3, 
javax.swing.GroupLayout.DEFAULT_SIZE, 283, Short.MAX_VALUE)
+                        .addGroup(jPanel3Layout.createSequentialGroup()
+                            .addComponent(addJavaPath)
+                            
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                            .addComponent(removeJavaPath)
+                            
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                            .addComponent(moveUpJavaPath)
+                            
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                            .addComponent(moveDownJavaPath)))
                     .addContainerGap()))
         );
 
@@ -381,43 +381,43 @@
             }
         });
 
-        org.jdesktop.layout.GroupLayout layout = new 
org.jdesktop.layout.GroupLayout(this);
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
                 .addContainerGap()
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
-                    .add(org.jdesktop.layout.GroupLayout.LEADING, 
makePlatformDefault, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 174, 
Short.MAX_VALUE)
-                    .add(org.jdesktop.layout.GroupLayout.LEADING, 
autoDetectPlatform, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 174, 
Short.MAX_VALUE)
-                    .add(org.jdesktop.layout.GroupLayout.LEADING, 
layout.createSequentialGroup()
-                        .add(newPlatform, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(removePlatform, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
-                    .add(org.jdesktop.layout.GroupLayout.LEADING, jLabel1)
-                    .add(org.jdesktop.layout.GroupLayout.LEADING, 
jScrollPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 174, 
Short.MAX_VALUE))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(jTabbedPane1, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 636, Short.MAX_VALUE)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+                    .addComponent(makePlatformDefault, 
javax.swing.GroupLayout.Alignment.LEADING, 
javax.swing.GroupLayout.DEFAULT_SIZE, 175, Short.MAX_VALUE)
+                    .addComponent(autoDetectPlatform, 
javax.swing.GroupLayout.Alignment.LEADING, 
javax.swing.GroupLayout.DEFAULT_SIZE, 175, Short.MAX_VALUE)
+                    .addGroup(javax.swing.GroupLayout.Alignment.LEADING, 
layout.createSequentialGroup()
+                        .addComponent(newPlatform, 
javax.swing.GroupLayout.DEFAULT_SIZE, 74, Short.MAX_VALUE)
+                        
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(removePlatform, 
javax.swing.GroupLayout.DEFAULT_SIZE, 95, Short.MAX_VALUE))
+                    .addComponent(jLabel1, 
javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(jScrollPane1, 
javax.swing.GroupLayout.Alignment.LEADING, 
javax.swing.GroupLayout.DEFAULT_SIZE, 175, Short.MAX_VALUE))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(jTabbedPane1, 
javax.swing.GroupLayout.DEFAULT_SIZE, 636, Short.MAX_VALUE)
                 .addContainerGap())
         );
         layout.setVerticalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
                 .addContainerGap()
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(jTabbedPane1, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 340, Short.MAX_VALUE)
-                    .add(layout.createSequentialGroup()
-                        .add(jLabel1)
-                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(jScrollPane1, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 213, Short.MAX_VALUE)
-                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                            .add(removePlatform)
-                            .add(newPlatform))
-                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(autoDetectPlatform)
-                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(makePlatformDefault))))
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(jTabbedPane1, 
javax.swing.GroupLayout.DEFAULT_SIZE, 340, Short.MAX_VALUE)
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(jLabel1)
+                        
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(jScrollPane1, 
javax.swing.GroupLayout.DEFAULT_SIZE, 226, Short.MAX_VALUE)
+                        
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                            .addComponent(removePlatform)
+                            .addComponent(newPlatform))
+                        
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(autoDetectPlatform)
+                        
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(makePlatformDefault))))
         );
     }// </editor-fold>//GEN-END:initComponents
 
diff --git a/python.project/nbproject/project.xml 
b/python.project/nbproject/project.xml
--- a/python.project/nbproject/project.xml
+++ b/python.project/nbproject/project.xml
@@ -6,15 +6,6 @@
             
<code-name-base>org.netbeans.modules.python.project</code-name-base>
             <module-dependencies>
                 <dependency>
-                    <code-name-base>org.jdesktop.layout</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.4.1</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
                     
<code-name-base>org.netbeans.api.progress</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
diff --git 
a/python.project/src/org/netbeans/modules/python/project/templates/EmptyPythonProjectPanelVisual.form
 
b/python.project/src/org/netbeans/modules/python/project/templates/EmptyPythonProjectPanelVisual.form
--- 
a/python.project/src/org/netbeans/modules/python/project/templates/EmptyPythonProjectPanelVisual.form
+++ 
b/python.project/src/org/netbeans/modules/python/project/templates/EmptyPythonProjectPanelVisual.form
@@ -4,9 +4,10 @@
   <AuxValues>
     <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" 
value="0"/>
     <AuxValue name="FormSettings_autoSetComponentName" 
type="java.lang.Boolean" value="false"/>
+    <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" 
value="true"/>
     <AuxValue name="FormSettings_generateMnemonicsCode" 
type="java.lang.Boolean" value="true"/>
     <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" 
value="false"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="2"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="1"/>
     <AuxValue name="FormSettings_listenerGenerationStyle" 
type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" 
value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" 
value="2"/>
diff --git 
a/python.project/src/org/netbeans/modules/python/project/templates/EmptyPythonProjectPanelVisual.java
 
b/python.project/src/org/netbeans/modules/python/project/templates/EmptyPythonProjectPanelVisual.java
--- 
a/python.project/src/org/netbeans/modules/python/project/templates/EmptyPythonProjectPanelVisual.java
+++ 
b/python.project/src/org/netbeans/modules/python/project/templates/EmptyPythonProjectPanelVisual.java
@@ -67,40 +67,40 @@
 
         createdFolderTextField.setEditable(false);
 
-        org.jdesktop.layout.GroupLayout layout = new 
org.jdesktop.layout.GroupLayout(this);
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(projectLocationLabel)
-                    .add(createdFolderLabel)
-                    .add(projectNameLabel))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(layout.createSequentialGroup()
-                        .add(projectLocationTextField, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 238, Short.MAX_VALUE)
-                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(browseButton))
-                    .add(projectNameTextField, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 343, Short.MAX_VALUE)
-                    .add(createdFolderTextField, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 343, Short.MAX_VALUE)))
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(projectLocationLabel)
+                    .addComponent(createdFolderLabel)
+                    .addComponent(projectNameLabel))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(projectLocationTextField, 
javax.swing.GroupLayout.DEFAULT_SIZE, 238, Short.MAX_VALUE)
+                        
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(browseButton))
+                    .addComponent(projectNameTextField, 
javax.swing.GroupLayout.DEFAULT_SIZE, 343, Short.MAX_VALUE)
+                    .addComponent(createdFolderTextField, 
javax.swing.GroupLayout.DEFAULT_SIZE, 343, Short.MAX_VALUE)))
         );
         layout.setVerticalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
-                .add(20, 20, 20)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(projectNameLabel)
-                    .add(projectNameTextField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .add(8, 8, 8)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(projectLocationLabel)
-                    .add(browseButton)
-                    .add(projectLocationTextField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(createdFolderLabel)
-                    .add(createdFolderTextField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addGap(20, 20, 20)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(projectNameLabel)
+                    .addComponent(projectNameTextField, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addGap(8, 8, 8)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(projectLocationLabel)
+                    .addComponent(browseButton)
+                    .addComponent(projectLocationTextField, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(createdFolderLabel)
+                    .addComponent(createdFolderTextField, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addContainerGap(31, Short.MAX_VALUE))
         );
     }// </editor-fold>//GEN-END:initComponents
diff --git 
a/python.project/src/org/netbeans/modules/python/project/templates/ExistingPythonProjectPanelVisual.form
 
b/python.project/src/org/netbeans/modules/python/project/templates/ExistingPythonProjectPanelVisual.form
--- 
a/python.project/src/org/netbeans/modules/python/project/templates/ExistingPythonProjectPanelVisual.form
+++ 
b/python.project/src/org/netbeans/modules/python/project/templates/ExistingPythonProjectPanelVisual.form
@@ -7,7 +7,7 @@
     <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" 
value="true"/>
     <AuxValue name="FormSettings_generateMnemonicsCode" 
type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" 
value="true"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="2"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="1"/>
     <AuxValue name="FormSettings_listenerGenerationStyle" 
type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" 
value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" 
value="2"/>
diff --git 
a/python.project/src/org/netbeans/modules/python/project/templates/ExistingPythonProjectPanelVisual.java
 
b/python.project/src/org/netbeans/modules/python/project/templates/ExistingPythonProjectPanelVisual.java
--- 
a/python.project/src/org/netbeans/modules/python/project/templates/ExistingPythonProjectPanelVisual.java
+++ 
b/python.project/src/org/netbeans/modules/python/project/templates/ExistingPythonProjectPanelVisual.java
@@ -73,35 +73,35 @@
             }
         });
 
-        org.jdesktop.layout.GroupLayout layout = new 
org.jdesktop.layout.GroupLayout(this);
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(jLabel2)
-                    .add(jLabel1))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(layout.createSequentialGroup()
-                        .add(projectFolder, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 167, Short.MAX_VALUE)
-                        .add(1, 1, 1)
-                        .add(browse)
-                        .add(48, 48, 48))
-                    .add(projectName, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 300, Short.MAX_VALUE)))
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(jLabel2)
+                    .addComponent(jLabel1))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(projectFolder, 
javax.swing.GroupLayout.DEFAULT_SIZE, 167, Short.MAX_VALUE)
+                        .addGap(1, 1, 1)
+                        .addComponent(browse)
+                        .addGap(48, 48, 48))
+                    .addComponent(projectName, 
javax.swing.GroupLayout.DEFAULT_SIZE, 300, Short.MAX_VALUE)))
         );
         layout.setVerticalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
                 .addContainerGap()
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(jLabel1)
-                    .add(projectName, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(jLabel2)
-                    .add(projectFolder, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                    .add(browse))
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(jLabel1)
+                    .addComponent(projectName, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(jLabel2)
+                    .addComponent(projectFolder, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE)
+                    .addComponent(browse))
                 .addContainerGap(29, Short.MAX_VALUE))
         );
     }// </editor-fold>//GEN-END:initComponents
diff --git 
a/python.project/src/org/netbeans/modules/python/project/templates/PanelConfigureSourcesVisual.form
 
b/python.project/src/org/netbeans/modules/python/project/templates/PanelConfigureSourcesVisual.form
--- 
a/python.project/src/org/netbeans/modules/python/project/templates/PanelConfigureSourcesVisual.form
+++ 
b/python.project/src/org/netbeans/modules/python/project/templates/PanelConfigureSourcesVisual.form
@@ -7,7 +7,7 @@
     <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" 
value="true"/>
     <AuxValue name="FormSettings_generateMnemonicsCode" 
type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" 
value="true"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="2"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="1"/>
     <AuxValue name="FormSettings_listenerGenerationStyle" 
type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" 
value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" 
value="2"/>
@@ -21,7 +21,7 @@
                   <Component id="jLabel1" alignment="0" min="-2" max="-2" 
attributes="0"/>
                   <Component id="jLabel2" alignment="0" min="-2" max="-2" 
attributes="0"/>
                   <Component id="jLabel3" alignment="0" min="-2" max="-2" 
attributes="0"/>
-                  <Component id="jScrollPane2" alignment="0" pref="307" 
max="32767" attributes="2"/>
+                  <Component id="jScrollPane2" alignment="0" pref="341" 
max="32767" attributes="2"/>
                   <Component id="jScrollPane1" alignment="0" pref="307" 
max="32767" attributes="2"/>
               </Group>
               <EmptySpace min="-2" max="-2" attributes="0"/>
diff --git 
a/python.project/src/org/netbeans/modules/python/project/templates/PanelConfigureSourcesVisual.java
 
b/python.project/src/org/netbeans/modules/python/project/templates/PanelConfigureSourcesVisual.java
--- 
a/python.project/src/org/netbeans/modules/python/project/templates/PanelConfigureSourcesVisual.java
+++ 
b/python.project/src/org/netbeans/modules/python/project/templates/PanelConfigureSourcesVisual.java
@@ -139,48 +139,48 @@
             }
         });
 
-        org.jdesktop.layout.GroupLayout layout = new 
org.jdesktop.layout.GroupLayout(this);
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(jLabel1)
-                    .add(jLabel2)
-                    .add(jLabel3)
-                    .add(jScrollPane2, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 307, Short.MAX_VALUE)
-                    .add(jScrollPane1, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 307, Short.MAX_VALUE))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, 
false)
-                    .add(removeTest, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .add(addTest, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
-                    .add(addSource, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 137, Short.MAX_VALUE)
-                    .add(removeSource, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)))
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(jLabel1)
+                    .addComponent(jLabel2)
+                    .addComponent(jLabel3)
+                    .addComponent(jScrollPane2, 
javax.swing.GroupLayout.DEFAULT_SIZE, 341, Short.MAX_VALUE)
+                    .addComponent(jScrollPane1, 
javax.swing.GroupLayout.DEFAULT_SIZE, 307, Short.MAX_VALUE))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING,
 false)
+                    .addComponent(removeTest, 
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
Short.MAX_VALUE)
+                    .addComponent(addTest, 
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
Short.MAX_VALUE)
+                    .addComponent(addSource, 
javax.swing.GroupLayout.DEFAULT_SIZE, 137, Short.MAX_VALUE)
+                    .addComponent(removeSource, 
javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
Short.MAX_VALUE)))
         );
         layout.setVerticalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
-                .add(20, 20, 20)
-                .add(jLabel1)
-                .add(18, 18, 18)
-                .add(jLabel2)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(layout.createSequentialGroup()
-                        .add(jScrollPane1, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 100, Short.MAX_VALUE)
-                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
-                        .add(jLabel3))
-                    .add(layout.createSequentialGroup()
-                        .add(addSource)
-                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(removeSource)))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(layout.createSequentialGroup()
-                        .add(addTest)
-                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
-                        .add(removeTest))
-                    .add(jScrollPane2, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 100, Short.MAX_VALUE))
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addGap(20, 20, 20)
+                .addComponent(jLabel1)
+                .addGap(18, 18, 18)
+                .addComponent(jLabel2)
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(jScrollPane1, 
javax.swing.GroupLayout.DEFAULT_SIZE, 100, Short.MAX_VALUE)
+                        
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addComponent(jLabel3))
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(addSource)
+                        
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(removeSource)))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(addTest)
+                        
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addComponent(removeTest))
+                    .addComponent(jScrollPane2, 
javax.swing.GroupLayout.DEFAULT_SIZE, 100, Short.MAX_VALUE))
                 .addContainerGap())
         );
     }// </editor-fold>//GEN-END:initComponents
diff --git 
a/python.project/src/org/netbeans/modules/python/project/templates/PanelOptionsVisual.form
 
b/python.project/src/org/netbeans/modules/python/project/templates/PanelOptionsVisual.form
--- 
a/python.project/src/org/netbeans/modules/python/project/templates/PanelOptionsVisual.form
+++ 
b/python.project/src/org/netbeans/modules/python/project/templates/PanelOptionsVisual.form
@@ -15,7 +15,7 @@
     <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" 
value="true"/>
     <AuxValue name="FormSettings_generateMnemonicsCode" 
type="java.lang.Boolean" value="true"/>
     <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" 
value="false"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="2"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="1"/>
     <AuxValue name="FormSettings_listenerGenerationStyle" 
type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" 
value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" 
value="2"/>
diff --git 
a/python.project/src/org/netbeans/modules/python/project/templates/PanelOptionsVisual.java
 
b/python.project/src/org/netbeans/modules/python/project/templates/PanelOptionsVisual.java
--- 
a/python.project/src/org/netbeans/modules/python/project/templates/PanelOptionsVisual.java
+++ 
b/python.project/src/org/netbeans/modules/python/project/templates/PanelOptionsVisual.java
@@ -177,40 +177,40 @@
             }
         });
 
-        org.jdesktop.layout.GroupLayout layout = new 
org.jdesktop.layout.GroupLayout(this);
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
-                .add(setAsMainCheckBox)
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addComponent(setAsMainCheckBox)
                 .addContainerGap(353, Short.MAX_VALUE))
-            .add(layout.createSequentialGroup()
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(createMainCheckBox)
-                    .add(jLabel1))
-                .add(18, 18, 18)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(layout.createSequentialGroup()
-                        .add(platforms, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 233, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
-                        .add(manage)
-                        .add(4, 4, 4))
-                    .add(mainFileTextField, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 353, Short.MAX_VALUE)))
+            .addGroup(layout.createSequentialGroup()
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(createMainCheckBox)
+                    .addComponent(jLabel1))
+                .addGap(18, 18, 18)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(platforms, 
javax.swing.GroupLayout.PREFERRED_SIZE, 233, 
javax.swing.GroupLayout.PREFERRED_SIZE)
+                        
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                        .addComponent(manage)
+                        .addGap(4, 4, 4))
+                    .addComponent(mainFileTextField, 
javax.swing.GroupLayout.DEFAULT_SIZE, 353, Short.MAX_VALUE)))
         );
         layout.setVerticalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
-                .add(setAsMainCheckBox)
-                .add(5, 5, 5)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(createMainCheckBox)
-                    .add(mainFileTextField, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                        .add(jLabel1)
-                        .add(platforms, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                    .add(manage))
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addComponent(setAsMainCheckBox)
+                .addGap(5, 5, 5)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(createMainCheckBox)
+                    .addComponent(mainFileTextField, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                        .addComponent(jLabel1)
+                        .addComponent(platforms, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE))
+                    .addComponent(manage))
                 .addContainerGap(50, Short.MAX_VALUE))
         );
 
diff --git 
a/python.project/src/org/netbeans/modules/python/project/ui/customizer/CustomizerPythonPath.form
 
b/python.project/src/org/netbeans/modules/python/project/ui/customizer/CustomizerPythonPath.form
--- 
a/python.project/src/org/netbeans/modules/python/project/ui/customizer/CustomizerPythonPath.form
+++ 
b/python.project/src/org/netbeans/modules/python/project/ui/customizer/CustomizerPythonPath.form
@@ -7,7 +7,7 @@
     <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" 
value="true"/>
     <AuxValue name="FormSettings_generateMnemonicsCode" 
type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" 
value="true"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="2"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="1"/>
     <AuxValue name="FormSettings_listenerGenerationStyle" 
type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" 
value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" 
value="2"/>
diff --git 
a/python.project/src/org/netbeans/modules/python/project/ui/customizer/CustomizerPythonPath.java
 
b/python.project/src/org/netbeans/modules/python/project/ui/customizer/CustomizerPythonPath.java
--- 
a/python.project/src/org/netbeans/modules/python/project/ui/customizer/CustomizerPythonPath.java
+++ 
b/python.project/src/org/netbeans/modules/python/project/ui/customizer/CustomizerPythonPath.java
@@ -144,54 +144,54 @@
 
         
jLabel2.setText(org.openide.util.NbBundle.getMessage(CustomizerPythonPath.class,
 "CustomizerPythonPath.jLabel2.text")); // NOI18N
 
-        org.jdesktop.layout.GroupLayout layout = new 
org.jdesktop.layout.GroupLayout(this);
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
                 .addContainerGap()
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(layout.createSequentialGroup()
-                        .add(jLabel1)
-                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(platforms, 0, 221, Short.MAX_VALUE)
-                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(manage)
-                        .add(30, 30, 30))
-                    .add(org.jdesktop.layout.GroupLayout.TRAILING, 
layout.createSequentialGroup()
-                        .add(jScrollPane2, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 309, Short.MAX_VALUE)
-                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                            .add(moveDownPythonPath, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 156, Short.MAX_VALUE)
-                            .add(moveUpPythonPath, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 156, Short.MAX_VALUE)
-                            .add(removePythonPath, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 156, Short.MAX_VALUE)
-                            .add(addPythonPath, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 156, Short.MAX_VALUE)))
-                    .add(jLabel2))
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(jLabel1)
+                        
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(platforms, 0, 244, Short.MAX_VALUE)
+                        
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(manage)
+                        .addGap(30, 30, 30))
+                    .addGroup(javax.swing.GroupLayout.Alignment.TRAILING, 
layout.createSequentialGroup()
+                        .addComponent(jScrollPane2, 
javax.swing.GroupLayout.DEFAULT_SIZE, 309, Short.MAX_VALUE)
+                        
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                            .addComponent(moveDownPythonPath, 
javax.swing.GroupLayout.DEFAULT_SIZE, 156, Short.MAX_VALUE)
+                            .addComponent(moveUpPythonPath, 
javax.swing.GroupLayout.DEFAULT_SIZE, 156, Short.MAX_VALUE)
+                            .addComponent(removePythonPath, 
javax.swing.GroupLayout.DEFAULT_SIZE, 156, Short.MAX_VALUE)
+                            .addComponent(addPythonPath, 
javax.swing.GroupLayout.DEFAULT_SIZE, 156, Short.MAX_VALUE)))
+                    .addComponent(jLabel2))
                 .addContainerGap())
         );
         layout.setVerticalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
                 .addContainerGap()
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING, 
false)
-                    
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                        .add(platforms, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                        .add(jLabel1))
-                    .add(manage))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(jLabel2, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 16, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
-                .add(8, 8, 8)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(layout.createSequentialGroup()
-                        .add(addPythonPath)
-                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(removePythonPath)
-                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(moveUpPythonPath)
-                        
.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                        .add(moveDownPythonPath))
-                    .add(jScrollPane2, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 214, Short.MAX_VALUE))
-                .add(19, 19, 19))
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING,
 false)
+                    
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                        .addComponent(platforms, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(jLabel1))
+                    .addComponent(manage))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(jLabel2, 
javax.swing.GroupLayout.PREFERRED_SIZE, 16, 
javax.swing.GroupLayout.PREFERRED_SIZE)
+                .addGap(8, 8, 8)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addGroup(layout.createSequentialGroup()
+                        .addComponent(addPythonPath)
+                        
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(removePythonPath)
+                        
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(moveUpPythonPath)
+                        
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                        .addComponent(moveDownPythonPath))
+                    .addComponent(jScrollPane2, 
javax.swing.GroupLayout.DEFAULT_SIZE, 214, Short.MAX_VALUE))
+                .addGap(19, 19, 19))
         );
     }// </editor-fold>//GEN-END:initComponents
 
diff --git 
a/python.project/src/org/netbeans/modules/python/project/ui/customizer/CustomizerRun.form
 
b/python.project/src/org/netbeans/modules/python/project/ui/customizer/CustomizerRun.form
--- 
a/python.project/src/org/netbeans/modules/python/project/ui/customizer/CustomizerRun.form
+++ 
b/python.project/src/org/netbeans/modules/python/project/ui/customizer/CustomizerRun.form
@@ -7,7 +7,7 @@
     <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" 
value="true"/>
     <AuxValue name="FormSettings_generateMnemonicsCode" 
type="java.lang.Boolean" value="false"/>
     <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" 
value="true"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="2"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="1"/>
     <AuxValue name="FormSettings_listenerGenerationStyle" 
type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" 
value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" 
value="2"/>
diff --git 
a/python.project/src/org/netbeans/modules/python/project/ui/customizer/CustomizerRun.java
 
b/python.project/src/org/netbeans/modules/python/project/ui/customizer/CustomizerRun.java
--- 
a/python.project/src/org/netbeans/modules/python/project/ui/customizer/CustomizerRun.java
+++ 
b/python.project/src/org/netbeans/modules/python/project/ui/customizer/CustomizerRun.java
@@ -66,33 +66,33 @@
         jLabel2.setLabelFor(appArgs);
         org.openide.awt.Mnemonics.setLocalizedText(jLabel2, 
org.openide.util.NbBundle.getMessage(CustomizerRun.class, 
"CustomizerRun.appArgs.text")); // NOI18N
 
-        org.jdesktop.layout.GroupLayout layout = new 
org.jdesktop.layout.GroupLayout(this);
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(jLabel2)
-                    .add(jLabel1))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(mainModule, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 116, Short.MAX_VALUE)
-                    .add(appArgs, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 116, Short.MAX_VALUE))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
-                .add(jButton1)
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(jLabel2)
+                    .addComponent(jLabel1))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+                    .addComponent(mainModule, 
javax.swing.GroupLayout.DEFAULT_SIZE, 116, Short.MAX_VALUE)
+                    .addComponent(appArgs, 
javax.swing.GroupLayout.DEFAULT_SIZE, 116, Short.MAX_VALUE))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.UNRELATED)
+                .addComponent(jButton1)
                 .addContainerGap())
         );
         layout.setVerticalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(jLabel1)
-                    .add(jButton1)
-                    .add(mainModule, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(jLabel2)
-                    .add(appArgs, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(jLabel1)
+                    .addComponent(jButton1)
+                    .addComponent(mainModule, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(jLabel2)
+                    .addComponent(appArgs, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE))
                 .addContainerGap(234, Short.MAX_VALUE))
         );
 
diff --git a/python.qshell/nbproject/project.xml 
b/python.qshell/nbproject/project.xml
--- a/python.qshell/nbproject/project.xml
+++ b/python.qshell/nbproject/project.xml
@@ -6,15 +6,6 @@
             
<code-name-base>org.netbeans.modules.python.qshell</code-name-base>
             <module-dependencies>
                 <dependency>
-                    <code-name-base>org.jdesktop.layout</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.7</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
                     
<code-name-base>org.netbeans.lib.terminalemulator</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
diff --git 
a/python.qshell/src/org/netbeans/modules/python/qshell/QShellConfigPanel.form 
b/python.qshell/src/org/netbeans/modules/python/qshell/QShellConfigPanel.form
--- 
a/python.qshell/src/org/netbeans/modules/python/qshell/QShellConfigPanel.form
+++ 
b/python.qshell/src/org/netbeans/modules/python/qshell/QShellConfigPanel.form
@@ -7,7 +7,7 @@
     <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" 
value="true"/>
     <AuxValue name="FormSettings_generateMnemonicsCode" 
type="java.lang.Boolean" value="true"/>
     <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" 
value="true"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="2"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="1"/>
     <AuxValue name="FormSettings_listenerGenerationStyle" 
type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" 
value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" 
value="0"/>
diff --git 
a/python.qshell/src/org/netbeans/modules/python/qshell/QShellConfigPanel.java 
b/python.qshell/src/org/netbeans/modules/python/qshell/QShellConfigPanel.java
--- 
a/python.qshell/src/org/netbeans/modules/python/qshell/QShellConfigPanel.java
+++ 
b/python.qshell/src/org/netbeans/modules/python/qshell/QShellConfigPanel.java
@@ -82,30 +82,30 @@
 
         
path.setText(org.openide.util.NbBundle.getMessage(QShellConfigPanel.class, 
"QShellConfigPanel.path.text")); // NOI18N
 
-        org.jdesktop.layout.GroupLayout layout = new 
org.jdesktop.layout.GroupLayout(this);
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
-                .add(jLabel1)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(command, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
272, Short.MAX_VALUE))
-            .add(layout.createSequentialGroup()
-                .add(jLabel2)
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(path, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
272, Short.MAX_VALUE))
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                .addComponent(jLabel1)
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(command, javax.swing.GroupLayout.DEFAULT_SIZE, 
272, Short.MAX_VALUE))
+            .addGroup(layout.createSequentialGroup()
+                .addComponent(jLabel2)
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                .addComponent(path, javax.swing.GroupLayout.DEFAULT_SIZE, 
272, Short.MAX_VALUE))
         );
         layout.setVerticalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(jLabel1)
-                    .add(command, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
-                    .add(jLabel2)
-                    .add(path, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 
org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
-                
.addContainerGap(org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 
Short.MAX_VALUE))
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(jLabel1)
+                    .addComponent(command, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE))
+                
.addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
+                
.addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                    .addComponent(jLabel2)
+                    .addComponent(path, 
javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, 
javax.swing.GroupLayout.PREFERRED_SIZE))
+                .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, 
Short.MAX_VALUE))
         );
     }// </editor-fold>//GEN-END:initComponents
 
diff --git a/python.samples/nbproject/project.xml 
b/python.samples/nbproject/project.xml
--- a/python.samples/nbproject/project.xml
+++ b/python.samples/nbproject/project.xml
@@ -6,21 +6,6 @@
             
<code-name-base>org.netbeans.modules.python.samples</code-name-base>
             <module-dependencies>
                 <dependency>
-                    
<code-name-base>org.netbeans.modules.python.kit</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.jdesktop.layout</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.7</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
                     
<code-name-base>org.netbeans.modules.projectapi</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
@@ -39,6 +24,12 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
+                    
<code-name-base>org.netbeans.modules.python.kit</code-name-base>
+                    <run-dependency>
+                        <release-version>1</release-version>
+                    </run-dependency>
+                </dependency>
+                <dependency>
                     <code-name-base>org.openide.awt</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
diff --git 
a/python.samples/src/org/netbeans/modules/python/samples/projects/JySwingPanelVisual.form
 
b/python.samples/src/org/netbeans/modules/python/samples/projects/JySwingPanelVisual.form
--- 
a/python.samples/src/org/netbeans/modules/python/samples/projects/JySwingPanelVisual.form
+++ 
b/python.samples/src/org/netbeans/modules/python/samples/projects/JySwingPanelVisual.form
@@ -7,7 +7,7 @@
     <AuxValue name="FormSettings_generateFQN" type="java.lang.Boolean" 
value="true"/>
     <AuxValue name="FormSettings_generateMnemonicsCode" 
type="java.lang.Boolean" value="true"/>
     <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" 
value="true"/>
-    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="2"/>
+    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" 
value="1"/>
     <AuxValue name="FormSettings_listenerGenerationStyle" 
type="java.lang.Integer" value="0"/>
     <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" 
value="false"/>
     <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" 
value="2"/>
diff --git 
a/python.samples/src/org/netbeans/modules/python/samples/projects/JySwingPanelVisual.java
 
b/python.samples/src/org/netbeans/modules/python/samples/projects/JySwingPanelVisual.java
--- 
a/python.samples/src/org/netbeans/modules/python/samples/projects/JySwingPanelVisual.java
+++ 
b/python.samples/src/org/netbeans/modules/python/samples/projects/JySwingPanelVisual.java
@@ -106,41 +106,41 @@
 
         createdFolderTextField.setEditable(false);
 
-        org.jdesktop.layout.GroupLayout layout = new 
org.jdesktop.layout.GroupLayout(this);
+        javax.swing.GroupLayout layout = new javax.swing.GroupLayout(this);
         this.setLayout(layout);
         layout.setHorizontalGroup(
-            
layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-            .add(layout.createSequentialGroup()
+            
layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(layout.createSequentialGroup()
                 .addContainerGap()
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(projectNameLabel)
-                    .add(projectLocationLabel)
-                    .add(createdFolderLabel))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                
.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
-                    .add(org.jdesktop.layout.GroupLayout.TRAILING, 
projectNameTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 191, 
Short.MAX_VALUE)
-                    .add(org.jdesktop.layout.GroupLayout.TRAILING, 
projectLocationTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 191, 
Short.MAX_VALUE)
-                    .add(org.jdesktop.layout.GroupLayout.TRAILING, 
createdFolderTextField, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 191, 
Short.MAX_VALUE))
-                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
-                .add(browseButton)

[[nbpython-commits]] [hg] main/contrib: Remove dependency on deprecated org.jdesktop....

Milutin Kristofic 12/13/2012

Project Features

About this Project

www was started in November 2009, is owned by jpirek, and has 21 members.
By use of this website, you agree to the NetBeans Policies and Terms of Use (revision 20140418.2d69abc). © 2013, Oracle Corporation and/or its affiliates. Sponsored by Oracle logo
 
 
Close
loading
Please Confirm
Close