use new FileUtilRt.createFilterByExtension method

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 5bbc280f40cc1978cd841d5f0c69602de2c2337d..50f16ea1677bb4529d497519581a43e167e6399d 100644 (file)
--- 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
@@ -18,6 +18,7 @@ package org.jetbrains.jps.uiDesigner.compiler;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.SystemInfo;
 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;
@@ -41,7 +42,6 @@ import org.jetbrains.jps.uiDesigner.model.JpsUiDesignerConfiguration;
 import org.jetbrains.jps.uiDesigner.model.JpsUiDesignerExtensionService;
 
 import java.io.File;
-import java.io.FilenameFilter;
 import java.io.IOException;
 import java.util.*;
 
@@ -50,6 +50,7 @@ import java.util.*;
  *         Date: 11/20/12
  */
 public class FormsBindingManager extends FormsBuilder {
+  private static final String JAVA_EXTENSION = ".java";
   private static final Key<Boolean> FORCE_FORMS_REBUILD_FLAG = Key.create("_forms_rebuild_flag_");
   private static final Key<Boolean> FORMS_REBUILD_FORCED = Key.create("_forms_rebuild_forced_flag_");
   public FormsBindingManager() {
@@ -256,12 +257,7 @@ public class FormsBindingManager extends FormsBuilder {
     if (containingDirectory == null) {
       return Collections.emptyList();
     }
-    final File[] files = containingDirectory.listFiles(new FilenameFilter() {
-      @Override
-      public boolean accept(File dir, String name) {
-        return name.endsWith(JAVA_EXTENSION);
-      }
-    });
+    final File[] files = containingDirectory.listFiles(FileUtilRt.createFilterByExtension("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 f29a8607ae42e7c83ad5d0b89ada0e9e4fe63e3a..c67781d84328079633ecea0b5c244411caeb5b88 100644 (file)
--- 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,8 +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.SystemInfo;
-import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.openapi.util.io.FileUtilRt;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jps.incremental.BuilderCategory;
 import org.jetbrains.jps.incremental.ModuleLevelBuilder;
@@ -36,35 +35,9 @@ import java.util.Map;
 public abstract class FormsBuilder extends ModuleLevelBuilder {
   protected static final Logger LOG = Logger.getInstance("#org.jetbrains.jps.uiDesigner.compiler.FormsInstrumenter");
   protected static final Key<Map<File, Collection<File>>> FORMS_TO_COMPILE = Key.create("_forms-to_compile_");
-  protected static final String JAVA_EXTENSION = ".java";
   protected static final String FORM_EXTENSION = "form";
-  protected static final String DOT_FORM_EXTENSION = "." + FORM_EXTENSION;
-  protected static final FileFilter JAVA_SOURCES_FILTER =
-    SystemInfo.isFileSystemCaseSensitive?
-    new FileFilter() {
-      public boolean accept(File file) {
-        return file.getPath().endsWith(JAVA_EXTENSION);
-      }
-    } :
-    new FileFilter() {
-      public boolean accept(File file) {
-        return StringUtil.endsWithIgnoreCase(file.getPath(), JAVA_EXTENSION);
-      }
-    };
-
-  protected static final FileFilter FORM_SOURCES_FILTER =
-    SystemInfo.isFileSystemCaseSensitive?
-    new FileFilter() {
-      public boolean accept(File file) {
-        return file.getPath().endsWith(DOT_FORM_EXTENSION);
-      }
-    } :
-    new FileFilter() {
-      public boolean accept(File file) {
-        return StringUtil.endsWithIgnoreCase(file.getPath(), DOT_FORM_EXTENSION);
-      }
-    }
-    ;
+  protected static final FileFilter JAVA_SOURCES_FILTER = FileUtilRt.createFilterByExtension("java");
+  protected static final FileFilter FORM_SOURCES_FILTER = FileUtilRt.createFilterByExtension(FORM_EXTENSION);
 
   private final String myBuilderName;