tuscany-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jsdelf...@apache.org
Subject svn commit: r567542 [7/7] - in /incubator/tuscany/java/sca/modules: assembly-xml/src/main/java/org/apache/tuscany/sca/assembly/xml/ assembly-xml/src/test/java/org/apache/tuscany/sca/assembly/xml/ assembly/src/main/java/org/apache/tuscany/sca/assembly/i...
Date Mon, 20 Aug 2007 05:13:50 GMT
Modified: incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java (original)
+++ incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/Operation.java Sun Aug 19 22:13:29 2007
@@ -21,8 +21,6 @@
 import java.util.List;
 
 import org.apache.tuscany.sca.interfacedef.util.WrapperInfo;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.PolicySet;
 
 /**
  * Represents an operation on a service interface.

Modified: incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java (original)
+++ incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/DataTypeImpl.java Sun Aug 19 22:13:29 2007
@@ -98,6 +98,7 @@
         this.dataBinding = dataBinding;
     }
 
+    @Override
     public String toString() {
         StringBuffer sb = new StringBuffer();
         sb.append(physical).append(" ").append(dataBinding).append(" ").append(logical);

Modified: incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java (original)
+++ incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/InterfaceContractImpl.java Sun Aug 19 22:13:29 2007
@@ -56,7 +56,7 @@
 
         // contract is bidrectional, so create a new unidirectional contract        
         try {
-            InterfaceContract newContract = (InterfaceContract)clone();
+            InterfaceContract newContract = clone();
             if (!isCallback) {
                 newContract.setCallbackInterface(null); // create unidirectional forward interface contract
             } else {

Modified: incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java (original)
+++ incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/impl/OperationImpl.java Sun Aug 19 22:13:29 2007
@@ -26,8 +26,6 @@
 import org.apache.tuscany.sca.interfacedef.Interface;
 import org.apache.tuscany.sca.interfacedef.Operation;
 import org.apache.tuscany.sca.interfacedef.util.WrapperInfo;
-import org.apache.tuscany.sca.policy.Intent;
-import org.apache.tuscany.sca.policy.PolicySet;
 
 /**
  * Represents an operation on a service interface.

Modified: incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java (original)
+++ incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/ElementInfo.java Sun Aug 19 22:13:29 2007
@@ -52,6 +52,7 @@
         return type;
     }
 
+    @Override
     public String toString() {
         StringBuffer sb = new StringBuffer();
         sb.append("Element: ").append(name).append(" ").append(type);

Modified: incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java (original)
+++ incubator/tuscany/java/sca/modules/interface/src/main/java/org/apache/tuscany/sca/interfacedef/util/TypeInfo.java Sun Aug 19 22:13:29 2007
@@ -63,6 +63,7 @@
         return baseType;
     }
 
+    @Override
     public String toString() {
         StringBuffer sb = new StringBuffer();
         sb.append("Type: ").append(name);

Modified: incubator/tuscany/java/sca/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java (original)
+++ incubator/tuscany/java/sca/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/SchemaBuilder.java Sun Aug 19 22:13:29 2007
@@ -323,9 +323,6 @@
             }
         }
 
-        // the following lines are executed only if a prefix was not found which implies that the
-        // schemaTypeName was not imported earlier and also it does not belong to the targetnamespace
-        String schemaLocation = null;
         XmlSchemaImport importElement = new XmlSchemaImport();
         importElement.setNamespace(schemaTypeName.getNamespaceURI());
         xmlSchema.getItems().add(importElement);
@@ -577,7 +574,7 @@
 
         Class factoryClass = null;
         try {
-            factoryClass = Class.forName((String)factoryBaseName, true, classLoader);
+            factoryClass = Class.forName(factoryBaseName, true, classLoader);
             if (!alreadyPrintedDefaultSDOFactoryFound) {
                 System.out.println("Found default generated SDO Factory with name: " + factoryBaseName + "; Registering.");
                 alreadyPrintedDefaultSDOFactoryFound = true;

Modified: incubator/tuscany/java/sca/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java (original)
+++ incubator/tuscany/java/sca/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLOptionsValidator.java Sun Aug 19 22:13:29 2007
@@ -29,6 +29,7 @@
  * Axis2 is also enhanced to support these additional options.
  */
 public class TuscanyJava2WSDLOptionsValidator extends Java2WSDLOptionsValidator implements TuscanyJava2WSDLConstants {
+    @Override
     public boolean isInvalid(Java2WSDLCommandLineOption option) {
         boolean invalid;
         String optionType = option.getOptionType();

Modified: incubator/tuscany/java/sca/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java (original)
+++ incubator/tuscany/java/sca/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanySchemaGenerator.java Sun Aug 19 22:13:29 2007
@@ -132,7 +132,6 @@
             HashMap uniqueMethods = new HashMap();
             XmlSchemaComplexType methodSchemaType = null;
             XmlSchemaSequence sequence = null;
-            QName methodPartSchemaTypeName = null;
             for (int i = 0; i < methods.length; i++) {
                 String methodName = methods[i].getSimpleName();
                 JMethod jMethod = methods[i];
@@ -174,8 +173,6 @@
                 }
                 // for its return type
                 JClass returnType = jMethod.getReturnType();
-                QName methodReturnSchemaTypeName = null;
-
                 if (!returnType.isVoidType()) {
                     methodSchemaType = createSchemaTypeForMethodPart(jMethod.getSimpleName() + RESPONSE);
                     sequence = new XmlSchemaSequence();

Modified: incubator/tuscany/java/sca/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java (original)
+++ incubator/tuscany/java/sca/modules/java2wsdl/src/main/java/org/apache/tuscany/tools/java2wsdl/generate/WSDLGenEvent.java Sun Aug 19 22:13:29 2007
@@ -21,7 +21,11 @@
 import java.util.EventObject;
 
 public class WSDLGenEvent extends EventObject {
-	private int generationPhase = WSDLGenListener.UNKNOWN;
+	/**
+     * 
+     */
+    private static final long serialVersionUID = -356100754190514245L;
+    private int generationPhase = WSDLGenListener.UNKNOWN;
 
 	public WSDLGenEvent(Object source, int genPhase) {
 		super(source);

Modified: incubator/tuscany/java/sca/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/java2wsdl/src/test/java/org/apache/tuscany/tools/java2wsdl/generate/TuscanyJava2WSDLTestCase.java Sun Aug 19 22:13:29 2007
@@ -32,7 +32,8 @@
 	 * 
 	 * @exception Exception
 	 */
-	protected void setUp() throws Exception {
+	@Override
+    protected void setUp() throws Exception {
 		// System.out.println("inside setup");
 		super.setUp();
 	}
@@ -40,7 +41,8 @@
 	/**
 	 * @exception Exception
 	 */
-	protected void tearDown() throws Exception {
+	@Override
+    protected void tearDown() throws Exception {
 		// System.out.println("inside tearDown");
 		super.tearDown();
 	}

Modified: incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointProcessor.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/IntentAttachPointProcessor.java Sun Aug 19 22:13:29 2007
@@ -19,7 +19,6 @@
 
 package org.apache.tuscany.sca.policy.xml;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.StringTokenizer;
 
@@ -33,9 +32,9 @@
 import org.apache.tuscany.sca.contribution.service.ContributionReadException;
 import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
 import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
 import org.apache.tuscany.sca.policy.Intent;
 import org.apache.tuscany.sca.policy.IntentAttachPointType;
+import org.apache.tuscany.sca.policy.IntentAttachPointTypeFactory;
 import org.apache.tuscany.sca.policy.PolicyFactory;
 import org.apache.tuscany.sca.policy.impl.BindingTypeImpl;
 import org.apache.tuscany.sca.policy.impl.ImplementationTypeImpl;
@@ -169,45 +168,47 @@
         }
     }
 
-    private void resolveAlwaysProvidedIntents(IntentAttachPointType extnType, ModelResolver resolver) throws ContributionResolveException {
-        boolean isUnresolved = false;
-        if (extnType != null && extnType.isUnresolved()) {
-            //resolve alwaysProvided Intents
-            List<Intent> alwaysProvided = new ArrayList<Intent>(); 
-            for ( Intent providedIntent : extnType.getAlwaysProvidedIntents() ) {
-                if ( providedIntent.isUnresolved() ) {
-                    providedIntent = resolver.resolveModel(Intent.class, providedIntent);
-                    alwaysProvided.add(providedIntent);
-                    if (providedIntent.isUnresolved()) {
-                        isUnresolved = true;
-                    }
-                }
-            }
-            extnType.getAlwaysProvidedIntents().clear();
-            extnType.getAlwaysProvidedIntents().addAll(alwaysProvided);
-        }
-        extnType.setUnresolved(isUnresolved);
-    }
-    
-    private void resolveMayProvideIntents(IntentAttachPointType extnType, ModelResolver resolver) throws ContributionResolveException {
-        boolean isUnresolved = false;
-        if (extnType != null && extnType.isUnresolved()) {
-            //resolve may provide Intents
-            List<Intent> mayProvide = new ArrayList<Intent>(); 
-            for ( Intent providedIntent : extnType.getMayProvideIntents() ) {
-                if ( providedIntent.isUnresolved() ) {
-                    providedIntent = resolver.resolveModel(Intent.class, providedIntent);
-                    mayProvide.add(providedIntent);
-                    if (providedIntent.isUnresolved()) {
-                        isUnresolved = true;
-                    }
-                }
-            }
-            extnType.getAlwaysProvidedIntents().clear();
-            extnType.getAlwaysProvidedIntents().addAll(mayProvide);
-        }
-        extnType.setUnresolved(isUnresolved);
-    }
+    //FIXME This method is never used
+//    private void resolveAlwaysProvidedIntents(IntentAttachPointType extnType, ModelResolver resolver) throws ContributionResolveException {
+//        boolean isUnresolved = false;
+//        if (extnType != null && extnType.isUnresolved()) {
+//            //resolve alwaysProvided Intents
+//            List<Intent> alwaysProvided = new ArrayList<Intent>(); 
+//            for ( Intent providedIntent : extnType.getAlwaysProvidedIntents() ) {
+//                if ( providedIntent.isUnresolved() ) {
+//                    providedIntent = resolver.resolveModel(Intent.class, providedIntent);
+//                    alwaysProvided.add(providedIntent);
+//                    if (providedIntent.isUnresolved()) {
+//                        isUnresolved = true;
+//                    }
+//                }
+//            }
+//            extnType.getAlwaysProvidedIntents().clear();
+//            extnType.getAlwaysProvidedIntents().addAll(alwaysProvided);
+//        }
+//        extnType.setUnresolved(isUnresolved);
+//    }
+
+    //FIXME This method is never used
+//    private void resolveMayProvideIntents(IntentAttachPointType extnType, ModelResolver resolver) throws ContributionResolveException {
+//        boolean isUnresolved = false;
+//        if (extnType != null && extnType.isUnresolved()) {
+//            //resolve may provide Intents
+//            List<Intent> mayProvide = new ArrayList<Intent>(); 
+//            for ( Intent providedIntent : extnType.getMayProvideIntents() ) {
+//                if ( providedIntent.isUnresolved() ) {
+//                    providedIntent = resolver.resolveModel(Intent.class, providedIntent);
+//                    mayProvide.add(providedIntent);
+//                    if (providedIntent.isUnresolved()) {
+//                        isUnresolved = true;
+//                    }
+//                }
+//            }
+//            extnType.getAlwaysProvidedIntents().clear();
+//            extnType.getAlwaysProvidedIntents().addAll(mayProvide);
+//        }
+//        extnType.setUnresolved(isUnresolved);
+//    }
     
     protected QName getQNameValue(XMLStreamReader reader, String value) {
         if (value != null) {

Modified: incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicyIntentProcessor.java Sun Aug 19 22:13:29 2007
@@ -22,7 +22,6 @@
 import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
 import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.StringTokenizer;
 
@@ -159,46 +158,48 @@
             throw new ContributionWriteException(e);
         }
     }
-    
-    private Intent resolveRequiredIntents(ProfileIntent policyIntent, ModelResolver resolver) throws ContributionResolveException {
-        boolean isUnresolved = false;
-        //FIXME: Need to check for cyclic references first i.e an A requiring B and then B requiring A... 
-        if (policyIntent != null && policyIntent.isUnresolved()) {
-            
-            //resolve all required intents
-            List<Intent> requiredIntents = new ArrayList<Intent>(); 
-            for (Intent requiredIntent : policyIntent.getRequiredIntents()) {
-                if ( requiredIntent.isUnresolved() ) {
-                    //policyIntent.getRequiredIntents().remove(requiredIntent);
-                    requiredIntent = resolver.resolveModel(Intent.class, requiredIntent);
-                    requiredIntents.add(requiredIntent);
-                    if (requiredIntent.isUnresolved()) {
-                        isUnresolved = true;
-                    }
-                }
-            }
-            policyIntent.getRequiredIntents().clear();
-            policyIntent.getRequiredIntents().addAll(requiredIntents);
-        }
-        policyIntent.setUnresolved(isUnresolved);
-        
-        return policyIntent;
-    }
-    
-    private Intent resolveQualifiableIntent(QualifiedIntent policyIntent, ModelResolver resolver) throws ContributionResolveException {
-        boolean isUnresolved = false;
 
-        if (policyIntent != null && policyIntent.isUnresolved()) {
-            //resolve the qualifiable intent
-            Intent qualifiableIntent = 
-                resolver.resolveModel(Intent.class, policyIntent.getQualifiableIntent());
-            policyIntent.setQualifiableIntent(qualifiableIntent);
-            isUnresolved = qualifiableIntent.isUnresolved();
-        }
-        policyIntent.setUnresolved(isUnresolved);
-        
-        return policyIntent;
-    }
+    //FIXME This method is never used
+//    private Intent resolveRequiredIntents(ProfileIntent policyIntent, ModelResolver resolver) throws ContributionResolveException {
+//        boolean isUnresolved = false;
+//        //FIXME: Need to check for cyclic references first i.e an A requiring B and then B requiring A... 
+//        if (policyIntent != null && policyIntent.isUnresolved()) {
+//            
+//            //resolve all required intents
+//            List<Intent> requiredIntents = new ArrayList<Intent>(); 
+//            for (Intent requiredIntent : policyIntent.getRequiredIntents()) {
+//                if ( requiredIntent.isUnresolved() ) {
+//                    //policyIntent.getRequiredIntents().remove(requiredIntent);
+//                    requiredIntent = resolver.resolveModel(Intent.class, requiredIntent);
+//                    requiredIntents.add(requiredIntent);
+//                    if (requiredIntent.isUnresolved()) {
+//                        isUnresolved = true;
+//                    }
+//                }
+//            }
+//            policyIntent.getRequiredIntents().clear();
+//            policyIntent.getRequiredIntents().addAll(requiredIntents);
+//        }
+//        policyIntent.setUnresolved(isUnresolved);
+//        
+//        return policyIntent;
+//    }
+    
+    //FIXME This method is never used
+//    private Intent resolveQualifiableIntent(QualifiedIntent policyIntent, ModelResolver resolver) throws ContributionResolveException {
+//        boolean isUnresolved = false;
+//
+//        if (policyIntent != null && policyIntent.isUnresolved()) {
+//            //resolve the qualifiable intent
+//            Intent qualifiableIntent = 
+//                resolver.resolveModel(Intent.class, policyIntent.getQualifiableIntent());
+//            policyIntent.setQualifiableIntent(qualifiableIntent);
+//            isUnresolved = qualifiableIntent.isUnresolved();
+//        }
+//        policyIntent.setUnresolved(isUnresolved);
+//        
+//        return policyIntent;
+//    }
     
     protected void resolveContrainedArtifacts(Intent policyIntent, ModelResolver resolver) {
         //FIXME : need to figure out this resolution. 

Modified: incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/PolicySetProcessor.java Sun Aug 19 22:13:29 2007
@@ -23,7 +23,6 @@
 import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
 
 import java.util.ArrayList;
-import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
 import java.util.StringTokenizer;
@@ -88,7 +87,7 @@
                         } else {
                             Object extension = extensionProcessor.read(reader);
                             if ( extension instanceof Policy ) {
-                                policySet.getPolicies().add((Policy)extension);
+                                policySet.getPolicies().add(extension);
                             }
                         }
                         break;
@@ -243,46 +242,48 @@
             writer.writeAttribute(PolicyConstants.PROVIDES, sb.toString());
         }
     }
-    
-    private void resolveProvidedIntents(PolicySet policySet, ModelResolver resolver) throws ContributionResolveException {
-        boolean isUnresolved = false;
-        if (policySet != null && policySet.isUnresolved()) {
-            //resolve all provided intents
-            List<Intent> providedIntents = new ArrayList<Intent>(); 
-            for (Intent providedIntent : policySet.getProvidedIntents()) {
-                if ( providedIntent.isUnresolved() ) {
-                    //policyIntent.getRequiredIntents().remove(requiredIntent);
-                    providedIntent = resolver.resolveModel(Intent.class, providedIntent);
-                    providedIntents.add(providedIntent);
-                    if (providedIntent.isUnresolved()) {
-                        isUnresolved = true;
-                    }
-                }
-            }
-            policySet.getProvidedIntents().clear();
-            policySet.getProvidedIntents().addAll(providedIntents);
-        }
-        policySet.setUnresolved(isUnresolved);
-    }
-    
-   private void resolveIntentsInMappedPolicies(PolicySet policySet, ModelResolver resolver) throws ContributionResolveException {
-       Map<Intent, List<Policy>> mappedPolicies = new Hashtable<Intent, List<Policy>>();   
-       boolean isUnresolved = false;
-       for ( Intent mappedIntent : policySet.getMappedPolicies().keySet() ) {
-           if ( mappedIntent.isUnresolved() ) {
-               //policyIntent.getRequiredIntents().remove(requiredIntent);
-               mappedIntent = resolver.resolveModel(Intent.class, mappedIntent);
-               mappedPolicies.put(mappedIntent, policySet.getMappedPolicies().get(mappedIntent));
-               if (mappedIntent.isUnresolved()) {
-                   isUnresolved = true;
-               }
-           }
-       }
-       
-       policySet.getMappedPolicies().clear();
-       policySet.getMappedPolicies().putAll(mappedPolicies);
-       policySet.setUnresolved(isUnresolved);
-   }
+
+    //FIXME This method is never used
+//    private void resolveProvidedIntents(PolicySet policySet, ModelResolver resolver) throws ContributionResolveException {
+//        boolean isUnresolved = false;
+//        if (policySet != null && policySet.isUnresolved()) {
+//            //resolve all provided intents
+//            List<Intent> providedIntents = new ArrayList<Intent>(); 
+//            for (Intent providedIntent : policySet.getProvidedIntents()) {
+//                if ( providedIntent.isUnresolved() ) {
+//                    //policyIntent.getRequiredIntents().remove(requiredIntent);
+//                    providedIntent = resolver.resolveModel(Intent.class, providedIntent);
+//                    providedIntents.add(providedIntent);
+//                    if (providedIntent.isUnresolved()) {
+//                        isUnresolved = true;
+//                    }
+//                }
+//            }
+//            policySet.getProvidedIntents().clear();
+//            policySet.getProvidedIntents().addAll(providedIntents);
+//        }
+//        policySet.setUnresolved(isUnresolved);
+//    }
+
+    //FIXME This method is never used
+//   private void resolveIntentsInMappedPolicies(PolicySet policySet, ModelResolver resolver) throws ContributionResolveException {
+//       Map<Intent, List<Policy>> mappedPolicies = new Hashtable<Intent, List<Policy>>();   
+//       boolean isUnresolved = false;
+//       for ( Intent mappedIntent : policySet.getMappedPolicies().keySet() ) {
+//           if ( mappedIntent.isUnresolved() ) {
+//               //policyIntent.getRequiredIntents().remove(requiredIntent);
+//               mappedIntent = resolver.resolveModel(Intent.class, mappedIntent);
+//               mappedPolicies.put(mappedIntent, policySet.getMappedPolicies().get(mappedIntent));
+//               if (mappedIntent.isUnresolved()) {
+//                   isUnresolved = true;
+//               }
+//           }
+//       }
+//       
+//       policySet.getMappedPolicies().clear();
+//       policySet.getMappedPolicies().putAll(mappedPolicies);
+//       policySet.setUnresolved(isUnresolved);
+//   }
   
    private void resolvePolicies(PolicySet policySet) {
        policySet.setUnresolved(false);

Modified: incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsDocumentProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsDocumentProcessor.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsDocumentProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsDocumentProcessor.java Sun Aug 19 22:13:29 2007
@@ -57,7 +57,7 @@
      * @param staxProcessor
      */
     public SCADefinitionsDocumentProcessor(StAXArtifactProcessor staxProcessor, XMLInputFactory inputFactory) {
-        this.extensionProcessor = (StAXArtifactProcessor<Object>)staxProcessor;
+        this.extensionProcessor = staxProcessor;
         this.inputFactory = inputFactory;
         defnBuilder = new SCADefinitionsBuilderImpl();
     }

Modified: incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsProcessor.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsProcessor.java Sun Aug 19 22:13:29 2007
@@ -63,7 +63,7 @@
     public SCADefinitionsProcessor(PolicyFactory policyFactory,
                               StAXArtifactProcessor extensionProcessor) {
         this.policyFactory = policyFactory;
-        this.extensionProcessor = (StAXArtifactProcessor<Object>)extensionProcessor;
+        this.extensionProcessor = extensionProcessor;
         //this.policyIntentResolver = new PolicyIntentProcessor(policyFactory, extensionProcessor);
     }
     
@@ -77,7 +77,7 @@
                               StAXArtifactProcessor extensionProcessor,
                               ModelResolver modelResolver) {
         this.policyFactory = policyFactory;
-        this.extensionProcessor = (StAXArtifactProcessor<Object>)extensionProcessor;
+        this.extensionProcessor = extensionProcessor;
         //this.policyIntentResolver = new PolicyIntentProcessor(policyFactory, extensionProcessor);
         this.definitionsResolver = modelResolver;
     }

Modified: incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsResolver.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsResolver.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsResolver.java (original)
+++ incubator/tuscany/java/sca/modules/policy-xml/src/main/java/org/apache/tuscany/sca/policy/xml/SCADefinitionsResolver.java Sun Aug 19 22:13:29 2007
@@ -48,6 +48,6 @@
             return (T)resolved;
         }
 
-        return (T)unresolved;
+        return unresolved;
     }
 }

