diff options
author | Anders Hammar | 2011-06-01 09:49:55 +0000 |
---|---|---|
committer | Igor Fedorenko | 2011-08-03 12:41:37 +0000 |
commit | d36e0d4507745afdab62ba9315d7db6d0696c854 (patch) | |
tree | e375f0d1a8fe7d856ef2f10831f72d45145a0b14 | |
parent | 089691914cf07b50b224b08255ef19561e954d54 (diff) | |
download | m2e-core-d36e0d4507745afdab62ba9315d7db6d0696c854.tar.gz m2e-core-d36e0d4507745afdab62ba9315d7db6d0696c854.tar.xz m2e-core-d36e0d4507745afdab62ba9315d7db6d0696c854.zip |
344657: folder file encoding reverted when m-compiler-p config removed
Signed-off-by: Anders Hammar <anders@hammar.net>
-rw-r--r-- | org.eclipse.m2e.jdt/src/org/eclipse/m2e/jdt/internal/AbstractJavaProjectConfigurator.java | 6 |
1 files changed, 3 insertions, 3 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..e5076f9a 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 @@ -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()); |