[jbosstools-commits] JBoss Tools SVN: r22943 - in trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext: hyperlink and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: dazarov
Date: 2010-06-23 08:08:39 -0400 (Wed, 23 Jun 2010)
New Revision: 22943

Modified:
   trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/CDIExtensionsMessages.java
   trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointListHyperlink.java
   trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/messages.properties
Log:
https://jira.jboss.org/browse/JBIDE-6451

Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/CDIExtensionsMessages.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/CDIExtensionsMessages.java	2010-06-23 11:53:25 UTC (rev 22942)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/CDIExtensionsMessages.java	2010-06-23 12:08:39 UTC (rev 22943)
@@ -21,7 +21,7 @@
 
 	public static String CDI_EXT_PLUGIN_NO_MESSAGE;
 	public static String CDI_INJECTED_POINT_HYPERLINK_OPEN_BEAN;
-	public static String CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECTED_CLASS;
+	public static String CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECTED_BEAN;
 	public static String CDI_PRODUCER_DISPOSER_HYPERLINK_OPEN_BOUND_DISPOSER;
 	public static String CDI_PRODUCER_DISPOSER_HYPERLINK_OPEN_BOUND_PRODUCER;
 }

Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointListHyperlink.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointListHyperlink.java	2010-06-23 11:53:25 UTC (rev 22942)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointListHyperlink.java	2010-06-23 12:08:39 UTC (rev 22943)
@@ -21,6 +21,10 @@
 import org.eclipse.jface.text.hyperlink.IHyperlink;
 import org.eclipse.jface.text.hyperlink.MultipleHyperlinkPresenter;
 import org.eclipse.swt.graphics.RGB;
+import org.eclipse.ui.IPartListener;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.texteditor.ITextEditor;
 import org.jboss.tools.cdi.core.CDICoreNature;
 import org.jboss.tools.cdi.core.CDICorePlugin;
 import org.jboss.tools.cdi.core.CDIUtil;
@@ -93,22 +97,45 @@
 			return;
 		}
 		
+		if(installed){
+			installed = false;
+			mhp.uninstall();
+		}
+		
 		if(hyperlinks.length == 1){
 			((InjectedPointHyperlink)hyperlinks[0]).doHyperlink(region);
 		}else{
-			if(installed)
-				mhp.uninstall();
-			
 			installed = true;
 			
 			mhp.install(viewer);
 			mhp.showHyperlinks(hyperlinks);
+			PlatformUI.getWorkbench().getActiveWorkbenchWindow().getPartService().addPartListener(new IPartListener(){
+				public void partActivated(IWorkbenchPart arg0) {
+				}
+
+				public void partBroughtToTop(IWorkbenchPart arg0) {
+				}
+
+				public void partClosed(IWorkbenchPart arg0) {
+					if(installed){
+						installed = false;
+						mhp.uninstall();
+					}
+				}
+
+				public void partDeactivated(IWorkbenchPart arg0) {
+					
+				}
+
+				public void partOpened(IWorkbenchPart arg0) {
+				}
+			});
 		}
 	}
 
 	@Override
 	public String getHyperlinkText() {
-		return CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECTED_CLASS;
+		return CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECTED_BEAN;
 	}
 
 }

Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/messages.properties
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/messages.properties	2010-06-23 11:53:25 UTC (rev 22942)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/messages.properties	2010-06-23 12:08:39 UTC (rev 22943)
@@ -1,5 +1,5 @@
 CDI_EXT_PLUGIN_NO_MESSAGE=No message
 CDI_INJECTED_POINT_HYPERLINK_OPEN_BEAN=Open CDI Bean
-CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECTED_CLASS=Open Injected Class
+CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECTED_BEAN=Open Injected Bean
 CDI_PRODUCER_DISPOSER_HYPERLINK_OPEN_BOUND_DISPOSER=Open Bound Disposer Method
 CDI_PRODUCER_DISPOSER_HYPERLINK_OPEN_BOUND_PRODUCER=Open Bound Producer Method