external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 12:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Reapply the previous NPE fix.

Browse Source
This commit is contained in:
Agetian
2014-01-27 16:06:36 +00:00
parent 0f5eb7d5f8
commit 5322d5a9c2
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-gui/src/main/java/forge/gui/toolbox/FHtmlViewer.java
View File

@@ -5,8 +5,6 @@ import javax.swing.SwingUtilities;
import forge.gui.toolbox.FSkin.SkinnedEditorPane; import forge.gui.toolbox.FSkin.SkinnedEditorPane;
import org.apache.commons.lang3.StringUtils;
/** /**
* Viewer for HTML * Viewer for HTML
* *
@@ -35,12 +33,7 @@ public class FHtmlViewer extends SkinnedEditorPane {
public void setText(final String text) { public void setText(final String text) {
SwingUtilities.invokeLater( new Runnable() { //need to invokeLater to avoid flicker SwingUtilities.invokeLater( new Runnable() { //need to invokeLater to avoid flicker
public void run() { public void run() {
if ( StringUtils.isBlank(text) ) { setSuperText(null == text ? "" : text.replaceAll("(\r\n)|(\n)", "<br>")); //replace line breaks with <br> elements
setSuperText("");
return;
}
setSuperText(text.replaceAll("(\r\n)|(\n)", "<br>")); //replace line breaks with <br> elements
setCaretPosition(0); //keep scrolled to top setCaretPosition(0); //keep scrolled to top
} }
}); });