Make Java 7 be the default in the GWT compiler and tools. Change-Id: I670ac6ae579a6e1f13f52dd56f4ec77611c49ac6
diff --git a/dev/core/src/com/google/gwt/dev/util/arg/SourceLevel.java b/dev/core/src/com/google/gwt/dev/util/arg/SourceLevel.java index be8c8d5..2b8796a 100644 --- a/dev/core/src/com/google/gwt/dev/util/arg/SourceLevel.java +++ b/dev/core/src/com/google/gwt/dev/util/arg/SourceLevel.java
@@ -26,10 +26,11 @@ // Source levels must appear in ascending order in order. JAVA6("1.6", "6"), JAVA7("1.7", "7"); + /** - * The default GWT source level is the one that matches best that of the runtime environment. + * The default java sourceLevel. */ - public static final SourceLevel DEFAULT_SOURCE_LEVEL; + public static final SourceLevel DEFAULT_SOURCE_LEVEL = JAVA7; private final String stringValue; private final String altStringValue; @@ -58,26 +59,6 @@ return stringValue; } - static { - SourceLevel result = SourceLevel.values()[0]; - /* TODO(rluble): source level should be set automatically to match the java version - * but a JDT bug is preventing the change (some correct code does not compile - * under sourceLevel 7). - * Uncomment the following code use the JDT is fixed or patched. - - String javaSpecLevel = System.getProperty("java.specification.version"); - try { - for (SourceLevel sourceLevel : SourceLevel.values()) { - if (Utility.versionCompare(javaSpecLevel, sourceLevel.stringValue) >= 0) { - result = sourceLevel; - } - } - } catch (IllegalArgumentException e) { - } - */ - DEFAULT_SOURCE_LEVEL = result; - } - /** * Returns the SourceLevel given the string or alternate string representation; * returns {@code null} if none is found.