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

Author: adietish Date: 2012-03-02 06:17:19 -0500 (Fri, 02 Mar 2012) New Revision: 39251 Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportOpenShiftExpressApplicationWizard.java branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewOpenShiftExpressApplicationWizard.java branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java Log: [JBIDE-11090] preselect "use existing application" when File->Import->Existing OpenShift Express Application" Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java =================================================================== --- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-03-02 11:11:42 UTC (rev 39250) +++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-03-02 11:17:19 UTC (rev 39251) @@ -221,8 +221,8 @@ setApplicationName(application.getName()); setSelectedCartridge(application.getCartridge()); setSelectedEmbeddableCartridges(new HashSet<IEmbeddableCartridge>(application.getEmbeddedCartridges())); + wizardModel.setApplication(application); } - wizardModel.setApplication(application); } public void resetExistingApplication() throws OpenShiftException { Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportOpenShiftExpressApplicationWizard.java =================================================================== --- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportOpenShiftExpressApplicationWizard.java 2012-03-02 11:11:42 UTC (rev 39250) +++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ImportOpenShiftExpressApplicationWizard.java 2012-03-02 11:17:19 UTC (rev 39251) @@ -18,7 +18,7 @@ * Constructor */ public ImportOpenShiftExpressApplicationWizard() { - super("Import OpenShift Express Application"); + super(true, "Import OpenShift Express Application"); } /** @@ -28,6 +28,6 @@ * @param application */ public ImportOpenShiftExpressApplicationWizard(IUser user, IProject project, IApplication application) { - super(user, project, application, "Import OpenShift Express Application"); + super(user, project, application, true, "Import OpenShift Express Application"); } } Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewOpenShiftExpressApplicationWizard.java =================================================================== --- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewOpenShiftExpressApplicationWizard.java 2012-03-02 11:11:42 UTC (rev 39250) +++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/NewOpenShiftExpressApplicationWizard.java 2012-03-02 11:17:19 UTC (rev 39251) @@ -15,10 +15,10 @@ * Constructor */ public NewOpenShiftExpressApplicationWizard() { - super("New OpenShift Express Application"); + super(false, "New OpenShift Express Application"); } public NewOpenShiftExpressApplicationWizard(IUser user) { - super(user, null, null, "New OpenShift Express Application"); + super(user, null, null, false, "New OpenShift Express Application"); } } Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java =================================================================== --- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-03-02 11:11:42 UTC (rev 39250) +++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java 2012-03-02 11:17:19 UTC (rev 39251) @@ -58,15 +58,12 @@ private OpenShiftExpressApplicationWizardModel wizardModel; - /** - * @see #setUser called by CredentialsWizardPageModel#getValidityStatus - */ - public OpenShiftExpressApplicationWizard(String wizardTitle) { - this(null, null, null, wizardTitle); + public OpenShiftExpressApplicationWizard(boolean useExistingApplication, String wizardTitle) { + this(null, null, null, useExistingApplication, wizardTitle); } - - public OpenShiftExpressApplicationWizard(IUser user, IProject project, IApplication application, String wizardTitle) { - setWizardModel(new OpenShiftExpressApplicationWizardModel(user, project, application)); + + public OpenShiftExpressApplicationWizard(IUser user, IProject project, IApplication application, boolean useExistingApplication, String wizardTitle) { + setWizardModel(new OpenShiftExpressApplicationWizardModel(user, project, application, useExistingApplication)); setWindowTitle(wizardTitle); setNeedsProgressMonitor(true); } Modified: branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java =================================================================== --- branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-03-02 11:11:42 UTC (rev 39250) +++ branches/jbosstools-3.3.0.Beta1/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-03-02 11:17:19 UTC (rev 39251) @@ -44,15 +44,16 @@ private static final String KEY_SELECTED_EMBEDDABLE_CARTRIDGES = "selectedEmbeddableCartridges"; public OpenShiftExpressApplicationWizardModel(IUser user) { - this(user, null, null); + this(user, null, null, false); } - public OpenShiftExpressApplicationWizardModel(IUser user, IProject project, IApplication application) { + public OpenShiftExpressApplicationWizardModel(IUser user, IProject project, IApplication application, boolean useExistingApplication) { // default value(s) setUser(user); setProject(project); setNewProject(true); setApplication(application); + setUseExistingApplication(useExistingApplication); setCreateServerAdapter(true); setRepositoryPath(DEFAULT_REPOSITORY_PATH); setRemoteName(NEW_PROJECT_REMOTE_NAME_DEFAULT);