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

logs detection: do not drill into folder as recursive patterns were never supported

Browse Source
This commit is contained in:
anna
2010-11-17 12:38:10 +03:00
parent 8fbdd13bda
commit 2e7dea638a
1 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-api/src/com/intellij/execution/configurations/LogFileOptions.java
+15 -1
View File
@@ -27,6 +27,7 @@ import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.regex.Pattern;
@@ -80,7 +81,7 @@ public class LogFileOptions implements JDOMExternalizable {
final ArrayList<File> files = new ArrayList<File>();
final String basePath = myPathPattern.substring(0, dirIndex);
final String pattern = myPathPattern.substring(dirIndex + File.separator.length());
FileUtil.collectMatchedFiles(new File(basePath), Pattern.compile(FileUtil.convertAntToRegexp(pattern)), files);
collectMatchedFiles(new File(basePath), Pattern.compile(FileUtil.convertAntToRegexp(pattern)), files);
if (!files.isEmpty()) {
if (myShowAll) {
for (File file : files) {
@@ -107,6 +108,19 @@ public class LogFileOptions implements JDOMExternalizable {
return result;
}
public static void collectMatchedFiles(final File root, final Pattern pattern, final List<File> files) {
final File[] dirs = root.listFiles();
if (dirs == null) return;
for (File dir : dirs) {
if (dir.isFile()) {
final String path = FileUtil.toSystemIndependentName(FileUtil.getRelativePath(root, dir));
if (pattern.matcher(path).matches()) {
files.add(dir);
}
}
}
}
public boolean isEnabled() {
return myEnabled;
}