Author: adietish
Date: 2012-01-30 12:26:30 -0500 (Mon, 30 Jan 2012)
New Revision: 38281
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportExistingApplicationWizard.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java
Log:
[JBIDE-10479] corrected confirmation message and strategy selection when importing to
existing project
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportExistingApplicationWizard.java
===================================================================
---
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportExistingApplicationWizard.java 2012-01-30
17:20:58 UTC (rev 38280)
+++
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportExistingApplicationWizard.java 2012-01-30
17:26:30 UTC (rev 38281)
@@ -22,6 +22,7 @@
import org.eclipse.jface.dialogs.ErrorDialog;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jgit.errors.TransportException;
+import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.IImportWizard;
import org.eclipse.ui.IWorkbench;
import org.jboss.tools.common.ui.DelegatingProgressMonitor;
@@ -34,7 +35,7 @@
import com.openshift.express.client.OpenShiftException;
/**
- * @author Andr� Dietisheim
+ * @author Andre Dietisheim
* @author Xavier Coulon
*/
public class ImportExistingApplicationWizard extends
AbstractOpenShiftApplicationWizard<ImportExistingApplicationWizardModel> implements
IImportWizard {
@@ -92,16 +93,32 @@
public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
try {
delegatingMonitor.add(monitor);
-
- if (getWizardModel().isNewProject()) {
- getWizardModel().importProject(delegatingMonitor);
+ ImportExistingApplicationWizardModel wizardModel = getWizardModel();
+ if (wizardModel.isNewProject()) {
+ wizardModel.importProject(delegatingMonitor);
+ } else if (!wizardModel.isGitSharedProject()) {
+ if (!askForConfirmation(
+ NLS.bind("OpenShift application {0} will be enabled on project {1} by "
+
+ "copying OpenShift configuration and enabling Git for the project.\n "
+
+ "This cannot be undone. Do you wish to continue ?"
+ , wizardModel.getApplicationName()
+ , wizardModel.getProjectName()),
+ wizardModel.getApplicationName())) {
+ return Status.CANCEL_STATUS;
+ }
+ getWizardModel().configureUnsharedProject(delegatingMonitor);
} else {
- if (!askForConfirmation(getWizardModel().getApplicationName(),
getWizardModel().getProjectName())) {
+ if (!askForConfirmation(
+ NLS.bind("OpenShift application {0} will be enabled on project {1} by copying
OpenShift " +
+ "configuration and adding the OpenShift git repo as remote.\n " +
+ "This cannot be undone. Do you wish to continue ?"
+ , wizardModel.getApplicationName()
+ , wizardModel.getProjectName())
+ , wizardModel.getApplicationName())) {
return Status.CANCEL_STATUS;
}
- getWizardModel().configureUnsharedProject(delegatingMonitor);
+ wizardModel.configureGitSharedProject(delegatingMonitor);
}
-
return Status.OK_STATUS;
} catch (final WontOverwriteException e) {
openError("Project already present", e.getMessage());
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java
===================================================================
---
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java 2012-01-30
17:20:58 UTC (rev 38280)
+++
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ConfigureGitSharedProject.java 2012-01-30
17:26:30 UTC (rev 38281)
@@ -13,6 +13,7 @@
import java.io.File;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
+import java.net.MalformedURLException;
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.Collection;
@@ -26,6 +27,7 @@
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.egit.core.op.AddToIndexOperation;
+import org.eclipse.jgit.lib.Repository;
import org.eclipse.osgi.util.NLS;
import org.jboss.ide.eclipse.as.core.util.FileUtil;
import org.jboss.tools.openshift.egit.core.EGitUtils;
@@ -105,17 +107,27 @@
addToModified(copyOpenshiftConfigurations(getApplication(), getRemoteName(), project,
monitor));
addToModified(setupGitIgnore(project, monitor));
addToModified(setupOpenShiftMavenProfile(project, monitor));
+ addRemote(getRemoteName(), getApplication().getUUID(), project);
- EGitUtils.addRemoteTo(
- getRemoteName(),
- getApplication().getGitUri(),
- EGitUtils.getRepository(project));
-
addAndCommitModifiedResource(project, monitor);
return Collections.singletonList(project);
}
+ private void addRemote(String remoteName, String uuid, IProject project) throws
MalformedURLException, URISyntaxException, IOException, OpenShiftException, CoreException
{
+ Repository repository = EGitUtils.getRepository(project);
+ Assert.isTrue(repository != null);
+
+ if (EGitUtils.hasRemote("rhcloud.com", repository)) {
+ return;
+ }
+
+ EGitUtils.addRemoteTo(
+ getRemoteName(),
+ getApplication().getGitUri(),
+ repository);
+ }
+
private void addAndCommitModifiedResource(IProject project, IProgressMonitor monitor)
throws CoreException {
new AddToIndexOperation(modifiedResources).execute(monitor);
EGitUtils.commit(project, monitor);
Show replies by date