From 3ea5ba50fd71b732985e97f945e77590af071dbd Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Fri, 4 Feb 2011 17:48:27 +0300
Subject: [PATCH] cleanup

---
 .../ex/util/LayeredLexerEditorHighlighter.java  |  1 +
 .../src/com/intellij/util/Alarm.java            |  2 +-
 .../usages/impl/UsageViewTreeModelBuilder.java  | 11 -----------
 .../usages/impl/UsageNodeTreeBuilderTest.java   | 17 +++--------------
 4 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/openapi/editor/ex/util/LayeredLexerEditorHighlighter.java b/platform/lang-impl/src/com/intellij/openapi/editor/ex/util/LayeredLexerEditorHighlighter.java
index e74fdb6a038f..6f1918ae803e 100644
--- a/platform/lang-impl/src/com/intellij/openapi/editor/ex/util/LayeredLexerEditorHighlighter.java
+++ b/platform/lang-impl/src/com/intellij/openapi/editor/ex/util/LayeredLexerEditorHighlighter.java
@@ -357,6 +357,7 @@ public class LayeredLexerEditorHighlighter extends LexerEditorHighlighter {
       }
     }
 
+    @NotNull
     private MappedRange insertMapping(int tokenIndex, IElementType outerToken) {
       CharSequence tokenText = getTokenText(tokenIndex);
 
diff --git a/platform/platform-api/src/com/intellij/util/Alarm.java b/platform/platform-api/src/com/intellij/util/Alarm.java
index de2fb35695d3..0c33ef8e85d7 100644
--- a/platform/platform-api/src/com/intellij/util/Alarm.java
+++ b/platform/platform-api/src/com/intellij/util/Alarm.java
@@ -38,7 +38,7 @@ import java.util.concurrent.TimeUnit;
 public class Alarm implements Disposable {
   private static final Logger LOG = Logger.getInstance("#com.intellij.util.Alarm");
 
-  private boolean myDisposed;
+  private volatile boolean myDisposed;
 
   private final List<Request> myRequests = new ArrayList<Request>();
   private final List<Request> myPendingRequests = new ArrayList<Request>();
diff --git a/platform/usageView/src/com/intellij/usages/impl/UsageViewTreeModelBuilder.java b/platform/usageView/src/com/intellij/usages/impl/UsageViewTreeModelBuilder.java
index bcbb9693d673..8d2da9c0ce91 100644
--- a/platform/usageView/src/com/intellij/usages/impl/UsageViewTreeModelBuilder.java
+++ b/platform/usageView/src/com/intellij/usages/impl/UsageViewTreeModelBuilder.java
@@ -19,7 +19,6 @@ import com.intellij.usages.UsageTarget;
 import com.intellij.usages.UsageViewPresentation;
 import org.jetbrains.annotations.NonNls;
 
-import javax.swing.*;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeNode;
@@ -109,16 +108,6 @@ public class UsageViewTreeModelBuilder extends DefaultTreeModel {
       super(null, 0, UsageViewTreeModelBuilder.this);
     }
 
-    public void addNode(final DefaultMutableTreeNode node) {
-      if (!myDetachedMode) {
-        SwingUtilities.invokeLater(new Runnable() {
-          public void run() {
-            myTreeModel.insertNodeInto(node, RootGroupNode.this, getNodeInsertionIndex(node));
-          }
-        });
-      }
-    }
-
     @NonNls
     public String toString() {
       return "Root "+super.toString();
diff --git a/platform/usageView/testSrc/com/intellij/usages/impl/UsageNodeTreeBuilderTest.java b/platform/usageView/testSrc/com/intellij/usages/impl/UsageNodeTreeBuilderTest.java
index 37b67c7c8dfe..0d01f31bbcb5 100644
--- a/platform/usageView/testSrc/com/intellij/usages/impl/UsageNodeTreeBuilderTest.java
+++ b/platform/usageView/testSrc/com/intellij/usages/impl/UsageNodeTreeBuilderTest.java
@@ -148,8 +148,7 @@ public class UsageNodeTreeBuilderTest extends TestCase {
     }
 
     public boolean equals(Object o) {
-      if (!(o instanceof LogUsageGroup)) return false;
-      return myPower == ((LogUsageGroup)o).myPower;
+      return o instanceof LogUsageGroup && myPower == ((LogUsageGroup)o).myPower;
     }
     public int hashCode() { return myPower; }
 
@@ -240,16 +239,11 @@ public class UsageNodeTreeBuilderTest extends TestCase {
 
     @Override
     public UsageGroup groupUsage(Usage usage) {
-      MockUsage mockUsage = ((MockUsage)usage);
+      MockUsage mockUsage = (MockUsage)usage;
 
       if (mockUsage.getId() > 1000) return null;
 
-      if (mockUsage.getId() % 2 == 0) {
-        return EVEN;
-      }
-      else {
-        return ODD;
-      }
+      return mockUsage.getId() % 2 == 0 ? EVEN : ODD;
     }
   }
 
@@ -260,7 +254,6 @@ public class UsageNodeTreeBuilderTest extends TestCase {
       myId = index;
     }
 
-
     public int getId() {
       return myId;
     }
@@ -316,10 +309,6 @@ public class UsageNodeTreeBuilderTest extends TestCase {
       return String.valueOf(myId);
     }
 
-    public int compareTo(Usage o) {
-      return getId() - ((MockUsage)o).getId();
-    }
-
     @Override
     public void navigate(boolean requestFocus) {
     }