[jbosstools-commits] JBoss Tools SVN: r39343 - in trunk/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: xcoulon
Date: 2012-03-07 11:41:48 -0500 (Wed, 07 Mar 2012)
New Revision: 39343

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/wizard/ApplicationSelectionDialog.java
   trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionDialogModel.java
Log:
Fixed - JBIDE-10856
Application selection UI issues

Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml	2012-03-07 16:40:58 UTC (rev 39342)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/plugin.xml	2012-03-07 16:41:48 UTC (rev 39343)
@@ -516,14 +516,14 @@
         <viewContribution
               id="org.jboss.tools.openshift.express.ui.viewer.expressConsoleViewContribution"
               targetID="org.jboss.tools.openshift.express.ui.viewer.expressConsoleView">
-           <action
+           <!--action
                  class="org.jboss.tools.openshift.express.internal.ui.viewer.actionDelegate.RefreshViewerActionDelegate"
                  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.viewer.actionDelegate.OpenConnectionDialogActionDelegate"
                  icon="icons/resource_obj.gif"

Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionDialog.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionDialog.java	2012-03-07 16:40:58 UTC (rev 39342)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionDialog.java	2012-03-07 16:41:48 UTC (rev 39343)
@@ -138,12 +138,12 @@
 					}
 				}), null);
 
-		Button refreshButton = new Button(dialogArea, SWT.PUSH);
+		/*Button refreshButton = new Button(dialogArea, SWT.PUSH);
 		refreshButton.setText("R&efresh");
 		GridDataFactory.fillDefaults().align(SWT.RIGHT, SWT.TOP).grab(false, false).hint(80, SWT.DEFAULT)
 				.applyTo(refreshButton);
 		refreshButton.addSelectionListener(onRefresh(dbc));
-
+		*/
 		Button detailsButton = new Button(dialogArea, SWT.PUSH);
 		detailsButton.setText("De&tails...");
 		GridDataFactory.fillDefaults().align(SWT.RIGHT, SWT.TOP).grab(false, true).hint(80, SWT.DEFAULT)
@@ -239,6 +239,7 @@
 					WizardUtils.runInWizard(new Job("Loading applications...") {
 						@Override
 						protected IStatus run(IProgressMonitor monitor) {
+							dialogModel.refresh(); 
 							final Collection<IApplication> applications = dialogModel.getApplications();
 							setViewerInput(applications);
 							return Status.OK_STATUS;

Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionDialogModel.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionDialogModel.java	2012-03-07 16:40:58 UTC (rev 39342)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/ui/wizard/ApplicationSelectionDialogModel.java	2012-03-07 16:41:48 UTC (rev 39343)
@@ -38,6 +38,14 @@
 		this.selectedApplication = wizardModel.getApplication();
 	}
 
+	public void refresh() {
+		try {
+			getUser().refresh();
+		} catch (OpenShiftException e) {
+			Logger.error("Failed to refresh User's account", e);
+		}
+	}
+	
 	public List<IApplication> getApplications() {
 		try {
 			IUser user = getUser();