Changeset 51448 in vbox for trunk/src/VBox/Main

Timestamp:

May 28, 2014 1:51:05 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

94011

Message:

Main/glue-java.xsl: fix the check, it was a bit too paranoid

File:

• trunk/src/VBox/Main/glue/glue-java.xsl (modified) (3 diffs)

trunk/src/VBox/Main/glue/glue-java.xsl

@@ -1904 +1904 @@
     <xsl:otherwise>
       <xsl:variable name="hasReturnParms" select="param[@dir='return']" />
-      <xsl:variable name="hasOutParms" select="param[@dir='out']" />
+      <xsl:variable name="hasOutParms" select="count(param[@dir='out']) > 0" />
       <xsl:variable name="returnidltype" select="param[@dir='return']/@type" />
       <xsl:variable name="returnidlsafearray" select="param[@dir='return']/@safearray" />
-      <xsl:if test="$hasOutParms and not($hasReturnParms) and (count(param[@dir='out']) = 1)">
+      <xsl:if test="$hasOutParms and not($hasReturnParms) and (string-length(@wsmap) = 0) and (count(param[@dir='out']) = 1)">
         <xsl:call-template name="fatalError">
-          <xsl:with-param name="msg" select="concat('genMethod: ', $ifname, '::', $methodname, ' has exactly one out parameter and no return parameter, this causes trouble with JAX-WS and the out parameter needs to be converted to return')" />
+          <xsl:with-param name="msg" select="concat('genMethod: ', $ifname, $hasOutParms, not($hasReturnParms), 'a', string-length(@wsmap) = 0, 'b', @wsmap, (count(param[@dir='out']) = 1), '::', $methodname, ' has exactly one out parameter and no return parameter, this causes trouble with JAX-WS and the out parameter needs to be converted to return')" />
         </xsl:call-template>
       </xsl:if>
@@ -2165 +2165 @@
     <xsl:otherwise>
       <xsl:variable name="hasReturnParms" select="param[@dir='return']" />
-      <xsl:variable name="hasOutParms" select="param[@dir='out']" />
       <xsl:variable name="returnidltype" select="param[@dir='return']/@type" />
       <xsl:variable name="returnidlsafearray" select="param[@dir='return']/@safearray" />
@@ -4603 +4602 @@
       <xsl:otherwise>
         <!-- We don't need WSDL-specific interfaces here -->
-        <xsl:if test="not($self_target='wsdl') and not($module)">
+        <xsl:if test="not(@internal='yes') and not($self_target='wsdl') and not($module)">
           <xsl:call-template name="genIface">
             <xsl:with-param name="ifname" select="@name" />