Author: xcoulon Date: 2012-02-14 09:01:11 -0500 (Tue, 14 Feb 2012) New Revision: 38697 Added: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/RefreshUserAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/RefreshUserActionDelegate.java Removed: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/RefreshDomainAction.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreateNewApplicationWizard.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreateNewApplicationWizardModel.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/behaviour/ExpressDetailsComposite.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.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 trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizard.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizardModel.java Log: Fixed JBIDE-10845 Application configuration UI issues JBIDE-10851 title of application configuration is misleading https://issues.jboss.org/browse/JBIDE-10851 And restoring the "Refresh" button on the 'OpenShift Express Console' view 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 13:40:36 UTC (rev 38696) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml 2012-02-14 14:01:11 UTC (rev 38697) @@ -484,14 +484,14 @@ <viewContribution id="org.jboss.tools.openshift.express.ui.viewer.expressConsoleViewContribution" targetID="org.jboss.tools.openshift.express.ui.viewer.expressConsoleView"> - <!--action - class="org.jboss.tools.openshift.express.internal.ui.viewer.RefreshDomainAction" + <action + class="org.jboss.tools.openshift.express.internal.ui.action.RefreshUserActionDelegate" icon="icons/refresh.gif" id="org.jboss.tools.openshift.express.ui.viewActions.refreshAction" label="Refresh" style="push" toolbarPath="openshift"> - </action--> + </action> <action class="org.jboss.tools.openshift.express.internal.ui.action.OpenConnectionDialogActionDelegate" icon="icons/resource_obj.gif" 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 13:40:36 UTC (rev 38696) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/CreateApplicationAction.java 2012-02-14 14:01:11 UTC (rev 38697) @@ -29,7 +29,7 @@ Object sel = ((ITreeSelection)selection).getFirstElement(); if( sel instanceof IUser) { IUser user = (IUser) sel; - OpenShiftExpressApplicationWizard wizard = new OpenShiftExpressApplicationWizard(user); + OpenShiftExpressApplicationWizard wizard = new OpenShiftExpressApplicationWizard(user, "New OpenShift Application"); 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 13:40:36 UTC (rev 38696) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/ImportApplicationAction.java 2012-02-14 14:01:11 UTC (rev 38697) @@ -41,7 +41,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); + OpenShiftExpressApplicationWizard wizard = new OpenShiftExpressApplicationWizard(user, project, application, "Import"); WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), wizard); dialog.create(); dialog.open(); Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/RefreshDomainAction.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/RefreshDomainAction.java 2012-02-14 13:40:36 UTC (rev 38696) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/RefreshDomainAction.java 2012-02-14 14:01:11 UTC (rev 38697) @@ -1,28 +0,0 @@ -package org.jboss.tools.openshift.express.internal.ui.action; - -import org.eclipse.jface.action.IAction; -import org.eclipse.jface.viewers.ISelection; -import org.eclipse.ui.IViewActionDelegate; -import org.eclipse.ui.IViewPart; - -public class RefreshDomainAction implements IViewActionDelegate { - - @Override - public void run(IAction action) { - // TODO Auto-generated method stub - - } - - @Override - public void selectionChanged(IAction action, ISelection selection) { - // TODO Auto-generated method stub - - } - - @Override - public void init(IViewPart view) { - // TODO Auto-generated method stub - - } - -} Copied: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/RefreshUserAction.java (from rev 38653, trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/RefreshDomainAction.java) =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/RefreshUserAction.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/RefreshUserAction.java 2012-02-14 14:01:11 UTC (rev 38697) @@ -0,0 +1,28 @@ +package org.jboss.tools.openshift.express.internal.ui.action; + +import org.eclipse.jface.action.IAction; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.ui.IViewActionDelegate; +import org.eclipse.ui.IViewPart; + +public class RefreshUserAction implements IViewActionDelegate { + + @Override + public void run(IAction action) { + // TODO Auto-generated method stub + + } + + @Override + public void selectionChanged(IAction action, ISelection selection) { + // TODO Auto-generated method stub + + } + + @Override + public void init(IViewPart view) { + // TODO Auto-generated method stub + + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/RefreshUserAction.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/action/RefreshUserActionDelegate.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/RefreshUserActionDelegate.java (rev 0) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/RefreshUserActionDelegate.java 2012-02-14 14:01:11 UTC (rev 38697) @@ -0,0 +1,50 @@ +package org.jboss.tools.openshift.express.internal.ui.action; + +import org.eclipse.jface.action.IAction; +import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.window.Window; +import org.eclipse.jface.wizard.IWizard; +import org.eclipse.swt.widgets.Display; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.IViewActionDelegate; +import org.eclipse.ui.IViewPart; +import org.eclipse.ui.navigator.CommonNavigator; +import org.jboss.tools.common.ui.WizardUtils; +import org.jboss.tools.openshift.express.internal.core.console.UserModel; +import org.jboss.tools.openshift.express.internal.ui.utils.Logger; +import org.jboss.tools.openshift.express.internal.ui.viewer.ConnectToOpenShiftWizard; + +public class RefreshUserActionDelegate implements IViewActionDelegate { + + private CommonNavigator view; + + private ISelection selection; + + @Override + public void run(IAction action) { + final Display display = Display.getCurrent(); + final Shell shell = new Shell(display); + final IWizard connectToOpenShiftWizard = new ConnectToOpenShiftWizard(); + int returnCode = WizardUtils.openWizardDialog(connectToOpenShiftWizard, shell); + if (returnCode == Window.OK) { + Logger.debug("OpenShift Auth succeeded."); + if (view != null) { + view.getCommonViewer().setInput(UserModel.getDefault()); + } + } + + } + + @Override + public void selectionChanged(IAction action, ISelection selection) { + this.selection = selection; + } + + @Override + public void init(IViewPart view) { + if (view instanceof CommonNavigator) { + this.view = (CommonNavigator) view; + } + } + +} Property changes on: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/action/RefreshUserActionDelegate.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/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 13:40:36 UTC (rev 38696) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/behaviour/ExpressDetailsComposite.java 2012-02-14 14:01:11 UTC (rev 38697) @@ -241,7 +241,7 @@ if( verifyButton != null ) { importLink.addSelectionListener(new SelectionListener() { public void widgetSelected(SelectionEvent e) { - OpenShiftExpressApplicationWizard wizard = new OpenShiftExpressApplicationWizard(); + OpenShiftExpressApplicationWizard wizard = new OpenShiftExpressApplicationWizard("Import"); wizard.setInitialUser(fuser); wizard.setSelectedApplication(fapplication); WizardDialog dialog = new WizardDialog(Display.getCurrent().getActiveShell(), wizard); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-02-14 13:40:36 UTC (rev 38696) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPage.java 2012-02-14 14:01:11 UTC (rev 38697) @@ -100,8 +100,8 @@ private Text newApplicationNameText; public ApplicationConfigurationWizardPage(IWizard wizard, OpenShiftExpressApplicationWizardModel wizardModel) { - super("Application Configuration", "Configure the application you want\nto create or import.", - "Application configuration", wizard); + super("Setup OpenShift Application", "Select an existing or create a new OpenShift Express Application.", + "Setup OpenShift Application", wizard); this.pageModel = new ApplicationConfigurationWizardPageModel(wizardModel); } Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreateNewApplicationWizard.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreateNewApplicationWizard.java 2012-02-14 13:40:36 UTC (rev 38696) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreateNewApplicationWizard.java 2012-02-14 14:01:11 UTC (rev 38697) @@ -1,162 +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.util.ArrayList; -import java.util.List; -import java.util.Set; -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.TimeUnit; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; -import org.eclipse.core.runtime.Status; -import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.jface.dialogs.ErrorDialog; -import org.eclipse.jface.viewers.IStructuredSelection; -import org.eclipse.osgi.util.NLS; -import org.eclipse.ui.INewWizard; -import org.eclipse.ui.IWorkbench; -import org.jboss.tools.common.ui.DelegatingProgressMonitor; -import org.jboss.tools.common.ui.JobUtils; -import org.jboss.tools.common.ui.WizardUtils; -import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; - -import com.openshift.express.client.IApplication; -import com.openshift.express.client.IEmbeddableCartridge; -import com.openshift.express.client.IUser; -import com.openshift.express.client.OpenShiftException; - -/** - * @author Andre Dietisheim - * @author Xavier Coulon - */ -@Deprecated -public class CreateNewApplicationWizard extends OpenShiftExpressApplicationWizard - implements INewWizard { - - public CreateNewApplicationWizard() { - setWizardModel(new OpenShiftExpressApplicationWizardModel()); - setNeedsProgressMonitor(true); - } - - @Override - public void addPages() { - final IUser user = OpenShiftUIActivator.getDefault().getUser(); - try { - if (user == null - || !user.isValid()) { - addPage(new CredentialsWizardPage(this)); - } - } catch (OpenShiftException e) { - // if the user's validity can't be checked, we may want to - // re-connect.. - addPage(new CredentialsWizardPage(this)); - } - addPage(new ApplicationConfigurationWizardPage(this, getWizardModel())); - addPage(new ProjectAndServerAdapterSettingsWizardPage(this, getWizardModel())); - addPage(new GitCloningSettingsWizardPage(this, getWizardModel())); - } - - @Override - public void init(IWorkbench workbench, IStructuredSelection selection) { - // TODO Auto-generated method stub - } - - @Override - public boolean performFinish() { - boolean successfull = true; - if (getWizardModel().getApplication() == null) { - successfull = processApplicationCreation(); - - } - if (successfull) { - successfull = processCartridges(); - } - if (successfull) { - try { - final DelegatingProgressMonitor delegatingMonitor = new DelegatingProgressMonitor(); - IStatus jobResult = WizardUtils.runInWizard( - new ImportJob(delegatingMonitor), delegatingMonitor, getContainer()); - return JobUtils.isOk(jobResult); - } catch (Exception e) { - ErrorDialog.openError(getShell(), "Error", "Could not create local git repository.", - new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, - "An exception occurred while creating local git repository.", e)); - return false; - } - } - return successfull; - } - - private boolean processApplicationCreation() { - final ArrayBlockingQueue<Boolean> queue = new ArrayBlockingQueue<Boolean>(1); - try { - WizardUtils.runInWizard( - new Job(NLS.bind("Creating application \"{0}\"...", getWizardModel().getApplicationName())) { - @Override - protected IStatus run(IProgressMonitor monitor) { - try { - getWizardModel().createApplication(monitor); - queue.offer(true); - return Status.OK_STATUS; - } catch (Exception e) { - // TODO: refresh user - queue.offer(false); - return OpenShiftUIActivator.createErrorStatus( - "Could not create application \"{0}\"", e, getWizardModel() - .getApplicationName()); - } - } - - }, getContainer()); - return queue.poll(10, TimeUnit.SECONDS); - } catch (Exception e) { - return false; - } - } - - private boolean processCartridges() { - final ArrayBlockingQueue<Boolean> queue = new ArrayBlockingQueue<Boolean>(1); - try { - WizardUtils.runInWizard( - new Job(NLS.bind("Adding selected embedded cartridges for application {0}...", getWizardModel() - .getApplication().getName())) { - - @Override - protected IStatus run(IProgressMonitor monitor) { - try { - - Set<IEmbeddableCartridge> selectedCartridges = - getWizardModel().getSelectedEmbeddableCartridges(); - final IApplication application = getWizardModel().getApplication(); - if (selectedCartridges != null - && !selectedCartridges.isEmpty()) { - List<IEmbeddableCartridge> list = new ArrayList<IEmbeddableCartridge>(); - list.addAll(selectedCartridges); - application.addEmbbedCartridges(list); - } - queue.offer(true); - } catch (OpenShiftException e) { - queue.offer(false); - return new Status(IStatus.ERROR, OpenShiftUIActivator.PLUGIN_ID, NLS.bind( - "Could not embed cartridges to application {0}", getWizardModel() - .getApplication().getName()), e); - } - return Status.OK_STATUS; - } - }, getContainer()); - return queue.poll(10, TimeUnit.SECONDS); - } catch (Exception e) { - return false; - } - } -} Deleted: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreateNewApplicationWizardModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreateNewApplicationWizardModel.java 2012-02-14 13:40:36 UTC (rev 38696) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/CreateNewApplicationWizardModel.java 2012-02-14 14:01:11 UTC (rev 38697) @@ -1,95 +0,0 @@ -package org.jboss.tools.openshift.express.internal.ui.wizard; - -import java.util.HashSet; -import java.util.Set; - -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.osgi.util.NLS; -import org.jboss.tools.openshift.express.internal.ui.OpenShiftUIActivator; -import org.jboss.tools.openshift.express.internal.ui.messages.OpenShiftExpressUIMessages; - -import com.openshift.express.client.IApplication; -import com.openshift.express.client.ICartridge; -import com.openshift.express.client.IEmbeddableCartridge; -import com.openshift.express.client.IUser; -import com.openshift.express.client.OpenShiftApplicationNotAvailableException; -import com.openshift.express.client.OpenShiftException; - -@Deprecated -public class CreateNewApplicationWizardModel extends OpenShiftExpressApplicationWizardModel { - - /** - * Timeout in seconds when trying to contact an application after it had been created. - */ - private static final int APP_CREATION_TIMEOUT = 40; - private static final String APPLICATION_NAME = "applicationName"; - private static final String APPLICATION_CARTRIDGE = "applicationCartridge"; - private static final String SELECTED_EMBEDDABLE_CARTRIDGES = "selectedEmbeddableCartridges"; - - public CreateNewApplicationWizardModel() { - dataModel.put(NEW_PROJECT, true); - } - - private void waitForAccessible(IApplication application, IProgressMonitor monitor) - throws OpenShiftApplicationNotAvailableException, OpenShiftException { - // monitor.subTask("waiting for application to become accessible..."); - if (!application.waitForAccessible(APP_CREATION_TIMEOUT * 1000)) { - throw new OpenShiftApplicationNotAvailableException(NLS.bind( - OpenShiftExpressUIMessages.HOSTNAME_NOT_ANSWERING, application.getApplicationUrl())); - } - } - - public IApplication createApplication(String name, ICartridge cartridge, IProgressMonitor monitor) throws OpenShiftApplicationNotAvailableException, OpenShiftException { - IUser user = OpenShiftUIActivator.getDefault().getUser(); - if (user == null) { - throw new OpenShiftException("Could not create application, have no valid user credentials"); - } - IApplication application = user.createApplication(name, cartridge); - waitForAccessible(application, monitor); - return application; - } - - public void createApplication(IProgressMonitor monitor) throws OpenShiftException { - IApplication application = createApplication(getApplicationName(), getApplicationCartridge(), monitor); - setApplication(application); - } - - @Override - public String getApplicationName() { - return (String) dataModel.get(APPLICATION_NAME); - } - - public void setApplicationName(String applicationName) { - dataModel.put(APPLICATION_NAME, applicationName); - } - - public void setApplicationCartridge(ICartridge cartridge) { - dataModel.put(APPLICATION_CARTRIDGE, cartridge); - } - - @Override - public ICartridge getApplicationCartridge() { - return (ICartridge)dataModel.get(APPLICATION_CARTRIDGE); - } - -// @Override - public String getApplicationCartridgeName() { - final ICartridge cartridge = (ICartridge)dataModel.get(APPLICATION_CARTRIDGE); - if(cartridge != null) { - return cartridge.getName(); - } - return null; - } - - public Set<IEmbeddableCartridge> getSelectedEmbeddableCartridges() { - @SuppressWarnings("unchecked") - Set<IEmbeddableCartridge> selectedEmbeddableCartridges = (Set<IEmbeddableCartridge>) dataModel.get(SELECTED_EMBEDDABLE_CARTRIDGES); - if(selectedEmbeddableCartridges == null) { - selectedEmbeddableCartridges = new HashSet<IEmbeddableCartridge>(); - dataModel.put(SELECTED_EMBEDDABLE_CARTRIDGES, selectedEmbeddableCartridges); - } - return selectedEmbeddableCartridges; - } - - -} Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java 2012-02-14 13:40:36 UTC (rev 38696) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewDomainWizardPage.java 2012-02-14 14:01:11 UTC (rev 38697) @@ -64,7 +64,7 @@ private NewDomainWizardPageModel model; public NewDomainWizardPage(String namespace, NewDomainWizardPageModel model, IWizard wizard) { - super("Domain", "Create a new domain", "New Domain", wizard); + super("Domain Creation", "Create a new domain", "New Domain", wizard); this.model = model; } 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 13:40:36 UTC (rev 38696) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-02-14 14:01:11 UTC (rev 38697) @@ -57,16 +57,18 @@ * @see #getUser which calls UserModel#getRecentUser if no user present at * construction time */ - public OpenShiftExpressApplicationWizard() { - this(null, null, null); + public OpenShiftExpressApplicationWizard(String wizardTitle) { + this(null, null, null, wizardTitle); } - public OpenShiftExpressApplicationWizard(IUser user) { - this(user, null, null); + public OpenShiftExpressApplicationWizard(IUser user, String wizardTitle) { + this(user, null, null, wizardTitle); } - public OpenShiftExpressApplicationWizard(IUser user, IProject project, IApplication application) { + public OpenShiftExpressApplicationWizard(IUser user, IProject project, IApplication application, String wizardTitle) { setWizardModel(new OpenShiftExpressApplicationWizardModel(user, project, application)); + setWindowTitle(wizardTitle); + setNeedsProgressMonitor(true); } public void setSelectedApplication(IApplication application) { @@ -79,8 +81,6 @@ @Override public void init(IWorkbench workbench, IStructuredSelection selection) { - setWindowTitle("OpenShift Application Wizard"); - setNeedsProgressMonitor(true); Object o = selection.getFirstElement(); if (o instanceof IUser) { setUser((IUser) o); 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 13:40:36 UTC (rev 38696) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ProjectAndServerAdapterSettingsWizardPage.java 2012-02-14 14:01:11 UTC (rev 38697) @@ -59,9 +59,9 @@ private Text existingProjectNameText = null; public ProjectAndServerAdapterSettingsWizardPage(IWizard wizard, IOpenShiftWizardModel wizardModel) { - super("Project configuration", + super("Project Configuration", "Configure your project and server adapter settings, then click 'next' or 'finish'.", - "Project configuration", wizard); + "Project Configuration", wizard); this.pageModel = new ProjectAndServerAdapterSettingsWizardPageModel(wizardModel); } Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizard.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizard.java 2012-02-14 13:40:36 UTC (rev 38696) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizard.java 2012-02-14 14:01:11 UTC (rev 38697) @@ -36,14 +36,13 @@ import org.jboss.tools.openshift.express.internal.ui.WontOverwriteException; import org.jboss.tools.openshift.express.internal.ui.wizard.AdapterWizardPage; import org.jboss.tools.openshift.express.internal.ui.wizard.ApplicationWizardPage; -import org.jboss.tools.openshift.express.internal.ui.wizard.CreateNewApplicationWizard; import org.jboss.tools.openshift.express.internal.ui.wizard.OpenShiftExpressApplicationWizard; import com.openshift.express.client.OpenShiftException; /** * @author André Dietisheim - * @Deprecated: see the {@link CreateNewApplicationWizard} and the {@link OpenShiftExpressApplicationWizard} + * @Deprecated: see {@link OpenShiftExpressApplicationWizard} */ @Deprecated public class ImportProjectWizard extends Wizard implements INewWizard { Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizardModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizardModel.java 2012-02-14 13:40:36 UTC (rev 38696) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/appimport/ImportProjectWizardModel.java 2012-02-14 14:01:11 UTC (rev 38697) @@ -27,7 +27,6 @@ import org.jboss.tools.common.ui.databinding.ObservableUIPojo; import org.jboss.tools.openshift.egit.core.EGitUtils; import org.jboss.tools.openshift.express.internal.ui.wizard.AdapterWizardPageModel; -import org.jboss.tools.openshift.express.internal.ui.wizard.CreateNewApplicationWizardModel; import org.jboss.tools.openshift.express.internal.ui.wizard.OpenShiftExpressApplicationWizardModel; import com.openshift.express.client.IApplication; @@ -37,7 +36,7 @@ /** * @author André Dietisheim <adietish(a)redhat.com&gt; - * @Deprecated: see the {@link CreateNewApplicationWizardModel} and the {@link OpenShiftExpressApplicationWizardModel} + * @Deprecated: see {@link OpenShiftExpressApplicationWizardModel} */ @Deprecated public class ImportProjectWizardModel extends ObservableUIPojo {