Author: xcoulon
Date: 2012-02-14 09:51:28 -0500 (Tue, 14 Feb 2012)
New Revision: 38700
Added:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportOpenShiftExpressApplicationWizard.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewOpenShiftExpressApplicationWizard.java
Removed:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AbstractOpenShiftApplicationWizard.java
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateApplicationAction.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ImportApplicationAction.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ShowPropertiesAction.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPage.java
Log:
Fixed - JBIDE-10829 No shell title in New Openshift Application Wizard
https://issues.jboss.org/browse/JBIDE-10829
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2012-02-14
14:22:47 UTC (rev 38699)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2012-02-14
14:51:28 UTC (rev 38700)
@@ -14,7 +14,7 @@
</category>
<wizard
category="org.jboss.ide.eclipse.as.openshift.express.ui.wizard.category"
-
class="org.jboss.tools.openshift.express.internal.ui.wizard.OpenShiftExpressApplicationWizard"
+
class="org.jboss.tools.openshift.express.internal.ui.wizard.NewOpenShiftExpressApplicationWizard"
icon="icons/openshift-logo-white-icon.png"
id="org.jboss.ide.eclipse.as.openshift.express.ui.wizard.createNewApplicationWizard"
name="OpenShift Express Application">
@@ -28,7 +28,7 @@
</category>
<wizard
category="org.jboss.tools.openshift.express.ui.wizard.importCategory"
-
class="org.jboss.tools.openshift.express.internal.ui.wizard.OpenShiftExpressApplicationWizard"
+
class="org.jboss.tools.openshift.express.internal.ui.wizard.ImportOpenShiftExpressApplicationWizard"
icon="icons/openshift-logo-white-icon.png"
id="org.jboss.tools.openshift.express.ui.importExistingApplicationWizard"
name="Existing OpenShift Express Application">
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateApplicationAction.java
===================================================================
---
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateApplicationAction.java 2012-02-14
14:22:47 UTC (rev 38699)
+++
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateApplicationAction.java 2012-02-14
14:51:28 UTC (rev 38700)
@@ -5,6 +5,7 @@
import org.eclipse.swt.widgets.Shell;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import
org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
+import
org.jboss.tools.openshift.express.internal.ui.wizard.NewOpenShiftExpressApplicationWizard;
import
org.jboss.tools.openshift.express.internal.ui.wizard.OpenShiftExpressApplicationWizard;
import com.openshift.express.client.IUser;
@@ -29,7 +30,7 @@
Object sel = ((ITreeSelection)selection).getFirstElement();
if( sel instanceof IUser) {
IUser user = (IUser) sel;
- OpenShiftExpressApplicationWizard wizard = new
OpenShiftExpressApplicationWizard(user, "New OpenShift Application");
+ OpenShiftExpressApplicationWizard wizard = new
NewOpenShiftExpressApplicationWizard(user);
new WizardDialog(new Shell(), wizard).open();
}
}
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ImportApplicationAction.java
===================================================================
---
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ImportApplicationAction.java 2012-02-14
14:22:47 UTC (rev 38699)
+++
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ImportApplicationAction.java 2012-02-14
14:51:28 UTC (rev 38700)
@@ -18,6 +18,7 @@
import org.eclipse.swt.widgets.Display;
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import
org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
+import
org.jboss.tools.openshift.express.internal.ui.wizard.ImportOpenShiftExpressApplicationWizard;
import
org.jboss.tools.openshift.express.internal.ui.wizard.OpenShiftExpressApplicationWizard;
import com.openshift.express.client.IApplication;
@@ -41,7 +42,7 @@
final IApplication application = (IApplication) treeSelection.getFirstElement();
final IUser user = getUser(treeSelection.getPaths());
final IProject project =
ResourcesPlugin.getWorkspace().getRoot().getProject(application.getName());
- OpenShiftExpressApplicationWizard wizard = new OpenShiftExpressApplicationWizard(user,
project, application, "Import");
+ OpenShiftExpressApplicationWizard wizard = new
ImportOpenShiftExpressApplicationWizard(user, project, application);
WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(),
wizard);
dialog.create();
dialog.open();
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ShowPropertiesAction.java
===================================================================
---
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ShowPropertiesAction.java 2012-02-14
14:22:47 UTC (rev 38699)
+++
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ShowPropertiesAction.java 2012-02-14
14:51:28 UTC (rev 38700)
@@ -2,7 +2,6 @@
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
-import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import
org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages;
import org.jboss.tools.openshift.express.internal.ui.utils.Logger;
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java
===================================================================
---
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-02-14
14:22:47 UTC (rev 38699)
+++
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-02-14
14:51:28 UTC (rev 38700)
@@ -49,6 +49,7 @@
import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
import org.jboss.tools.openshift.express.internal.ui.wizard.CredentialsWizardPageModel;
import org.jboss.tools.openshift.express.internal.ui.wizard.IOpenShiftWizardModel;
+import
org.jboss.tools.openshift.express.internal.ui.wizard.ImportOpenShiftExpressApplicationWizard;
import
org.jboss.tools.openshift.express.internal.ui.wizard.OpenShiftExpressApplicationWizard;
import com.openshift.express.client.IApplication;
@@ -241,7 +242,7 @@
if( verifyButton != null ) {
importLink.addSelectionListener(new SelectionListener() {
public void widgetSelected(SelectionEvent e) {
- OpenShiftExpressApplicationWizard wizard = new
OpenShiftExpressApplicationWizard("Import");
+ OpenShiftExpressApplicationWizard wizard = new
ImportOpenShiftExpressApplicationWizard();
wizard.setInitialUser(fuser);
wizard.setSelectedApplication(fapplication);
WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(),
wizard);
Deleted:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AbstractOpenShiftApplicationWizard.java
===================================================================
---
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AbstractOpenShiftApplicationWizard.java 2012-02-14
14:22:47 UTC (rev 38699)
+++
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/AbstractOpenShiftApplicationWizard.java 2012-02-14
14:51:28 UTC (rev 38700)
@@ -1,172 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at
http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.openshift.express.internal.ui.wizard;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.net.URISyntaxException;
-
-import org.eclipse.core.resources.WorkspaceJob;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.jface.dialogs.MessageDialog;
-import org.eclipse.jface.wizard.Wizard;
-import org.eclipse.jgit.api.errors.JGitInternalException;
-import org.eclipse.jgit.errors.TransportException;
-import org.eclipse.osgi.util.NLS;
-import org.jboss.tools.common.ui.DelegatingProgressMonitor;
-import org.jboss.tools.openshift.express.internal.ui.ImportFailedException;
-import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator;
-import org.jboss.tools.openshift.express.internal.ui.WontOverwriteException;
-
-import com.openshift.express.client.OpenShiftException;
-
-/**
- * @author Andre Dietisheim
- *
- */
-public abstract class AbstractOpenShiftApplicationWizard<T extends
IOpenShiftWizardModel> extends Wizard {
-
- private T wizardModel;
-
- public AbstractOpenShiftApplicationWizard() {
- super();
- }
-
- void setWizardModel(T wizardModel) {
- this.wizardModel = wizardModel;
- }
-
- T getWizardModel() {
- return wizardModel;
- }
-
- protected boolean isTransportException(InvocationTargetException e) {
- return e.getTargetException() instanceof JGitInternalException
- && e.getTargetException().getCause() instanceof TransportException;
- }
-
- protected TransportException getTransportException(InvocationTargetException e) {
- if (isTransportException(e)) {
- return (TransportException) ((JGitInternalException)
e.getTargetException()).getCause();
- }
- return null;
- }
-
- protected void openError(final String title, final String message) {
- getShell().getDisplay().syncExec(new Runnable() {
-
- @Override
- public void run() {
- MessageDialog.openError(getShell(), title, message);
- }
- });
- }
-
- protected boolean askForConfirmation(final String message, final String applicationName)
{
- final boolean[] confirmed = new boolean[1];
- getShell().getDisplay().syncExec(new Runnable() {
-
- @Override
- public void run() {
- confirmed[0] = MessageDialog.openConfirm(
- getShell(),
- NLS.bind("Import OpenShift Application ", applicationName),
- message);
- }
- });
- return confirmed[0];
- }
-
- /**
- * A workspace job that will create a new project or enable the selected
- * project to be used with OpenShift.
- */
- class ImportJob extends WorkspaceJob {
-
- private DelegatingProgressMonitor delegatingMonitor;
-
- public ImportJob(DelegatingProgressMonitor delegatingMonitor) {
- super("Importing project to workspace...");
- this.delegatingMonitor = delegatingMonitor;
- }
-
- @Override
- public IStatus runInWorkspace(IProgressMonitor monitor) throws CoreException {
- try {
- delegatingMonitor.add(monitor);
-
- 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;
- }
- wizardModel.configureUnsharedProject(delegatingMonitor);
- } else {
- 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;
- }
- wizardModel.configureGitSharedProject(delegatingMonitor);
- }
-
- return Status.OK_STATUS;
- } catch (final WontOverwriteException e) {
- openError("Project already present", e.getMessage());
- return Status.CANCEL_STATUS;
- } catch (final ImportFailedException e) {
- return OpenShiftUIActivator.createErrorStatus(
- "Could not import maven project {0}.", e,
- wizardModel.getProjectName());
- } catch (IOException e) {
- return OpenShiftUIActivator.createErrorStatus(
- "Could not copy openshift configuration files to project {0}", e,
- wizardModel.getProjectName());
- } catch (OpenShiftException e) {
- return OpenShiftUIActivator.createErrorStatus(
- "Could not import project to the workspace.", e);
- } catch (URISyntaxException e) {
- return OpenShiftUIActivator.createErrorStatus(
- "The url of the remote git repository is not valid", e);
- } catch (InvocationTargetException e) {
- if (isTransportException(e)) {
- TransportException te = getTransportException(e);
- return OpenShiftUIActivator
- .createErrorStatus(
- "Could not clone the repository. Authentication failed.\n"
- + " Please make sure that you added your private key to the ssh
preferences.",
- te);
- } else {
- return OpenShiftUIActivator.createErrorStatus(
- "An exception occurred while creating local git repository.", e);
- }
- } catch (Exception e) {
- return OpenShiftUIActivator.createErrorStatus(
- "Could not import project to the workspace.", e);
- } finally {
- delegatingMonitor.done();
- }
- }
- }
-
-}
\ No newline at end of file
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java
===================================================================
---
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java 2012-02-14
14:22:47 UTC (rev 38699)
+++
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CredentialsWizardPageModel.java 2012-02-14
14:51:28 UTC (rev 38700)
@@ -23,7 +23,6 @@
import com.openshift.express.client.IUser;
import com.openshift.express.client.NotFoundOpenShiftException;
-import com.openshift.express.client.OpenShiftException;
import com.openshift.express.client.configuration.OpenShiftConfiguration;
/**
Added:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportOpenShiftExpressApplicationWizard.java
===================================================================
---
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportOpenShiftExpressApplicationWizard.java
(rev 0)
+++
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportOpenShiftExpressApplicationWizard.java 2012-02-14
14:51:28 UTC (rev 38700)
@@ -0,0 +1,33 @@
+/**
+ *
+ */
+package org.jboss.tools.openshift.express.internal.ui.wizard;
+
+import org.eclipse.core.resources.IProject;
+
+import com.openshift.express.client.IApplication;
+import com.openshift.express.client.IUser;
+
+/**
+ * @author Xavier Coulon
+ *
+ */
+public class ImportOpenShiftExpressApplicationWizard extends
OpenShiftExpressApplicationWizard {
+
+ /**
+ * Constructor
+ */
+ public ImportOpenShiftExpressApplicationWizard() {
+ super("Import OpenShift Express Application");
+ }
+
+ /**
+ * Constructor
+ * @param user
+ * @param project
+ * @param application
+ */
+ public ImportOpenShiftExpressApplicationWizard(IUser user, IProject project,
IApplication application) {
+ super(user, project, application, "Import OpenShift Express Application");
+ }
+}
Property changes on:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportOpenShiftExpressApplicationWizard.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewOpenShiftExpressApplicationWizard.java
===================================================================
---
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewOpenShiftExpressApplicationWizard.java
(rev 0)
+++
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewOpenShiftExpressApplicationWizard.java 2012-02-14
14:51:28 UTC (rev 38700)
@@ -0,0 +1,24 @@
+/**
+ *
+ */
+package org.jboss.tools.openshift.express.internal.ui.wizard;
+
+import com.openshift.express.client.IUser;
+
+/**
+ * @author Xavier Coulon
+ *
+ */
+public class NewOpenShiftExpressApplicationWizard extends
OpenShiftExpressApplicationWizard {
+
+ /**
+ * Constructor
+ */
+ public NewOpenShiftExpressApplicationWizard() {
+ super("New OpenShift Express Application");
+ }
+
+ public NewOpenShiftExpressApplicationWizard(IUser user) {
+ super(user, null, null, "New OpenShift Express Application");
+ }
+}
Property changes on:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewOpenShiftExpressApplicationWizard.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
===================================================================
---
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-02-14
14:22:47 UTC (rev 38699)
+++
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-02-14
14:51:28 UTC (rev 38700)
@@ -25,8 +25,11 @@
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.dialogs.ErrorDialog;
+import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.IWizardPage;
+import org.eclipse.jface.wizard.Wizard;
+import org.eclipse.jgit.api.errors.JGitInternalException;
import org.eclipse.jgit.errors.TransportException;
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.IImportWizard;
@@ -48,20 +51,12 @@
* @author Andre Dietisheim
* @author Xavier Coulon
*/
-public class OpenShiftExpressApplicationWizard extends
- AbstractOpenShiftApplicationWizard<OpenShiftExpressApplicationWizardModel>
implements IImportWizard, INewWizard {
+public abstract class OpenShiftExpressApplicationWizard extends Wizard implements
IImportWizard, INewWizard {
private IUser initialUser;
- /**
- * @see #getUser which calls UserModel#getRecentUser if no user present at
- * construction time
- */
- public OpenShiftExpressApplicationWizard() {
- this(null, null, null, null);
- }
+ private OpenShiftExpressApplicationWizardModel wizardModel;
-
/**
* @see #getUser which calls UserModel#getRecentUser if no user present at
* construction time
@@ -70,16 +65,57 @@
this(null, null, null, wizardTitle);
}
- public OpenShiftExpressApplicationWizard(IUser user, String wizardTitle) {
- this(user, null, null, wizardTitle);
- }
-
public OpenShiftExpressApplicationWizard(IUser user, IProject project, IApplication
application, String wizardTitle) {
setWizardModel(new OpenShiftExpressApplicationWizardModel(user, project,
application));
setWindowTitle(wizardTitle);
setNeedsProgressMonitor(true);
}
+ void setWizardModel(OpenShiftExpressApplicationWizardModel wizardModel) {
+ this.wizardModel = wizardModel;
+ }
+
+ OpenShiftExpressApplicationWizardModel getWizardModel() {
+ return wizardModel;
+ }
+
+ protected boolean isTransportException(InvocationTargetException e) {
+ return e.getTargetException() instanceof JGitInternalException
+ && e.getTargetException().getCause() instanceof TransportException;
+ }
+
+ protected TransportException getTransportException(InvocationTargetException e) {
+ if (isTransportException(e)) {
+ return (TransportException) ((JGitInternalException)
e.getTargetException()).getCause();
+ }
+ return null;
+ }
+
+ protected void openError(final String title, final String message) {
+ getShell().getDisplay().syncExec(new Runnable() {
+
+ @Override
+ public void run() {
+ MessageDialog.openError(getShell(), title, message);
+ }
+ });
+ }
+
+ protected boolean askForConfirmation(final String message, final String applicationName)
{
+ final boolean[] confirmed = new boolean[1];
+ getShell().getDisplay().syncExec(new Runnable() {
+
+ @Override
+ public void run() {
+ confirmed[0] = MessageDialog.openConfirm(
+ getShell(),
+ NLS.bind("Import OpenShift Application ", applicationName),
+ message);
+ }
+ });
+ return confirmed[0];
+ }
+
public void setSelectedApplication(IApplication application) {
getWizardModel().setApplication(application);
}
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPage.java
===================================================================
---
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPage.java 2012-02-14
14:22:47 UTC (rev 38699)
+++
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPage.java 2012-02-14
14:51:28 UTC (rev 38700)
@@ -59,7 +59,7 @@
private Text existingProjectNameText = null;
public ProjectAndServerAdapterSettingsWizardPage(IWizard wizard, IOpenShiftWizardModel
wizardModel) {
- super("Project Configuration",
+ super("Setup Project",
"Configure your project and server adapter settings, then click 'next'
or 'finish'.",
"Project Configuration", wizard);
this.pageModel = new ProjectAndServerAdapterSettingsWizardPageModel(wizardModel);