[jbosstools-commits] JBoss Tools SVN: r39278 - branches/jbosstools-3.3.0.Beta1/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console.

[jbosstools-commits at lists.jboss.org]

Author: koen.aers at jboss.com
Date: 2012-03-05 07:22:14 -0500 (Mon, 05 Mar 2012)
New Revision: 39278

Modified:
   branches/jbosstools-3.3.0.Beta1/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeCommandProcessor.java
Log:
JBIDE-10714: Forge "rm" does not clean up Eclipse UI
-> manually refresh project explorer

Modified: branches/jbosstools-3.3.0.Beta1/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeCommandProcessor.java
===================================================================
--- branches/jbosstools-3.3.0.Beta1/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeCommandProcessor.java	2012-03-05 09:42:08 UTC (rev 39277)
+++ branches/jbosstools-3.3.0.Beta1/forge/plugins/org.jboss.tools.forge.ui/src/org/jboss/tools/forge/ui/console/ForgeCommandProcessor.java	2012-03-05 12:22:14 UTC (rev 39278)
@@ -11,6 +11,7 @@
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.navigator.CommonNavigator;
 import org.jboss.tools.forge.ui.ForgeUIPlugin;
 import org.jboss.tools.forge.ui.part.ForgeView;
 
@@ -53,6 +54,7 @@
 				if (postProcessor != null) {
 					postProcessor.postProcess(getCommandDetails(commandString));
 				}
+				refreshProjectExplorer();
 				showForgeConsole();
 			}			
 		});
@@ -82,17 +84,22 @@
 	}
 	
 	private void showForgeConsole() {		
-//		try {
-			IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
-			IWorkbenchPage workbenchPage = workbenchWindow.getActivePage();
-			IViewPart forgeView = workbenchPage.findView(ForgeView.ID);
-			if (forgeView != null) {
-				forgeView.setFocus();
-			}
-//			workbenchPage.showView(ForgeView.ID).setFocus();
-//		} catch (PartInitException e) {
-//			ForgeUIPlugin.log(e);
-//		}		
+		IWorkbenchWindow workbenchWindow = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+		IWorkbenchPage workbenchPage = workbenchWindow.getActivePage();
+		IViewPart forgeView = workbenchPage.findView(ForgeView.ID);
+		if (forgeView != null) {
+			forgeView.setFocus();
+		}
 	}
 	
+	private void refreshProjectExplorer() {
+		IWorkbenchPage workbenchPage = ForgeCommandPostProcessorHelper.getActiveWorkbenchPage();
+		if (workbenchPage != null) {
+			IViewPart projectExplorer = workbenchPage.findView("org.eclipse.ui.navigator.ProjectExplorer");
+			if (projectExplorer != null && projectExplorer instanceof CommonNavigator) {
+				((CommonNavigator)projectExplorer).getCommonViewer().refresh();
+			} 
+		}
+	}
+	
 }