diff --git a/python/ipnb/src/org/jetbrains/plugins/ipnb/IpnbUtils.java b/python/ipnb/src/org/jetbrains/plugins/ipnb/IpnbUtils.java index 84369778fb9a..84ed2d892b2e 100644 --- a/python/ipnb/src/org/jetbrains/plugins/ipnb/IpnbUtils.java +++ b/python/ipnb/src/org/jetbrains/plugins/ipnb/IpnbUtils.java @@ -76,8 +76,8 @@ public class IpnbUtils { editorPane.setBackground(IpnbEditorUtil.getBackground()); editorPane.setContentType(new HTMLEditorKit().getContentType()); editorPane.setEditorKit(new HTMLEditorKit()); - - final StyleSheet sheet = ((HTMLDocument)editorPane.getDocument()).getStyleSheet(); + final HTMLDocument document = (HTMLDocument)editorPane.getDocument(); + final StyleSheet sheet = document.getStyleSheet(); sheet.addRule(ourBodyRule); sheet.addRule(ourCodeRule); sheet.addRule(ourAlertRule); @@ -86,7 +86,7 @@ public class IpnbUtils { editorPane.setEditable(false); - final String html = convertToHtml(source, editorPane); + final String html = convertToHtml(source, document); editorPane.setText("" + html + ""); editorPane.addMouseListener(new MouseAdapter() { @@ -103,7 +103,8 @@ public class IpnbUtils { return editorPane; } - private static String convertToHtml(@NotNull final String source, @NotNull final JEditorPane editorPane) { + + private static String convertToHtml(@NotNull final String source, @NotNull final HTMLDocument document) { final StringBuilder result = new StringBuilder(); StringBuilder markdown = new StringBuilder(); StringBuilder formula = new StringBuilder(); @@ -162,7 +163,7 @@ public class IpnbUtils { markdown.append(charAt); } if (formula.length() != 0) { - addFormula(formula.toString(), editorPane, imageIndex, result); + addFormula(formula.toString(), document, imageIndex, result); imageIndex += 1; formula = new StringBuilder(); @@ -176,7 +177,7 @@ public class IpnbUtils { } if (formula.length() != 0) { - addFormula(formula.toString(), editorPane, imageIndex, result); + addFormula(formula.toString(), document, imageIndex, result); } if (markdown.length() != 0) { result.append(markdown.toString()); @@ -184,7 +185,7 @@ public class IpnbUtils { return markdown2Html(result.toString()); } - private static void addFormula(@NotNull final String formulaText, JEditorPane editorPane, int imageIndex, StringBuilder result) { + private static void addFormula(@NotNull final String formulaText, @NotNull final HTMLDocument editorDocument, int imageIndex, StringBuilder result) { final SnuggleEngine engine = new SnuggleEngine(); engine.getPackages().add(0, IpnbTexPackageDefinitions.getPackage()); @@ -209,11 +210,11 @@ public class IpnbUtils { try { @SuppressWarnings("unchecked") - Dictionary cache = (Dictionary)editorPane.getDocument().getProperty("imageCache"); + Dictionary cache = (Dictionary)editorDocument.getProperty("imageCache"); if (cache == null) { //noinspection UseOfObsoleteCollectionType cache = new Hashtable(); - editorPane.getDocument().putProperty("imageCache", cache); + editorDocument.putProperty("imageCache", cache); } final URL u = new URL(ourImagePrefix + imageIndex + ".jpg"); diff --git a/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/panels/IpnbEditablePanel.java b/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/panels/IpnbEditablePanel.java index 714cd68d9d6b..aa6d9373f2ea 100644 --- a/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/panels/IpnbEditablePanel.java +++ b/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/panels/IpnbEditablePanel.java @@ -9,8 +9,6 @@ import org.jetbrains.plugins.ipnb.editor.IpnbEditorUtil; import org.jetbrains.plugins.ipnb.format.cells.IpnbEditableCell; import javax.swing.*; -import javax.swing.text.BadLocationException; -import javax.swing.text.Utilities; import java.awt.*; import java.awt.event.KeyAdapter; import java.awt.event.KeyEvent; @@ -166,22 +164,6 @@ public abstract class IpnbEditablePanel 0) { - offset = Utilities.getRowStart(textArea, offset) - 1; - lineCount++; - } - } catch (BadLocationException e) { - return 1; - } - return lineCount; - } - public boolean contains(int y) { return y>= getTop() && y<=getBottom(); } diff --git a/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/panels/code/IpnbErrorPanel.java b/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/panels/code/IpnbErrorPanel.java index 78d7e7a901e7..0f61cd0e14c8 100644 --- a/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/panels/code/IpnbErrorPanel.java +++ b/python/ipnb/src/org/jetbrains/plugins/ipnb/editor/panels/code/IpnbErrorPanel.java @@ -82,6 +82,7 @@ public class IpnbErrorPanel extends IpnbCodeOutputPanel { } else { substring = addString.substring(position, mIndex + 1); + //noinspection AssignmentToStaticFieldFromInstanceMethod currentColor = getANSIColor(substring); } position = mIndex + 1;