Fix and re-include Easymport wizard

Bug: 466361
Change-Id: Id591f4c089cca0da81c559a8dac66641aa4a1cc2
Signed-off-by: Mickael Istria <mistria@redhat.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

3 files changed, 17 insertions, 12 deletions

diff --git a/org.eclipse.egit.repository/category.xml b/org.eclipse.egit.repository/category.xml
index 09c481f385..0b312848bf 100644
--- a/org.eclipse.egit.repository/category.xml
+++ b/org.eclipse.egit.repository/category.xml
@@ -27,9 +27,9 @@
    <feature url="features/org.eclipse.jgit.http.apache_0.0.0.qualifier.jar" id="org.eclipse.jgit.http.apache" version="0.0.0">
       <category name="JGit"/>
    </feature>
-<!--   <bundle id="org.eclipse.egit.ui.importer" version="0.0.1.qualifier">
+   <bundle id="org.eclipse.egit.ui.importer" version="0.0.1.qualifier">
       <category name="Eclipse Git Team Provider - experimental features (incubation)"/>
-   </bundle> -->
+   </bundle>
    <category-def name="Eclipse Git Team Provider" label="Eclipse Git Team Provider">
       <description>
          Eclipse Git Team Provider
@@ -41,5 +41,5 @@
       </description>
    </category-def>
    <category-def name="Eclipse Git Team Provider - experimental features (incubation)" label="Eclipse Git Team Provider - experimental features  (incubation)"/>
-<!--   <repository-reference location="http://download.eclipse.org/e4/snapshots/org.eclipse.e4.ui" enabled="true" /> -->
+   <repository-reference location="http://download.eclipse.org/e4/snapshots/org.eclipse.e4.ui" enabled="true" />
 </site>
diff --git a/org.eclipse.egit.ui.importer/src/org/eclipse/egit/ui/internal/clone/EasymportGitWizard.java b/org.eclipse.egit.ui.importer/src/org/eclipse/egit/ui/internal/clone/EasymportGitWizard.java
index b10313928d..d72f617433 100644
--- a/org.eclipse.egit.ui.importer/src/org/eclipse/egit/ui/internal/clone/EasymportGitWizard.java
+++ b/org.eclipse.egit.ui.importer/src/org/eclipse/egit/ui/internal/clone/EasymportGitWizard.java
@@ -27,7 +27,8 @@ import org.eclipse.jgit.lib.Repository;
 import org.eclipse.ui.IImportWizard;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.internal.wizards.datatransfer.Activator;
-import org.eclipse.ui.internal.wizards.datatransfer.NestedProjectsWizardPage;
+import org.eclipse.ui.internal.wizards.datatransfer.EasymportJob;
+import org.eclipse.ui.internal.wizards.datatransfer.EasymportJobReportDialog;
 import org.eclipse.ui.internal.wizards.datatransfer.SelectImportRootWizardPage;
 
 /**
@@ -48,7 +49,6 @@ public class EasymportGitWizard extends AbstractGitCloneWizard implements IImpor
 			super.setVisible(visible);
 		}
 	};
-	private NestedProjectsWizardPage nestedProjectsPage;
 	private GitSelectRepositoryPage selectRepoPage = new GitSelectRepositoryPage();
 	private Repository existingRepo;
 
@@ -75,21 +75,26 @@ public class EasymportGitWizard extends AbstractGitCloneWizard implements IImpor
 	@Override
 	protected void addPostClonePages() {
 		addPage(this.selectRootPage);
-		this.nestedProjectsPage = new NestedProjectsWizardPage(this, this.selectRootPage);
-		addPage(this.nestedProjectsPage);
 	}
 
 	@Override
 	public boolean performFinish() {
-		this.nestedProjectsPage.performNestedImport();
+		EasymportJob job = new EasymportJob(
+				this.selectRootPage.getSelectedRootDirectory(),
+				this.selectRootPage.getSelectedWorkingSets(),
+				this.selectRootPage.isConfigureAndDetectNestedProject());
+		EasymportJobReportDialog dialog = new EasymportJobReportDialog(
+				getShell(), job);
+		job.schedule();
+		if (this.selectRootPage.isConfigureAndDetectNestedProject()) {
+			dialog.open();
+		}
 		return true;
 	}
 
 	@Override
 	public boolean canFinish() {
-		return getContainer().getCurrentPage().equals(this.nestedProjectsPage)
-				|| (getContainer().getCurrentPage().equals(this.selectRootPage) && this.selectRootPage
-						.canFlipToNextPage());
+		return getContainer().getCurrentPage() == this.selectRootPage && this.selectRootPage.isPageComplete();
 	}
 
 	@Override
diff --git a/pom.xml b/pom.xml
index 1aef4aba86..5e03eb70c1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -285,7 +285,7 @@
     <module>org.eclipse.egit.core</module>
     <module>org.eclipse.egit.ui</module>
 
-<!--    <module>org.eclipse.egit.ui.importer</module> -->
+    <module>org.eclipse.egit.ui.importer</module>
 
     <module>org.eclipse.egit.mylyn.ui</module>
     <module>org.eclipse.egit.mylyn-feature</module>