JBoss Tools SVN: r34657 - branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US.
by jbosstools-commits＠lists.jboss.org
Author: irooskov(a)redhat.com
Date: 2011-09-12 19:43:06 -0400 (Mon, 12 Sep 2011)
New Revision: 34657
Modified:
branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml
Log:
updated with new fixed issues for JBDS 4.1.1
Modified: branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml
===================================================================
--- branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 2011-09-12 23:14:30 UTC (rev 34656)
+++ branches/jbosstools-3.2.x/documentation/guides/JBDS_Release_Notes/en-US/Fixed_Issues.xml 2011-09-12 23:43:06 UTC (rev 34657)
@@ -264,6 +264,11 @@
<itemizedlist>
<listitem>
<para>
+ <ulink url="http://jira.jboss.com/jira/browse/JBDS-1710">JBDS-1710</ulink>: When using a WSDL (Web Service Definition Language) file to create a new web service, the wizard would not work correctly if the WSDL file contained similar wording to an error that can be generated by the component. By modifying the code within the <classname>AbstractGenerateCodeCommand</classname> class that checks for non-compilation errors from searching for errors based on <property>error:</property> instead of only <property>error</property>, it allows for the word <emphasis>error</emphasis> to now appear in a WSDL without causing issue. Using a WSDL file to create a new web service now works as expected.
+ </para>
+ </listitem>
+ <listitem>
+ <para>
<ulink url="http://jira.jboss.com/jira/browse/JBIDE-9516">JBIDE-9516</ulink>: When creating a Sample RESTful Web Service, the wizard referenced a JAR file that did not exist and an error would occur. The issue has been fixed by ensuring that the wizard looks for a file that has a name starting with <filename>jaxrs-api</filename> and ends with <filename>.jar</filename>. This also allows for the JBoss Developer Studio to automatically use newer versions of the the file in the future.
</para>
</listitem>
14 years, 7 months
JBoss Tools SVN: r34656 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-09-12 19:14:30 -0400 (Mon, 12 Sep 2011)
New Revision: 34656
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java
Log:
https://issues.jboss.org/browse/JBIDE-9685 Seam JMS: CDI validator should be aware of JMS resource injections
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java 2011-09-12 23:03:39 UTC (rev 34655)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java 2011-09-12 23:14:30 UTC (rev 34656)
@@ -30,14 +30,14 @@
Set<IInjectionPoint> injections = bean.getInjectionPoints();
assertEquals(9, injections.size());
for (IInjectionPoint injectionPoint : injections) {
- IAnnotationDeclaration declaration = CDIUtil.getAnnotationDeclaration(injectionPoint, "org.jboss.jsr299.tck.tests.jbt.test.core.TestQualifier");
+ IAnnotationDeclaration declaration = CDIUtil.getAnnotationDeclaration(injectionPoint, "org.jboss.jsr299.tck.tests.jbt.core.TestQualifier");
String elementName = injectionPoint.getSourceMember().getElementName();
if(elementName.equals("i4")) {
assertNull("Have found @TestQualifier for " + elementName, declaration);
} else {
assertNotNull("Have not found @TestQualifier for " + elementName, declaration);
}
- declaration = CDIUtil.getAnnotationDeclaration(injectionPoint, "org.jboss.jsr299.tck.tests.jbt.test.core.TestQualifier3");
+ declaration = CDIUtil.getAnnotationDeclaration(injectionPoint, "org.jboss.jsr299.tck.tests.jbt.core.TestQualifier3");
if(elementName.equals("i1") || elementName.equals("i2") || elementName.equals("i3") || elementName.equals("i7")) {
assertNull("Have found @TestQualifier3 for " + elementName, declaration);
} else {
14 years, 7 months
JBoss Tools SVN: r34655 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-09-12 19:03:39 -0400 (Mon, 12 Sep 2011)
New Revision: 34655
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java
Log:
https://issues.jboss.org/browse/JBIDE-9685 Seam JMS: CDI validator should be aware of JMS resource injections
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java 2011-09-12 22:53:39 UTC (rev 34654)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java 2011-09-12 23:03:39 UTC (rev 34655)
@@ -25,9 +25,8 @@
/**
* See https://issues.jboss.org/browse/JBIDE-9685 Seam JMS: CDI validator should be aware of JMS resource injections
*/
- public void testMethodParameter() {
+ public void testMethodParameter() throws Exception {
IClassBean bean = getClassBean("org.jboss.jsr299.tck.tests.jbt.core.TestInjection", "JavaSource/org/jboss/jsr299/tck/tests/jbt/core/TestInjection.java");
- assertNotNull("Can't find the bean.", bean);
Set<IInjectionPoint> injections = bean.getInjectionPoints();
assertEquals(9, injections.size());
for (IInjectionPoint injectionPoint : injections) {
14 years, 7 months
JBoss Tools SVN: r34654 - trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-09-12 18:53:39 -0400 (Mon, 12 Sep 2011)
New Revision: 34654
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
Log:
https://issues.jboss.org/browse/JBIDE-9685 Seam JMS: CDI validator should be aware of JMS resource injections
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java 2011-09-12 22:26:27 UTC (rev 34653)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java 2011-09-12 22:53:39 UTC (rev 34654)
@@ -26,7 +26,7 @@
* See https://issues.jboss.org/browse/JBIDE-9685 Seam JMS: CDI validator should be aware of JMS resource injections
*/
public void testMethodParameter() {
- IClassBean bean = getClassBean("JavaSource/org/jboss/jsr299/tck/tests/jbt/core/TestInjection.java");
+ IClassBean bean = getClassBean("org.jboss.jsr299.tck.tests.jbt.core.TestInjection", "JavaSource/org/jboss/jsr299/tck/tests/jbt/core/TestInjection.java");
assertNotNull("Can't find the bean.", bean);
Set<IInjectionPoint> injections = bean.getInjectionPoints();
assertEquals(9, injections.size());
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2011-09-12 22:26:27 UTC (rev 34653)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/TCKTest.java 2011-09-12 22:53:39 UTC (rev 34654)
@@ -141,10 +141,15 @@
}
protected IClassBean getClassBean(String path) {
+ return getClassBean(null, path);
+ }
+
+ protected IClassBean getClassBean(String fullyQualifiedTypeName, String path) {
IFile file = tckProject.getFile(path);
+ assertTrue(file.exists());
Set<IBean> beans = cdiProject.getBeans(file.getFullPath());
for (IBean bean : beans) {
- if(bean instanceof IClassBean) {
+ if(bean instanceof IClassBean && (fullyQualifiedTypeName==null || fullyQualifiedTypeName.equals(bean.getBeanClass().getFullyQualifiedName()))) {
return (IClassBean)bean;
}
}
14 years, 7 months
JBoss Tools SVN: r34653 - 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-12 18:26:27 -0400 (Mon, 12 Sep 2011)
New Revision: 34653
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestInjection.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestQualifier.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestQualifier1.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestQualifier2.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestQualifier3.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestStereotype.java
Log:
https://issues.jboss.org/browse/JBIDE-9685 Seam JMS: CDI validator should be aware of JMS resource injections
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestInjection.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestInjection.java 2011-09-12 22:11:11 UTC (rev 34652)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestInjection.java 2011-09-12 22:26:27 UTC (rev 34653)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.jbt.test.core;
+package org.jboss.jsr299.tck.tests.jbt.core;
import javax.inject.Inject;
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestQualifier.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestQualifier.java 2011-09-12 22:11:11 UTC (rev 34652)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestQualifier.java 2011-09-12 22:26:27 UTC (rev 34653)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.jbt.test.core;
+package org.jboss.jsr299.tck.tests.jbt.core;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestQualifier1.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestQualifier1.java 2011-09-12 22:11:11 UTC (rev 34652)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestQualifier1.java 2011-09-12 22:26:27 UTC (rev 34653)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.jbt.test.core;
+package org.jboss.jsr299.tck.tests.jbt.core;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestQualifier2.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestQualifier2.java 2011-09-12 22:11:11 UTC (rev 34652)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestQualifier2.java 2011-09-12 22:26:27 UTC (rev 34653)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.jbt.test.core;
+package org.jboss.jsr299.tck.tests.jbt.core;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestQualifier3.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestQualifier3.java 2011-09-12 22:11:11 UTC (rev 34652)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestQualifier3.java 2011-09-12 22:26:27 UTC (rev 34653)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.jbt.test.core;
+package org.jboss.jsr299.tck.tests.jbt.core;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestStereotype.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestStereotype.java 2011-09-12 22:11:11 UTC (rev 34652)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestStereotype.java 2011-09-12 22:26:27 UTC (rev 34653)
@@ -1,4 +1,4 @@
-package org.jboss.jsr299.tck.tests.jbt.test.core;
+package org.jboss.jsr299.tck.tests.jbt.core;
import java.lang.annotation.Documented;
import java.lang.annotation.Retention;
14 years, 7 months
JBoss Tools SVN: r34652 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test: src/org/jboss/tools/cdi/core/test/tck and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-09-12 18:11:11 -0400 (Mon, 12 Sep 2011)
New Revision: 34652
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestInjection.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java
Log:
https://issues.jboss.org/browse/JBIDE-9685 Seam JMS: CDI validator should be aware of JMS resource injections
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestInjection.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestInjection.java 2011-09-12 21:39:13 UTC (rev 34651)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/core/TestInjection.java 2011-09-12 22:11:11 UTC (rev 34652)
@@ -11,7 +11,7 @@
@Inject @TestQualifier3 @TestQualifier2 Test i5; // has @TestQualifier, @TestQualifier1, @TestQualifier2 and @TestQualifier3
@Inject @TestQualifier2 @TestQualifier3 Test i6; // has @TestQualifier, @TestQualifier1, @TestQualifier2 and @TestQualifier3
- @Inject @TestQualifier Test i7;
+ @Inject @TestQualifier Test i7; // has @TestQualifier
@Inject @TestStereotype Test i8; // has @TestQualifier, @TestQualifier1, @TestQualifier2 and @TestQualifier3
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java 2011-09-12 21:39:13 UTC (rev 34651)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java 2011-09-12 22:11:11 UTC (rev 34652)
@@ -29,19 +29,20 @@
IClassBean bean = getClassBean("JavaSource/org/jboss/jsr299/tck/tests/jbt/core/TestInjection.java");
assertNotNull("Can't find the bean.", bean);
Set<IInjectionPoint> injections = bean.getInjectionPoints();
+ assertEquals(9, injections.size());
for (IInjectionPoint injectionPoint : injections) {
IAnnotationDeclaration declaration = CDIUtil.getAnnotationDeclaration(injectionPoint, "org.jboss.jsr299.tck.tests.jbt.test.core.TestQualifier");
String elementName = injectionPoint.getSourceMember().getElementName();
if(elementName.equals("i4")) {
- assertNull(declaration);
+ assertNull("Have found @TestQualifier for " + elementName, declaration);
} else {
- assertNotNull(declaration);
+ assertNotNull("Have not found @TestQualifier for " + elementName, declaration);
}
declaration = CDIUtil.getAnnotationDeclaration(injectionPoint, "org.jboss.jsr299.tck.tests.jbt.test.core.TestQualifier3");
- if(elementName.equals("i1") || elementName.equals("i2") || elementName.equals("i3")) {
- assertNull(declaration);
+ if(elementName.equals("i1") || elementName.equals("i2") || elementName.equals("i3") || elementName.equals("i7")) {
+ assertNull("Have found @TestQualifier3 for " + elementName, declaration);
} else {
- assertNotNull(declaration);
+ assertNotNull("Have not found @TestQualifier3 for " + elementName, declaration);
}
}
}
14 years, 7 months
JBoss Tools SVN: r34651 - in trunk/cdi: plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: scabanovich
Date: 2011-09-12 17:39:13 -0400 (Mon, 12 Sep 2011)
New Revision: 34651
Removed:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPointMethod.java
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/internal/core/impl/ClassBean.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlinkDetector.java
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/EventHyperlink.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIBeanQueryParticipant.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIElementWrapper.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointLabelProvider.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ObserverMethodResolutionTest.java
Log:
JBIDE-9698
https://issues.jboss.org/browse/JBIDE-9698
IInjectionPointMethod interface removed.
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-12 21:32:35 UTC (rev 34650)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2011-09-12 21:39:13 UTC (rev 34651)
@@ -220,9 +220,6 @@
if (element instanceof IField && iPoint instanceof IInjectionPointField) {
if (((IInjectionPointField) iPoint).getField() != null && ((IInjectionPointField) iPoint).getField().getElementName().equals(element.getElementName()))
return iPoint;
- } else if (element instanceof IMethod && iPoint instanceof IInjectionPointMethod && position == 0) {
- if (((IInjectionPointMethod) iPoint).getMethod() != null && ((IInjectionPointMethod) iPoint).getMethod().equals(element))
- return iPoint;
}else if(element instanceof ILocalVariable && iPoint instanceof IInjectionPointParameter){
if (((IInjectionPointParameter) iPoint).getName().equals(element.getElementName()))
return iPoint;
Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPointMethod.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPointMethod.java 2011-09-12 21:32:35 UTC (rev 34650)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPointMethod.java 2011-09-12 21:39:13 UTC (rev 34651)
@@ -1,20 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Red Hat, Inc.
- * Distributed under license by Red Hat, Inc. All rights reserved.
- * This program is made available under the terms of the
- * Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * Red Hat, Inc. - initial API and implementation
- ******************************************************************************/
-package org.jboss.tools.cdi.core;
-
-/**
- * Represents an injection point which is a method of a bean class.
- *
- * @author Alexey Kazakov
- */
-public interface IInjectionPointMethod extends IInjectionPoint, IBeanMethod {
-
-}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2011-09-12 21:32:35 UTC (rev 34650)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2011-09-12 21:39:13 UTC (rev 34651)
@@ -313,9 +313,6 @@
}
}
for (BeanMethod m: methods) {
-// if(m instanceof IInjectionPoint) {
-// result.add((IInjectionPoint)m);
-// }
List<IParameter> ps = m.getParameters();
for (IParameter p: ps) {
if(p instanceof IInjectionPoint) {
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-09-12 21:32:35 UTC (rev 34650)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-09-12 21:39:13 UTC (rev 34651)
@@ -63,7 +63,6 @@
import org.jboss.tools.cdi.core.IInitializerMethod;
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IInjectionPointField;
-import org.jboss.tools.cdi.core.IInjectionPointMethod;
import org.jboss.tools.cdi.core.IInjectionPointParameter;
import org.jboss.tools.cdi.core.IInterceptor;
import org.jboss.tools.cdi.core.IInterceptorBinded;
@@ -1463,11 +1462,7 @@
private void validateInitializers(IClassBean bean) {
Set<IInitializerMethod> initializers = bean.getInitializers();
for (IInitializerMethod initializer: initializers) {
- try {
- validateInitializerMethod(initializer);
- } catch (Exception e) {
- e.printStackTrace();
- }
+ validateInitializerMethod(initializer);
}
}
@@ -1522,11 +1517,11 @@
* 5.2.2. Legal injection point types
* - injection point type is a type variable
*/
- if(!(injection instanceof IInjectionPointMethod) && CDIUtil.isTypeVariable(injection, false)) {
+ if(CDIUtil.isTypeVariable(injection, false)) {
addError(CDIValidationMessages.INJECTION_TYPE_IS_VARIABLE, CDIPreferences.INJECTION_TYPE_IS_VARIABLE, declaration, injection.getResource());
}
- if(declaration!=null && !(injection instanceof IInjectionPointMethod)) {
+ if(declaration!=null) {
Set<IBean> beans = cdiProject.getBeans(true, injection);
ITextSourceReference reference = injection instanceof IInjectionPointParameter?injection:declaration;
/*
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlinkDetector.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlinkDetector.java 2011-09-12 21:32:35 UTC (rev 34650)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlinkDetector.java 2011-09-12 21:39:13 UTC (rev 34651)
@@ -42,7 +42,6 @@
import org.jboss.tools.cdi.core.IClassBean;
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IInjectionPointField;
-import org.jboss.tools.cdi.core.IInjectionPointMethod;
import org.jboss.tools.cdi.core.IInjectionPointParameter;
import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderConstants;
import org.jboss.tools.cdi.seam.solder.core.generic.GenericClassBean;
@@ -182,9 +181,6 @@
if (element instanceof IField && iPoint instanceof IInjectionPointField) {
if (((IInjectionPointField) iPoint).getField() != null && ((IInjectionPointField) iPoint).getField().getElementName().equals(element.getElementName()))
results.add(iPoint);
- } else if (element instanceof IMethod && iPoint instanceof IInjectionPointMethod && position == 0) {
- if (((IInjectionPointMethod) iPoint).getMethod() != null && ((IInjectionPointMethod) iPoint).getMethod().equals(element))
- results.add(iPoint);
}else if(element instanceof ILocalVariable && iPoint instanceof IInjectionPointParameter){
if (((IInjectionPointParameter) iPoint).getName().equals(element.getElementName()))
results.add(iPoint);
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-12 21:32:35 UTC (rev 34650)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventAndObserverMethodHyperlinkDetector.java 2011-09-12 21:39:13 UTC (rev 34651)
@@ -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());
}
- }
+// }
}
}
}
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-12 21:32:35 UTC (rev 34650)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlink.java 2011-09-12 21:39:13 UTC (rev 34651)
@@ -22,7 +22,7 @@
import org.jboss.tools.cdi.core.ICDIElement;
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IInjectionPointField;
-import org.jboss.tools.cdi.core.IInjectionPointMethod;
+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;
@@ -59,8 +59,8 @@
IJavaElement element = event.getClassBean().getBeanClass();
if(event instanceof IInjectionPointField)
element = ((IInjectionPointField)event).getField();
- else if(event instanceof IInjectionPointMethod)
- element = ((IInjectionPointMethod)event).getMethod();
+ else if(event instanceof IInjectionPointParameter)
+ element = ((IInjectionPointParameter)event).getBeanMethod().getMethod();
if (part != null) {
JavaUI.revealInEditor(part, element);
@@ -74,10 +74,12 @@
public String getHyperlinkText() {
String text = CDIExtensionsMessages.CDI_EVENT_HYPERLINK_OPEN_EVENT+" "+event.getClassBean().getBeanClass().getElementName();
- if(event instanceof IInjectionPointField)
+ if(event instanceof IInjectionPointField) {
text += "."+((IInjectionPointField)event).getField().getElementName();
- else if(event instanceof IInjectionPointMethod)
- text += "."+((IInjectionPointMethod)event).getMethod().getElementName();
+ } else if(event instanceof IInjectionPointParameter) {
+ IInjectionPointParameter p = (IInjectionPointParameter)event;
+ text += "." + p.getBeanMethod().getMethod().getElementName();
+ }
return text;
}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java 2011-09-12 21:32:35 UTC (rev 34650)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java 2011-09-12 21:39:13 UTC (rev 34651)
@@ -46,7 +46,6 @@
import org.jboss.tools.cdi.core.IBeanMethod;
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IInjectionPointField;
-import org.jboss.tools.cdi.core.IInjectionPointMethod;
import org.jboss.tools.cdi.core.IInjectionPointParameter;
import org.jboss.tools.cdi.core.IQualifier;
import org.jboss.tools.cdi.core.IQualifierDeclaration;
@@ -575,12 +574,12 @@
IField f = t.getField(field.getElementName());
return f;
- }else if(injectionPoint instanceof IInjectionPointMethod){
- IMethod method = ((IInjectionPointMethod)injectionPoint).getMethod();
+ }else if(injectionPoint instanceof IInjectionPointParameter){
+ IMethod method = ((IInjectionPointParameter)injectionPoint).getBeanMethod().getMethod();
IType type = method.getDeclaringType();
IType t = compilationUnit.getType(type.getElementName());
IMethod m = t.getMethod(method.getElementName(), method.getParameterTypes());
-
+ // Why method? Why not Java element for parameter?
return m;
}
return null;
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIBeanQueryParticipant.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIBeanQueryParticipant.java 2011-09-12 21:32:35 UTC (rev 34650)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIBeanQueryParticipant.java 2011-09-12 21:39:13 UTC (rev 34651)
@@ -35,9 +35,9 @@
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.ICDIElement;
import org.jboss.tools.cdi.core.ICDIProject;
+import org.jboss.tools.cdi.core.IInitializerMethod;
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IInjectionPointField;
-import org.jboss.tools.cdi.core.IInjectionPointMethod;
import org.jboss.tools.cdi.core.IInjectionPointParameter;
import org.jboss.tools.cdi.ui.CDIUIMessages;
import org.jboss.tools.cdi.ui.CDIUIPlugin;
@@ -171,7 +171,8 @@
if(cdiElement instanceof IInjectionPointField){
return NLS.bind(CDIUIMessages.CDI_BEAN_QUERY_PARTICIPANT_INJECT_FIELD, label);
- }else if(cdiElement instanceof IInjectionPointMethod){
+ }else if(cdiElement instanceof IInitializerMethod){
+ //It is not an injection point, but it has annotation @Inject and contains injection point parameters
return NLS.bind(CDIUIMessages.CDI_BEAN_QUERY_PARTICIPANT_INJECT_METHOD, label);
}else if(cdiElement instanceof IInjectionPointParameter){
return NLS.bind(CDIUIMessages.CDI_BEAN_QUERY_PARTICIPANT_INJECT_PARAMETER, label);
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIElementWrapper.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIElementWrapper.java 2011-09-12 21:32:35 UTC (rev 34650)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIElementWrapper.java 2011-09-12 21:39:13 UTC (rev 34651)
@@ -17,11 +17,10 @@
import org.jboss.tools.cdi.core.CDIUtil;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.ICDIElement;
+import org.jboss.tools.cdi.core.IInitializerMethod;
import org.jboss.tools.cdi.core.IInjectionPointField;
-import org.jboss.tools.cdi.core.IInjectionPointMethod;
import org.jboss.tools.cdi.core.IInjectionPointParameter;
import org.jboss.tools.cdi.core.IObserverMethod;
-import org.jboss.tools.cdi.ui.marker.MarkerResolutionUtils;
public class CDIElementWrapper {
private static String SPACE = " ";
@@ -45,9 +44,9 @@
}else if(element instanceof IInjectionPointField){
javaElement = ((IInjectionPointField)element).getField();
label = ((IInjectionPointField)element).getField().getDeclaringType().getElementName()+DOT+((IInjectionPointField)element).getField().getElementName();
- }else if(element instanceof IInjectionPointMethod){
- javaElement = ((IInjectionPointMethod)element).getMethod();
- label = ((IInjectionPointMethod)element).getMethod().getDeclaringType().getElementName()+DOT+((IInjectionPointMethod)element).getMethod().getElementName()+BRACKETS;
+ }else if(element instanceof IInitializerMethod){
+ javaElement = ((IInitializerMethod)element).getMethod();
+ label = ((IInitializerMethod)element).getMethod().getDeclaringType().getElementName()+DOT+((IInitializerMethod)element).getMethod().getElementName()+BRACKETS;
}else if(element instanceof IInjectionPointParameter){
IMethod method = ((IInjectionPointParameter)element).getBeanMethod().getMethod();
javaElement = CDIUtil.getParameter(method, ((IInjectionPointParameter)element).getName());
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointLabelProvider.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointLabelProvider.java 2011-09-12 21:32:35 UTC (rev 34650)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointLabelProvider.java 2011-09-12 21:39:13 UTC (rev 34651)
@@ -16,8 +16,8 @@
import org.eclipse.swt.graphics.Image;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.ICDIElement;
+import org.jboss.tools.cdi.core.IInitializerMethod;
import org.jboss.tools.cdi.core.IInjectionPointField;
-import org.jboss.tools.cdi.core.IInjectionPointMethod;
import org.jboss.tools.cdi.core.IInjectionPointParameter;
import org.jboss.tools.cdi.core.IObserverMethod;
import org.jboss.tools.cdi.ui.CDIUIMessages;
@@ -39,7 +39,7 @@
return NLS.bind(CDIUIMessages.INJECTION_POINT_LABEL_PROVIDER_OBSERVER_METHOD, label);
}else if(cdiElement instanceof IInjectionPointField){
return NLS.bind(CDIUIMessages.INJECTION_POINT_LABEL_PROVIDER_EVENT, label);
- }else if(cdiElement instanceof IInjectionPointMethod){
+ }else if(cdiElement instanceof IInitializerMethod){
return NLS.bind(CDIUIMessages.INJECTION_POINT_LABEL_PROVIDER_EVENT, label);
}else if(cdiElement instanceof IInjectionPointParameter){
return NLS.bind(CDIUIMessages.INJECTION_POINT_LABEL_PROVIDER_EVENT, label);
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java 2011-09-12 21:32:35 UTC (rev 34650)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java 2011-09-12 21:39:13 UTC (rev 34651)
@@ -15,7 +15,6 @@
import org.jboss.tools.cdi.core.CDIUtil;
import org.jboss.tools.cdi.core.IClassBean;
import org.jboss.tools.cdi.core.IInjectionPoint;
-import org.jboss.tools.cdi.core.IInjectionPointMethod;
import org.jboss.tools.common.java.IAnnotationDeclaration;
/**
Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ObserverMethodResolutionTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ObserverMethodResolutionTest.java 2011-09-12 21:32:35 UTC (rev 34650)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ObserverMethodResolutionTest.java 2011-09-12 21:39:13 UTC (rev 34651)
@@ -19,7 +19,6 @@
import org.jboss.tools.cdi.core.IInitializerMethod;
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IInjectionPointField;
-import org.jboss.tools.cdi.core.IInjectionPointMethod;
import org.jboss.tools.cdi.core.IInjectionPointParameter;
import org.jboss.tools.cdi.core.IObserverMethod;
import org.jboss.tools.cdi.core.IParameter;
14 years, 7 months
JBoss Tools SVN: r34650 - workspace/snjeza/discovery.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2011-09-12 17:32:35 -0400 (Mon, 12 Sep 2011)
New Revision: 34650
Modified:
workspace/snjeza/discovery/org.jboss.tools.central.discovery_3.3.0.jar
Log:
Modified: workspace/snjeza/discovery/org.jboss.tools.central.discovery_3.3.0.jar
===================================================================
(Binary files differ)
14 years, 7 months
JBoss Tools SVN: r34648 - in trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test: tck and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2011-09-12 16:56:51 -0400 (Mon, 12 Sep 2011)
New Revision: 34648
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/tck/CDIUtilTest.java
Log:
https://issues.jboss.org/browse/JBIDE-9685 Seam JMS: CDI validator should be aware of JMS resource injections
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-12 20:39:14 UTC (rev 34647)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-09-12 20:56:51 UTC (rev 34648)
@@ -25,6 +25,7 @@
import org.jboss.tools.cdi.core.test.tck.BeanDefinitionTest;
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.DecoratorDefinitionTest;
import org.jboss.tools.cdi.core.test.tck.DefaultNamedTest;
import org.jboss.tools.cdi.core.test.tck.EnterpriseQualifierDefinitionTest;
@@ -106,6 +107,7 @@
suite.addTestSuite(AmbiguousDependencyTest.class);
suite.addTestSuite(UnsatisfiedDependencyTest.class);
suite.addTestSuite(ResolvedTypesCacheTest.class);
+ suite.addTestSuite(CDIUtilTest.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/CDIUtilTest.java
===================================================================
--- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java 2011-09-12 20:39:14 UTC (rev 34647)
+++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java 2011-09-12 20:56:51 UTC (rev 34648)
@@ -31,9 +31,6 @@
assertNotNull("Can't find the bean.", bean);
Set<IInjectionPoint> injections = bean.getInjectionPoints();
for (IInjectionPoint injectionPoint : injections) {
- if(injectionPoint instanceof IInjectionPointMethod) { // TODO Remove this check when https://issues.jboss.org/browse/JBIDE-9698 (Replace interface IInjectionPointMethod by IInitializerMethod) is fixed
- continue;
- }
IAnnotationDeclaration declaration = CDIUtil.getAnnotationDeclaration(injectionPoint, "org.jboss.jsr299.tck.tests.jbt.test.core.TestQualifier");
String elementName = injectionPoint.getSourceMember().getElementName();
if(elementName.equals("i4")) {
14 years, 7 months