Changeset 42129 in vbox for trunk/src/VBox/Main/webservice

Timestamp:

Jul 12, 2012 5:32:31 PM (13 years ago)

Author:

vboxsync

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

79090

Message:

Main/VirtualBox+Machine: add support for VM groups (incomplete, saving of settings is not implemented), remaining code adjusted accordingly, use better parameter checking macros, make XSLT generators process setter attributes using safearrays correctly, various cleanups and warning fixes
Frontends/VBoxManage: first traces of groups support

File:

• trunk/src/VBox/Main/webservice/websrv-cpp.xsl (modified) (7 diffs)

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

@@ -534 +534 @@
   <xsl:param name="safearray" />
 
-  <xsl:value-of select="concat('        // convert input arg ', $name)" />
+  <xsl:value-of select="concat('        // convert input arg ', $name, '(safearray: ', $safearray, ')')" />
   <xsl:call-template name="emitNewlineIndent8" />
 
@@ -709 +709 @@
 
 <!--
+    emitInParam:
+-->
+<xsl:template name="emitInParam">
+  <xsl:param name="name" />
+  <xsl:param name="type" />
+  <xsl:param name="safearray" />
+  <xsl:param name="varprefix" />      <!-- only with nested set-attribute calls -->
+
+  <xsl:variable name="varname" select="concat('comcall_', $varprefix, $name)" />
+
+  <xsl:choose>
+    <xsl:when test="@safearray='yes'">
+      <xsl:value-of select="concat('ComSafeArrayAsInParam(', $varname, ')')" />
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:value-of select="$varname" />
+      <xsl:if test="@type='wstring' or @type='uuid'">
+        <xsl:text>.raw()</xsl:text>
+      </xsl:if>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
+<!--
     emitOutParam:
 -->
@@ -768 +792 @@
     <xsl:choose>
       <xsl:when test="$attrdir='in'">
-        <xsl:value-of select="concat('comcall_', $varprefix, @name)" />
-        <xsl:if test="$attrtype='wstring' or $attrtype='uuid'">
-          <xsl:text>.raw()</xsl:text>
-        </xsl:if>
+        <xsl:call-template name="emitInParam">
+          <xsl:with-param name="name" select="$attrname" />
+          <xsl:with-param name="type" select="$attrtype" />
+          <xsl:with-param name="safearray" select="$attrsafearray" />
+          <xsl:with-param name="varprefix" select="$varprefix" />
+        </xsl:call-template>
       </xsl:when>
       <xsl:when test="$attrdir='return'">
@@ -794 +820 @@
     <xsl:choose>
       <xsl:when test="@dir='in'">
-        <xsl:choose>
-          <xsl:when test="@safearray='yes'">
-            <xsl:value-of select="concat('ComSafeArrayAsInParam(comcall_', $varprefix, @name, ')')" />
-          </xsl:when>
-          <xsl:otherwise>
-            <xsl:value-of select="concat('comcall_', $varprefix, @name)" />
-            <xsl:if test="@type='wstring' or @type='uuid'">
-              <xsl:text>.raw()</xsl:text>
-            </xsl:if>
-          </xsl:otherwise>
-        </xsl:choose>
+        <xsl:call-template name="emitInParam">
+          <xsl:with-param name="name" select="@name" />
+          <xsl:with-param name="type" select="@type" />
+          <xsl:with-param name="safearray" select="@safearray" />
+          <xsl:with-param name="varprefix" select="$varprefix" />
+        </xsl:call-template>
       </xsl:when>
       <xsl:when test="@dir='out'">
@@ -1204 +1225 @@
   <xsl:param name="attrtype" select="$attrtype" />
   <xsl:param name="attrreadonly" select="$attrreadonly" />
+  <xsl:param name="attrsafearray" select="$attrsafearray" />
 
   <xsl:variable name="settername"><xsl:call-template name="makeSetterName"><xsl:with-param name="attrname" select="$attrname" /></xsl:call-template></xsl:variable>
@@ -1244 +1266 @@
         <xsl:with-param name="attrname"><xsl:value-of select="$attrname" /></xsl:with-param>
         <xsl:with-param name="attrtype"><xsl:value-of select="$attrtype" /></xsl:with-param>
+        <xsl:with-param name="attrsafearray"><xsl:value-of select="$attrsafearray" /></xsl:with-param>
       </xsl:call-template>
     <!-- </xsl:otherwise>
@@ -1316 +1339 @@
               <xsl:with-param name="attrtype" select="$attrtype" />
               <xsl:with-param name="attrreadonly" select="$attrreadonly" />
+              <xsl:with-param name="attrsafearray" select="$attrsafearray" />
             </xsl:call-template>
           </xsl:if>