diff options
Diffstat (limited to 'org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java')
| -rw-r--r-- | org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java | 35 |
1 files changed, 30 insertions, 5 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 e0a69e4d..d3d4a814 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 @@ -73,9 +73,9 @@ 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,1.6,1.7".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".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,1.6,1.7".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".split(",")); //$NON-NLS-1$ //$NON-NLS-2$ private static final String GOAL_RESOURCES = "resources"; @@ -348,9 +348,9 @@ public abstract class AbstractJavaProjectConfigurator extends AbstractProjectCon log.info("Not adding source folder " + sourceFolder.getFullPath() + " because it overlaps with " + cped.getPath()); } - if(sourceEncoding != null) { - sourceFolder.setDefaultCharset(sourceEncoding, monitor); - } + + // Set folder encoding (null = platform/container default) + sourceFolder.setDefaultCharset(sourceEncoding, monitor); } else { if(sourceFolder != null) { classpath.removeEntry(sourceFolder.getFullPath()); @@ -437,6 +437,31 @@ 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"; + } + if( source.equals("6") ) { + source = "1.6"; + } + if( source.equals("7") ) { + source = "1.7"; + } + + + // 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"; + } + if( target.equals("6") ) { + target = "1.6"; + } + if( target.equals("7") ) { + target = "1.7"; + } + options.put(JavaCore.COMPILER_SOURCE, source); options.put(JavaCore.COMPILER_COMPLIANCE, source); options.put(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, target); |