diff options
author | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2009-10-16 09:06:56 +0000 |
---|---|---|
committer | slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68> | 2009-10-16 09:06:56 +0000 |
commit | 148e65bdb1e4c79e3cad2de946be3b404699402c (patch) | |
tree | 7d2d5aeb4219049aeabde2f4a2f82a03a95ffc02 /java | |
parent | 2082c54eed45553088ab8a90eeee982df14f443c (diff) |
Another straggler after the uber monitor commit at r825773
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@825819 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'java')
-rw-r--r-- | java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java b/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java index e1f1c3ec2b..519ce7b36f 100644 --- a/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java +++ b/java/sca/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java @@ -225,7 +225,7 @@ public class JavaInterfaceProcessor implements StAXArtifactProcessor<JavaInterfa 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 @@ public class JavaInterfaceProcessor implements StAXArtifactProcessor<JavaInterfa 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 @@ public class JavaInterfaceProcessor implements StAXArtifactProcessor<JavaInterfa 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 @@ public class JavaInterfaceProcessor implements StAXArtifactProcessor<JavaInterfa 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 @@ public class JavaInterfaceProcessor implements StAXArtifactProcessor<JavaInterfa 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 @@ public class JavaInterfaceProcessor implements StAXArtifactProcessor<JavaInterfa 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 @@ public class JavaInterfaceProcessor implements StAXArtifactProcessor<JavaInterfa 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 @@ public class JavaInterfaceProcessor implements StAXArtifactProcessor<JavaInterfa 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()); } } } |