471362 : Add suport for JavaSE-9

Change-Id: I486ee489db0f4c044620c8bc8b5a2feee755603f
Signed-off-by: Fred Bricon <fbricon@gmail.com>

1 files changed, 26 insertions, 26 deletions

diff --git a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java
index d9a90b18..f0e366de 100644
--- a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java
+++ b/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java
@@ -75,10 +75,11 @@ public abstract class AbstractJavaProjectConfigurator extends AbstractProjectCon
 
   public static final String COMPILER_PLUGIN_GROUP_ID = "org.apache.maven.plugins";
 
-  protected static final List<String> SOURCES = Arrays.asList("1.1,1.2,1.3,1.4,1.5,5,1.6,6,1.7,7,1.8,8".split(",")); //$NON-NLS-1$ //$NON-NLS-2$
+  protected static final List<String> SOURCES = Arrays
+      .asList("1.1,1.2,1.3,1.4,1.5,5,1.6,6,1.7,7,1.8,8,1.9,9".split(",")); //$NON-NLS-1$ //$NON-NLS-2$
 
   protected static final List<String> TARGETS = Arrays
-      .asList("1.1,1.2,1.3,1.4,jsr14,1.5,5,1.6,6,1.7,7,1.8,8".split(",")); //$NON-NLS-1$ //$NON-NLS-2$
+      .asList("1.1,1.2,1.3,1.4,jsr14,1.5,5,1.6,6,1.7,7,1.8,8,1.9,9".split(",")); //$NON-NLS-1$ //$NON-NLS-2$
 
   private static final String GOAL_RESOURCES = "resources";
 
@@ -100,9 +101,10 @@ public abstract class AbstractJavaProjectConfigurator extends AbstractProjectCon
     ENVIRONMENTS.put("1.6", "JavaSE-1.6"); //$NON-NLS-1$ //$NON-NLS-2$
     ENVIRONMENTS.put("1.7", "JavaSE-1.7"); //$NON-NLS-1$ //$NON-NLS-2$
     ENVIRONMENTS.put("1.8", "JavaSE-1.8"); //$NON-NLS-1$ //$NON-NLS-2$
+    ENVIRONMENTS.put("1.9", "JavaSE-1.9"); //$NON-NLS-1$ //$NON-NLS-2$
   }
 
-  protected static final String DEFAULT_COMPILER_LEVEL = "1.4"; //$NON-NLS-1$
+  protected static final String DEFAULT_COMPILER_LEVEL = "1.5"; //$NON-NLS-1$
 
   public void configure(ProjectConfigurationRequest request, IProgressMonitor monitor) throws CoreException {
     IProject project = request.getProject();
@@ -493,29 +495,12 @@ public abstract class AbstractJavaProjectConfigurator extends AbstractProjectCon
       log.warn("Could not determine target level, using default " + target);
     }
 
-    // While "5" and "6" are valid synonyms for Java 5 and Java 6 source,
-    // Eclipse expects the values 1.5 and 1.6.
-    if(source.equals("5")) {
-      source = "1.5";
-    } else if(source.equals("6")) {
-      source = "1.6";
-    } else if(source.equals("7")) {
-      source = "1.7";
-    } else if(source.equals("8")) {
-      source = "1.8";
-    }
-
-    // While "5" and "6" are valid synonyms for Java 5 and Java 6 target,
-    // Eclipse expects the values 1.5 and 1.6.
-    if(target.equals("5")) {
-      target = "1.5";
-    } else if(target.equals("6")) {
-      target = "1.6";
-    } else if(target.equals("7")) {
-      target = "1.7";
-    } else if(target.equals("8")) {
-      target = "1.8";
-    }
+    // While "5" and "6" ... are valid synonyms for Java 5, Java 6 ... source,
+    // Eclipse expects the values 1.5 and 1.6 and so on.
+    source = sanitizeJavaVersion(source);
+    // While "5" and "6" ... are valid synonyms for Java 5, Java 6 ... target,
+    // Eclipse expects the values 1.5 and 1.6 and so on.
+    target = sanitizeJavaVersion(target);
 
     options.put(JavaCore.COMPILER_SOURCE, source);
     options.put(JavaCore.COMPILER_COMPLIANCE, source);
@@ -528,6 +513,21 @@ public abstract class AbstractJavaProjectConfigurator extends AbstractProjectCon
     }
   }
 
+  private String sanitizeJavaVersion(String version) {
+    switch(version) {
+      case "5":
+      case "6":
+      case "7":
+      case "8":
+      case "9":
+        version = "1." + version;
+        break;
+      default:
+        break;
+    }
+    return version;
+  }
+
   protected String getDefaultTargetLevel(String source) {
     return DEFAULT_COMPILER_LEVEL;
   }