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

Timestamp:

Aug 16, 2010 1:48:57 PM (15 years ago)

Author:

vboxsync

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

64838

Message:

Java XPCOM bridge: octet arrays are byte[] in XPCOM backend, proper null treatment

Location:

trunk/src/VBox/Main/glue

Files:

• glue-java.xsl (modified) (13 diffs)
• tests/TestVBox.java (modified) (2 diffs)

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

@@ -315 +315 @@
 
         <xsl:when test="$type='octet'">
-          <xsl:value-of select="'short'" />
+          <xsl:value-of select="'byte'" />
         </xsl:when>
 
@@ -2204 +2204 @@
 
 public class Helper {
-    public static List<Short> wrap(short[] vals) {
-        if (vals==null || vals.length == 0)  return Collections.emptyList();
+    public static List<Short> wrap(byte[] vals) {
+        if (vals==null)
+            return null;
 
         List<Short> ret = new ArrayList<Short>(vals.length);
@@ -2215 +2216 @@
 
     public static List<Integer> wrap(int[] vals) {
-        if (vals==null || vals.length == 0)  return Collections.emptyList();
+        if (vals==null)
+             return null;
 
         List<Integer> ret = new ArrayList<Integer>(vals.length);
         for (int v : vals) {
-                ret.add(v);
+             ret.add(v);
         }
         return ret;
@@ -2225 +2227 @@
 
     public static List<Long> wrap(long[] vals) {
-        if (vals==null || vals.length == 0)  return Collections.emptyList();
+        if (vals==null)
+             return null;
 
         List<Long> ret = new ArrayList<Long>(vals.length);
@@ -2235 +2238 @@
 
     public static List<String> wrap(String[] vals) {
-        if (vals==null || vals.length == 0)  return Collections.emptyList();
-
+        if (vals==null)
+            return null;
         List<String> ret = new ArrayList<String>(vals.length);
         for (String v : vals) {
-                ret.add(v);
+            ret.add(v);
         }
         return ret;
@@ -2245 +2248 @@
 
     public static <T> List<T> wrap(Class<T> wrapperClass, T[] thisPtrs) {
-        if (thisPtrs==null || thisPtrs.length == 0)  return Collections.emptyList();
+        if (thisPtrs==null)
+             return null;
 
         List<T> ret = new ArrayList<T>(thisPtrs.length);
@@ -2285 +2289 @@
 
     public static short[] unwrap(List<Short> vals) {
-        if (vals==null || vals.size() == 0)  return new short[0];
+        if (vals==null)
+           return null;
 
         short[] ret = new short[vals.size()];
@@ -2296 +2301 @@
 
     public static int[] unwrap(List<Integer> vals) {
-        if (vals==null || vals.size() == 0)  return new int[0];
+        if (vals == null)
+           return null;
 
         int[] ret = new int[vals.size()];
@@ -2307 +2313 @@
 
     public static long[] unwrap(List<Long> vals) {
-        if (vals==null || vals.size() == 0)  return new long[0];
+        if (vals == null)
+           return null;
 
         long[] ret = new long[vals.size()];
@@ -2318 +2325 @@
 
     public static boolean[] unwrap(List<Boolean> vals) {
-        if (vals==null || vals.size() == 0)  return new boolean[0];
+        if (vals==null)
+           return null;
 
         boolean[] ret = new boolean[vals.size()];
@@ -2329 +2337 @@
 
     public static String[] unwrap(List<String> vals) {
-        if (vals==null || vals.size() == 0)  return new String[0];
+        if (vals==null)
+            return null;
 
         String[] ret = new String[vals.size()];
@@ -2365 +2374 @@
     public static <T1, T2> List<T1> wrap2(Class<T1> wrapperClass1, Class<T2> wrapperClass2, T2[] thisPtrs) {
         try {
-            if (thisPtrs==null || thisPtrs.length == 0)  return Collections.emptyList();
+            if (thisPtrs==null) 
+                return null;
 
             Constructor<T1> c = wrapperClass1.getConstructor(wrapperClass2);
@@ -2413 +2423 @@
     @SuppressWarnings("unchecked")
     public static <T1 extends IUnknown,T2> T2[] unwrap2(Class<T1> wrapperClass1, Class<T2> wrapperClass2, List<T1> thisPtrs) {
-        if (thisPtrs==null || thisPtrs.size() == 0)  return null;
+        if (thisPtrs==null)  return null;
 
         T2 ret[] = (T2[])Array.newInstance(wrapperClass2, thisPtrs.size());

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)
+    {
+        IMachine m =  vbox.getMachines().get(0);
+        long logNo = 0;
+        long off = 0;
+        long size = 16 * 1024;
+        while (true)
+        {
+            byte[] buf = m.readLog(logNo, off, size);
+            if (buf.length == 0)
+                break;
+            System.out.print(new String(buf));
+            off += buf.length;
+        }
+        }
+    */
+
+
     public static void main(String[] args)
     {
@@ -154 +189 @@
                 System.out.println("VirtualBox version: " + vbox.getVersion() + "\n");
                 testEnumeration(mgr, vbox);
+                //testReadLog(mgr, vbox);
                 testStart(mgr, vbox);
                 testEvents(mgr, vbox.getEventSource());