Author: mthl
Date: Sat May 11 20:40:37 2019
New Revision: 1859124
URL: http://svn.apache.org/viewvc?rev=1859124&view=rev
Log:
Fixed: Fix javadoc build for OpenJDK 11
(OFBIZ-10757)
This removes HTML5 deprecated stuff such as ‘<tt>’ elements, and
‘cellpadding’ table attributes which were breaking the ‘:javadoc’
Gradle task when using OpenJDK 11.
Modified:
ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/util/Observable.java
ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java
ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java
ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelFunctions.java
ofbiz/ofbiz-framework/branches/release18.12/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthenticationComparator.java
ofbiz/ofbiz-framework/branches/release18.12/framework/start/src/main/java/org/apache/ofbiz/base/start/Start.java
ofbiz/ofbiz-framework/branches/release18.12/framework/start/src/main/java/org/apache/ofbiz/base/start/StartupCommand.java
Modified:
ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/util/Observable.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/util/Observable.java?rev=1859124&r1=1859123&r2=1859124&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/util/Observable.java
(original)
+++
ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/util/Observable.java
Sat May 11 20:40:37 2019
@@ -89,12 +89,12 @@ public final class Observable {
/**
* Notify all of the observers.
- * <p>Each <code>Observer</code> has its <code>update</code> method called
with two
- * arguments: this observable object and <code>null</code>. In other
+ * <p>Each {@code Observer} has its {@code update} method called with two
+ * arguments: this observable object and {@code null}. In other
* words, this method is equivalent to:
* </p>
* <blockquote>
- * <tt>notifyObservers(null)</tt>
+ * {@code notifyObservers(null)}
* </blockquote>
*
*/
Modified:
ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java?rev=1859124&r1=1859123&r2=1859124&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java
(original)
+++
ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/util/StringUtil.java
Sat May 11 20:40:37 2019
@@ -536,7 +536,7 @@ public class StringUtil {
/** Converts operator substitutions (@and, @or, etc) back to their
original form.
* <p>OFBiz script syntax provides special forms of common operators to
make
* it easier to embed logical expressions in XML</p>
- * <table border="1" cellpadding="2">
+ * <table>
* <caption>OFBiz XML operators</caption>
* <tr><th>OFBiz operator</th><th>Substitution</th></tr>
* <tr><td><strong>@and</strong></td><td>&&</td></tr>
Modified:
ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java?rev=1859124&r1=1859123&r2=1859124&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java
(original)
+++
ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/util/UtilDateTime.java
Sat May 11 20:40:37 2019
@@ -1168,11 +1168,12 @@ public final class UtilDateTime {
}
/**
- * Returns a copy of <code>date</code> that cannot be modified.
+ * Returns a copy of {@code date} that cannot be modified.
* Attempts to modify the returned date will result in an
- * <tt>UnsupportedOperationException</tt>.
+ * {@code UnsupportedOperationException}.
*
- * @param date
+ * @param date the date to copy
+ * @return an immutable copy of {@code date}.
*/
public static Date unmodifiableDate(Date date) {
if (date instanceof ImmutableDate) {
Modified:
ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelFunctions.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelFunctions.java?rev=1859124&r1=1859123&r2=1859124&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelFunctions.java
(original)
+++
ofbiz/ofbiz-framework/branches/release18.12/framework/base/src/main/java/org/apache/ofbiz/base/util/string/UelFunctions.java
Sat May 11 20:40:37 2019
@@ -56,7 +56,8 @@ import org.xml.sax.SAXException;
/** Implements Unified Expression Language functions.
* <p>Built-in functions are divided into a number of
* namespace prefixes:</p>
- * <table border="1" summary="">
+ * <table border="1">
+ * <caption>Miscellaneous date/time functions</caption>
* <tr><td colspan="2"><b><code>date:</code> contains miscellaneous date/time
functions</b></td></tr>
* <tr><td><code>date:second(Timestamp, TimeZone,
Locale)</code></td><td>Returns the second value of <code>Timestamp</code> (0 -
59).</td></tr>
* <tr><td><code>date:minute(Timestamp, TimeZone,
Locale)</code></td><td>Returns the minute value of <code>Timestamp</code> (0 -
59).</td></tr>
Modified:
ofbiz/ofbiz-framework/branches/release18.12/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthenticationComparator.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthenticationComparator.java?rev=1859124&r1=1859123&r2=1859124&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/branches/release18.12/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthenticationComparator.java
(original)
+++
ofbiz/ofbiz-framework/branches/release18.12/framework/common/src/main/java/org/apache/ofbiz/common/authentication/AuthenticationComparator.java
Sat May 11 20:40:37 2019
@@ -33,25 +33,22 @@ public class AuthenticationComparator im
/**
* Compares its two arguments for order. Returns a negative integer,
* zero, or a positive integer as the first argument is less than, equal
- * to, or greater than the second.<p>
+ * to, or greater than the second.
* <p>
- * The implementor must ensure that <tt>sgn(compare(x, y)) ==
- * -sgn(compare(y, x))</tt> for all <tt>x</tt> and <tt>y</tt>. (This
- * implies that <tt>compare(x, y)</tt> must throw an exception if and only
- * if <tt>compare(y, x)</tt> throws an exception.)<p>
- * </p>
+ * The implementor must ensure that {@code sgn(compare(x, y)) ==
-sgn(compare(y, x))}
+ * for all {@code x} and {@code y}. (This implies that {@code compare(x,
y)}
+ * must throw an exception if and only if {@code compare(y, x)} throws an
exception.)
* <p>
* The implementor must also ensure that the relation is transitive:
- * <tt>((compare(x, y)>0) && (compare(y, z)>0))</tt> implies
- * <tt>compare(x, z)>0</tt>.<p>
- * </p>
+ * {@code (compare(x, y) > 0) && (compare(y, z) > 0)} implies
+ * {@code compare(x, z) > 0}.
+ * <p>
+ * Finally, the implementer must ensure that {@code compare(x, y) == 0}
+ * implies that {@code sgn(compare(x, z)) == sgn(compare(y, z))} for all
+ * {@code z}.
* <p>
- * Finally, the implementer must ensure that <tt>compare(x, y)==0</tt>
- * implies that <tt>sgn(compare(x, z))==sgn(compare(y, z))</tt> for all
- * <tt>z</tt>.
- * </p>
* It is generally the case, but <i>not</i> strictly required that
- * <tt>(compare(x, y)==0) == (x.equals(y))</tt>. Generally speaking,
+ * {@code (compare(x, y) == 0) == x.equals(y)}. Generally speaking,
* any comparator that violates this condition should clearly indicate
* this fact. The recommended language is "Note: this comparator
* imposes orderings that are inconsistent with equals."
Modified:
ofbiz/ofbiz-framework/branches/release18.12/framework/start/src/main/java/org/apache/ofbiz/base/start/Start.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/framework/start/src/main/java/org/apache/ofbiz/base/start/Start.java?rev=1859124&r1=1859123&r2=1859124&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/branches/release18.12/framework/start/src/main/java/org/apache/ofbiz/base/start/Start.java
(original)
+++
ofbiz/ofbiz-framework/branches/release18.12/framework/start/src/main/java/org/apache/ofbiz/base/start/Start.java
Sat May 11 20:40:37 2019
@@ -36,7 +36,7 @@ import java.util.concurrent.atomic.Atomi
* <p>
* This class uses a singleton pattern to guarantee that only one server
instance
* is running in the VM. Client code retrieves the instance by using the
- * <tt>getInstance()</tt> static method.
+ * {@code getInstance()} static method.
* </p>
*/
public final class Start {
Modified:
ofbiz/ofbiz-framework/branches/release18.12/framework/start/src/main/java/org/apache/ofbiz/base/start/StartupCommand.java
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/branches/release18.12/framework/start/src/main/java/org/apache/ofbiz/base/start/StartupCommand.java?rev=1859124&r1=1859123&r2=1859124&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/branches/release18.12/framework/start/src/main/java/org/apache/ofbiz/base/start/StartupCommand.java
(original)
+++
ofbiz/ofbiz-framework/branches/release18.12/framework/start/src/main/java/org/apache/ofbiz/base/start/StartupCommand.java
Sat May 11 20:40:37 2019
@@ -25,9 +25,9 @@ import java.util.Map;
* A command line argument passed to OFBiz
*
* <p>
- * A <tt>StartupCommand</tt> represents a processed command line argument
passed
+ * A {@code StartupCommand} represents a processed command line argument passed
* to OFBiz such that it is no longer a raw string but an instance of this
class.
- * For example: <code>java -jar build/libs/ofbiz.jar --status</code> where
status is a command.
+ * For example: {@code java -jar build/libs/ofbiz.jar --status} where status
is a command.
* </p>
*/
public final class StartupCommand {
