From 17e573358db8a4a83247037b957db32127bdd00a Mon Sep 17 00:00:00 2001
From: slaws <slaws@13f79535-47bb-0310-9956-ffa450edef68>
Date: Wed, 29 Feb 2012 15:06:57 +0000
Subject: TUSCANY-4020 - move hardcoded message strings into properties files

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1295144 13f79535-47bb-0310-9956-ffa450edef68
---
 .../java/xml/JavaInterfaceProcessor.java            | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

(limited to 'sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache')

diff --git a/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java b/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
index b321b0d5de..ed5fe421e2 100644
--- a/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
+++ b/sca-java-2.x/trunk/modules/interface-java/src/main/java/org/apache/tuscany/sca/interfacedef/java/xml/JavaInterfaceProcessor.java
@@ -33,6 +33,7 @@ import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
 import javax.xml.ws.WebServiceClient;
 
+import org.apache.tuscany.sca.assembly.xml.Messages;
 import org.apache.tuscany.sca.assembly.xml.PolicySubjectProcessor;
 import org.apache.tuscany.sca.contribution.processor.ContributionReadException;
 import org.apache.tuscany.sca.contribution.processor.ContributionResolveException;
@@ -233,13 +234,18 @@ public class JavaInterfaceProcessor implements StAXArtifactProcessor<JavaInterfa
                     javaInterface.setContributionContainingClass(classReference.getContributionContainingClass());
                 
                 } catch (InvalidInterfaceException e) {
-                	ContributionResolveException ce = new ContributionResolveException("Resolving Java interface " + javaInterface.getName(), e);
-                	//error("ContributionResolveException", javaFactory, ce);
+                	ContributionResolveException ce = new ContributionResolveException(context.getMonitor().getMessageString(JavaInterfaceProcessor.class.getName(),
+                	                                                                                                         "interface-javaxml-validation-messages", 
+                                                                                                                             "ResolvingInterface") + 
+                                                                                       javaInterface.getName(), e);
                 	error(monitor, "InvalidInterfaceException", javaFactory, e);
                     return javaInterface;
-                	//throw ce;
                 } catch ( Exception e ) {
-                	throw new ContributionResolveException( "Resolving Java interface " + javaInterface.getName(), e );
+                	throw new ContributionResolveException(context.getMonitor().getMessageString(JavaInterfaceProcessor.class.getName(),
+                	                                                                             "interface-javaxml-validation-messages", 
+                                                                                                 "ResolvingInterface") +
+                                                           " " +
+                                                           javaInterface.getName(), e );
                 } // end try
 
                 // Cache the resolved interface
@@ -268,8 +274,11 @@ public class JavaInterfaceProcessor implements StAXArtifactProcessor<JavaInterfa
 	        checkForbiddenAnnotations(monitor, javaInterfaceContract);
 	        
         } catch (Exception e) {
-            throw new ContributionResolveException("Resolving Java Interface " + javaInterfaceContract.getInterface()
-                .toString(), e);
+            throw new ContributionResolveException(context.getMonitor().getMessageString(JavaInterfaceProcessor.class.getName(),
+                                                                                         "interface-javaxml-validation-messages",
+                                                                                         "ResolvingInterface") + 
+                                                   " " +
+                                                   javaInterfaceContract.getInterface().toString(), e);
         } // end try
     }
     
-- 
cgit v1.2.3