vbox的更動 20888 路徑 trunk/src/VBox/Main/webservice/websrv-shared.inc.xsl

時間撮記:

2009-6-24 下午12:06:04 (15 年 以前)

作者:

vboxsync

訊息:

webservice: changes to allow for supporting IDisplay and other interfaces: suppress only methods with [ptr] args, not entire interfaces that use them; better error reporting in jax-ws generator; use common table in include file for type conversions; make takeScreenShotSlow() use dir=return instead of dir=out for one output arg

檔案:

• trunk/src/VBox/Main/webservice/websrv-shared.inc.xsl (修改) (2 筆差異)

trunk/src/VBox/Main/webservice/websrv-shared.inc.xsl

@@ -160 +160 @@
 
 <xsl:variable name="G_aSharedTypes">
-  <type idlname="boolean"            xmlname="boolean"       cname="bool" />
-  <type idlname="short"              xmlname="short"         cname="short" />
-  <type idlname="unsigned short"     xmlname="unsignedShort" cname="unsigned short" />
-  <type idlname="long"               xmlname="int"           cname="int" />
-  <type idlname="unsigned long"      xmlname="unsignedInt"   cname="unsigned int" />
-  <type idlname="long long"          xmlname="long"          cname="LONG64" />
-  <type idlname="unsigned long long" xmlname="unsignedLong"  cname="ULONG64" />
-  <type idlname="double"             xmlname="double"        cname="double" />
-  <type idlname="float"              xmlname="float"         cname="float" />
-  <type idlname="wstring"            xmlname="string"        cname="std::string" />
-  <type idlname="uuid"               xmlname="string"        cname="std::string" />
-  <type idlname="result"             xmlname="unsignedInt"   cname="unsigned int"/>
+  <type idlname="octet"              xmlname="unsignedByte"  cname="unsigned char"    gluename="BYTE"    javaname="Short" />
+  <type idlname="boolean"            xmlname="boolean"       cname="bool"             gluename="BOOL"    javaname="Boolean" />
+  <type idlname="short"              xmlname="short"         cname="short"            gluename="SHORT"   javaname="Short" />
+  <type idlname="unsigned short"     xmlname="unsignedShort" cname="unsigned short"   gluename="USHORT"  javaname="Integer" />
+  <type idlname="long"               xmlname="int"           cname="int"              gluename="LONG"    javaname="Integer" />
+  <type idlname="unsigned long"      xmlname="unsignedInt"   cname="unsigned int"     gluename="ULONG"   javaname="Long" />
+  <type idlname="long long"          xmlname="long"          cname="LONG64"           gluename="LONG64"  javaname="Long" />
+  <type idlname="unsigned long long" xmlname="unsignedLong"  cname="ULONG64"          gluename="ULONG64" javaname="BigInteger" />
+  <type idlname="double"             xmlname="double"        cname="double"           gluename=""        javaname="Double" />
+  <type idlname="float"              xmlname="float"         cname="float"            gluename=""        javaname="Float" />
+  <type idlname="wstring"            xmlname="string"        cname="std::string"      gluename=""        javaname="String" />
+  <type idlname="uuid"               xmlname="string"        cname="std::string"      gluename=""        javaname="UUID" />
+  <type idlname="result"             xmlname="unsignedInt"   cname="unsigned int"     gluename="HRESULT" javaname="Long" />
 </xsl:variable>
 
@@ -237 +238 @@
     <xsl:when test="$strlen>1">
      <xsl:choose>
-       <xsl:when test="contains('ABCDEFGHIJKLMNOPQRSTUVWXYZ',substring($str,1,1)) 
-                       and 
+       <xsl:when test="contains('ABCDEFGHIJKLMNOPQRSTUVWXYZ',substring($str,1,1))
+                       and
                        contains('ABCDEFGHIJKLMNOPQRSTUVWXYZ',substring($str,2,1))">
          <xsl:variable name="cdr">