revert and a better fix for IDEA-136786

roshan · Feb 20, 2015 · ca120c0 · ca120c0
1 parent 4901d76
commit ca120c0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/platform/editor-ui-api/src/com/intellij/openapi/editor/colors/EditorFontType.java b/platform/editor-ui-api/src/com/intellij/openapi/editor/colors/EditorFontType.java
@@ -15,6 +15,8 @@
  */
 package com.intellij.openapi.editor.colors;
 
+import com.intellij.util.ObjectUtils;
+
 import java.util.HashMap;
 import java.util.Map;
 
@@ -37,6 +39,6 @@ public enum EditorFontType {
   }
 
   public static EditorFontType getConsoleType(EditorFontType fontType) {
-    return ourConsoleTypes.get(fontType);
+    return ObjectUtils.chooseNotNull(ourConsoleTypes.get(fontType), fontType);
   }
 }
diff --git a/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java b/platform/lang-impl/src/com/intellij/execution/console/LanguageConsoleImpl.java
@@ -166,7 +166,7 @@ public JComponent getPreferredFocusableComponent() {
     return getConsoleEditor().getContentComponent();
   }
 
-  public void initComponents() {
+  private void initComponents() {
     setupComponents();
 
     myPanel.add(myHistoryViewer.getComponent());

diff --git a/platform/platform-impl/src/com/intellij/execution/impl/ConsoleViewUtil.java b/platform/platform-impl/src/com/intellij/execution/impl/ConsoleViewUtil.java
@@ -126,11 +126,7 @@ public float getLineSpacing() {
 
       @Override
       public Font getFont(EditorFontType key) {
-        Font font = super.getFont(EditorFontType.getConsoleType(key));
-        if (font == null) {
-          return super.getFont(key);
-        }
-        return font;
+        return super.getFont(EditorFontType.getConsoleType(key));
       }
 
       @Override