You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by sl...@apache.org on 2009/10/16 11:06:57 UTC
svn commit: r825819 -
/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
Author: slaws
Date: Fri Oct 16 09:06:56 2009
New Revision: 825819
URL: http://svn.apache.org/viewvc?rev=825819&view=rev
Log:
Another straggler after the uber monitor commit at r825773
Modified:
tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
Modified: tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
URL: http://svn.apache.org/viewvc/tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java?rev=825819&r1=825818&r2=825819&view=diff
==============================================================================
--- tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java (original)
+++ tuscany/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java Fri Oct 16 09:06:56 2009
@@ -225,7 +225,7 @@
resolveJavaInterface((JavaInterface)javaInterfaceContract.getCallbackInterface(), resolver, context);
javaInterfaceContract.setCallbackInterface(javaCallbackInterface);
- checkForbiddenAnnotations(javaInterfaceContract);
+ checkForbiddenAnnotations(monitor, javaInterfaceContract);
} catch (Exception e) {
throw new ContributionResolveException("Resolving Java Interface " + javaInterfaceContract.getInterface()
@@ -243,7 +243,7 @@
Property.class, Qualifier.class, Reference.class, Scope.class, Service.class});
private static List<Class<?>> JCA30008_ANNOTATIONS = Arrays.asList(new Class<?>[] {Intent.class, Qualifier.class});
- private void checkForbiddenAnnotations(JavaInterfaceContract javaInterfaceContract) {
+ private void checkForbiddenAnnotations(Monitor monitor, JavaInterfaceContract javaInterfaceContract) {
if (javaInterfaceContract.getInterface() == null) {
return;
}
@@ -254,11 +254,11 @@
for (Annotation a : ifc.getAnnotations()) {
if (ifc.isInterface()) {
if (JCA30006_ANNOTATIONS.contains(a.annotationType())) {
- error("ForbiddenAnnotationJCA30006", javaInterfaceContract, a.annotationType(), ifc.getName());
+ error(monitor, "ForbiddenAnnotationJCA30006", javaInterfaceContract, a.annotationType(), ifc.getName());
}
} else {
if (JCA30008_ANNOTATIONS.contains(a.annotationType())) {
- error("ForbiddenAnnotationJCA30008", javaInterfaceContract, a.annotationType(), ifc.getName());
+ error(monitor, "ForbiddenAnnotationJCA30008", javaInterfaceContract, a.annotationType(), ifc.getName());
}
}
}
@@ -266,11 +266,11 @@
for (Annotation a : m.getAnnotations()) {
if (ifc.isInterface()) {
if (JCA30006_ANNOTATIONS.contains(a.annotationType())) {
- error("ForbiddenAnnotationJCA30006", javaInterfaceContract, a.annotationType(), ifc.getName());
+ error(monitor, "ForbiddenAnnotationJCA30006", javaInterfaceContract, a.annotationType(), ifc.getName());
}
} else {
if (JCA30008_ANNOTATIONS.contains(a.annotationType())) {
- error("ForbiddenAnnotationJCA30008", javaInterfaceContract, a.annotationType(), ifc.getName());
+ error(monitor, "ForbiddenAnnotationJCA30008", javaInterfaceContract, a.annotationType(), ifc.getName());
}
}
}
@@ -279,11 +279,11 @@
for (Annotation a : f.getAnnotations()) {
if (ifc.isInterface()) {
if (JCA30006_ANNOTATIONS.contains(a.annotationType())) {
- error("ForbiddenAnnotationJCA30006", javaInterfaceContract, a.annotationType(), ifc.getName());
+ error(monitor, "ForbiddenAnnotationJCA30006", javaInterfaceContract, a.annotationType(), ifc.getName());
}
} else {
if (JCA30008_ANNOTATIONS.contains(a.annotationType())) {
- error("ForbiddenAnnotationJCA30008", javaInterfaceContract, a.annotationType(), ifc.getName());
+ error(monitor, "ForbiddenAnnotationJCA30008", javaInterfaceContract, a.annotationType(), ifc.getName());
}
}
}
@@ -300,11 +300,11 @@
for (Annotation a : ifc.getAnnotations()) {
if (ifc.isInterface()) {
if (JCA30007_ANNOTATIONS.contains(a.annotationType())) {
- error("ForbiddenAnnotationJCA30007", javaInterfaceContract, a.annotationType(), ifc.getName());
+ error(monitor, "ForbiddenAnnotationJCA30007", javaInterfaceContract, a.annotationType(), ifc.getName());
}
} else {
if (JCA30008_ANNOTATIONS.contains(a.annotationType())) {
- error("ForbiddenAnnotationJCA30008", javaInterfaceContract, a.annotationType(), ifc.getName());
+ error(monitor, "ForbiddenAnnotationJCA30008", javaInterfaceContract, a.annotationType(), ifc.getName());
}
}
}
@@ -312,11 +312,11 @@
for (Annotation a : m.getAnnotations()) {
if (ifc.isInterface()) {
if (JCA30007_ANNOTATIONS.contains(a.annotationType())) {
- error("ForbiddenAnnotationJCA30007", javaInterfaceContract, a.annotationType(), ifc.getName());
+ error(monitor, "ForbiddenAnnotationJCA30007", javaInterfaceContract, a.annotationType(), ifc.getName());
}
} else {
if (JCA30008_ANNOTATIONS.contains(a.annotationType())) {
- error("ForbiddenAnnotationJCA30008", javaInterfaceContract, a.annotationType(), ifc.getName());
+ error(monitor, "ForbiddenAnnotationJCA30008", javaInterfaceContract, a.annotationType(), ifc.getName());
}
}
}
@@ -325,11 +325,11 @@
for (Annotation a : f.getAnnotations()) {
if (ifc.isInterface()) {
if (JCA30007_ANNOTATIONS.contains(a.annotationType())) {
- error("ForbiddenAnnotationJCA30007", javaInterfaceContract, a.annotationType(), ifc.getName());
+ error(monitor, "ForbiddenAnnotationJCA30007", javaInterfaceContract, a.annotationType(), ifc.getName());
}
} else {
if (JCA30008_ANNOTATIONS.contains(a.annotationType())) {
- error("ForbiddenAnnotationJCA30008", javaInterfaceContract, a.annotationType(), ifc.getName());
+ error(monitor, "ForbiddenAnnotationJCA30008", javaInterfaceContract, a.annotationType(), ifc.getName());
}
}
}