Author: adietish
Date: 2011-11-30 10:46:17 -0500 (Wed, 30 Nov 2011)
New Revision: 36786
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java
Log:
cleanup
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java
===================================================================
---
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java 2011-11-30
15:27:16 UTC (rev 36785)
+++
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportProjectWizardModel.java 2011-11-30
15:46:17 UTC (rev 36786)
@@ -146,14 +146,7 @@
@Override
public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
try {
- MavenProjectImportOperation mavenImport = new
MavenProjectImportOperation(projectFolder);
- List<IProject> importedProjects = Collections.emptyList();
- if (mavenImport.isMavenProject()) {
- importedProjects = mavenImport.importToWorkspace(monitor);
- } else {
- importedProjects = new
GeneralProjectImportOperation(projectFolder).importToWorkspace(monitor);
- }
-
+ List<IProject> importedProjects = importMavenProject(projectFolder, monitor);
connectToGitRepo(importedProjects, projectFolder, monitor);
createServerAdapterIfRequired(importedProjects, monitor);
return Status.OK_STATUS;
@@ -164,6 +157,18 @@
return status;
}
}
+
+ private List<IProject> importMavenProject(final File projectFolder,
IProgressMonitor monitor)
+ throws CoreException, InterruptedException {
+ MavenProjectImportOperation mavenImport = new
MavenProjectImportOperation(projectFolder);
+ List<IProject> importedProjects = Collections.emptyList();
+ if (mavenImport.isMavenProject()) {
+ importedProjects = mavenImport.importToWorkspace(monitor);
+ } else {
+ importedProjects = new
GeneralProjectImportOperation(projectFolder).importToWorkspace(monitor);
+ }
+ return importedProjects;
+ }
}.schedule();
}
Show replies by date