svn commit: r501146 - /incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidator.java

[lmandel]

Author: lmandel
Date: Mon Jan 29 11:01:17 2007
New Revision: 501146

URL: http://svn.apache.org/viewvc?view=rev&rev=501146
Log:
[Woden-132] Cleaned up method signatures to follow standard scheme.

Modified:
    
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidator.java

Modified: 
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidator.java
URL: 
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidator.java?view=diff&rev=501146&r1=501145&r2=501146
==============================================================================
--- 
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidator.java
 (original)
+++ 
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/validation/WSDLDocumentValidator.java
 Mon Jan 29 11:01:17 2007
@@ -153,10 +153,10 @@
          if(!testAssertionInterface0031(interfaceElem, errorReporter))
                isValid = false;
          
-         
if(!validateInterfaceFaults(interfaceElem.getInterfaceFaultElements(), 
descElement, errorReporter))
+         if(!validateInterfaceFaults(descElement, 
interfaceElem.getInterfaceFaultElements(), errorReporter))
            isValid = false;
          
-         
if(!validateInterfaceOperations(interfaceElem.getInterfaceOperationElements(), 
descElement, errorReporter))
+         if(!validateInterfaceOperations(descElement, 
interfaceElem.getInterfaceOperationElements(), errorReporter))
                isValid = false;
        }
        
@@ -166,13 +166,13 @@
   /**
    * Validate the InterfaceFault elements.
    * 
-   * @param faultElements An array of fault elements.
    * @param descElement The root description element.
+   * @param faultElements An array of fault elements.
    * @param errorReporter An error reporter.
    * @return True if the interface fault elements are all valid, false 
otherwise.
    * @throws WSDLException
    */
-  protected boolean validateInterfaceFaults(InterfaceFaultElement[] 
faultElements, DescriptionElement descElement, ErrorReporter errorReporter) 
throws WSDLException
+  protected boolean validateInterfaceFaults(DescriptionElement descElement, 
InterfaceFaultElement[] faultElements, ErrorReporter errorReporter) throws 
WSDLException
   {
        boolean isValid = true;
        int numFaultElements = faultElements.length;
@@ -190,13 +190,13 @@
   /**
    * Validate the InterfaceOperation elements.
    * 
-   * @param interfaceOperations An array of interface operation elements.
    * @param descElement The root description element.
+   * @param interfaceOperations An array of interface operation elements.
    * @param errorReporter An error reporter.
    * @return True if the interface operation elements are all valid, false 
otherwise.
    * @throws WSDLException
    */
-  protected boolean validateInterfaceOperations(InterfaceOperationElement[] 
interfaceOperations, DescriptionElement descElement, ErrorReporter 
errorReporter) throws WSDLException
+  protected boolean validateInterfaceOperations(DescriptionElement 
descElement, InterfaceOperationElement[] interfaceOperations, ErrorReporter 
errorReporter) throws WSDLException
   {
        boolean isValid = true;
        int numInterfaceOperations = interfaceOperations.length;
@@ -204,16 +204,8 @@
        {
          InterfaceOperationElement interfaceOperation = interfaceOperations[j];
          
-         
if(!validateInterfaceMessageReferences(interfaceOperation.getInterfaceMessageReferenceElements(),
 descElement, errorReporter))
+         if(!validateInterfaceMessageReferences(descElement, 
interfaceOperation.getInterfaceMessageReferenceElements(), errorReporter))
                isValid = false;
-//             FaultReferenceElement[] faultReferences = 
interfaceOperation.getFaultReferenceElements();
-//             int numFaultReferences = faultReferences.length;
-//             for(int k = 0; k < numFaultReferences; k++)
-//             {
-//           FaultReferenceElement faultReference = faultReferences[k];
-//           if(!testAssertionSchema0020b(descElement, faultReference, 
errorReporter))
-//             isValid = false;
-//             }
        }
     return isValid;
   }
@@ -221,13 +213,13 @@
   /**
    * Validate the InterfaceMessageReference elements.
    * 
-   * @param messageReferences An array of interface message reference elements.
    * @param descElement The root description element.
+   * @param messageReferences An array of interface message reference elements.
    * @param errorReporter An error reporter.
    * @return True if the interface message reference elements are all valid, 
false otherwise.
    * @throws WSDLException
    */
-  protected boolean 
validateInterfaceMessageReferences(InterfaceMessageReferenceElement[] 
messageReferences, DescriptionElement descElement, ErrorReporter errorReporter) 
throws WSDLException
+  protected boolean validateInterfaceMessageReferences(DescriptionElement 
descElement, InterfaceMessageReferenceElement[] messageReferences, 
ErrorReporter errorReporter) throws WSDLException
   {
        boolean isValid = true;
        int numMessageReferences = messageReferences.length;



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]