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

Timestamp:

Aug 16, 2010 3:56:57 PM (14 years ago)

Author:

vboxsync

Message:

Java: use byte[] for glue layer (JWS converts from List<Short> atm)

Location:

trunk/src/VBox/Main

Files:

• glue/glue-java.xsl (modified) (6 diffs)
• glue/tests/TestVBox.java (modified) (2 diffs)
• webservice/websrv-shared.inc.xsl (modified) (1 diff)

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

@@ -249 +249 @@
 
   <xsl:variable name="needarray" select="($safearray='yes') and not($forceelem='yes')" />
-
-  <xsl:if test="$needarray">
+  <xsl:variable name="needlist" select="($needarray) and not($type='octet')" />
+
+  <xsl:if test="($needlist)">
     <xsl:value-of select="'List&lt;'" />
   </xsl:if>
@@ -271 +272 @@
   </xsl:choose>
 
-  <xsl:if test="$needarray">
-    <xsl:value-of select="'&gt;'" />
-  </xsl:if>
+  <xsl:choose>
+    <xsl:when test="($needlist)">
+      <xsl:value-of select="'&gt;'" />
+    </xsl:when>
+    <xsl:when test="($needarray)">
+      <xsl:value-of select="'[]'" />
+    </xsl:when>
+  </xsl:choose>
 </xsl:template>
 
@@ -510 +516 @@
     </xsl:when>
 
-    <xsl:when test="$idltype='unsigned long long'">
-      <xsl:choose>
-        <xsl:when test="$safearray='yes'">
-          <xsl:value-of select="concat('Helper.wrapUnsignedLongLong(', $value,')')"/>
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="concat('Helper.doubleToBigInteger(', $value,')')"/>
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
-
     <xsl:otherwise>
       <xsl:choose>
+        <xsl:when test="($safearray='yes') and ($idltype='octet')">
+          <xsl:value-of select="$value"/>
+        </xsl:when>
         <xsl:when test="$safearray='yes'">
           <xsl:value-of select="concat('Helper.wrap(', $value,')')"/>
@@ -656 +654 @@
         <xsl:when test="//interface[@name=$idltype] or $idltype='$unknown'">
           <xsl:value-of select="concat('Helper.wrap(',$elemgluetype,'.class, port, ', $value,')')"/>
+        </xsl:when>
+        <xsl:when test="$idltype='octet'">
+          <xsl:value-of select="concat('Helper.wrapBytes(',$value,')')"/>
         </xsl:when>
         <xsl:otherwise>
@@ -2374 +2375 @@
     public static <T1, T2> List<T1> wrap2(Class<T1> wrapperClass1, Class<T2> wrapperClass2, T2[] thisPtrs) {
         try {
-            if (thisPtrs==null) 
+            if (thisPtrs==null)
                 return null;
 
@@ -3228 +3229 @@
         }
     }
+    // temporary method, will bo away soon
+    public static byte[] wrapBytes(List<Short> arr)
+    {
+       if (arr == null)
+          return null;
+       int i = 0;
+       byte[] rv = new byte[arr.size()];
+       for (short s : arr)
+           rv[i++] = (byte)(s & 0xff);
+       return rv;
+    }
 }
 ]]></xsl:text>

trunk/src/VBox/Main/glue/tests/TestVBox.java

@@ -116 +116 @@
     }
 
-    /*
-    static void testReadLogBI(VirtualBoxManager mgr, IVirtualBox vbox)
-    {
-        IMachine m =  vbox.getMachines().get(0);
-        long logNo = 0;
-        BigInteger off = BigInteger.valueOf(0);
-        BigInteger size = BigInteger.valueOf(16 * 1024);
-        while (true)
-        {
-            byte[] buf = m.readLog(logNo, off, size);
-            if (buf.length == 0)
-                break;
-            System.out.print(new String(buf));
-            off.add(BigInteger.valueOf(buf.length));
-        }
-    }
-
     static void testReadLog(VirtualBoxManager mgr, IVirtualBox vbox)
     {
@@ -147 +130 @@
             off += buf.length;
         }
-        }
-    */
+    }
 
 

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

@@ -158 +158 @@
 
 <xsl:variable name="G_aSharedTypes">
-  <type idlname="octet"              xmlname="unsignedByte"  cname="unsigned char"    gluename="BYTE"    javaname="Short" />
+  <type idlname="octet"              xmlname="unsignedByte"  cname="unsigned char"    gluename="BYTE"    javaname="byte" />
   <type idlname="boolean"            xmlname="boolean"       cname="bool"             gluename="BOOL"    javaname="Boolean" />
   <type idlname="short"              xmlname="short"         cname="short"            gluename="SHORT"   javaname="Short" />