[jbosstools-commits] JBoss Tools SVN: r43052 - trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core.

[jbosstools-commits at lists.jboss.org]

Author: scabanovich
Date: 2012-08-15 20:10:09 -0400 (Wed, 15 Aug 2012)
New Revision: 43052

Modified:
   trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/DeltaspikeConfigPropertyExtension.java
   trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/DeltaspikeExceptionExtension.java
Log:
JBIDE-12417
https://issues.jboss.org/browse/JBIDE-12417
Replaced Set by Collection in interfaces.

Modified: trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/DeltaspikeConfigPropertyExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/DeltaspikeConfigPropertyExtension.java	2012-08-16 00:09:09 UTC (rev 43051)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/DeltaspikeConfigPropertyExtension.java	2012-08-16 00:10:09 UTC (rev 43052)
@@ -33,10 +33,9 @@
 		if(injection.isAnnotationPresent(CONFIG_PROPERTY_ANNOTATION_TYPE_NAME)) {
 			return true;
 		}
-		Set<IQualifierDeclaration> qs = injection.getQualifierDeclarations();
-		for (IQualifierDeclaration d: qs) {
+		for (IQualifierDeclaration d: injection.getQualifierDeclarations()) {
 			IQualifier q = d.getQualifier();
-			if(q.isAnnotationPresent(CONFIG_PROPERTY_ANNOTATION_TYPE_NAME)) {
+			if(q != null && q.isAnnotationPresent(CONFIG_PROPERTY_ANNOTATION_TYPE_NAME)) {
 				return true;
 			}
 		}

Modified: trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/DeltaspikeExceptionExtension.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/DeltaspikeExceptionExtension.java	2012-08-16 00:09:09 UTC (rev 43051)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.deltaspike.core/src/org/jboss/tools/cdi/deltaspike/core/DeltaspikeExceptionExtension.java	2012-08-16 00:10:09 UTC (rev 43052)
@@ -68,13 +68,11 @@
 	@Override
 	public void validateResource(IFile file, CDICoreValidator validator) {
 		ICDIProject cdi = CDICorePlugin.getCDIProject(file.getProject(), true);
-		Set<IBean> beans = cdi.getBeans(file.getFullPath());
-		for (IBean b: beans) {
+		for (IBean b: cdi.getBeans(file.getFullPath())) {
 			if(b instanceof IClassBean) {
 				IClassBean cb = (IClassBean)b;
 				boolean isExceptionHandler = cb.isAnnotationPresent(EXCEPTION_HANDLER_ANNOTATION_TYPE_NAME);
-				Set<IBeanMethod> ms = cb.getAllMethods();
-				for (IBeanMethod m: ms) {
+				for (IBeanMethod m: cb.getAllMethods()) {
 					for (IParameter p: m.getParameters()) {
 						if(isHandler(p)) {
 							if(!isExceptionHandler) {