VirtualBox

Changeset 53385 in vbox for trunk


Ignore:
Timestamp:
Nov 24, 2014 1:21:30 PM (10 years ago)
Author:
vboxsync
Message:

javadoc v8 HTML fixes.

Location:
trunk/src/VBox/Main
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r53243 r53385  
    219219  </xsl:variable>
    220220
     221  <!-- &amp;, &lt; and &gt; must remain as they are or javadoc 8 throws a fit. -->
    221222  <xsl:variable name="rep4">
    222     <xsl:call-template name="string-trim">
    223       <xsl:with-param name="text" select="$rep3"/>
     223    <xsl:call-template name="string-replace">
     224      <xsl:with-param name="haystack" select="$rep3"/>
     225      <xsl:with-param name="needle" select="'&amp;'"/>
     226      <xsl:with-param name="replacement" select="'&amp;amp;'"/>
    224227    </xsl:call-template>
    225228  </xsl:variable>
    226 
    227   <xsl:value-of select="$rep4"/>
     229  <xsl:variable name="rep5">
     230    <xsl:call-template name="string-replace">
     231      <xsl:with-param name="haystack" select="$rep4"/>
     232      <xsl:with-param name="needle" select="'&lt;'"/>
     233      <xsl:with-param name="replacement" select="'&amp;lt;'"/>
     234    </xsl:call-template>
     235  </xsl:variable>
     236  <xsl:variable name="rep6">
     237    <xsl:call-template name="string-replace">
     238      <xsl:with-param name="haystack" select="$rep5"/>
     239      <xsl:with-param name="needle" select="'&gt;'"/>
     240      <xsl:with-param name="replacement" select="'&amp;gt;'"/>
     241    </xsl:call-template>
     242  </xsl:variable>
     243
     244  <xsl:variable name="rep7">
     245    <xsl:call-template name="string-trim">
     246      <xsl:with-param name="text" select="$rep6"/>
     247    </xsl:call-template>
     248  </xsl:variable>
     249
     250  <xsl:value-of select="$rep7"/>
    228251</xsl:template>
    229252
    … …  
    234257<xsl:template match="desc//*">
    235258  <xsl:variable name="tagname" select="local-name()"/>
    236   <xsl:value-of select="concat('&lt;', $tagname, '&gt;')"/>
     259  <xsl:value-of select="concat('&lt;', $tagname)"/>
     260  <xsl:if test="$tagname = 'table'"> <!-- javadoc 8 fudge -->
     261    <xsl:text> summary=""</xsl:text>
     262  </xsl:if>
     263  <xsl:text>&gt;</xsl:text>
    237264  <xsl:apply-templates/>
    238265  <xsl:value-of select="concat('&lt;/', $tagname, '&gt;')"/>
    … …  
    412439  <xsl:if test="result">
    413440    <xsl:text>&#10;Expected result codes:&#10;</xsl:text>
    414     <xsl:text>&lt;table&gt;&#10;</xsl:text>
     441    <xsl:text>&lt;table summary=""&gt;&#10;</xsl:text>
    415442    <xsl:for-each select="result">
    416443      <xsl:text>&lt;tr&gt;</xsl:text>
    … …  
    426453      <xsl:apply-templates select="text() | *[not(self::note or self::see or
    427454                                                  self::result)]"/>
    428       <xsl:text>&lt;/td&gt;&lt;tr&gt;&#10;</xsl:text>
     455      <xsl:text>&lt;/td&gt;&lt;/tr&gt;&#10;</xsl:text>
    429456    </xsl:for-each>
    430457    <xsl:text>&lt;/table&gt;&#10;</xsl:text>
    … …  
    446473  <xsl:apply-templates select="." mode="begin"/>
    447474  <xsl:apply-templates select="." mode="middle"/>
    448   <xsl:text>&#10;Interface ID: &lt;tt&gt;{</xsl:text>
     475  <xsl:text>&#10;&#10;Interface ID: &lt;tt&gt;{</xsl:text>
    449476  <xsl:call-template name="uppercase">
    450477    <xsl:with-param name="str" select="../@uuid"/>
    … …  
    465492    <xsl:with-param name="type" select="../@type"/>
    466493    <xsl:with-param name="safearray" select="../@safearray"/>
     494    <xsl:with-param name="doubleescape">yes</xsl:with-param>
    467495  </xsl:call-template>
    468496  <xsl:text>&#10;</xsl:text>
    … …  
    483511    <xsl:with-param name="type" select="../@type"/>
    484512    <xsl:with-param name="safearray" select="../@safearray"/>
     513    <xsl:with-param name="doubleescape">yes</xsl:with-param>
    485514  </xsl:call-template>
    486515  <xsl:text>&#10;</xsl:text>
    … …  
    715744  <xsl:param name="forceelem" />
    716745  <xsl:param name="skiplisttype" />
     746  <xsl:param name="doubleescape" />
    717747
    718748  <xsl:variable name="needarray" select="($safearray='yes') and not($forceelem='yes')" />
    … …  
    722752    <xsl:text>List</xsl:text>
    723753    <xsl:if test="not($skiplisttype='yes')">
    724       <xsl:text>&lt;</xsl:text>
     754      <xsl:choose>
     755        <xsl:when test="$doubleescape='yes'">
     756          <xsl:text>&amp;lt;</xsl:text>
     757        </xsl:when>
     758        <xsl:otherwise>
     759          <xsl:text>&lt;</xsl:text>
     760        </xsl:otherwise>
     761      </xsl:choose>
    725762    </xsl:if>
    726763  </xsl:if>
    … …  
    748785    <xsl:when test="($needlist)">
    749786      <xsl:if test="not($skiplisttype='yes')">
    750         <xsl:text>&gt;</xsl:text>
     787        <xsl:choose>
     788          <xsl:when test="$doubleescape='yes'">
     789            <xsl:text>&amp;gt;</xsl:text>
     790          </xsl:when>
     791          <xsl:otherwise>
     792            <xsl:text>&gt;</xsl:text>
     793          </xsl:otherwise>
     794        </xsl:choose>
    751795      </xsl:if>
    752796    </xsl:when>

  • trunk/src/VBox/Main/idl/VirtualBox.xidl

    r53354 r53385  
    1148511485      <param name="environment" type="wstring" dir="in" safearray="yes">
    1148611486        <desc>
    11487           <para>Environment variables that can be set while the command is being
     11487          Environment variables that can be set while the command is being
    1148811488          executed, in form of "NAME=VALUE"; one pair per entry. To unset a
    11489           variable just set its name ("NAME") without a value.</para>
    11490           <para>This parameter can be used to override environment variables set by
     11489          variable just set its name ("NAME") without a value.
     11490
     11491          This parameter can be used to override environment variables set by
    1149111492          the guest session, which will be applied to the newly started process
    11492           in any case.</para>
     11493          in any case.
    1149311494        </desc>
    1149411495      </param>
    … …  
    1151411515    <method name="processCreateEx">
    1151511516      <desc>
    11516         <para>Creates a new process running on the guest. Extended version for
    11517           also setting the process priority and affinity.</para>
    11518 
    11519         <para>See <link to="IGuestSession::processCreate"/> for more
    11520           information.</para>
     11517        Creates a new process running on the guest. Extended version for
     11518        also setting the process priority and affinity.
     11519
     11520        See <link to="IGuestSession::processCreate"/> for more information.
    1152111521      </desc>
    1152211522      <param name="command" type="wstring" dir="in">
    … …  
    1153111531      <param name="environment" type="wstring" dir="in" safearray="yes">
    1153211532        <desc>
    11533           <para>Environment variables that can be set while the command is being
     11533          Environment variables that can be set while the command is being
    1153411534          executed, in form of "NAME=VALUE"; one pair per entry. To unset a
    11535           variable just set its name ("NAME") without a value.</para>
    11536           <para>This parameter can be used to override environment variables set by
     11535          variable just set its name ("NAME") without a value.
     11536
     11537          This parameter can be used to override environment variables set by
    1153711538          the guest session, which will be applied to the newly started process
    11538           in any case.</para>
     11539          in any case.
    1153911540        </desc>
    1154011541      </param>
Note: See TracChangeset for help on using the changeset viewer.

© 2024 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette