From 653d5fafd24c871fef42767b453135ab78ee9f5c Mon Sep 17 00:00:00 2001
From: Anna Kozlova <Anna.Kozlova@jetbrains.com>
Date: Mon, 9 Feb 2009 21:55:32 +0300
Subject: [PATCH] imports: file/directory based format switch fixed

---
 .../eclipse/action/EclipseWorkspaceRootStep.form   | 10 ++++++++-
 .../eclipse/action/EclipseWorkspaceRootStep.java   |  9 ++++++++
 .../maven/project/MavenImportingSettingsForm.form  | 26 ++++++++++++++--------
 .../maven/project/MavenImportingSettingsForm.java  | 11 +++++++++
 .../idea/maven/wizards/MavenProjectRootStep.java   |  2 +-
 5 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/action/EclipseWorkspaceRootStep.form b/plugins/eclipse/src/org/jetbrains/idea/eclipse/action/EclipseWorkspaceRootStep.form
index ef1ed9a7f9..8cbaad342b 100644
--- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/action/EclipseWorkspaceRootStep.form
+++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/action/EclipseWorkspaceRootStep.form
@@ -21,7 +21,7 @@
           <grid row="5" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
-      <grid id="fa65a" layout-manager="GridLayoutManager" row-count="2" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+      <grid id="fa65a" layout-manager="GridLayoutManager" row-count="3" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
         <margin top="0" left="0" bottom="0" right="0"/>
         <constraints>
           <grid row="2" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
@@ -51,6 +51,14 @@
             </constraints>
             <properties/>
           </component>
+          <grid id="d8fb5" binding="myFormatPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+            <constraints>
+              <grid row="2" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+            </constraints>
+            <properties/>
+            <border type="none"/>
+            <children/>
+          </grid>
         </children>
       </grid>
       <component id="7ccdd" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myWorkspaceRootComponent">
diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/action/EclipseWorkspaceRootStep.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/action/EclipseWorkspaceRootStep.java
index 802fe7333d..af87351253 100644
--- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/action/EclipseWorkspaceRootStep.java
+++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/action/EclipseWorkspaceRootStep.java
@@ -6,9 +6,11 @@ import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.ui.TextFieldWithBrowseButton;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.projectImport.ProjectFormatPanel;
 import com.intellij.projectImport.ProjectImportWizardStep;
 
 import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
@@ -22,6 +24,9 @@ public class EclipseWorkspaceRootStep extends ProjectImportWizardStep {
   private JTextField myTestSourcesMask;
   private TextFieldWithBrowseButton myDirComponent;
   private TextFieldWithBrowseButton myWorkspaceRootComponent;
+  private ProjectFormatPanel myProjectFormatPanel;
+  private JPanel myFormatPanel;
+
 
   private EclipseProjectWizardContext myContext;
   private EclipseImportBuilder.Parameters myParameters;
@@ -48,6 +53,9 @@ public class EclipseWorkspaceRootStep extends ProjectImportWizardStep {
 
     rbModulesColocated.addActionListener(listener);
     rbModulesDedicated.addActionListener(listener);
+
+    myProjectFormatPanel = new ProjectFormatPanel();
+    myFormatPanel.add(myProjectFormatPanel.getPanel(), BorderLayout.WEST);
   }
 
   public JComponent getComponent() {
@@ -65,6 +73,7 @@ public class EclipseWorkspaceRootStep extends ProjectImportWizardStep {
     getParameters().converterOptions.testPattern = wildcardToRegexp(myTestSourcesMask.getText());
     getParameters().linkConverted = myLinkCheckBox.isSelected();
     getParameters().projectsToConvert = null;
+    myProjectFormatPanel.updateData(getWizardContext());
   }
 
   public void updateStep() {
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.form b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.form
index aad0b5f758..141a7f4606 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.form
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.form
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.jetbrains.idea.maven.project.MavenImportingSettingsForm">
-  <grid id="27dc6" binding="panel" layout-manager="GridLayoutManager" row-count="9" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="27dc6" binding="panel" layout-manager="GridLayoutManager" row-count="10" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="4" bottom="4" right="4"/>
     <constraints>
       <xy x="20" y="20" width="597" height="365"/>
@@ -10,7 +10,7 @@
     <children>
       <vspacer id="5d738">
         <constraints>
-          <grid row="8" column="1" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+          <grid row="9" column="1" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
         </constraints>
       </vspacer>
       <component id="dd23c" class="com.intellij.openapi.ui.TextFieldWithBrowseButton" binding="myModuleDirControl">
@@ -33,7 +33,7 @@
       </component>
       <component id="d7aa1" class="javax.swing.JCheckBox" binding="myUseExhaustiveSearchCheckBox">
         <constraints>
-          <grid row="1" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="2" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text value="E&amp;xhaustive search (look for Maven projects under other Maven projects)"/>
@@ -41,7 +41,7 @@
       </component>
       <component id="3dfbe" class="javax.swing.JCheckBox" binding="myAutoSyncCheckBox" default-binding="true">
         <constraints>
-          <grid row="2" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="3" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text value="Automatically &amp;re-import on project opening"/>
@@ -49,7 +49,7 @@
       </component>
       <component id="b48ca" class="javax.swing.JCheckBox" binding="myCreateModulesForAggregators">
         <constraints>
-          <grid row="3" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="4" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text value="Create &amp;IDEA modules for aggregate projects (with 'pom' packaging)"/>
@@ -57,7 +57,7 @@
       </component>
       <component id="2b9b5" class="javax.swing.JCheckBox" binding="myCreateGroupsCheckBox" default-binding="true">
         <constraints>
-          <grid row="4" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="5" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text value="Create &amp;module groups for multi-module Maven projects"/>
@@ -65,7 +65,7 @@
       </component>
       <component id="1b499" class="javax.swing.JCheckBox" binding="myUseMavenOutputCheckBox">
         <constraints>
-          <grid row="5" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="6" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text value="Use Maven &amp;output directories"/>
@@ -73,7 +73,7 @@
       </component>
       <component id="c2e5e" class="javax.swing.JCheckBox" binding="myUpdateFoldersOnImportCheckBox">
         <constraints>
-          <grid row="6" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="7" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text value="Automatically &amp;generate sources and update folders on import"/>
@@ -81,12 +81,20 @@
       </component>
       <component id="6b09c" class="javax.swing.JCheckBox" binding="myResolveInBackgroundCheckBox" default-binding="true">
         <constraints>
-          <grid row="7" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="8" column="0" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text value="Resolve dependencies and plugins in &amp;background"/>
         </properties>
       </component>
+      <grid id="41f33" binding="myFormatPanel" layout-manager="BorderLayout" hgap="0" vgap="0">
+        <constraints>
+          <grid row="1" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+        <border type="none"/>
+        <children/>
+      </grid>
     </children>
   </grid>
   <buttonGroups>
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.java
index 1d3cae4cbb..1cdca5a83f 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenImportingSettingsForm.java
@@ -1,11 +1,14 @@
 package org.jetbrains.idea.maven.project;
 
+import com.intellij.ide.util.projectWizard.WizardContext;
 import com.intellij.openapi.fileChooser.FileChooserDescriptor;
 import com.intellij.openapi.ui.TextFieldWithBrowseButton;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.projectImport.ProjectFormatPanel;
 
 import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -24,6 +27,8 @@ public class MavenImportingSettingsForm {
   private JCheckBox myUseMavenOutputCheckBox;
   private JCheckBox myUpdateFoldersOnImportCheckBox;
   private JCheckBox myResolveInBackgroundCheckBox;
+  private JPanel myFormatPanel;
+  private ProjectFormatPanel myProjectFormatPanel;
 
   public MavenImportingSettingsForm() {
     this(false);
@@ -42,6 +47,8 @@ public class MavenImportingSettingsForm {
                                                new FileChooserDescriptor(false, true, false, false, false, false));
 
     if(isImportStep){
+      myProjectFormatPanel = new ProjectFormatPanel();
+      myFormatPanel.add(myProjectFormatPanel.getPanel(), BorderLayout.WEST);
       myCreateGroupsCheckBox.setVisible(false);
       myUseMavenOutputCheckBox.setVisible(false);
       myUpdateFoldersOnImportCheckBox.setVisible(false);
@@ -98,4 +105,8 @@ public class MavenImportingSettingsForm {
     getData(formData);
     return !formData.equals(settings);
   }
+
+  public void updateData(WizardContext wizardContext) {
+    myProjectFormatPanel.updateData(wizardContext);
+  }
 }
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenProjectRootStep.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenProjectRootStep.java
index 22e8febbff..190466a67b 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenProjectRootStep.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenProjectRootStep.java
@@ -11,7 +11,6 @@ import com.intellij.projectImport.ProjectImportWizardStep;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.Nullable;
-import org.jetbrains.idea.maven.project.MavenGeneralSettings;
 import org.jetbrains.idea.maven.project.*;
 
 import javax.swing.*;
@@ -67,6 +66,7 @@ public class MavenProjectRootStep extends ProjectImportWizardStep {
   public void updateDataModel() {
     MavenImportingSettings settings = getImportingSettings();
     myImporterSettingsForm.getData(settings);
+    myImporterSettingsForm.updateData(getWizardContext());
     suggestProjectNameAndPath(settings.getDedicatedModuleDir(), myRootPathComponent.getPath());
   }
 
-- 
2.11.4.GIT