From 3bd66724e1a303a8b4b5fb93604595478928c092 Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Tue, 12 Jan 2010 14:28:45 +0300
Subject: [PATCH] cleanup

---
 .../codeInsight/daemon/impl/quickfix/ModifierFix.java         | 1 +
 .../src/com/intellij/codeInspection/dataFlow/ControlFlow.java | 4 ----
 .../src/com/intellij/psi/codeStyle/CodeStyleSettings.java     | 2 +-
 .../com/intellij/openapi/command/impl/UndoManagerImpl.java    | 2 +-
 .../intellij/openapi/command/impl/UndoRedoStacksHolder.java   | 4 ++--
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ModifierFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ModifierFix.java
index a5d1ea164e74..3b9f9633b698 100644
--- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ModifierFix.java
+++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ModifierFix.java
@@ -99,6 +99,7 @@ public class ModifierFix extends IntentionAndQuickFixAction {
     return myModifierList != null &&
            myModifierList.isValid() &&
            myModifierList.getManager().isInProject(myModifierList) &&
+           myModifierList.hasModifierProperty(myModifier) != myShouldHave &&
            (myVariable == null || myVariable.isValid());
   }
 
diff --git a/java/java-impl/src/com/intellij/codeInspection/dataFlow/ControlFlow.java b/java/java-impl/src/com/intellij/codeInspection/dataFlow/ControlFlow.java
index 38f199306aaa..cfd4d0816797 100644
--- a/java/java-impl/src/com/intellij/codeInspection/dataFlow/ControlFlow.java
+++ b/java/java-impl/src/com/intellij/codeInspection/dataFlow/ControlFlow.java
@@ -92,10 +92,6 @@ public class ControlFlow {
     myFields = fields;
   }
 
-  public void dump(PrintStream p) {
-    p.println(toString());
-  }
-
 
   public String toString() {
     StringBuilder result = new StringBuilder();
diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java b/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java
index 5a3376679f27..7a838c6165a2 100644
--- a/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java
+++ b/platform/lang-api/src/com/intellij/psi/codeStyle/CodeStyleSettings.java
@@ -164,7 +164,7 @@ public class CodeStyleSettings implements Cloneable, JDOMExternalizable {
       field.set(to, field.get(from));
     }
     else {
-      System.out.println("Field not copied " + field.getName());
+      throw new RuntimeException("Field not copied " + field.getName());
     }
   }
 
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 77bfe1d0eab1..1385a344ec29 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
@@ -403,7 +403,7 @@ public class UndoManagerImpl extends UndoManager implements ProjectComponent, Ap
     return isUndoOrRedoAvailable(refs, false);
   }
 
-  private Collection<DocumentReference> getDocRefs(FileEditor editor) {
+  private static Collection<DocumentReference> getDocRefs(FileEditor editor) {
     if (editor instanceof TextEditor && ((TextEditor)editor).getEditor().isViewer()) return null;
     return getDocumentReferences(editor);
   }
diff --git a/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoRedoStacksHolder.java b/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoRedoStacksHolder.java
index 8e98c1f57ec4..5f5e169a6271 100644
--- a/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoRedoStacksHolder.java
+++ b/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoRedoStacksHolder.java
@@ -136,7 +136,7 @@ class UndoRedoStacksHolder {
     }
   }
 
-  private void doAddToStack(LinkedList<UndoableGroup> stack, UndoableGroup group, int limit) {
+  private static void doAddToStack(LinkedList<UndoableGroup> stack, UndoableGroup group, int limit) {
     if (!group.isUndoable() && stack.isEmpty()) return;
     
     stack.addLast(group);
@@ -187,7 +187,7 @@ class UndoRedoStacksHolder {
     }
   }
 
-  private void doInvalidateAllGlobalActions(LinkedList<UndoableGroup> stack) {
+  private static void doInvalidateAllGlobalActions(LinkedList<UndoableGroup> stack) {
     for (UndoableGroup g : stack) {
       g.invalidateIfGlobal();
     }