Author: dazarov Date: 2011-09-14 13:35:52 -0400 (Wed, 14 Sep 2011) New Revision: 34734 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlink.java trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodHyperlink.java trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ProducerDisposerHyperlinkDetector.java trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/AbstractInformationControl.java trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/HierarchyInformationControl.java Log: "Show All Generic Configuration Points", "Show CDI Events" and "Show CDI Observer Methods" dialogs should look like "Open Implementation" in JDT https://issues.jboss.org/browse/JBIDE-9673 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlink.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlink.java 2011-09-14 17:00:51 UTC (rev 34733) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlink.java 2011-09-14 17:35:52 UTC (rev 34734) @@ -24,7 +24,6 @@ import org.jboss.tools.cdi.core.IInjectionPoint; import org.jboss.tools.cdi.core.IInjectionPointField; import org.jboss.tools.cdi.core.IInjectionPointParameter; -import org.jboss.tools.cdi.core.IObserverMethod; import org.jboss.tools.cdi.text.ext.CDIExtensionsMessages; import org.jboss.tools.cdi.text.ext.CDIExtensionsPlugin; import org.jboss.tools.common.text.ext.hyperlink.AbstractHyperlink; @@ -73,16 +72,7 @@ @Override public String getHyperlinkText() { - String text = CDIExtensionsMessages.CDI_EVENT_HYPERLINK_OPEN_EVENT+" "+event.getClassBean().getBeanClass().getElementName(); - - if(event instanceof IInjectionPointField) { - text += "."+((IInjectionPointField)event).getField().getElementName(); - } else if(event instanceof IInjectionPointParameter) { - IInjectionPointParameter p = (IInjectionPointParameter)event; - text += "." + p.getBeanMethod().getMethod().getElementName(); - } - - return text; + return CDIExtensionsMessages.CDI_EVENT_HYPERLINK_OPEN_EVENT+" "+event.getElementName(); } @@ -99,19 +89,9 @@ } public String getInformation() { - String text = event.getClassBean().getBeanClass().getElementName(); - - if(event instanceof IInjectionPointField) { - text += "."+((IInjectionPointField)event).getField().getElementName(); - } else if(event instanceof IInjectionPointParameter) { - IInjectionPointParameter p = (IInjectionPointParameter)event; - text += "." + p.getBeanMethod().getMethod().getElementName(); - } - - return text; + return event.getElementName(); } - public Image getImage() { return null; } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java 2011-09-14 17:00:51 UTC (rev 34733) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InjectedPointHyperlink.java 2011-09-14 17:35:52 UTC (rev 34734) @@ -94,17 +94,7 @@ text = CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_BEAN+" "; } - - - text += bean.getBeanClass().getElementName(); - - if(bean instanceof IProducerField){ - text += "."+((IProducerField)bean).getField().getElementName(); - }else if(bean instanceof IProducerMethod){ - text += "."+((IProducerMethod)bean).getMethod().getElementName()+"()"; - } - - + text += bean.getElementName(); } return text; } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodHyperlink.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodHyperlink.java 2011-09-14 17:00:51 UTC (rev 34733) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ObserverMethodHyperlink.java 2011-09-14 17:35:52 UTC (rev 34734) @@ -63,7 +63,7 @@ @Override public String getHyperlinkText() { - return CDIExtensionsMessages.CDI_EVENT_HYPERLINK_OPEN_OBSERVER_METHOD+" "+observerMethod.getMethod().getElementName(); + return CDIExtensionsMessages.CDI_EVENT_HYPERLINK_OPEN_OBSERVER_METHOD+" "+observerMethod.getElementName(); } @@ -80,7 +80,7 @@ } public String getInformation() { - return observerMethod.getClassBean().getBeanClass().getElementName()+"."+observerMethod.getMethod().getElementName()+"()"; + return observerMethod.getElementName(); } public Image getImage() { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ProducerDisposerHyperlinkDetector.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ProducerDisposerHyperlinkDetector.java 2011-09-14 17:00:51 UTC (rev 34733) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/ProducerDisposerHyperlinkDetector.java 2011-09-14 17:35:52 UTC (rev 34734) @@ -33,7 +33,6 @@ import org.eclipse.ui.texteditor.ITextEditor; import org.jboss.tools.cdi.core.CDIConstants; import org.jboss.tools.cdi.core.CDICoreNature; -import org.jboss.tools.cdi.core.CDICorePlugin; import org.jboss.tools.cdi.core.CDIUtil; import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.IBeanMethod; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/AbstractInformationControl.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/AbstractInformationControl.java 2011-09-14 17:00:51 UTC (rev 34733) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/AbstractInformationControl.java 2011-09-14 17:35:52 UTC (rev 34734) @@ -13,11 +13,9 @@ import java.util.List; -import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.internal.ui.JavaPlugin; import org.eclipse.jdt.internal.ui.util.StringMatcher; -import org.eclipse.jdt.ui.actions.CustomFiltersActionGroup; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; import org.eclipse.jface.action.IMenuManager; @@ -90,8 +88,6 @@ */ private Composite fViewMenuButtonComposite; - private CustomFiltersActionGroup fCustomFiltersActionGroup; - private IAction fShowViewMenuAction; private HandlerSubmission fShowViewMenuHandlerSubmission; @@ -153,8 +149,6 @@ protected Control createDialogArea(Composite parent) { fTableViewer= createTableViewer(parent, fTableStyle); - fCustomFiltersActionGroup= new CustomFiltersActionGroup(getId(), fTableViewer); - final Table table= fTableViewer.getTable(); table.addKeyListener(new KeyListener() { public void keyPressed(KeyEvent e) { @@ -351,17 +345,6 @@ Object selectedElement= getSelectedElement(); if (selectedElement instanceof IHyperlink) { ((IHyperlink)selectedElement).open(); -// IJavaElement jElement = CDIUtil.getJavaElement((IBean)selectedElement); -// if(jElement != null){ -// try { -// dispose(); -// IEditorPart part= EditorUtility.openInEditor(jElement, true); -// if (part != null) -// EditorUtility.revealInEditor(part, jElement); -// } catch (CoreException ex) { -// JavaPlugin.log(ex); -// } -// } } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/HierarchyInformationControl.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/HierarchyInformationControl.java 2011-09-14 17:00:51 UTC (rev 34733) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/HierarchyInformationControl.java 2011-09-14 17:35:52 UTC (rev 34734) @@ -24,7 +24,6 @@ import org.eclipse.jface.viewers.ViewerCell; import org.eclipse.jface.viewers.ViewerFilter; import org.eclipse.swt.SWT; -import org.eclipse.swt.events.KeyAdapter; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.TextStyle; @@ -44,7 +43,6 @@ private IHyperlink[] hyperlinks; private BeanTableLabelProvider fLabelProvider; - private KeyAdapter fKeyAdapter; public HierarchyInformationControl(Shell parent, String title, int shellStyle, int tableStyle, IHyperlink[] hyperlinks) { super(parent, shellStyle, tableStyle, IJavaEditorActionDefinitionIds.OPEN_HIERARCHY, true);