MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

honor per-file encoding (IDEA-97558 External build: Honor file-level encoding during maven resources processing)

Browse Source
This commit is contained in:
Eugene Zhuravlev
2012-12-14 15:39:01 +01:00
parent c484ce61f0
commit ec78d7bc17
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/compiler/MavenResourcesBuilder.java
+5 -1
View File
@@ -19,6 +19,8 @@ import org.jetbrains.jps.incremental.messages.CompilerMessage;
import org.jetbrains.jps.incremental.messages.ProgressMessage;
import org.jetbrains.jps.maven.model.JpsMavenExtensionService;
import org.jetbrains.jps.maven.model.impl.*;
import org.jetbrains.jps.model.JpsEncodingConfigurationService;
import org.jetbrains.jps.model.JpsEncodingProjectConfiguration;
import java.io.*;
import java.text.SimpleDateFormat;
@@ -49,7 +51,8 @@ public class MavenResourcesBuilder extends TargetBuilder<MavenResourceRootDescri
return;
}
final Set<String> filteringExcludedExtensions = config.getFilteringExcludedExtensions();
final String encoding = context.getProjectDescriptor().getEncodingConfiguration().getPreferredModuleEncoding(target.getModule());
final JpsEncodingProjectConfiguration encodingConfig =
JpsEncodingConfigurationService.getInstance().getEncodingConfiguration(target.getModule().getProject());
final Date timestamp = new Date();
@Nullable
@@ -111,6 +114,7 @@ public class MavenResourcesBuilder extends TargetBuilder<MavenResourceRootDescri
}
private void copyWithFiltering(File file, File outputFile) throws IOException {
final String encoding = encodingConfig != null? encodingConfig.getEncoding(file) : null;
PrintWriter writer;
try {
writer = encoding != null ? new PrintWriter(outputFile, encoding) : new PrintWriter(outputFile);