cleanup

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);
 

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>();

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();

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) {
     }