Author: dazarov Date: 2011-09-30 13:23:22 -0400 (Fri, 30 Sep 2011) New Revision: 35232 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventAndObserverMethodHyperlinkDetector.java trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/messages.properties Log: "Show CDI Observer Methods" OpenOn should look "Open <class>.<method>() CDI Observer Method" in case of one method https://issues.jboss.org/browse/JBIDE-9796 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventAndObserverMethodHyperlinkDetector.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventAndObserverMethodHyperlinkDetector.java 2011-09-30 17:08:34 UTC (rev 35231) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventAndObserverMethodHyperlinkDetector.java 2011-09-30 17:23:22 UTC (rev 35232) @@ -109,16 +109,26 @@ if(injectionPoint != null){ Set<IObserverMethod> observerMethods = cdiProject.resolveObserverMethods(injectionPoint); - if(observerMethods.size() > 0) + if(observerMethods.size() == 1){ + for(IObserverMethod method : observerMethods){ + hyperlinks.add(new ObserverMethodHyperlink(region, method, document)); + } + }else if(observerMethods.size() > 0){ hyperlinks.add(new ObserverMethodListHyperlink(textViewer, region, observerMethods, document)); + } } else if(param != null) { Set<IInjectionPoint> events = new HashSet<IInjectionPoint>(); for (IParameter p: param) events.addAll(cdiProject.findObservedEvents(p)); - - if(events.size() > 0) + + if(events.size() == 1){ + for(IInjectionPoint event : events){ + hyperlinks.add(new EventHyperlink(region, event, document)); + } + }else if(events.size() > 0){ hyperlinks.add(new EventListHyperlink(textViewer, region, events, document)); + } } } 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 2011-09-30 17:08:34 UTC (rev 35231) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/messages.properties 2011-09-30 17:23:22 UTC (rev 35232) @@ -6,9 +6,9 @@ CDI_INJECTED_POINT_HYPERLINK_SHOW_ASSIGNABLE=Show All Assignable Beans... CDI_PRODUCER_DISPOSER_HYPERLINK_OPEN_BOUND_DISPOSER=Open Bound Disposer Method CDI_PRODUCER_DISPOSER_HYPERLINK_OPEN_BOUND_PRODUCER=Open Bound Producer Method -CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS=Show CDI Observer Methods +CDI_EVENT_LIST_HYPERLINK_OPEN_OBSERVER_METHODS=Show CDI Observer Methods... CDI_OBSERVER_METHODS_TITLE=CDI Observer Methods -CDI_EVENT_LIST_HYPERLINK_OPEN_EVENTS=Show CDI Events +CDI_EVENT_LIST_HYPERLINK_OPEN_EVENTS=Show CDI Events... CDI_EVENT_TITLE=CDI Events CDI_EVENT_HYPERLINK_OPEN_OBSERVER_METHOD=Open CDI Observer Method CDI_EVENT_HYPERLINK_OPEN_EVENT=Open CDI Event