[jbosstools-commits] JBoss Tools SVN: r43580 - in branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal: ui/wizard and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: adietish
Date: 2012-09-11 05:41:16 -0400 (Tue, 11 Sep 2012)
New Revision: 43580

Modified:
   branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserModel.java
   branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IOpenShiftExpressWizardModel.java
   branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
   branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java
Log:
[JBIDE-12142] replaced erroneous UserModel#addUser where the intent was to have the view refreshing a user. Replaced call to UserModel#addUser by UserModel#fireUserChanged

Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserModel.java
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserModel.java	2012-09-11 09:40:32 UTC (rev 43579)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/console/UserModel.java	2012-09-11 09:41:16 UTC (rev 43580)
@@ -92,6 +92,10 @@
 		fireModelChange(user, ADDED);
 	}
 
+	public void fireUserChanged(UserDelegate user) {
+		fireModelChange(user, CHANGED);
+	}
+	
 	public void removeUser(UserDelegate user) {
 		allUsers.remove(user.getUsername());
 		if (this.recentUser == user)

Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IOpenShiftExpressWizardModel.java
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IOpenShiftExpressWizardModel.java	2012-09-11 09:40:32 UTC (rev 43579)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/IOpenShiftExpressWizardModel.java	2012-09-11 09:41:16 UTC (rev 43580)
@@ -189,8 +189,6 @@
 
 	public boolean setUseExistingApplication(boolean useExistingApplication);
 
-	public void addUserToModel();
-
 	public Set<IEmbeddableCartridge> setSelectedEmbeddableCartridges(
 			Set<IEmbeddableCartridge> selectedEmbeddableCartridges);
 

Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java	2012-09-11 09:40:32 UTC (rev 43579)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizard.java	2012-09-11 09:41:16 UTC (rev 43580)
@@ -164,8 +164,8 @@
 
 		boolean success = importProject();
 
-		wizardModel.addUserToModel();
-
+		wizardModel.refreshUser();
+		
 		return success;
 	}
 

Modified: branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java
===================================================================
--- branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java	2012-09-11 09:40:32 UTC (rev 43579)
+++ branches/jbosstools-3.3.x/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/OpenShiftExpressApplicationWizardModel.java	2012-09-11 09:41:16 UTC (rev 43580)
@@ -478,11 +478,10 @@
 		setServerType(ServerCore.findServerType(ExpressServerUtils.OPENSHIFT_SERVER_TYPE));
 	}
 	
-	@Override
-	public void addUserToModel() {
+	public void refreshUser() {
 		UserDelegate user = getUser();
 		Assert.isNotNull(user);
-		UserModel.getDefault().addUser(user);
+		UserModel.getDefault().fireUserChanged(user);
 	}
 
 }
\ No newline at end of file