diff --git a/java/java-impl/src/com/intellij/codeInsight/folding/impl/CollapseBlockHandler.java b/java/java-impl/src/com/intellij/codeInsight/folding/impl/CollapseBlockHandler.java
index 82330f6fff93..16d9c5a9b303 100644
--- a/java/java-impl/src/com/intellij/codeInsight/folding/impl/CollapseBlockHandler.java
+++ b/java/java-impl/src/com/intellij/codeInsight/folding/impl/CollapseBlockHandler.java
@@ -30,7 +30,7 @@ import org.jetbrains.annotations.Nullable;
  * @author ven
  */
 public class CollapseBlockHandler implements CodeInsightActionHandler {
-  public static final String ourPlaceHolderText = "{...}";
+  private static final String ourPlaceHolderText = "{...}";
   private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.folding.impl.CollapseBlockHandler");
 
   @Override
diff --git a/platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/RangeHighlighterImpl.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/RangeHighlighterImpl.java
index f0acd3223070..b53c965e5dba 100644
--- a/platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/RangeHighlighterImpl.java
+++ b/platform/editor-ui-ex/src/com/intellij/openapi/editor/impl/RangeHighlighterImpl.java
@@ -341,7 +341,7 @@ class RangeHighlighterImpl extends RangeMarkerImpl implements RangeHighlighterEx
     return result;
   }
 
-  public MarkupModel getMarkupModel() {
+  private MarkupModel getMarkupModel() {
     return myModel;
   }
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/DelegateColorScheme.java b/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/DelegateColorScheme.java
index 6746a135f237..1741a0531d1d 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/DelegateColorScheme.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/colors/impl/DelegateColorScheme.java
@@ -23,7 +23,6 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.awt.*;
-import java.util.Map;
 import java.util.Properties;
 
 public abstract class DelegateColorScheme implements EditorColorsScheme {
@@ -121,6 +120,7 @@ public abstract class DelegateColorScheme implements EditorColorsScheme {
     myDelegate.setEditorFontName(fontName);
   }
 
+  @NotNull
   @Override
   public Font getFont(EditorFontType key) {
     return myDelegate.getFont(key);
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/ex/FoldingListener.java b/platform/platform-impl/src/com/intellij/openapi/editor/ex/FoldingListener.java
index 1a4ee3803c34..5ca4ee4c1ab6 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/ex/FoldingListener.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/ex/FoldingListener.java
@@ -27,7 +27,7 @@ import org.jetbrains.annotations.NotNull;
 public interface FoldingListener {
 
   /**
-   * Informs that <code>'collapsed'</code> state of given fold region is just changed.
+   * Informs that {@code 'collapsed'} state of given fold region is just changed.
    * <p/>
    * <b>Note:</b> listener should delay fold region state processing until {@link #onFoldProcessingEnd()} is called.
    * I.e. folding model may return inconsistent data between current moment and {@link #onFoldProcessingEnd()}.
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
index 92cd4a648a71..51d5bc89b2c3 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
@@ -142,9 +142,9 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
   public static final Object IGNORE_MOUSE_TRACKING = "ignore_mouse_tracking";
   private static final Key<JComponent> PERMANENT_HEADER = Key.create("PERMANENT_HEADER");
   public static final Key<Boolean> DO_DOCUMENT_UPDATE_TEST = Key.create("DoDocumentUpdateTest");
-  public static final Key<Boolean> FORCED_SOFT_WRAPS = Key.create("forced.soft.wraps");
+  static final Key<Boolean> FORCED_SOFT_WRAPS = Key.create("forced.soft.wraps");
   public static final Key<Boolean> SOFT_WRAPS_EXIST = Key.create("soft.wraps.exist");
-  public static final Key<Boolean> DISABLE_CARET_POSITION_KEEPING = Key.create("editor.disable.caret.position.keeping");
+  private static final Key<Boolean> DISABLE_CARET_POSITION_KEEPING = Key.create("editor.disable.caret.position.keeping");
   static final Key<Boolean> DISABLE_CARET_SHIFT_ON_WHITESPACE_INSERTION = Key.create("editor.disable.caret.shift.on.whitespace.insertion");
   private static final boolean HONOR_CAMEL_HUMPS_ON_TRIPLE_CLICK = Boolean.parseBoolean(System.getProperty("idea.honor.camel.humps.on.triple.click"));
   private static final Key<BufferedImage> BUFFER = Key.create("buffer");
@@ -1278,7 +1278,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
   }
 
   // optimization: do not do column calculations here since we are interested in line number only
-  public int offsetToVisualLine(int offset) {
+  int offsetToVisualLine(int offset) {
     return myView.offsetToVisualLine(offset, false);
   }
   
@@ -4109,6 +4109,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
       reinitFontsAndSettings();
     }
 
+    @NotNull
     @Override
     public Font getFont(EditorFontType key) {
       if (myFontsMap != null) {
@@ -4308,8 +4309,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
     @Override
     public boolean importData(TransferSupport support) {
       Component comp = support.getComponent();
-      if (!(comp instanceof JComponent)) return false;
-      return handleDrop(getEditor((JComponent)comp), support.getTransferable(), support.getDropAction());
+      return comp instanceof JComponent && handleDrop(getEditor((JComponent)comp), support.getTransferable(), support.getDropAction());
     }
     
     @Override
@@ -4471,7 +4471,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
   }
 
   @TestOnly
-  public void validateState() {
+  void validateState() {
     myView.validateState();
     mySoftWrapModel.validateState();
     myFoldingModel.validateState();
@@ -4625,7 +4625,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
   private static class NullEditorHighlighter extends EmptyEditorHighlighter {
     private static final TextAttributes NULL_ATTRIBUTES = new TextAttributes();
   
-    public NullEditorHighlighter() {
+    NullEditorHighlighter() {
       super(NULL_ATTRIBUTES);
     }
   
diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/view/EditorSizeManager.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/view/EditorSizeManager.java
index b997117c9de8..cf5ffb7f48e5 100644
--- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/view/EditorSizeManager.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/view/EditorSizeManager.java
@@ -452,7 +452,7 @@ class EditorSizeManager extends InlayModel.SimpleAdapter implements PrioritizedD
   }
 
   @TestOnly
-  public void validateState() {
+  void validateState() {
     assertValidState();
   }
 }