Modified: incubator/tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/policy-xml/src/test/java/org/apache/tuscany/sca/policy/xml/ReadDocumentTestCase.java Sun Aug 19 22:13:29 2007
@@ -52,7 +52,6 @@
  */
 public class ReadDocumentTestCase extends TestCase {
 
-    private SCADefinitionsBuilder builder = null;
     private ModelResolver resolver; 
     private SCADefinitionsDocumentProcessor scaDefnDocProcessor = null;
     private SCADefinitionsProcessor scaDefnProcessor = null;
@@ -76,12 +75,12 @@
     private static final QName javaImpl = new QName(namespace, "implementation.java");
     
 
+    @Override
     public void setUp() throws Exception {
         XMLInputFactory inputFactory = XMLInputFactory.newInstance();
         PolicyFactory policyFactory = new DefaultPolicyFactory();
         IntentAttachPointTypeFactory intentAttachPointFactory = new DefaultIntentAttachPointTypeFactoryImpl();
         this.resolver = new SCADefinitionsResolver();
-        this.builder = new SCADefinitionsBuilderImpl();
         
         // Create Stax processors
         DefaultStAXArtifactProcessorExtensionPoint staxProcessors = new DefaultStAXArtifactProcessorExtensionPoint(new DefaultModelFactoryExtensionPoint());
@@ -101,7 +100,7 @@
         
         URL url = getClass().getResource("definitions.xml");
         URI uri = URI.create("definitions.xml");
-        scaDefinitions = (SCADefinitions)scaDefnDocProcessor.read(null, uri, url);
+        scaDefinitions = scaDefnDocProcessor.read(null, uri, url);
         
         for ( Intent intent : scaDefinitions.getPolicyIntents() ) {
             intentTable.put(intent.getName(), intent);
@@ -120,6 +119,7 @@
         }
     }
 
+    @Override
     public void tearDown() throws Exception {
         resolver = null;
         scaDefnDocProcessor = null;

Modified: incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java (original)
+++ incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/IntentImpl.java Sun Aug 19 22:13:29 2007
@@ -139,6 +139,7 @@
         return true;
     }
 
+    @Override
     public String toString() {
         return String.valueOf(getName());
     }

Modified: incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java (original)
+++ incubator/tuscany/java/sca/modules/policy/src/main/java/org/apache/tuscany/sca/policy/impl/PolicySetImpl.java Sun Aug 19 22:13:29 2007
@@ -113,6 +113,7 @@
         }
     }
     
