Cleanup (language level decoding code extracted)

diff --git a/java/openapi/src/com/intellij/pom/java/LanguageLevel.java b/java/openapi/src/com/intellij/pom/java/LanguageLevel.java
index 80badd5a8c94fc57f0b25c050961adefed911451..6e36e8a4e257a52549656b7b9199ca0a1032f295 100644 (file)
--- a/java/openapi/src/com/intellij/pom/java/LanguageLevel.java
+++ b/java/openapi/src/com/intellij/pom/java/LanguageLevel.java
@@ -17,6 +17,7 @@ package com.intellij.pom.java;
 
 import com.intellij.openapi.util.Key;
 import com.intellij.psi.PsiBundle;
+import org.jetbrains.annotations.Nullable;
 
 /**
  * @author dsl
@@ -57,4 +58,16 @@ public enum LanguageLevel {
   public boolean isAtLeast(final LanguageLevel level) {
     return compareTo(level) >= 0;
   }
+
+  @Nullable
+  public static LanguageLevel parse(final String value) {
+    if ("1.3".equals(value)) return JDK_1_3;
+    if ("1.4".equals(value)) return JDK_1_4;
+    if ("1.5".equals(value)) return JDK_1_5;
+    if ("1.6".equals(value)) return JDK_1_6;
+    if ("1.7".equals(value)) return JDK_1_7;
+    if ("1.8".equals(value)) return JDK_1_8;
+
+    return null;
+  }
 }

diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java
index cb3192aebf823ade8503ce2df05634ab50b73e63..180f3f3231e8ea8112e2c19cc92c04bd4a392f24 100644 (file)
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenModuleImporter.java
@@ -20,7 +20,6 @@ import com.intellij.openapi.roots.DependencyScope;
 import com.intellij.openapi.roots.ModifiableRootModel;
 import com.intellij.openapi.util.Pair;
 import com.intellij.pom.java.LanguageLevel;
-import org.jetbrains.annotations.Nullable;
 import org.jetbrains.idea.maven.model.MavenArtifact;
 import org.jetbrains.idea.maven.model.MavenConstants;
 import org.jetbrains.idea.maven.project.*;
@@ -122,7 +121,7 @@ public class MavenModuleImporter {
     }
   }
 
-  private DependencyScope selectScope(String mavenScope) {
+  private static DependencyScope selectScope(String mavenScope) {
     if (MavenConstants.SCOPE_RUNTIME.equals(mavenScope)) return DependencyScope.RUNTIME;
     if (MavenConstants.SCOPE_TEST.equals(mavenScope)) return DependencyScope.TEST;
     if (MavenConstants.SCOPE_PROVIDEED.equals(mavenScope)) return DependencyScope.PROVIDED;
@@ -130,17 +129,7 @@ public class MavenModuleImporter {
   }
 
   private void configLanguageLevel() {
-    LanguageLevel level = translateLanguageLevel(myMavenProject.getSourceLevel());
+    final LanguageLevel level = LanguageLevel.parse(myMavenProject.getSourceLevel());
     myRootModelAdapter.setLanguageLevel(level);
   }
-
-  @Nullable
-  private LanguageLevel translateLanguageLevel(@Nullable String level) {
-    if ("1.3".equals(level)) return LanguageLevel.JDK_1_3;
-    if ("1.4".equals(level)) return LanguageLevel.JDK_1_4;
-    if ("1.5".equals(level)) return LanguageLevel.JDK_1_5;
-    if ("1.6".equals(level)) return LanguageLevel.JDK_1_6;
-
-    return null;
-  }
 }