From a3575ef86d42c397468f0018178cabbae95d9e4a Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Tue, 28 Apr 2009 16:37:05 +0400
Subject: [PATCH] avoid anonymous classes

---
 .../openapi/vcs/changes/PsiChangeTracker.java      | 44 +++++++++++++---------
 .../openapi/vcs/changes/PsiElementFilter.java      | 22 +++++++++++
 2 files changed, 49 insertions(+), 17 deletions(-)
 create mode 100644 lang-impl/src/com/intellij/openapi/vcs/changes/PsiElementFilter.java

diff --git a/lang-impl/src/com/intellij/openapi/vcs/changes/PsiChangeTracker.java b/lang-impl/src/com/intellij/openapi/vcs/changes/PsiChangeTracker.java
index a416bbc113..9679c61814 100644
--- a/lang-impl/src/com/intellij/openapi/vcs/changes/PsiChangeTracker.java
+++ b/lang-impl/src/com/intellij/openapi/vcs/changes/PsiChangeTracker.java
@@ -29,7 +29,7 @@ public class PsiChangeTracker {
   private PsiChangeTracker() {
   }
 
-  public static <T extends PsiElement> Map<T, FileStatus> getElementsChanged(PsiFile file, final Class<T> filter) {
+  public static <T extends PsiElement> Map<T, FileStatus> getElementsChanged(PsiFile file, final PsiElementFilter<T> filter) {
     final Project project = file.getProject();
     FileStatus status = FileStatusManager.getInstance(project).getStatus(file.getVirtualFile());
     final String oldText = getUnmodifiedDocument(file.getVirtualFile(), project);
@@ -38,14 +38,18 @@ public class PsiChangeTracker {
     //TODO: for some languages (eg XML) isEquivalentTo works ugly. Think about pluggable matchers for different languages/elements
     final List<T> elements = new ArrayList<T>();
     final List<T> oldElements = new ArrayList<T>();
-    final PsiFile oldFile = oldText == null ? null : PsiFileFactory.getInstance(project)
-      .createFileFromText(file.getName(), file.getLanguage(), oldText, false, true);
+    final PsiFile oldFile = oldText == null
+                            ? null
+                            : PsiFileFactory.getInstance(project)
+                              .createFileFromText(file.getName(), file.getLanguage(), oldText, false, true);
 
     file.accept(new MyVisitor<T>(filter, elements));
 
     final HashMap<T, FileStatus> result = new HashMap<T, FileStatus>();
-    if (status == FileStatus.ADDED || status == FileStatus.DELETED
-        || status == FileStatus.DELETED_FROM_FS || status == FileStatus.UNKNOWN) {
+    if (status == FileStatus.ADDED ||
+        status == FileStatus.DELETED ||
+        status == FileStatus.DELETED_FROM_FS ||
+        status == FileStatus.UNKNOWN) {
       for (T element : elements) {
         result.put(element, status);
       }
@@ -59,7 +63,9 @@ public class PsiChangeTracker {
     return result;
   }
 
-  private static <T extends PsiElement> Map<T, FileStatus> calculateStatuses(List<T> elements, List<T> oldElements, Map<T, FileStatus> result) {
+  private static <T extends PsiElement> Map<T, FileStatus> calculateStatuses(List<T> elements,
+                                                                             List<T> oldElements,
+                                                                             Map<T, FileStatus> result) {
     for (T element : elements) {
       T e = null;
       for (T oldElement : oldElements) {
@@ -70,16 +76,17 @@ public class PsiChangeTracker {
       }
       if (e != null) {
         oldElements.remove(e);
-        if (! element.getText().equals(e.getText())) {
+        if (!element.getText().equals(e.getText())) {
           result.put(element, FileStatus.MODIFIED);
         }
-      } else {
-        result.put(element,  FileStatus.ADDED);
+      }
+      else {
+        result.put(element, FileStatus.ADDED);
       }
     }
 
     for (T oldElement : oldElements) {
-      result.put(oldElement,  FileStatus.DELETED);
+      result.put(oldElement, FileStatus.DELETED);
     }
 
     return result;
@@ -98,7 +105,7 @@ public class PsiChangeTracker {
         try {
           content = beforeRevision.getContent();
         }
-        catch(VcsException ex) {
+        catch (VcsException ex) {
           content = null;
         }
         return content == null ? null : StringUtil.convertLineSeparators(content);
@@ -119,20 +126,23 @@ public class PsiChangeTracker {
   }
 
   static class MyVisitor<T extends PsiElement> extends PsiRecursiveElementVisitor {
-    private final Class<T> filter;
+    private final PsiElementFilter<T> filter;
     private final List<T> elements;
 
-    protected MyVisitor(final Class<T> filter, final List<T> elements) {
+    protected MyVisitor(final PsiElementFilter<T> filter, final List<T> elements) {
       this.filter = filter;
       this.elements = elements;
     }
 
     @Override
-      public void visitElement(PsiElement element) {
-        if (filter.isAssignableFrom(element.getClass())) {
-          elements.add((T)element);
+    public void visitElement(PsiElement element) {
+      if (filter.getClassFilter().isAssignableFrom(element.getClass())) {
+        final T e = (T)element;
+        if (filter.accept(e)) {
+          elements.add(e);
         }
-        super.visitElement(element);
       }
+      super.visitElement(element);
     }
+  }
 }
diff --git a/lang-impl/src/com/intellij/openapi/vcs/changes/PsiElementFilter.java b/lang-impl/src/com/intellij/openapi/vcs/changes/PsiElementFilter.java
new file mode 100644
index 0000000000..8058b83855
--- /dev/null
+++ b/lang-impl/src/com/intellij/openapi/vcs/changes/PsiElementFilter.java
@@ -0,0 +1,22 @@
+package com.intellij.openapi.vcs.changes;
+
+import com.intellij.psi.PsiElement;
+
+/**
+ * @author Konstantin Bulenkov
+ */
+public class PsiElementFilter<T extends PsiElement> {
+  private final Class<T> filter;
+
+  public PsiElementFilter(Class<T> filter) {
+    this.filter = filter;
+  }
+
+  public boolean accept(T element) {
+    return true;
+  }
+
+  public final Class<T> getClassFilter() {
+    return filter; 
+  }
+}
-- 
2.11.4.GIT