diff --git a/Mage.Client/src/main/java/mage/client/components/MageTextArea.java b/Mage.Client/src/main/java/mage/client/components/MageTextArea.java
index d9b4bdd7051..47c68ce1410 100644
--- a/Mage.Client/src/main/java/mage/client/components/MageTextArea.java
+++ b/Mage.Client/src/main/java/mage/client/components/MageTextArea.java
@@ -5,6 +5,7 @@ import org.mage.card.arcane.UI;
import javax.swing.*;
import java.awt.*;
+import javax.swing.text.JTextComponent;
/**
* Component for displaying text in mage.
@@ -12,6 +13,7 @@ import java.awt.*;
*
* @author nantuko
*/
+
public class MageTextArea extends JEditorPane {
public MageTextArea() {
@@ -19,35 +21,31 @@ public class MageTextArea extends JEditorPane {
setEditable(false);
setBackground(new Color(0, 0, 0, 0)); // transparent background
setFocusable(false);
- //setBorder(BorderFactory.createLineBorder(Color.red));
- //setSelectionColor(new Color(0, 0, 0, 0));
+ // setBorder(BorderFactory.createLineBorder(Color.red));
+ // setSelectionColor(new Color(0, 0, 0, 0));
}
+ @Override
public void setText(String text) {
setText(text, 16);
}
public void setText(String text, int fontSize) {
- if (text == null) return;
-
- String fontFamily = "times";
+ if (text == null) {
+ return;
+ }
final StringBuilder buffer = new StringBuilder(512);
- buffer.append("");
text = text.replaceAll("#([^#]+)#", "$1");
//text = text.replaceAll("\\s*//\\s*", "
");
text = text.replace("\r\n", "");
- //text += "
";
if (text.length() > 0) {
- //buffer.append("
");
- //text = text.replaceAll("\\{this\\}", card.getName());
- //text = text.replaceAll("\\{source\\}", card.getName());
buffer.append(ManaSymbols.replaceSymbolsWithHTML(text, ManaSymbols.Type.PAY));
}
diff --git a/Mage.Client/src/main/java/org/mage/card/arcane/UI.java b/Mage.Client/src/main/java/org/mage/card/arcane/UI.java
index a84f4415cea..3d1b83ec27a 100644
--- a/Mage.Client/src/main/java/org/mage/card/arcane/UI.java
+++ b/Mage.Client/src/main/java/org/mage/card/arcane/UI.java
@@ -46,7 +46,7 @@ import javax.swing.text.html.ImageView;
* UI utility functions.
*/
public class UI {
- private static ConcurrentMap imageCache = new ConcurrentHashMap();
+ private static final ConcurrentMap imageCache = new ConcurrentHashMap<>();
public static JToggleButton getToggleButton () {
JToggleButton button = new JToggleButton();