+    @Override
     public String toString() {
         return getName().toString();
     }

Modified: incubator/tuscany/java/sca/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/policy/src/test/java/org/apache/tuscany/sca/policy/PolicyFactoryTestCase.java Sun Aug 19 22:13:29 2007
@@ -31,10 +31,12 @@
 
     PolicyFactory factory;
 
+    @Override
     public void setUp() throws Exception {
         factory = new DefaultPolicyFactory();
     }
 
+    @Override
     public void tearDown() throws Exception {
         factory = null;
     }

Modified: incubator/tuscany/java/sca/modules/topology-xml/src/main/java/org/apache/tuscany/sca/topology/xml/BaseArtifactProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/topology-xml/src/main/java/org/apache/tuscany/sca/topology/xml/BaseArtifactProcessor.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/topology-xml/src/main/java/org/apache/tuscany/sca/topology/xml/BaseArtifactProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/topology-xml/src/main/java/org/apache/tuscany/sca/topology/xml/BaseArtifactProcessor.java Sun Aug 19 22:13:29 2007
@@ -19,11 +19,6 @@
 
 package org.apache.tuscany.sca.topology.xml;
 
-import static javax.xml.XMLConstants.W3C_XML_SCHEMA_INSTANCE_NS_URI;
-import static javax.xml.XMLConstants.XMLNS_ATTRIBUTE_NS_URI;
-import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
-import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -32,8 +27,6 @@
 import javax.xml.XMLConstants;
 import javax.xml.namespace.QName;
 import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
@@ -48,10 +41,6 @@
 import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
 import org.apache.tuscany.sca.interfacedef.InterfaceContract;
 import org.apache.tuscany.sca.topology.TopologyFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
 
 /**
  * A base class with utility methods for the other artifact processors in this module. 
@@ -78,7 +67,7 @@
     public BaseArtifactProcessor(TopologyFactory topologyFactory, AssemblyFactory assemblyFactory, StAXArtifactProcessor extensionProcessor) {
         this.topologyFactory = topologyFactory;
         this.assemblyFactory = assemblyFactory;
-        this.extensionProcessor = (StAXArtifactProcessor<Object>)extensionProcessor;
+        this.extensionProcessor = extensionProcessor;
     }
 
     /**

Modified: incubator/tuscany/java/sca/modules/topology-xml/src/main/java/org/apache/tuscany/sca/topology/xml/TopologyProcessor.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/topology-xml/src/main/java/org/apache/tuscany/sca/topology/xml/TopologyProcessor.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/topology-xml/src/main/java/org/apache/tuscany/sca/topology/xml/TopologyProcessor.java (original)
+++ incubator/tuscany/java/sca/modules/topology-xml/src/main/java/org/apache/tuscany/sca/topology/xml/TopologyProcessor.java Sun Aug 19 22:13:29 2007
@@ -22,10 +22,7 @@
 import static javax.xml.stream.XMLStreamConstants.END_ELEMENT;
 import static javax.xml.stream.XMLStreamConstants.START_ELEMENT;
 
-import java.util.StringTokenizer;
-
 import javax.xml.namespace.QName;
-import javax.xml.stream.XMLStreamConstants;
 import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
@@ -36,10 +33,6 @@
 import org.apache.tuscany.sca.contribution.service.ContributionReadException;
 import org.apache.tuscany.sca.contribution.service.ContributionResolveException;
 import org.apache.tuscany.sca.contribution.service.ContributionWriteException;
-import org.apache.tuscany.sca.interfacedef.InterfaceContract;
-import org.apache.tuscany.sca.interfacedef.InterfaceContractMapper;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.policy.PolicyFactory;
 import org.apache.tuscany.sca.topology.Node;
 import org.apache.tuscany.sca.topology.Runtime;
 import org.apache.tuscany.sca.topology.Scheme;

Modified: incubator/tuscany/java/sca/modules/topology-xml/src/test/java/org/apache/tuscany/sca/topology/xml/ReadDocumentTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/topology-xml/src/test/java/org/apache/tuscany/sca/topology/xml/ReadDocumentTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/topology-xml/src/test/java/org/apache/tuscany/sca/topology/xml/ReadDocumentTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/topology-xml/src/test/java/org/apache/tuscany/sca/topology/xml/ReadDocumentTestCase.java Sun Aug 19 22:13:29 2007
@@ -49,8 +49,8 @@
 public class ReadDocumentTestCase extends TestCase {
 
     private ExtensibleURLArtifactProcessor documentProcessor;
-    private TestModelResolver resolver; 
-
+    
+    @Override
     public void setUp() throws Exception {
         AssemblyFactory factory = new DefaultAssemblyFactory();
         TopologyFactory topologyFactory = new DefaultTopologyFactory();
@@ -66,13 +66,11 @@
         // Create document processors
         XMLInputFactory inputFactory = XMLInputFactory.newInstance(); 
         documentProcessors.addArtifactProcessor(new TopologyDocumentProcessor(staxProcessor, inputFactory));
-
-        resolver = new TestModelResolver();
     }
 
+    @Override
     public void tearDown() throws Exception {
         documentProcessor = null;
-        resolver = null;
     }
 
     public void testReadTopology() throws Exception {

Modified: incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Component.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Component.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Component.java (original)
+++ incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/Component.java Sun Aug 19 22:13:29 2007
@@ -19,9 +19,6 @@
 
 package org.apache.tuscany.sca.topology;
 
-
-import javax.xml.namespace.QName;
-
 /**
  * Represents an SCA component and is used to represent which components
  * will run on a node

Modified: incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/ComponentImpl.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/ComponentImpl.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/ComponentImpl.java (original)
+++ incubator/tuscany/java/sca/modules/topology/src/main/java/org/apache/tuscany/sca/topology/impl/ComponentImpl.java Sun Aug 19 22:13:29 2007
@@ -19,8 +19,6 @@
 
 package org.apache.tuscany.sca.topology.impl;
 
-import javax.xml.namespace.QName;
-
 import org.apache.tuscany.sca.topology.Component;
 
 /**

Modified: incubator/tuscany/java/sca/modules/topology/src/test/java/org/apache/tuscany/sca/topology/TopologyFactoryTestCase.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/topology/src/test/java/org/apache/tuscany/sca/topology/TopologyFactoryTestCase.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/topology/src/test/java/org/apache/tuscany/sca/topology/TopologyFactoryTestCase.java (original)
+++ incubator/tuscany/java/sca/modules/topology/src/test/java/org/apache/tuscany/sca/topology/TopologyFactoryTestCase.java Sun Aug 19 22:13:29 2007
@@ -32,10 +32,12 @@
 
     TopologyFactory topologyFactory;
     
+    @Override
     public void setUp() throws Exception {
         topologyFactory = new DefaultTopologyFactory();
     }
 
+    @Override
     public void tearDown() throws Exception {
         topologyFactory = null;
     }

Modified: incubator/tuscany/java/sca/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java (original)
+++ incubator/tuscany/java/sca/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceEmitter.java Sun Aug 19 22:13:29 2007
@@ -46,11 +46,13 @@
     private CodeGenConfiguration codegenConfiguration;
     private TypeMapper typeMapper;
 
+    @Override
     public void setCodeGenConfiguration(CodeGenConfiguration configuration) {
         super.setCodeGenConfiguration(configuration);
         codegenConfiguration = configuration;
     }
 
+    @Override
     public void setMapper(TypeMapper typeMapper) {
         super.setMapper(typeMapper);
         this.typeMapper = typeMapper;
@@ -65,7 +67,7 @@
                 (SDODataBindingTypeMappingEntry)this.typeMapper.getTypeMappingObject(message.getElementQName());
             List typeMappings;
             if (wrapped) {
-                typeMappings = (List)typeMappingEntry.getPropertyClassNames();
+                typeMappings = typeMappingEntry.getPropertyClassNames();
             } else {
                 typeMappings = new ArrayList();
                 typeMappings.add(typeMappingEntry.getClassName());
@@ -99,6 +101,7 @@
         return parameterElementList;
     }
 
+    @Override
     public List getParameterElementList(Document doc, List parameters, String location) {
         List parameterElementList = new ArrayList();
 
@@ -170,6 +173,7 @@
             WSDLConstants.WSDL_MESSAGE_DIRECTION_IN.endsWith(MEP);
     }
 
+    @Override
     protected Element getInputElement(Document doc, AxisOperation operation, List headerParameterQNameList) {
         return getElement(doc,
                           "input",
@@ -178,6 +182,7 @@
                           headerParameterQNameList);
     }
 
+    @Override
     protected Element getOutputElement(Document doc, AxisOperation operation, List headerParameterQNameList) {
         return getElement(doc,
                           "output",
@@ -207,6 +212,7 @@
         return element;
     }
 
+    @Override
     protected void writeInterface(boolean writeDatabinders) throws Exception {
         Document interfaceModel = createDOMDocumentForInterface(writeDatabinders);
         if (!codegenConfiguration.getOutputLocation().exists()) {
@@ -229,11 +235,13 @@
         writeClass(interfaceModel, interfaceWriter);
     }
 
+    @Override
     protected String makeJavaClassName(String word) {
         // return XMLNameUtil.getJavaNameFromXMLName(word, true);
         return getJavaNameFromXMLName(word, true);
     }
 
+    @Override
     protected Element[] getFaultParamElements(Document doc, AxisOperation operation) {
         ArrayList params = new ArrayList();
         ArrayList faultMessages = operation.getFaultMessages();

Modified: incubator/tuscany/java/sca/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java?rev=567542&r1=567541&r2=567542&view=diff
==============================================================================
--- incubator/tuscany/java/sca/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java (original)
+++ incubator/tuscany/java/sca/modules/wsdl2java/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/SDODataBindingCodegenExtension.java Sun Aug 19 22:13:29 2007
@@ -34,6 +34,7 @@
         this.typeMapper=typeMapper;
     }
     
+    @Override
     protected boolean testFallThrough(String dbFrameworkName) {
         return !dbFrameworkName.equals("sdo");
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org


Mime
View raw message