[jbosstools-commits] JBoss Tools SVN: r39282 - branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport.

[jbosstools-commits at lists.jboss.org]

Author: adietish
Date: 2012-03-05 08:15:08 -0500 (Mon, 05 Mar 2012)
New Revision: 39282

Modified:
   branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AbstractImportApplicationOperation.java
   branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java
   branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java
Log:
[JBIDE-11152] now adding openshift profile to pom for unshared projects (was: only happened for git-shared projects)

Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AbstractImportApplicationOperation.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AbstractImportApplicationOperation.java	2012-03-05 13:04:57 UTC (rev 39281)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/AbstractImportApplicationOperation.java	2012-03-05 13:15:08 UTC (rev 39282)
@@ -33,6 +33,7 @@
 import org.jboss.tools.openshift.egit.core.EGitUtils;
 import org.jboss.tools.openshift.egit.core.GitIgnore;
 import org.jboss.tools.openshift.egit.ui.util.EGitUIUtils;
+import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
 
 import com.openshift.express.client.IApplication;
 import com.openshift.express.client.OpenShiftException;
@@ -222,5 +223,17 @@
 				.add(".factorypath");
 		return gitIgnore.write(monitor);
 	}
+	
+	protected IResource setupOpenShiftMavenProfile(IProject project, IProgressMonitor monitor) throws CoreException {
+		if(!OpenShiftMavenProfile.isMavenProject(project)) {
+			return null;
+		}
 
+		OpenShiftMavenProfile profile = new OpenShiftMavenProfile(project, OpenShiftUIActivator.PLUGIN_ID);
+		if (profile.existsInPom()) {
+			return null;
+		}
+		profile.addToPom(project.getName());
+		return profile.savePom(monitor);
+	}
 }

Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java	2012-03-05 13:04:57 UTC (rev 39281)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java	2012-03-05 13:15:08 UTC (rev 39282)
@@ -31,7 +31,6 @@
 import org.jboss.ide.eclipse.as.core.util.FileUtil;
 import org.jboss.ide.eclipse.as.core.util.RegExUtils;
 import org.jboss.tools.openshift.egit.core.EGitUtils;
-import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
 import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIException;
 import org.jboss.tools.openshift.express.internal.ui.UnCommittedChangesException;
 import org.jboss.tools.openshift.express.internal.ui.utils.FileUtils;
@@ -132,17 +131,6 @@
 		EGitUtils.addRemoteTo(getRemoteName(), getApplication().getGitUri(), repository);
 	}
 
-	private IResource setupOpenShiftMavenProfile(IProject project, IProgressMonitor monitor) throws CoreException {
-		Assert.isLegal(OpenShiftMavenProfile.isMavenProject(project));
-
-		OpenShiftMavenProfile profile = new OpenShiftMavenProfile(project, OpenShiftUIActivator.PLUGIN_ID);
-		if (profile.existsInPom()) {
-			return null;
-		}
-		profile.addToPom(project.getName());
-		return profile.savePom(monitor);
-	}
-
 	/**
 	 * Copies the openshift configuration from the given application to the
 	 * given project. Clones the application to a tmp-folder, copies

Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java	2012-03-05 13:04:57 UTC (rev 39281)
+++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureUnsharedProject.java	2012-03-05 13:15:08 UTC (rev 39282)
@@ -95,6 +95,7 @@
 
 		copyOpenshiftConfigurations(getApplication(), getRemoteName(), project, monitor);
 		createGitIgnore(project, monitor);
+		setupOpenShiftMavenProfile(project, monitor);
 		shareProject(project, monitor);
 		addRemoteRepo(getRemoteName(), getApplication().getGitUri(), EGitUtils.getRepository(project));