JBoss Tools SVN: r34747 - trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-09-14 19:19:21 -0400 (Wed, 14 Sep 2011)
New Revision: 34747
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansDialog.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansHyperlink.java
Log:
JBIDE-9347
https://issues.jboss.org/browse/JBIDE-9347
Small fixes.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansDialog.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansDialog.java 2011-09-14 23:09:32 UTC (rev 34746)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansDialog.java 2011-09-14 23:19:21 UTC (rev 34747)
@@ -22,7 +22,6 @@
import org.eclipse.jdt.core.IMethod;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.TitleAreaDialog;
-import org.eclipse.jface.resource.ColorRegistry;
import org.eclipse.jface.resource.JFaceResources;
import org.eclipse.jface.viewers.CheckStateChangedEvent;
import org.eclipse.jface.viewers.CheckboxTreeViewer;
@@ -45,7 +44,6 @@
import org.eclipse.jface.viewers.StyledString.Styler;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.graphics.TextStyle;
import org.eclipse.swt.layout.GridData;
@@ -155,7 +153,6 @@
list.getControl().setLayoutData(g);
list.setContentProvider(new ListContent());
list.setLabelProvider(new LP());
-// TableOwnerDrawSupport.install(list.getTable());
list.setInput(injectionPoint);
list.addOpenListener(new IOpenListener() {
@Override
@@ -165,6 +162,7 @@
Object o = ((IStructuredSelection)s).getFirstElement();
if(o instanceof IBean) {
((IBean)o).open();
+ close();
}
}
}
@@ -371,8 +369,8 @@
static Color black = new Color(null, 0, 0, 0);
static Styler ELIGIBLE_NAME = new DefaultStyler(black, false);
- static Styler ELIGIBLE_QUALIFIER = new DefaultStyler(gray, true);
- static Styler DISABLED = new DefaultStyler(gray, true);
+ static Styler ELIGIBLE_QUALIFIER = new DefaultStyler(gray, false);
+ static Styler DISABLED = new DefaultStyler(gray, false);
private static class DefaultStyler extends Styler {
private final Color foreground;
@@ -384,7 +382,6 @@
}
public void applyStyles(TextStyle textStyle) {
-// ColorRegistry colorRegistry = JFaceResources.getColorRegistry();
if (foreground != null) {
textStyle.foreground = foreground;
}
@@ -554,5 +551,4 @@
}
}
-
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansHyperlink.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansHyperlink.java 2011-09-14 23:09:32 UTC (rev 34746)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/AssignableBeansHyperlink.java 2011-09-14 23:19:21 UTC (rev 34747)
@@ -14,6 +14,7 @@
import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion;
+import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.swt.widgets.Display;
import org.jboss.tools.cdi.core.ICDIElement;
import org.jboss.tools.cdi.core.IInjectionPoint;
@@ -44,7 +45,12 @@
dialog.setInjectionPoint(injectionPoint);
dialog.create();
dialog.getShell().setText(CDIExtensionsMessages.ASSIGNABLE_BEANS_DIALOG_TITLE);
- dialog.getShell().setSize(700, 400);
+ int width = 700;
+ int height = 400;
+ Rectangle b = display.getActiveShell().getBounds();
+ int x = b.x + (b.width - width) / 2;
+ int y = b.y + (b.height - height) / 2;
+ dialog.getShell().setBounds(x, y, width, height);
dialog.open();
}
14 years, 7 months
JBoss Tools SVN: r34746 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-09-14 19:09:32 -0400 (Wed, 14 Sep 2011)
New Revision: 34746
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java
Log:
Logic error fixed.
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2011-09-14 20:30:47 UTC (rev 34745)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2011-09-14 23:09:32 UTC (rev 34746)
@@ -210,7 +210,7 @@
* @param element
*/
public static IInjectionPoint findInjectionPoint(Set<IBean> beans, IJavaElement element, int position) {
- if (!(element instanceof IField) && (element instanceof IMethod) && (element instanceof ILocalVariable)) {
+ if (!(element instanceof IField) && !(element instanceof IMethod) && !(element instanceof ILocalVariable)) {
return null;
}
14 years, 7 months
JBoss Tools SVN: r34745 - in trunk/cdi: plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dazarov
Date: 2011-09-14 16:30:47 -0400 (Wed, 14 Sep 2011)
New Revision: 34745
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InformationControlManager.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/InformationPresenter.java
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.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/InformationControlManager.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InformationControlManager.java 2011-09-14 20:18:48 UTC (rev 34744)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/InformationControlManager.java 2011-09-14 20:30:47 UTC (rev 34745)
@@ -21,12 +21,21 @@
import org.jboss.tools.cdi.text.ext.hyperlink.xpl.InformationPresenter;
public class InformationControlManager {
- public static void showHyperlinks(String title, ITextViewer viewer, IHyperlink[] hyperlinks){
+ public static IInformationControl showHyperlinks(String title, ITextViewer viewer, IHyperlink[] hyperlinks){
+ return showHyperlinks(title, viewer, hyperlinks, false);
+ }
+
+ public static IInformationControl showHyperlinks(String title, ITextViewer viewer, IHyperlink[] hyperlinks, boolean test){
InformationPresenter presenter= new InformationPresenter(viewer, getHierarchyPresenterControlCreator(title, hyperlinks));
presenter.setAnchor(AbstractInformationControlManager.ANCHOR_GLOBAL);
presenter.setSizeConstraints(60, 10, true, false);
presenter.install(viewer.getTextWidget());
- presenter.showInformation();
+ if(test){
+ return presenter.showInformationForTest();
+ } else {
+ presenter.showInformation();
+ return null;
+ }
}
private static IInformationControlCreator getHierarchyPresenterControlCreator(final String title, final IHyperlink[] hyperlinks) {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/InformationPresenter.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/InformationPresenter.java 2011-09-14 20:18:48 UTC (rev 34744)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/xpl/InformationPresenter.java 2011-09-14 20:30:47 UTC (rev 34745)
@@ -41,6 +41,10 @@
@Override
public void showInformation() {
+ showInformation_internal(false);
+ }
+
+ private IInformationControl showInformation_internal(boolean test){
IInformationControl iControl = getInformationControl();
Point sizeConstraints= computeSizeConstraints(viwer.getTextWidget(), null, iControl);
iControl.setSizeConstraints(sizeConstraints.x, sizeConstraints.y);
@@ -58,8 +62,16 @@
size= Geometry.max(size, sizeConstraints);
iControl.setSize(size.x, size.y);
+ if(test){
+ ((HierarchyInformationControl)iControl).setBlockOnOpen(false);
+ }
iControl.setVisible(true);
+ return iControl;
}
+
+ public IInformationControl showInformationForTest(){
+ return showInformation_internal(true);
+ }
@Override
protected void computeInformation() {
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 2011-09-14 20:18:48 UTC (rev 34744)
+++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java 2011-09-14 20:30:47 UTC (rev 34745)
@@ -4,17 +4,52 @@
import java.util.Set;
import org.eclipse.core.resources.IFile;
+import org.eclipse.jdt.internal.ui.javaeditor.JavaEditor;
+import org.eclipse.jface.text.IDocument;
+import org.eclipse.jface.text.IInformationControl;
+import org.eclipse.jface.text.Region;
+import org.eclipse.jface.text.hyperlink.IHyperlink;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.texteditor.ITextEditor;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.test.tck.TCKTest;
import org.jboss.tools.cdi.text.ext.CDIExtensionsMessages;
import org.jboss.tools.cdi.text.ext.hyperlink.AssignableBeansHyperlink;
+import org.jboss.tools.cdi.text.ext.hyperlink.InformationControlManager;
import org.jboss.tools.cdi.text.ext.hyperlink.InjectedPointHyperlink;
import org.jboss.tools.cdi.text.ext.hyperlink.InjectedPointHyperlinkDetector;
+import org.jboss.tools.cdi.text.ext.test.CDIHyperlinkTestUtil.TestHyperlink;
import org.jboss.tools.cdi.text.ext.test.CDIHyperlinkTestUtil.TestRegion;
import org.jboss.tools.common.util.FileUtil;
-import org.jboss.tools.cdi.text.ext.test.CDIHyperlinkTestUtil.TestHyperlink;
public class InjectedPointHyperlinkDetectorTest extends TCKTest {
+
+ public void testShowHyperlinksDialog() throws Exception {
+ IFile file = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/lookup/injectionpoint/BasicLogger.java");
+
+ assertTrue("File must be exist", file.exists());
+
+ IEditorPart part = CDIHyperlinkTestUtil.openFileInEditor(file);
+ if(part instanceof JavaEditor){
+ IDocument document = ((JavaEditor)part).getViewer().getDocument();
+
+ assertNotNull("Document not found", document);
+
+ IBean[] beans = cdiProject.getBeans();
+ IHyperlink[] hyperlinks = new IHyperlink[beans.length];
+ int index = 0;
+ for(IBean b : beans){
+ hyperlinks[index++] = new InjectedPointHyperlink(new Region(1,1), b, document);
+ }
+
+ IInformationControl informationControl = InformationControlManager.showHyperlinks("Title", ((JavaEditor)part).getViewer(), hyperlinks, true);
+
+ assertNotNull("InformationControl not found", informationControl);
+ informationControl.setVisible(false);
+ }else{
+ fail("Editor part must be instance of JavaEditor, was - "+part.getClass());
+ }
+ }
public void testInjectedPointHyperlinkDetector() throws Exception {
Set<IBean> beans = cdiProject.getBeans("/tck/JavaSource/org/jboss/jsr299/tck/tests/lookup/injectionpoint/BasicLogger.java", true);
14 years, 7 months
JBoss Tools SVN: r34744 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-09-14 16:18:48 -0400 (Wed, 14 Sep 2011)
New Revision: 34744
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TypeNames.java
Log:
https://issues.jboss.org/browse/JBIDE-9673 "Show All Generic Configuration Points", "Show CDI Events" and "Show CDI Observer Methods" dialogs should look like "Open Implementation" in JDT
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TypeNames.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TypeNames.java 2011-09-14 19:27:51 UTC (rev 34743)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TypeNames.java 2011-09-14 20:18:48 UTC (rev 34744)
@@ -9,7 +9,7 @@
@Produces long arg2;
@Produces Integer[] arg3;
@Produces Short arg4;
- @Produces Object arg5;
+ @Produces Test arg5;
@Produces
public int[] getFoo() {
@@ -32,11 +32,13 @@
}
@Produces
- public Object getFoo4() {
+ public Test getFoo4() {
return null;
}
@Inject
- private void injectFoo(int[] arg1, long arg2, Integer[] arg3, Short arg4, Object arg5) {
+ private void injectFoo(int[] arg1, long arg2, Integer[] arg3, Short arg4, Test arg5) {
}
+
+ public static class Test {}
}
\ No newline at end of file
14 years, 7 months
JBoss Tools SVN: r34743 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-09-14 15:27:51 -0400 (Wed, 14 Sep 2011)
New Revision: 34743
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TypeNames.java
Log:
https://issues.jboss.org/browse/JBIDE-9673 "Show All Generic Configuration Points", "Show CDI Events" and "Show CDI Observer Methods" dialogs should look like "Open Implementation" in JDT
Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TypeNames.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TypeNames.java (rev 0)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TypeNames.java 2011-09-14 19:27:51 UTC (rev 34743)
@@ -0,0 +1,42 @@
+package org.jboss.jsr299.tck.tests.jbt.core;
+
+import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
+
+public class TypeNames {
+
+ @Produces int[] arg1;
+ @Produces long arg2;
+ @Produces Integer[] arg3;
+ @Produces Short arg4;
+ @Produces Object arg5;
+
+ @Produces
+ public int[] getFoo() {
+ return new int[]{};
+ }
+
+ @Produces
+ public long getFoo1() {
+ return 0;
+ }
+
+ @Produces
+ public Integer[] getFoo2() {
+ return null;
+ }
+
+ @Produces
+ public Short getFoo3() {
+ return null;
+ }
+
+ @Produces
+ public Object getFoo4() {
+ return null;
+ }
+
+ @Inject
+ private void injectFoo(int[] arg1, long arg2, Integer[] arg3, Short arg4, Object arg5) {
+ }
+}
\ No newline at end of file
Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TypeNames.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
14 years, 7 months
JBoss Tools SVN: r34742 - trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-09-14 14:46:16 -0400 (Wed, 14 Sep 2011)
New Revision: 34742
Modified:
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IParametedType.java
trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedType.java
Log:
https://issues.jboss.org/browse/JBIDE-9673 "Show All Generic Configuration Points", "Show CDI Events" and "Show CDI Observer Methods" dialogs should look like "Open Implementation" in JDT
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IParametedType.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IParametedType.java 2011-09-14 18:45:20 UTC (rev 34741)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/IParametedType.java 2011-09-14 18:46:16 UTC (rev 34742)
@@ -47,6 +47,8 @@
* Returns the simple name of the type. In case of IType this method will return the short name of the type.
* If this type is primitive then the method will return the name of the primitive type.
*
+ * Implementations may not return null.
+ *
* @return the simple name of the type.
*/
String getSimpleName();
Modified: trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedType.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedType.java 2011-09-14 18:45:20 UTC (rev 34741)
+++ trunk/common/plugins/org.jboss.tools.common/src/org/jboss/tools/common/java/ParametedType.java 2011-09-14 18:46:16 UTC (rev 34742)
@@ -29,6 +29,7 @@
* @author Viacheslav Kabanovich
*
*/
+@SuppressWarnings("nls")
public class ParametedType implements IParametedType {
protected ParametedTypeFactory typeFactory = null;
protected IType type;
@@ -368,6 +369,13 @@
primitives.put("Float", "float");
primitives.put("Double", "double");
primitives.put("Boolean", "boolean");
+ primitives.put("Integer[]", "int[]");
+ primitives.put("Short[]", "short[]");
+ primitives.put("Long[]", "long[]");
+ primitives.put("Character[]", "char[]");
+ primitives.put("Float[]", "float[]");
+ primitives.put("Double[]", "double[]");
+ primitives.put("Boolean[]", "boolean[]");
}
/*
14 years, 7 months
JBoss Tools SVN: r34741 - in trunk/cdi: tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-09-14 14:45:20 -0400 (Wed, 14 Sep 2011)
New Revision: 34741
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDIElement.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CoreTest.java
Log:
https://issues.jboss.org/browse/JBIDE-9673 "Show All Generic Configuration Points", "Show CDI Events" and "Show CDI Observer Methods" dialogs should look like "Open Implementation" in JDT
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDIElement.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDIElement.java 2011-09-14 18:36:24 UTC (rev 34740)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ICDIElement.java 2011-09-14 18:45:20 UTC (rev 34741)
@@ -63,6 +63,9 @@
* If the element is a field then the method will return "TypeName.fieldName".
* If the bean is a method then the method will return "TypeName.methodName()".
* For a method parameter, a name of the parameter will be return.
+ *
+ * Implementations may not return null.
+ *
* @return the text representation of this bean.
*/
String getElementName();
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-09-14 18:36:24 UTC (rev 34740)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-09-14 18:45:20 UTC (rev 34741)
@@ -26,6 +26,7 @@
import org.jboss.tools.cdi.core.test.tck.BeanSpecializationTest;
import org.jboss.tools.cdi.core.test.tck.BuiltInBeanInjectionTest;
import org.jboss.tools.cdi.core.test.tck.CDIUtilTest;
+import org.jboss.tools.cdi.core.test.tck.CoreTest;
import org.jboss.tools.cdi.core.test.tck.DecoratorDefinitionTest;
import org.jboss.tools.cdi.core.test.tck.DefaultNamedTest;
import org.jboss.tools.cdi.core.test.tck.EnterpriseQualifierDefinitionTest;
@@ -108,6 +109,7 @@
suite.addTestSuite(UnsatisfiedDependencyTest.class);
suite.addTestSuite(ResolvedTypesCacheTest.class);
suite.addTestSuite(CDIUtilTest.class);
+ suite.addTestSuite(CoreTest.class);
// Validation tests
suite.addTestSuite(DefenitionErrorsValidationTest.class);
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CoreTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CoreTest.java 2011-09-14 18:36:24 UTC (rev 34740)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CoreTest.java 2011-09-14 18:45:20 UTC (rev 34741)
@@ -41,9 +41,6 @@
for (IInjectionPoint point : points) {
assertElementName(point);
if(point.getType()!=null) {
- if(point.getType().getSimpleName()==null) {
- System.out.println("!!!");
- }
assertNotNull(point.getType().getSimpleName());
}
}
14 years, 7 months
JBoss Tools SVN: r34740 - trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-09-14 14:36:24 -0400 (Wed, 14 Sep 2011)
New Revision: 34740
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/EventAndObserverMethodHyperlinkDetectorTest.java
trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java
Log:
JBIDE-9699
https://issues.jboss.org/browse/JBIDE-9699
Test fixed.
Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java 2011-09-14 18:33:11 UTC (rev 34739)
+++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CDIHyperlinkTestUtil.java 2011-09-14 18:36:24 UTC (rev 34740)
@@ -288,14 +288,17 @@
}
private static String findRegionInformation(IDocument document, int offset, List<TestRegion> regionList) throws BadLocationException{
- int index = 0;
+ int index = -1;
for(int i = 0; i < regionList.size(); i++){
TestRegion testRegion = regionList.get(i);
if(offset > testRegion.region.getOffset()+testRegion.region.getLength()){
index = i;
}
}
- String info = "previous region - " + getRegionInformation(document, regionList.get(index));
+ String info = "";
+ if(index >= 0) {
+ info = "previous region - " + getRegionInformation(document, regionList.get(index));
+ }
if(index+1 < regionList.size())
info += " next region - " + getRegionInformation(document, regionList.get(index+1));
return info;
Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/EventAndObserverMethodHyperlinkDetectorTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/EventAndObserverMethodHyperlinkDetectorTest.java 2011-09-14 18:33:11 UTC (rev 34739)
+++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/EventAndObserverMethodHyperlinkDetectorTest.java 2011-09-14 18:36:24 UTC (rev 34740)
@@ -6,6 +6,7 @@
import org.jboss.tools.cdi.text.ext.CDIExtensionsMessages;
import org.jboss.tools.cdi.text.ext.hyperlink.EventAndObserverMethodHyperlinkDetector;
import org.jboss.tools.cdi.text.ext.hyperlink.EventListHyperlink;
+import org.jboss.tools.cdi.text.ext.hyperlink.InjectedPointHyperlink;
import org.jboss.tools.cdi.text.ext.hyperlink.ObserverMethodListHyperlink;
import org.jboss.tools.cdi.text.ext.test.CDIHyperlinkTestUtil.TestRegion;
import org.jboss.tools.cdi.text.ext.test.CDIHyperlinkTestUtil.TestHyperlink;
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 2011-09-14 18:33:11 UTC (rev 34739)
+++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/InjectedPointHyperlinkDetectorTest.java 2011-09-14 18:36:24 UTC (rev 34740)
@@ -7,7 +7,6 @@
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.test.tck.TCKTest;
import org.jboss.tools.cdi.text.ext.CDIExtensionsMessages;
-import org.jboss.tools.cdi.text.ext.hyperlink.AlternativeInjectedPointListHyperlink;
import org.jboss.tools.cdi.text.ext.hyperlink.AssignableBeansHyperlink;
import org.jboss.tools.cdi.text.ext.hyperlink.InjectedPointHyperlink;
import org.jboss.tools.cdi.text.ext.hyperlink.InjectedPointHyperlinkDetector;
@@ -15,7 +14,6 @@
import org.jboss.tools.common.util.FileUtil;
import org.jboss.tools.cdi.text.ext.test.CDIHyperlinkTestUtil.TestHyperlink;
-
public class InjectedPointHyperlinkDetectorTest extends TCKTest {
public void testInjectedPointHyperlinkDetector() throws Exception {
@@ -90,7 +88,15 @@
regionList.add(new TestRegion(orderPosition, 15, new TestHyperlink[]{
new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " CustomProducerImpl.produce()", bean)
})); // order
+
+ //It may seem strange that we cannot start with "@Disposes"
+ String disposesParam = "Disposes Something toDispose";
+ int disposePosition = text.indexOf(disposesParam);
+ regionList.add(new TestRegion(disposePosition, disposesParam.length(), new TestHyperlink[]{
+ new TestHyperlink(InjectedPointHyperlink.class, CDIExtensionsMessages.CDI_INJECTED_POINT_HYPERLINK_OPEN_INJECT_BEAN+ " CustomProducerImpl.produce()", bean)
+ })); // toDispose
+
CDIHyperlinkTestUtil.checkRegions(tckProject, "JavaSource/org/jboss/jsr299/tck/tests/jbt/openon/CustomProducerImpl.java", regionList, new InjectedPointHyperlinkDetector());
}
14 years, 7 months
JBoss Tools SVN: r34739 - in trunk/vpe/plugins: org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2011-09-14 14:33:11 -0400 (Wed, 14 Sep 2011)
New Revision: 34739
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/custom/CustomTLDReference.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeCompletedExpression.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/ColorFormatController.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/css/MultiPropertyValue.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/css/StyleAttribute.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/css/StyleProperty.java
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/FormatHandler.java
Log:
Code cleanup: replaced StringBuffer to StringBuilder
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2011-09-14 18:30:39 UTC (rev 34738)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeController.java 2011-09-14 18:33:11 UTC (rev 34739)
@@ -2060,20 +2060,20 @@
gridData.horizontalSpan = 2;
tipControlHeaderText.setLayoutData(gridData);
- StringBuffer tempAttr = new StringBuffer();
- StringBuffer tempValue = new StringBuffer();
+ StringBuilder tempAttr = new StringBuilder();
+ StringBuilder tempValue = new StringBuilder();
if (attributeString.length >= 2) {
for (int i = 1; i < attributeString.length; i++) {
buffer = attributeString[i].split(" ", 2); //$NON-NLS-1$
if (i == 1) {
- tempAttr.append(buffer[0] + " "); //$NON-NLS-1$
+ tempAttr.append(buffer[0]).append(" "); //$NON-NLS-1$
tempValue
- .append((buffer.length >= 2 ? buffer[1] : "") + " "); //$NON-NLS-1$ //$NON-NLS-2$
+ .append((buffer.length >= 2 ? buffer[1] : "")).append(" "); //$NON-NLS-1$ //$NON-NLS-2$
} else {
- tempAttr.append("\n" + buffer[0] + " "); //$NON-NLS-1$ //$NON-NLS-2$
+ tempAttr.append("\n").append(buffer[0]).append(" "); //$NON-NLS-1$ //$NON-NLS-2$
tempValue
- .append(" \n" + (buffer.length >= 2 ? buffer[1] : "") + " "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
+ .append(" \n").append(buffer.length >= 2 ? buffer[1] : "").append(" "); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
}
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2011-09-14 18:30:39 UTC (rev 34738)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/VpeVisualDomBuilder.java 2011-09-14 18:33:11 UTC (rev 34739)
@@ -1150,7 +1150,7 @@
linkNode.setAttribute(VpeTemplateManager.ATTR_LINK_EXT, ext_val);
BufferedReader in = null;
try {
- StringBuffer styleText = new StringBuffer(EMPTY_STRING);
+ StringBuilder styleText = new StringBuilder(EMPTY_STRING);
URL url = new URL((new Path(href_val)).toOSString());
String fileName = url.getFile();
in = new BufferedReader(new FileReader(
@@ -1404,7 +1404,7 @@
}
private String getTooltip(Element sourceElement) {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
buffer.append(sourceElement.getNodeName());
NamedNodeMap attrs = sourceElement.getAttributes();
int len = attrs.getLength();
@@ -1414,15 +1414,15 @@
}
int valueLength = attrs.item(i).getNodeValue().length();
if (valueLength > 30) {
- StringBuffer temp = new StringBuffer();
- temp.append(attrs.item(i).getNodeValue().substring(0, 15)
- + " ... " //$NON-NLS-1$
- + attrs.item(i).getNodeValue().substring(
+ StringBuilder temp = new StringBuilder();
+ temp.append(attrs.item(i).getNodeValue().substring(0, 15))
+ .append(" ... ") //$NON-NLS-1$
+ .append(attrs.item(i).getNodeValue().substring(
valueLength - 15, valueLength));
- buffer.append("\n" + attrs.item(i).getNodeName() + ": " + temp); //$NON-NLS-1$ //$NON-NLS-2$
+ buffer.append("\n").append(attrs.item(i).getNodeName()).append(": ").append(temp); //$NON-NLS-1$ //$NON-NLS-2$
} else {
- buffer.append("\n" + attrs.item(i).getNodeName() + ": " //$NON-NLS-1$ //$NON-NLS-2$
- + attrs.item(i).getNodeValue());
+ buffer.append("\n").append(attrs.item(i).getNodeName()).append(": ") //$NON-NLS-1$ //$NON-NLS-2$
+ .append(attrs.item(i).getNodeValue());
}
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java 2011-09-14 18:30:39 UTC (rev 34738)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeAnyCreator.java 2011-09-14 18:33:11 UTC (rev 34739)
@@ -81,7 +81,7 @@
try {
//TODO Max Areshkau This code was leave here for versions compatibility BEGIN
Node attrBorder = element.getAttributeNode(VpeTemplateManager.ATTR_ANY_BORDER);
- StringBuffer stringBuffer = new StringBuffer();
+ StringBuilder stringBuffer = new StringBuilder();
if (attrBorder != null) {
stringBuffer.append("border-width:").append(attrBorder.getNodeValue()) //$NON-NLS-1$
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2011-09-14 18:30:39 UTC (rev 34738)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/VpeTemplateManager.java 2011-09-14 18:33:11 UTC (rev 34739)
@@ -740,7 +740,7 @@
anyData.setChildren(ATTR_VALUE_YES.equalsIgnoreCase(attr.getNodeValue()));
}
//TODO Max Areshkau This code was leave here for versions compatibility BEGIN
- StringBuffer stringBuffer = new StringBuffer();
+ StringBuilder stringBuffer = new StringBuilder();
Node attrDisplay = anyNode.getAttributeNode(ATTR_ANY_DISPLAY);
if (attr != null) {
stringBuffer.append(HTML.ATTR_DISPLAY).append(":") //$NON-NLS-1$
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/custom/CustomTLDReference.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/custom/CustomTLDReference.java 2011-09-14 18:30:39 UTC (rev 34738)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/custom/CustomTLDReference.java 2011-09-14 18:33:11 UTC (rev 34739)
@@ -167,7 +167,7 @@
}
File fileToOpen = new File(fullResourcePath);
if (fileToOpen.exists() && fileToOpen.isFile()) {
- StringBuffer fileContent = new StringBuffer();
+ StringBuilder fileContent = new StringBuilder();
try {
BufferedReader input = new BufferedReader(new FileReader(fileToOpen));
try {
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeCompletedExpression.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeCompletedExpression.java 2011-09-14 18:30:39 UTC (rev 34738)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/template/expression/VpeCompletedExpression.java 2011-09-14 18:33:11 UTC (rev 34739)
@@ -25,7 +25,7 @@
if (expressions == null) {
return new VpeValue(""); //$NON-NLS-1$
}
- StringBuffer result = new StringBuffer();
+ StringBuilder result = new StringBuilder();
for (int i = 0; i < expressions.length; i++) {
result.append(expressions[i].exec(pageContext, sourceNode).stringValue());
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/ColorFormatController.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/ColorFormatController.java 2011-09-14 18:30:39 UTC (rev 34738)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/ColorFormatController.java 2011-09-14 18:33:11 UTC (rev 34739)
@@ -48,7 +48,7 @@
if (newColor == null) {
return;
}
- StringBuffer buf = new StringBuffer();
+ StringBuilder buf = new StringBuilder();
String c = Integer.toHexString(newColor.red);
if(c.length()<2) {
buf.append("0"); //$NON-NLS-1$
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/css/MultiPropertyValue.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/css/MultiPropertyValue.java 2011-09-14 18:30:39 UTC (rev 34738)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/css/MultiPropertyValue.java 2011-09-14 18:33:11 UTC (rev 34739)
@@ -116,7 +116,7 @@
* @see java.lang.Object#toString()
*/
public String toString() {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
for(int i=0; i<tokens.size(); i++) {
buffer.append(tokens.get(i).toString());
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/css/StyleAttribute.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/css/StyleAttribute.java 2011-09-14 18:30:39 UTC (rev 34738)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/css/StyleAttribute.java 2011-09-14 18:33:11 UTC (rev 34739)
@@ -227,7 +227,7 @@
* @see java.lang.Object#toString()
*/
public String toString() {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
for(int i=0; i<tokens.size(); i++) {
buffer.append(tokens.get(i).toString());
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/css/StyleProperty.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/css/StyleProperty.java 2011-09-14 18:30:39 UTC (rev 34738)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/css/StyleProperty.java 2011-09-14 18:33:11 UTC (rev 34739)
@@ -160,7 +160,7 @@
* @see java.lang.Object#toString()
*/
public String toString() {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
for(int i=0; i<tokens.size(); i++) {
buffer.append(tokens.get(i).toString());
}
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/FormatHandler.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/FormatHandler.java 2011-09-14 18:30:39 UTC (rev 34738)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/toolbar/format/handler/FormatHandler.java 2011-09-14 18:33:11 UTC (rev 34739)
@@ -134,7 +134,7 @@
}
protected String getNodeBody(Node node) {
- StringBuffer buffer = new StringBuffer();
+ StringBuilder buffer = new StringBuilder();
NodeList list = node.getChildNodes();
for(int i=0; i<list.getLength(); i++) {
Node child = list.item(i);
@@ -186,7 +186,7 @@
IDocument document = viewer.getDocument();
// Append start part - "<tag";
- StringBuffer resultNode = new StringBuffer("<").append(newName); //$NON-NLS-1$
+ StringBuilder resultNode = new StringBuilder("<").append(newName); //$NON-NLS-1$
int endOffcet = element.getEndOffset() - element.getStartOffset();
int startEndOffcet = element.getStartEndOffset() - element.getStartOffset();
Modified: trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2011-09-14 18:30:39 UTC (rev 34738)
+++ trunk/vpe/plugins/org.jboss.tools.vpe.xulrunner/src/org/jboss/tools/vpe/xulrunner/browser/XulRunnerBrowser.java 2011-09-14 18:33:11 UTC (rev 34739)
@@ -93,7 +93,7 @@
private static final Mozilla mozilla;
static {
- StringBuffer buff = new StringBuffer();
+ StringBuilder buff = new StringBuilder();
buff.append("org.mozilla.xulrunner.") //$NON-NLS-1$
.append(Platform.getWS()).append('.')
.append(Platform.getOS());
14 years, 7 months
JBoss Tools SVN: r34738 - trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-09-14 14:30:39 -0400 (Wed, 14 Sep 2011)
New Revision: 34738
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventAndObserverMethodHyperlinkDetector.java
Log:
JBIDE-9698
https://issues.jboss.org/browse/JBIDE-9698
Rolled back wrong commit.
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-14 17:49:18 UTC (rev 34737)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventAndObserverMethodHyperlinkDetector.java 2011-09-14 18:30:39 UTC (rev 34738)
@@ -145,13 +145,13 @@
Set<IObserverMethod> observers = ((IClassBean)bean).getObserverMethods();
for (IObserverMethod bm: observers) {
ISourceRange sr = bm.getMethod().getSourceRange();
-// if(sr.getOffset() <= offset && sr.getOffset() + sr.getLength() >= offset) {
+ if(sr.getOffset() <= offset && sr.getOffset() + sr.getLength() >= offset) {
IObserverMethod obs = (IObserverMethod)bm;
Set<IParameter> ps = obs.getObservedParameters();
if(!ps.isEmpty()) {
result.add(ps.iterator().next());
}
-// }
+ }
}
}
}
14 years, 7 months