svn commit: r563120 - in /incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20: BindingFaultImpl.java InterfaceFaultReferenceImpl.java

[jkaputin]

Author: jkaputin
Date: Mon Aug  6 05:12:02 2007
New Revision: 563120

URL: http://svn.apache.org/viewvc?view=rev&rev=563120
Log:
WODEN-135
Include extended interfaces when resolving references
to InterfaceFaultElements. Thanks to Dan Harvey for
contributing this fix.

Modified:
    
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/BindingFaultImpl.java
    
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/InterfaceFaultReferenceImpl.java

Modified: 
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/BindingFaultImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/BindingFaultImpl.java?view=diff&rev=563120&r1=563119&r2=563120
==============================================================================
--- 
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/BindingFaultImpl.java
 (original)
+++ 
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/BindingFaultImpl.java
 Mon Aug  6 05:12:02 2007
@@ -90,7 +90,10 @@
         BindingElement binding = (BindingElement)getParentElement();
         InterfaceElement interfac = binding.getInterfaceElement();
         if(interfac != null) {
-            fault = interfac.getInterfaceFaultElement(fRef);
+            InterfaceFault faultComp = 
((Interface)interfac).getFromAllInterfaceFaults(fRef);
+            if (faultComp != null) {
+                fault = faultComp.toElement();
+            }
         }
         return fault;
     }

Modified: 
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/InterfaceFaultReferenceImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/InterfaceFaultReferenceImpl.java?view=diff&rev=563120&r1=563119&r2=563120
==============================================================================
--- 
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/InterfaceFaultReferenceImpl.java
 (original)
+++ 
incubator/woden/trunk/java/src/org/apache/woden/internal/wsdl20/InterfaceFaultReferenceImpl.java
 Mon Aug  6 05:12:02 2007
@@ -105,9 +105,16 @@
      */
     public InterfaceFaultElement getInterfaceFaultElement() 
     {
+        InterfaceFaultElement fault = null;
         InterfaceOperationElement oper = 
(InterfaceOperationElement)getParentElement();
         InterfaceElement interfac = (InterfaceElement)oper.getParentElement();
-        return interfac.getInterfaceFaultElement(fRef);
+        if (interfac != null) {
+            InterfaceFault faultComp = 
((Interface)interfac).getFromAllInterfaceFaults(fRef);
+            if (faultComp != null) {
+                fault = faultComp.toElement();
+            }
+        }
+        return fault;
     }
 
     /* (non-Javadoc)



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