Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 420848 | Differences between
and this patch

Collapse All | Expand All

(-)a/org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java (-3 / +8 lines)
Lines 72-80 public abstract class AbstractJavaProjectConfigurator extends AbstractProjectCon Link Here
72
72
73
  public static final String COMPILER_PLUGIN_GROUP_ID = "org.apache.maven.plugins";
73
  public static final String COMPILER_PLUGIN_GROUP_ID = "org.apache.maven.plugins";
74
74
75
  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".split(",")); //$NON-NLS-1$ //$NON-NLS-2$
75
  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$
76
76
77
  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".split(",")); //$NON-NLS-1$ //$NON-NLS-2$
77
  protected static final List<String> TARGETS = Arrays
78
      .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$
78
79
79
  private static final String GOAL_RESOURCES = "resources";
80
  private static final String GOAL_RESOURCES = "resources";
80
81
Lines 95-100 public abstract class AbstractJavaProjectConfigurator extends AbstractProjectCon Link Here
95
    ENVIRONMENTS.put("jsr14", "J2SE-1.5"); //$NON-NLS-1$ //$NON-NLS-2$
96
    ENVIRONMENTS.put("jsr14", "J2SE-1.5"); //$NON-NLS-1$ //$NON-NLS-2$
96
    ENVIRONMENTS.put("1.6", "JavaSE-1.6"); //$NON-NLS-1$ //$NON-NLS-2$
97
    ENVIRONMENTS.put("1.6", "JavaSE-1.6"); //$NON-NLS-1$ //$NON-NLS-2$
97
    ENVIRONMENTS.put("1.7", "JavaSE-1.7"); //$NON-NLS-1$ //$NON-NLS-2$
98
    ENVIRONMENTS.put("1.7", "JavaSE-1.7"); //$NON-NLS-1$ //$NON-NLS-2$
99
    ENVIRONMENTS.put("1.8", "JavaSE-1.8"); //$NON-NLS-1$ //$NON-NLS-2$
98
  }
100
  }
99
101
100
  protected static final String DEFAULT_COMPILER_LEVEL = "1.4"; //$NON-NLS-1$
102
  protected static final String DEFAULT_COMPILER_LEVEL = "1.4"; //$NON-NLS-1$
Lines 469-474 public abstract class AbstractJavaProjectConfigurator extends AbstractProjectCon Link Here
469
      source = "1.6";
471
      source = "1.6";
470
    } else if(source.equals("7")) {
472
    } else if(source.equals("7")) {
471
      source = "1.7";
473
      source = "1.7";
474
    } else if(source.equals("8")) {
475
      source = "1.8";
472
    }
476
    }
473
477
474
    // While "5" and "6" are valid synonyms for Java 5 and Java 6 target,
478
    // While "5" and "6" are valid synonyms for Java 5 and Java 6 target,
Lines 479-484 public abstract class AbstractJavaProjectConfigurator extends AbstractProjectCon Link Here
479
      target = "1.6";
483
      target = "1.6";
480
    } else if(target.equals("7")) {
484
    } else if(target.equals("7")) {
481
      target = "1.7";
485
      target = "1.7";
486
    } else if(target.equals("8")) {
487
      target = "1.8";
482
    }
488
    }
483
489
484
    options.put(JavaCore.COMPILER_SOURCE, source);
490
    options.put(JavaCore.COMPILER_SOURCE, source);
485
- 

Return to bug 420848