[tomcat] 03/04: Use constants for Java 13 and Java 14 that are now available

[markt]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git

commit a4811220f40e1e699f373da4e3dc2e1459a83cdc
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Mon Oct 26 19:31:33 2020 +0000

    Use constants for Java 13 and Java 14 that are now available
---
 java/org/apache/jasper/compiler/JDTCompiler.java | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/java/org/apache/jasper/compiler/JDTCompiler.java 
b/java/org/apache/jasper/compiler/JDTCompiler.java
index a5a5806..3377112 100644
--- a/java/org/apache/jasper/compiler/JDTCompiler.java
+++ b/java/org/apache/jasper/compiler/JDTCompiler.java
@@ -317,15 +317,9 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
                 settings.put(CompilerOptions.OPTION_Source,
                              CompilerOptions.VERSION_12);
             } else if(opt.equals("13")) {
-                // Constant not available in latest ECJ version shipped with
-                // Tomcat. May be supported in a snapshot build.
-                // This is checked against the actual version below.
-                settings.put(CompilerOptions.OPTION_Source, "13");
+                settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_13);
             } else if(opt.equals("14")) {
-                // Constant not available in latest ECJ version shipped with
-                // Tomcat. May be supported in a snapshot build.
-                // This is checked against the actual version below.
-                settings.put(CompilerOptions.OPTION_Source, "14");
+                settings.put(CompilerOptions.OPTION_Source, 
CompilerOptions.VERSION_14);
             } else if(opt.equals("15")) {
                 // Constant not available in latest ECJ version shipped with
                 // Tomcat. May be supported in a snapshot build.
@@ -405,17 +399,11 @@ public class JDTCompiler extends 
org.apache.jasper.compiler.Compiler {
                 settings.put(CompilerOptions.OPTION_Compliance,
                         CompilerOptions.VERSION_12);
             } else if(opt.equals("13")) {
-                // Constant not available in latest ECJ version shipped with
-                // Tomcat. May be supported in a snapshot build.
-                // This is checked against the actual version below.
-                settings.put(CompilerOptions.OPTION_TargetPlatform, "13");
-                settings.put(CompilerOptions.OPTION_Compliance, "13");
+                settings.put(CompilerOptions.OPTION_TargetPlatform, 
CompilerOptions.VERSION_13);
+                settings.put(CompilerOptions.OPTION_Compliance, 
CompilerOptions.VERSION_13);
             } else if(opt.equals("14")) {
-                // Constant not available in latest ECJ version shipped with
-                // Tomcat. May be supported in a snapshot build.
-                // This is checked against the actual version below.
-                settings.put(CompilerOptions.OPTION_TargetPlatform, "14");
-                settings.put(CompilerOptions.OPTION_Compliance, "14");
+                settings.put(CompilerOptions.OPTION_TargetPlatform, 
CompilerOptions.VERSION_14);
+                settings.put(CompilerOptions.OPTION_Compliance, 
CompilerOptions.VERSION_14);
             } else if(opt.equals("15")) {
                 // Constant not available in latest ECJ version shipped with
                 // Tomcat. May be supported in a snapshot build.


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org