From 426f85b7b24d18bf217b11430c5a871d0f79080c Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Mon, 19 Sep 2011 12:35:28 +0400
Subject: [PATCH] cleanup

---
 .../impl/source/codeStyle/CodeStyleSchemesImpl.java    |  5 +++--
 .../openapi/actionSystem/impl/ActionManagerImpl.java   |  5 +++--
 .../intellij/openapi/command/impl/UndoManagerImpl.java |  3 +--
 .../intellij/openapi/util/objectTree/ObjectNode.java   | 10 +++++-----
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleSchemesImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleSchemesImpl.java
index 57b5c6dede44..674d92604578 100644
--- a/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleSchemesImpl.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/source/codeStyle/CodeStyleSchemesImpl.java
@@ -92,8 +92,9 @@ public class CodeStyleSchemesImpl extends CodeStyleSchemes implements Exportable
   }
 
   public void setCurrentScheme(CodeStyleScheme scheme) {
-    mySchemesManager.setCurrentSchemeName(scheme == null ? null : scheme.getName());
-    CURRENT_SCHEME_NAME = scheme.getName();
+    String schemeName = scheme == null ? null : scheme.getName();
+    mySchemesManager.setCurrentSchemeName(schemeName);
+    CURRENT_SCHEME_NAME = schemeName;
   }
 
   public CodeStyleScheme createNewScheme(String preferredName, CodeStyleScheme parentScheme) {
diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java
index 560fad1d532e..12b77c7f07b2 100644
--- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionManagerImpl.java
@@ -1159,9 +1159,10 @@ public final class ActionManagerImpl extends ActionManagerEx implements Applicat
   }
 
   private void preloadActionGroup(final ActionGroup group) {
-    final AnAction[] children = ApplicationManager.getApplication().runReadAction(new Computable<AnAction[]>() {
+    final Application application = ApplicationManager.getApplication();
+    final AnAction[] children = application.runReadAction(new Computable<AnAction[]>() {
       public AnAction[] compute() {
-        if (ApplicationManager.getApplication().isDisposed()) {
+        if (application.isDisposed()) {
           return AnAction.EMPTY_ARRAY;
         }
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoManagerImpl.java
index 2e7284b1de70..f6e7111b0366 100644
--- a/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoManagerImpl.java
@@ -564,8 +564,7 @@ public class UndoManagerImpl extends UndoManager implements ProjectComponent, Ap
   @TestOnly
   private void flushMergers() {
     // Run dummy command in order to flush all mergers...
-    CommandProcessor.getInstance()
-      .executeCommand(myProject, EmptyRunnable.getInstance(), CommonBundle.message("drop.undo.history.command.name"), null);
+    CommandProcessor.getInstance().executeCommand(myProject, EmptyRunnable.getInstance(), CommonBundle.message("drop.undo.history.command.name"), null);
   }
 
   @TestOnly
diff --git a/platform/util/src/com/intellij/openapi/util/objectTree/ObjectNode.java b/platform/util/src/com/intellij/openapi/util/objectTree/ObjectNode.java
index 04cff69d31ae..85b23350415a 100644
--- a/platform/util/src/com/intellij/openapi/util/objectTree/ObjectNode.java
+++ b/platform/util/src/com/intellij/openapi/util/objectTree/ObjectNode.java
@@ -64,7 +64,7 @@ public final class ObjectNode<T> {
       myChildren.add(child);
       myTree.putNode(child.getObject(), child);
 
-      propogateChildModification(child.getModification());
+      propagateChildModification(child.getModification());
     }
   }
 
@@ -74,7 +74,7 @@ public final class ObjectNode<T> {
       if (myChildren.remove(child)) {
         child.setParent(null);
         myTree.putNode(child.getObject(), null);
-        propogateChildModification(myTree.getNextModification());
+        propagateChildModification(myTree.getNextModification());
       }
     }
   }
@@ -108,7 +108,7 @@ public final class ObjectNode<T> {
         action.beforeTreeExecution(myObject);
 
         ObjectNode<T>[] childrenArray = getChildrenArray();
-//todo: [kirillk] optimize
+        //todo: [kirillk] optimize
 
           for (int i = childrenArray.length - 1; i >= 0; i--) {
             childrenArray[i].execute(disposeTree, action);
@@ -187,11 +187,11 @@ public final class ObjectNode<T> {
     return myChildModification;
   }
 
-  private void propogateChildModification(long stamp) {
+  private void propagateChildModification(long stamp) {
     if (myChildModification < stamp) {
       myChildModification = stamp;
       if (getParent() != null) {
-        getParent().propogateChildModification(stamp);
+        getParent().propagateChildModification(stamp);
       }
     }
   }