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

Timestamp:

Nov 25, 2022 7:31:13 PM (2 years ago)

Author:

vboxsync

Message:

Main/glue-java.xsl: Avoid "summary" attribute for "table" tags since it's not HTML5. Also map "h3" to "h2" since it's more suitable for this context. Recent javadoc is picky.

Location:

trunk/src/VBox/Main

Files:

• glue/glue-java.xsl (modified) (3 diffs)
• webservice/Makefile.kmk (modified) (1 diff)

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

@@ -291 +291 @@
       <xsl:text>&lt;code</xsl:text>
     </xsl:when>
+    <xsl:when test="$tagname = 'h3'">
+      <xsl:text>&lt;h2</xsl:text>
+    </xsl:when>
     <xsl:otherwise>
       <xsl:value-of select="concat('&lt;', $tagname)"/>
     </xsl:otherwise>
   </xsl:choose>
-  <xsl:if test="$tagname = 'table'"> <!-- javadoc 8 fudge -->
+  <xsl:if test="$tagname = 'table' and boolean($G_vboxFakeTableSummary)">
     <xsl:text> summary=""</xsl:text>
   </xsl:if>
@@ -303 +306 @@
     <xsl:when test="$tagname = 'tt'">
       <xsl:text>&lt;/code&gt;</xsl:text>
+    </xsl:when>
+    <xsl:when test="$tagname = 'h3'">
+      <xsl:text>&lt;/h2&gt;</xsl:text>
     </xsl:when>
     <xsl:otherwise>
@@ -487 +493 @@
   <xsl:if test="result">
     <xsl:text>&#10;Expected result codes:&#10;</xsl:text>
-    <xsl:text>&lt;table summary=""&gt;&#10;</xsl:text>
+    <xsl:text>&lt;table</xsl:text>
+    <xsl:if test="boolean($G_vboxFakeTableSummary)">
+      <xsl:text> summary=""</xsl:text>
+    </xsl:if>
+    <xsl:text>&gt;&#10;</xsl:text>
     <xsl:for-each select="result">
       <xsl:text>&lt;tr&gt;</xsl:text>

trunk/src/VBox/Main/webservice/Makefile.kmk

@@ -505 +505 @@
               --stringparam G_vboxGlueStyle jaxws              \
               --stringparam G_vboxDirPrefix org/virtualbox$(VBOX_API_SUFFIX)/ \
+              --stringparam G_vboxFakeTableSummary $(if-expr $(VBOX_JAVA_VERSION) >= 80000 && $(VBOX_JAVA_VERSION) < 110000,1,"") \
               -o $(VBOX_JWS_GEN_RAWSRC) $(VBOX_GLUE_XSLT_DIR)/glue-java.xsl $<
         $(QUIET)$(MKDIR) -p $(VBOX_JWS_GEN)/java/org/virtualbox$(VBOX_API_SUFFIX)