Fix 'ajdoc' tests for Java 15 build

Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>

2 files changed, 12 insertions, 8 deletions

diff --git a/util/src/main/java/org/aspectj/util/LangUtil.java b/util/src/main/java/org/aspectj/util/LangUtil.java
index fecf38e47..1f4ee65b4 100644
--- a/util/src/main/java/org/aspectj/util/LangUtil.java
+++ b/util/src/main/java/org/aspectj/util/LangUtil.java
@@ -126,7 +126,7 @@ public class LangUtil {
 	}
 
 	@Deprecated
-	public static boolean isOnePointThreeVMOrGreater() {
+	public static boolean is1dot3VMOrGreater() {
 		return 1.3 <= vmVersion;
 	}
 
@@ -136,25 +136,25 @@ public class LangUtil {
 	}
 
 	@Deprecated
-	public static boolean is15VMOrGreater() {
+	public static boolean is1dot5VMOrGreater() {
 		return 1.5 <= vmVersion;
 	}
 
 	@Deprecated
-	public static boolean is16VMOrGreater() {
+	public static boolean is1dot6VMOrGreater() {
 		return 1.6 <= vmVersion;
 	}
 
 	@Deprecated
-	public static boolean is17VMOrGreater() {
+	public static boolean is1dot7VMOrGreater() {
 		return 1.7 <= vmVersion;
 	}
 
-	public static boolean is18VMOrGreater() {
+	public static boolean is1dot8VMOrGreater() {
 		return 1.8 <= vmVersion;
 	}
 
-	public static boolean is19VMOrGreater() {
+	public static boolean is9VMOrGreater() {
 		return 9 <= vmVersion;
 	}
 
@@ -178,6 +178,10 @@ public class LangUtil {
 		return 14 <= vmVersion;
 	}
 
+	public static boolean is15VMOrGreater() {
+		return 15 <= vmVersion;
+	}
+
 	/**
 	 * Shorthand for "if null, throw IllegalArgumentException"
 	 *
diff --git a/util/src/test/java/org/aspectj/util/LangUtilTest.java b/util/src/test/java/org/aspectj/util/LangUtilTest.java
index 87b976957..fddc6f946 100644
--- a/util/src/test/java/org/aspectj/util/LangUtilTest.java
+++ b/util/src/test/java/org/aspectj/util/LangUtilTest.java
@@ -101,9 +101,9 @@ public class LangUtilTest extends TestCase {
 	// }
 
 	public void testVersion() {
-		assertTrue(LangUtil.is18VMOrGreater()); // min vm now - floor may change
+		assertTrue(LangUtil.is1dot8VMOrGreater()); // min vm now - floor may change
 		if (LangUtil.is11VMOrGreater()) {
-			assertTrue(LangUtil.is19VMOrGreater());
+			assertTrue(LangUtil.is9VMOrGreater());
 			assertTrue(LangUtil.is10VMOrGreater());
 		}
 	}