Changeset 21819 in vbox for trunk

Timestamp:

Jul 27, 2009 3:59:56 PM (16 years ago)

Author:

vboxsync

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

50433

Message:

API/webservice: eliminate the last traces of special UUID data type handling.

Location:

trunk/src/VBox/Main/webservice

Files:

• glue-jaxws.xsl (modified) (6 diffs)
• websrv-python.xsl (modified) (2 diffs)
• websrv-shared.inc.xsl (modified) (1 diff)

trunk/src/VBox/Main/webservice/glue-jaxws.xsl

@@ -211 +211 @@
   <xsl:param name="safearray"/>
   <xsl:choose>
-    <xsl:when test="$idltype='uuid'">
-      <xsl:choose>
-        <xsl:when test="$safearray">
-          <xsl:value-of select="concat('Helper.uuidWrap(',$value,')')" />
-        </xsl:when>
-        <xsl:otherwise>
-          <xsl:value-of select="concat('UUID.fromString(',$value,')')" />
-        </xsl:otherwise>
-      </xsl:choose>
-    </xsl:when>
     <xsl:when test="//collection[@name=$idltype]">
       <xsl:variable name="elemtype">
@@ -305 +295 @@
       </xsl:choose>
     </xsl:when>
-    <xsl:when test="$paramtype='uuid'">
-      <xsl:value-of select="concat($paramname, '.toString()')" />
-    </xsl:when>
     <xsl:otherwise>
       <xsl:value-of select="$paramname" />
@@ -416 +403 @@
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.UUID;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -442 +428 @@
     }
 
-    public static List<UUID> uuidWrap(List<String> uuidVals) {
-         List<UUID> ret = new ArrayList<UUID>(uuidVals.size());
-         for (String uuid : uuidVals) {
-              ret.add(UUID.fromString(uuid));
-         }
-         return ret;
-    }
-
     public static <T extends IUnknown> List<String> unwrap(List<T> thisPtrs) {
         if (thisPtrs==null)  return Collections.emptyList();
@@ -476 +454 @@
 import java.util.Map;
 import java.util.HashMap;
-import java.util.UUID;
 import javax.xml.namespace.QName;
 import javax.xml.ws.BindingProvider;
@@ -800 +777 @@
       <xsl:text>import java.math.BigInteger;&#10;</xsl:text>
       <xsl:text>import java.util.List;&#10;</xsl:text>
-      <xsl:text>import java.util.UUID;&#10;</xsl:text>
       <xsl:text>import javax.xml.ws.Holder;&#10;</xsl:text>
       <xsl:text>import javax.xml.ws.WebServiceException;&#10;</xsl:text>

trunk/src/VBox/Main/webservice/websrv-python.xsl

@@ -53 +53 @@
     <xsl:when test="$type='unsigned long long'">UnsignedLong</xsl:when>
     <xsl:when test="$type='result'">UnsignedInt</xsl:when>
-    <xsl:when test="$type='uuid'">UUID</xsl:when>
     <xsl:when test="$type='$unknown'">IUnknown</xsl:when>
     <xsl:when test="$type='$dispatched'">IUnknown</xsl:when>
@@ -538 +537 @@
 
 
-class UUID:
-  def __init__(self, mgr, handle, isarray = False):
-      self.handle = handle
-      self.mgr = mgr
-      self.isarray = isarray
- 
-  def __next(self):
-      if self.isarray:
-          return self.handle.__next()
-      raise TypeError, "iteration over non-sequence"
-
-  def __size(self):
-      if self.isarray:         
-          return self.handle.__size()
-      raise TypeError, "iteration over non-sequence"
-
-  def __len__(self):
-      if self.isarray:
-          return self.handle.__len__()
-      raise TypeError, "iteration over non-sequence"
-
-  def __getitem__(self, index):
-      if self.isarray:
-          return UUID(self.mgr, self.handle[index])
-      raise TypeError, "iteration over non-sequence"       
-
-  def __str__(self):
-      return self.handle
-
-  def __eq__(self,other):
-      if self.isarray:
-         return isinstance(other,UUID) and self.handle == other.handle
-      if isinstance(other,UUID):
-         return self.handle == other.handle
-      if isinstance(other,basestring):
-         return self.handle == other
-      return False
-
-  def __ne__(self,other):
-      if self.isarray:
-         return not isinstance(other,UUID) or self.handle == other.handle     
-      if isinstance(other,UUID):
-         return self.handle != other.handle
-      if isinstance(other,basestring):
-         return self.handle != other
-      return True
-
 class Boolean:
   def __init__(self, mgr, handle, isarray = False):       

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

@@ -171 +171 @@
   <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>