Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the java doc contents in openJ9 class files to work with JDK file make/CompileJavaModules.gmk #1570

Merged
merged 1 commit into from
Apr 17, 2018
Merged

Fix the java doc contents in openJ9 class files to work with JDK file make/CompileJavaModules.gmk #1570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions jcl/src/java.base/share/classes/java/lang/Class.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1300,7 +1300,7 @@ public Field[] getFields() throws SecurityException {
* specified in the receiver classes <code>implements</code>
* declaration
*
* @return Class<?>[]
* @return {@code Class<?>[]}
* the interfaces the receiver claims to implement.
*/
public Class<?>[] getInterfaces()
Expand All @@ -1314,7 +1314,7 @@ public Class<?>[] getInterfaces()
*
* @param name String
* the name of the method
* @param parameterTypes Class<?>[]
* @param parameterTypes {@code Class<?>[]}
* the types of the arguments.
* @return Method
* the method described by the arguments.
Expand Down Expand Up @@ -2820,8 +2820,7 @@ public boolean isAnnotationPresent(Class<? extends Annotation> annotation) {

/**
* Cast this Class to a subclass of the specified Class.
*
* @param cls the Class to cast to
* @param <U> cls the Class to cast to
* @return this Class, cast to a subclass of the specified Class
*
* @throws ClassCastException if this Class is not the same or a subclass
Expand Down
32 changes: 16 additions & 16 deletions jcl/src/java.base/share/classes/java/lang/String.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ private static final class CaseInsensitiveComparator implements Comparator<Strin
* an Object to compare
* @param o2
* an Object to compare
* @return an int < 0 if object1 is less than object2, 0 if they are equal, and > 0 if object1 is greater
* @return an {@code int < 0} if object1 is less than object2, 0 if they are equal, and {@code > 0} if object1 is greater
*
* @exception ClassCastException
* when objects are not the correct type
Expand Down Expand Up @@ -505,7 +505,7 @@ public String(byte[] data, int high) {
* the number of bytes to convert
*
* @throws IndexOutOfBoundsException
* when <code>length < 0, start < 0</code> or <code>start + length > data.length</code>
* when {@code length < 0, start < 0} or {@code start + length > data.length}
* @throws NullPointerException
* when data is null
*
Expand Down Expand Up @@ -585,7 +585,7 @@ public String(byte[] data, int start, int length) {
* the number of bytes to convert
*
* @throws IndexOutOfBoundsException
* when <code>length < 0, start < 0</code> or <code>start + length > data.length</code>
* when {@code length < 0, start < 0} or {@code start + length > data.length}
* @throws NullPointerException
* when data is null
*
Expand Down Expand Up @@ -670,7 +670,7 @@ public String(byte[] data, int high, int start, int length) {
* the encoding
*
* @throws IndexOutOfBoundsException
* when <code>length < 0, start < 0</code> or <code>start + length > data.length</code>
* when {@code length < 0, start < 0} or {@code start + length > data.length}
* @throws UnsupportedEncodingException
* when encoding is not supported
* @throws NullPointerException
Expand Down Expand Up @@ -912,7 +912,7 @@ public String(char[] data) {
* the number of characters to use
*
* @throws IndexOutOfBoundsException
* when <code>length < 0, start < 0</code> or <code>start + length > data.length</code>
* when {@code length < 0, start < 0} or {@code start + length > data.length}
* @throws NullPointerException
* when data is null
*/
Expand Down Expand Up @@ -1927,7 +1927,7 @@ static private String cachedConstantString(String s1, String s2, int index) {
* @return the character at the index
*
* @throws IndexOutOfBoundsException
* when <code>index < 0</code> or <code>index >= length()</code>
* when {@code index < 0} or {@code index >= length()}
*/
/*[IF]*/
// TODO : Is it better to throw the AIOOB here implicitly and catch and rethrow?
Expand Down Expand Up @@ -2071,7 +2071,7 @@ private char compareValue(byte b) {
*
* @param string
* a String
* @return an int < 0 if this String is less than the specified String, 0 if they are equal, and > 0 if this String is greater
* @return an {@code int < 0} if this String is less than the specified String, 0 if they are equal, and {@code > 0} if this String is greater
*/
public int compareToIgnoreCase(String string) {
String s1 = this;
Expand Down Expand Up @@ -2225,7 +2225,7 @@ public static String copyValueOf(char[] data) {
* @return the new String
*
* @throws IndexOutOfBoundsException
* if <code>length < 0, start < 0</code> or <code>start + length > data.length</code>
* if {@code length < 0, start < 0} or {@code start + length > data.length}
* @throws NullPointerException
* if data is null
*/
Expand Down Expand Up @@ -2505,7 +2505,7 @@ public byte[] getBytes() {
* @throws NullPointerException
* when data is null
* @throws IndexOutOfBoundsException
* when <code>start < 0, end > length(), index < 0, end - start > data.length - index</code>
* when {@code start < 0, end > length(), index < 0, end - start > data.length - index}
*
* @deprecated Use getBytes() or getBytes(String)
*/
Expand Down Expand Up @@ -2607,8 +2607,8 @@ public byte[] getBytes(String encoding) throws UnsupportedEncodingException {
* the starting offset in the character array
*
* @throws IndexOutOfBoundsException
* when <code>start < 0, end > length(),
* start > end, index < 0, end - start > buffer.length - index</code>
* when {@code start < 0, end > length(),
* start > end, index < 0, end - start > buffer.length - index}
* @throws NullPointerException
* when buffer is null
*/
Expand Down Expand Up @@ -3449,7 +3449,7 @@ public boolean startsWith(String prefix, int start) {
* @return a new String containing the characters from start to the end of the string
*
* @throws IndexOutOfBoundsException
* when <code>start < 0</code> or <code>start > length()</code>
* when {@code start < 0} or {@code start > length()}
*/
public String substring(int start) {
if (start == 0) {
Expand Down Expand Up @@ -3480,7 +3480,7 @@ public String substring(int start) {
* @return a String containing the characters from start to end - 1
*
* @throws IndexOutOfBoundsException
* when <code>start < 0, start > end</code> or <code>end > length()</code>
* when {@code start < 0, start > end} or {@code end > length()}
*/
public String substring(int start, int end) {
int len = lengthInternal();
Expand Down Expand Up @@ -4084,7 +4084,7 @@ private String toUpperCaseCore(String language) {
/**
* Removes white space characters from the beginning and end of the string.
*
* @return a String with characters <code><= \\u0020</code> removed from the beginning and the end
* @return a String with characters {@code <= \\u0020} removed from the beginning and the end
*/
public String trim() {
int start = 0;
Expand Down Expand Up @@ -4153,7 +4153,7 @@ public static String valueOf(char[] data) {
* @return the String
*
* @throws IndexOutOfBoundsException
* when <code>length < 0, start < 0</code> or <code>start + length > data.length</code>
* when {@code length < 0, start < 0} or {@code start + length > data.length}
* @throws NullPointerException
* when data is null
*/
Expand Down Expand Up @@ -5129,7 +5129,7 @@ public String(byte[] data, Charset charset) {
* the Charset to use
*
* @throws IndexOutOfBoundsException
* when <code>length < 0, start < 0</code> or <code>start + length > data.length</code>
* when {@code length < 0, start < 0} or {@code start + length > data.length}
* @throws NullPointerException
* when data is null
*
Expand Down
Loading