Author: dazarov Date: 2010-07-23 12:30:21 -0400 (Fri, 23 Jul 2010) New Revision: 23706 Added: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/EventHyperlinkDetectorTest.java trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/ProducerDisposerHyperlinkDetectorTest.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlinkDetector.java trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CdiTextExtAllTests.java trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java Log: https://jira.jboss.org/browse/JBIDE-3124 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlinkDetector.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlinkDetector.java 2010-07-23 16:28:21 UTC (rev 23705) +++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlinkDetector.java 2010-07-23 16:30:21 UTC (rev 23706) @@ -100,7 +100,8 @@ } } Set<IObserverMethod> observerMethods = findEvents(cdiNature, element, position, file); - hyperlinks.add(new EventListHyperlink(textViewer, region, observerMethods, document)); + if(observerMethods.size() > 0) + hyperlinks.add(new EventListHyperlink(textViewer, region, observerMethods, document)); } if (hyperlinks != null && !hyperlinks.isEmpty()) { Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CdiTextExtAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CdiTextExtAllTests.java 2010-07-23 16:28:21 UTC (rev 23705) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CdiTextExtAllTests.java 2010-07-23 16:30:21 UTC (rev 23706) @@ -14,6 +14,8 @@ TestSuite suite = new TestSuite(CdiTextExtAllTests.class.getName()); suite.addTest(new CDICoreTestSetup(new TestSuite(InjectedPointHyperlinkDetectorTest.class))); + suite.addTest(new CDICoreTestSetup(new TestSuite(ProducerDisposerHyperlinkDetectorTest.class))); + suite.addTest(new CDICoreTestSetup(new TestSuite(EventHyperlinkDetectorTest.class))); return suite; } } Added: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/EventHyperlinkDetectorTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/EventHyperlinkDetectorTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/EventHyperlinkDetectorTest.java 2010-07-23 16:30:21 UTC (rev 23706) @@ -0,0 +1,29 @@ +package org.jboss.tools.cdi.text.ext.test; + +import java.util.ArrayList; + +import org.eclipse.jface.text.Region; +import org.jboss.tools.cdi.text.ext.hyperlink.EventHyperlinkDetector; + +public class EventHyperlinkDetectorTest extends HyperlinkDetectorTest { + + public void testEventHyperlinkDetector() throws Exception { + ArrayList<Region> regionList = new ArrayList<Region>(); + regionList.add(new Region(959, 6)); + regionList.add(new Region(967, 16)); + regionList.add(new Region(985, 11)); + regionList.add(new Region(1006, 6)); + regionList.add(new Region(1014, 3)); + regionList.add(new Region(1019, 34)); + regionList.add(new Region(1055, 42)); + regionList.add(new Region(1107, 6)); + regionList.add(new Region(1115, 34)); + regionList.add(new Region(1151, 36)); + regionList.add(new Region(1188, 3)); + regionList.add(new Region(1235, 11)); + regionList.add(new Region(1334, 42)); + + checkRegions("JavaSource/org/jboss/jsr299/tck/tests/event/bindingTypes/EventEmitter.java", regionList, new EventHyperlinkDetector()); + } + +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/EventHyperlinkDetectorTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java 2010-07-23 16:28:21 UTC (rev 23705) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java 2010-07-23 16:30:21 UTC (rev 23706) @@ -33,15 +33,6 @@ checkRegions("JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/CustomProducerImpl.java", regionList, new InjectedPointHyperlinkDetector()); } - public void testProducerDisposerHyperlinkDetector() throws Exception { - ArrayList<Region> regionList = new ArrayList<Region>(); - regionList.add(new Region(1199, 8)); // @Produces - regionList.add(new Region(1222, 7)); // producer - regionList.add(new Region(1291, 7)); // disposer - - checkRegions("JavaSource/org/jboss/jsr299/tck/tests/decorators/invocation/producer/method/ProducerImpl.java", regionList, new ProducerDisposerHyperlinkDetector()); - } - public void testInjectedConstructorParametersHyperlinkDetector() throws Exception { ArrayList<Region> regionList = new ArrayList<Region>(); regionList.add(new Region(880, 6)); Added: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/ProducerDisposerHyperlinkDetectorTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/ProducerDisposerHyperlinkDetectorTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/ProducerDisposerHyperlinkDetectorTest.java 2010-07-23 16:30:21 UTC (rev 23706) @@ -0,0 +1,18 @@ +package org.jboss.tools.cdi.text.ext.test; + +import java.util.ArrayList; + +import org.eclipse.jface.text.Region; +import org.jboss.tools.cdi.text.ext.hyperlink.ProducerDisposerHyperlinkDetector; + +public class ProducerDisposerHyperlinkDetectorTest extends HyperlinkDetectorTest { + + public void testProducerDisposerHyperlinkDetector() throws Exception { + ArrayList<Region> regionList = new ArrayList<Region>(); + regionList.add(new Region(1199, 8)); // @Produces + regionList.add(new Region(1222, 7)); // producer + regionList.add(new Region(1291, 7)); // disposer + + checkRegions("JavaSource/org/jboss/jsr299/tck/tests/decorators/invocation/producer/method/ProducerImpl.java", regionList, new ProducerDisposerHyperlinkDetector()); + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/ProducerDisposerHyperlinkDetectorTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain