From 148e65bdb1e4c79e3cad2de946be3b404699402c Mon Sep 17 00:00:00 2001
From: slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 16 Oct 2009 09:06:56 +0000
Subject: 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
---
 .../java/xml/JavaInterfaceProcessor.java           | 28 +++++++++++-----------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'java')

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());
                     }
                 }
             }
-- 
cgit v1.2.3