diff --git a/java/testFramework/src/com/intellij/execution/ExecutionTestCase.java b/java/testFramework/src/com/intellij/execution/ExecutionTestCase.java index 1cfdd4e55268..2a94928b7603 100644 --- a/java/testFramework/src/com/intellij/execution/ExecutionTestCase.java +++ b/java/testFramework/src/com/intellij/execution/ExecutionTestCase.java @@ -23,8 +23,8 @@ import com.intellij.openapi.application.PathManager; import com.intellij.openapi.projectRoots.impl.JavaAwareProjectJdkTableImpl; import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.openapi.util.Key; +import com.intellij.openapi.util.io.FileFilters; import com.intellij.openapi.util.io.FileUtil; -import com.intellij.openapi.util.io.FileUtilRt; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VfsUtilCore; import com.intellij.openapi.vfs.VirtualFile; @@ -263,7 +263,7 @@ public abstract class ExecutionTestCase extends IdeaTestCase { args.add(junitLibRoot); } - final File[] files = new File(appPath, SRC).listFiles(FileUtilRt.createFilterByExtension("java")); + final File[] files = new File(appPath, SRC).listFiles(FileFilters.withExtension("java")); if (files == null) return 0; // Nothing to compile for (File file : files) { diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java index 04b1f96e8457..1fe956a11b86 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java +++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/java/JavaBuilder.java @@ -19,8 +19,8 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.Pair; +import com.intellij.openapi.util.io.FileFilters; import com.intellij.openapi.util.io.FileUtil; -import com.intellij.openapi.util.io.FileUtilRt; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.SystemProperties; import com.intellij.util.concurrency.SequentialTaskExecutor; @@ -89,7 +89,7 @@ public class JavaBuilder extends ModuleLevelBuilder { "-g", "-deprecation", "-nowarn", "-verbose", "-proc:none", "-proc:only", "-proceedOnError" )); - public static final FileFilter JAVA_SOURCES_FILTER = FileUtilRt.createFilterByExtension(JAVA_EXTENSION); + public static final FileFilter JAVA_SOURCES_FILTER = FileFilters.withExtension(JAVA_EXTENSION); private static final String RT_JAR_PATH_SUFFIX = File.separator + "rt.jar"; private final Executor myTaskRunner; diff --git a/platform/util-rt/src/com/intellij/openapi/util/io/FileFilters.java b/platform/util-rt/src/com/intellij/openapi/util/io/FileFilters.java new file mode 100644 index 000000000000..d4e7b8b2486f --- /dev/null +++ b/platform/util-rt/src/com/intellij/openapi/util/io/FileFilters.java @@ -0,0 +1,38 @@ +/* + * Copyright 2000-2015 JetBrains s.r.o. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.openapi.util.io; + +import org.jetbrains.annotations.NotNull; + +import java.io.File; +import java.io.FileFilter; + +/** + * @author nik + */ +public class FileFilters { + private FileFilters() { + } + + public static FileFilter withExtension(@NotNull final String extension) { + return new FileFilter() { + @Override + public boolean accept(File pathname) { + return FileUtilRt.extensionEquals(pathname.getPath(), extension); + } + }; + } +} diff --git a/platform/util-rt/src/com/intellij/openapi/util/io/FileUtilRt.java b/platform/util-rt/src/com/intellij/openapi/util/io/FileUtilRt.java index 47ee0ddc73b4..3e221d272be3 100644 --- a/platform/util-rt/src/com/intellij/openapi/util/io/FileUtilRt.java +++ b/platform/util-rt/src/com/intellij/openapi/util/io/FileUtilRt.java @@ -168,15 +168,6 @@ public class FileUtilRt { } } - public static FileFilter createFilterByExtension(@NotNull final String extension) { - return new FileFilter() { - @Override - public boolean accept(File pathname) { - return extensionEquals(pathname.getPath(), extension); - } - }; - } - @NotNull public static String getExtension(@NotNull String fileName) { int index = fileName.lastIndexOf('.'); diff --git a/plugins/ui-designer/jps-plugin/src/org/jetbrains/jps/uiDesigner/compiler/FormsBindingManager.java b/plugins/ui-designer/jps-plugin/src/org/jetbrains/jps/uiDesigner/compiler/FormsBindingManager.java index 50f16ea1677b..e0f396439d43 100644 --- a/plugins/ui-designer/jps-plugin/src/org/jetbrains/jps/uiDesigner/compiler/FormsBindingManager.java +++ b/plugins/ui-designer/jps-plugin/src/org/jetbrains/jps/uiDesigner/compiler/FormsBindingManager.java @@ -17,8 +17,8 @@ package org.jetbrains.jps.uiDesigner.compiler; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.SystemInfo; +import com.intellij.openapi.util.io.FileFilters; import com.intellij.openapi.util.io.FileUtil; -import com.intellij.openapi.util.io.FileUtilRt; import com.intellij.openapi.util.text.StringUtil; import gnu.trove.THashMap; import gnu.trove.THashSet; @@ -257,7 +257,7 @@ public class FormsBindingManager extends FormsBuilder { if (containingDirectory == null) { return Collections.emptyList(); } - final File[] files = containingDirectory.listFiles(FileUtilRt.createFilterByExtension("java")); + final File[] files = containingDirectory.listFiles(FileFilters.withExtension("java")); if (files == null || files.length == 0) { return Collections.emptyList(); } diff --git a/plugins/ui-designer/jps-plugin/src/org/jetbrains/jps/uiDesigner/compiler/FormsBuilder.java b/plugins/ui-designer/jps-plugin/src/org/jetbrains/jps/uiDesigner/compiler/FormsBuilder.java index c67781d84328..8097b2cd3298 100644 --- a/plugins/ui-designer/jps-plugin/src/org/jetbrains/jps/uiDesigner/compiler/FormsBuilder.java +++ b/plugins/ui-designer/jps-plugin/src/org/jetbrains/jps/uiDesigner/compiler/FormsBuilder.java @@ -17,7 +17,7 @@ package org.jetbrains.jps.uiDesigner.compiler; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.Key; -import com.intellij.openapi.util.io.FileUtilRt; +import com.intellij.openapi.util.io.FileFilters; import org.jetbrains.annotations.NotNull; import org.jetbrains.jps.incremental.BuilderCategory; import org.jetbrains.jps.incremental.ModuleLevelBuilder; @@ -36,8 +36,8 @@ public abstract class FormsBuilder extends ModuleLevelBuilder { protected static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.uiDesigner.compiler.FormsInstrumenter"); protected static final Key>> FORMS_TO_COMPILE = Key.create("_forms-to_compile_"); protected static final String FORM_EXTENSION = "form"; - protected static final FileFilter JAVA_SOURCES_FILTER = FileUtilRt.createFilterByExtension("java"); - protected static final FileFilter FORM_SOURCES_FILTER = FileUtilRt.createFilterByExtension(FORM_EXTENSION); + protected static final FileFilter JAVA_SOURCES_FILTER = FileFilters.withExtension("java"); + protected static final FileFilter FORM_SOURCES_FILTER = FileFilters.withExtension(FORM_EXTENSION); private final String myBuilderName;