Author: adietish Date: 2012-02-15 18:15:44 -0500 (Wed, 15 Feb 2012) New Revision: 38790 Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IOpenShiftExpressWizardModel.java trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java Log: [JBIDE-10901] setting widget values to imported application Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-02-15 23:07:40 UTC (rev 38789) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationConfigurationWizardPageModel.java 2012-02-15 23:15:44 UTC (rev 38790) @@ -155,6 +155,7 @@ public void loadCartridges() throws OpenShiftException { setCartridges(getUser().getCartridges()); + refreshSelectedCartridge(); } public void setCartridges(List<ICartridge> cartridges) { @@ -169,6 +170,15 @@ return wizardModel.getApplicationCartridge(); } + /** + * forces property change listeners to update their value + */ + protected void refreshSelectedCartridge() { + ICartridge selectedCartridge = getSelectedCartridge(); + setSelectedCartridge((ICartridge) null); + setSelectedCartridge(selectedCartridge); + } + public void setSelectedCartridge(ICartridge cartridge) { firePropertyChange(PROPERTY_SELECTED_CARTRIDGE , wizardModel.getApplicationCartridge() Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IOpenShiftExpressWizardModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IOpenShiftExpressWizardModel.java 2012-02-15 23:07:40 UTC (rev 38789) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IOpenShiftExpressWizardModel.java 2012-02-15 23:15:44 UTC (rev 38790) @@ -184,7 +184,7 @@ public IServerType getServerType(); - public void setServerType(IServerType serverType); + public IServerType setServerType(IServerType serverType); public boolean isUseExistingApplication(); Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java =================================================================== --- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-02-15 23:07:40 UTC (rev 38789) +++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java 2012-02-15 23:15:44 UTC (rev 38790) @@ -311,8 +311,8 @@ } @Override - public void setServerType(IServerType serverType) { - setProperty(SERVER_TYPE, serverType); + public IServerType setServerType(IServerType serverType) { + return (IServerType) setProperty(SERVER_TYPE, serverType); } private void setPublicationMode(String mode) { @@ -326,7 +326,8 @@ @Override public boolean setUseExistingApplication(boolean useExistingApplication) { - return (Boolean) setProperty(USE_EXISTING_APPLICATION, useExistingApplication); + Boolean isUseExistingApplication = (Boolean) setProperty(USE_EXISTING_APPLICATION, useExistingApplication); + return isUseExistingApplication != null && isUseExistingApplication; } protected void setUseExistingApplication(IApplication application) { @@ -363,7 +364,7 @@ public Set<IEmbeddableCartridge> getSelectedEmbeddableCartridges() { @SuppressWarnings("unchecked") Set<IEmbeddableCartridge> selectedEmbeddableCartridges = - (Set<IEmbeddableCartridge>) dataModel.get(KEY_SELECTED_EMBEDDABLE_CARTRIDGES); + (Set<IEmbeddableCartridge>) getProperty(KEY_SELECTED_EMBEDDABLE_CARTRIDGES); if (selectedEmbeddableCartridges == null) { selectedEmbeddableCartridges = new HashSet<IEmbeddableCartridge>(); setSelectedEmbeddableCartridges(selectedEmbeddableCartridges); @@ -371,16 +372,16 @@ return selectedEmbeddableCartridges; } + @SuppressWarnings("unchecked") @Override public Set<IEmbeddableCartridge> setSelectedEmbeddableCartridges( Set<IEmbeddableCartridge> selectedEmbeddableCartridges) { - dataModel.put(KEY_SELECTED_EMBEDDABLE_CARTRIDGES, selectedEmbeddableCartridges); - return selectedEmbeddableCartridges; + return (Set<IEmbeddableCartridge>) setProperty(KEY_SELECTED_EMBEDDABLE_CARTRIDGES, selectedEmbeddableCartridges); } @Override public ICartridge setApplicationCartridge(ICartridge cartridge) { - return (ICartridge) dataModel.put(APPLICATION_CARTRIDGE, cartridge); + return (ICartridge) setProperty(APPLICATION_CARTRIDGE, cartridge); } protected void setApplicationCartridge(IApplication application) { @@ -392,13 +393,12 @@ @Override public ICartridge getApplicationCartridge() { - return (ICartridge) dataModel.get(APPLICATION_CARTRIDGE); + return (ICartridge) getProperty(APPLICATION_CARTRIDGE); } @Override public String setApplicationName(String applicationName) { - firePropertyChange(APPLICATION_NAME, getApplicationName(), dataModel.put(APPLICATION_NAME, applicationName)); - return applicationName; + return (String) setProperty(APPLICATION_NAME, applicationName); } protected void setApplicationName(IApplication application) { @@ -410,18 +410,17 @@ @Override public String getApplicationName() { - return (String) dataModel.get(APPLICATION_NAME); + return (String) getProperty(APPLICATION_NAME); } @Override public IUser getUser() { - return (IUser) dataModel.get(USER); + return (IUser) getProperty(USER); } @Override public IUser setUser(IUser user) { - dataModel.put(USER, user); - return user; + return (IUser) setProperty(USER, user); } @Override