[jbosstools-commits] JBoss Tools SVN: r39881 - trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors.

[jbosstools-commits at lists.jboss.org]

Author: snjeza
Date: 2012-03-28 08:29:59 -0400 (Wed, 28 Mar 2012)
New Revision: 39881

Modified:
   trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/SoftwarePage.java
Log:
JBIDE-11420 No busy indication when clicking the little Install button on upper right side of Central Software/Update Page

Modified: trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/SoftwarePage.java
===================================================================
--- trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/SoftwarePage.java	2012-03-28 12:28:43 UTC (rev 39880)
+++ trunk/central/plugins/org.jboss.tools.central/src/org/jboss/tools/central/editors/SoftwarePage.java	2012-03-28 12:29:59 UTC (rev 39881)
@@ -78,6 +78,8 @@
 	private DiscoveryViewer discoveryViewer;
 	private RefreshJobChangeListener refreshJobChangeListener;
 	private InstallAction installAction;
+
+	private Button installButton;
 	
 	public SoftwarePage(FormEditor editor) {
 		super(editor, ID, "Software/Update");
@@ -180,30 +182,14 @@
 			}
 	    });
 
-	    final Button installButton = toolkit.createButton(featureComposite, "Install", SWT.PUSH);
+	    installButton = toolkit.createButton(featureComposite, "Install", SWT.PUSH);
 	    installButton.setEnabled(false);
 	    installButton.setImage(JBossCentralActivator.getDefault().getImage(ICON_INSTALL));
 	    installButton.addSelectionListener(new SelectionListener() {
 			
 			@Override
 			public void widgetSelected(SelectionEvent e) {
-				Display display = Display.getCurrent();
-				Shell shell = display.getActiveShell();
-				Cursor cursor = shell == null ? null : shell.getCursor();
-				try {
-					if (shell != null) {
-						shell.setCursor(display.getSystemCursor(SWT.CURSOR_WAIT));
-					}
-					installAction.setEnabled(false);
-					installButton.setEnabled(false);
-					installAction.run();
-				} finally {
-					if (shell != null) {
-						shell.setCursor(cursor);
-					}
-					installAction.setEnabled(true);
-					installButton.setEnabled(true);
-				}
+				installAction.run();
 			}
 			
 			@Override
@@ -379,7 +365,27 @@
 
 		@Override
 		public void run() {
-			DiscoveryUi.install(discoveryViewer.getInstallableConnectors(), SoftwarePage.this);
+			Display display = Display.getCurrent();
+			Shell shell = display.getActiveShell();
+			Cursor cursor = shell == null ? null : shell.getCursor();
+			try {
+				if (shell != null) {
+					shell.setCursor(display.getSystemCursor(SWT.CURSOR_WAIT));
+				}
+				setEnabled(false);
+				if (installButton != null) {
+					installButton.setEnabled(false);
+				}
+				DiscoveryUi.install(discoveryViewer.getInstallableConnectors(), SoftwarePage.this);
+			} finally {
+				if (shell != null) {
+					shell.setCursor(cursor);
+				}
+				setEnabled(true);
+				if (installButton != null) {
+					installButton.setEnabled(true);
+				}
+			}
 		}
 		
 	}
@@ -394,10 +400,13 @@
 		public void run() {
 			IHandlerService handlerService = (IHandlerService) getSite().getService(IHandlerService.class);
 	        try {
-	          handlerService.executeCommand("org.eclipse.equinox.p2.ui.sdk.update", new Event());
+	        	setEnabled(false);
+	        	handlerService.executeCommand("org.eclipse.equinox.p2.ui.sdk.update", new Event());
 	        }
 	        catch (Exception e) {
 	        	JBossCentralActivator.log(e);
+	        } finally {
+	        	setEnabled(true);
 	        }
 		}