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

IDEA-97815 If Maven project has two resources-folders, neither is copied.

Browse Source
This commit is contained in:
Sergey Evdokimov
2013-01-10 19:15:18 +04:00
parent b647d6d4fa
commit f163e84d11
2 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenProjectConfiguration.java
-1
View File
@@ -37,7 +37,6 @@ import java.util.regex.Pattern;
public class MavenProjectConfiguration {
public static final String CONFIGURATION_FILE_RELATIVE_PATH = "maven/configuration.xml";
public static final String DEFAULT_ESCAPE_STRING = "\\";
public static final String[] DEFAULT_INCLUDES = {"**/*"};
private static final Pattern PROPERTY_PATTERN = Pattern.compile("-D(\\S+?)=(.+)");
public static final Set<String> DEFAULT_FILTERING_EXCLUDED_EXTENSIONS;
static {
plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/model/impl/MavenResourceRootDescriptor.java
+8 -5
View File
@@ -78,10 +78,15 @@ public class MavenResourceRootDescriptor extends BuildRootDescriptor {
public boolean isIncluded(String relativePath) {
if (myNormalizedIncludes == null) {
myNormalizedIncludes = normalizePatterns(myConfig.includes, MavenProjectConfiguration.DEFAULT_INCLUDES);
if (myConfig.includes.isEmpty()) {
myNormalizedIncludes = new String[]{"**" + File.separatorChar + '*'};
}
else {
myNormalizedIncludes = normalizePatterns(myConfig.includes);
}
}
if (myNormalizedExcludes == null) {
myNormalizedExcludes = normalizePatterns(myConfig.excludes, ArrayUtil.EMPTY_STRING_ARRAY);
myNormalizedExcludes = normalizePatterns(myConfig.excludes);
}
return isIncluded(FileUtil.toSystemIndependentName(relativePath), myNormalizedIncludes, myNormalizedExcludes);
}
@@ -106,9 +111,7 @@ public class MavenResourceRootDescriptor extends BuildRootDescriptor {
}
@NotNull
private static String[] normalizePatterns(@NotNull Collection<String> patterns, @NotNull String[] defaultValue) {
if (patterns.size() == 0) return defaultValue;
private static String[] normalizePatterns(@NotNull Collection<String> patterns) {
String[] res = new String[patterns.size()];
int i = 0;