X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2Fio%2FECMA48Screen.java;h=7e143175196791a7e2ff1bd1c7e267b70b589a89;hb=9b1afdde02c30f0d4a80ba330a4bc72384093253;hp=15dee5019a49e9bd1d8aaadd9af1f2f160980df9;hpb=7b5261bc5b641e0769902f014e3b21f61050b02b;p=nikiroo-utils.git

diff --git a/src/jexer/io/ECMA48Screen.java b/src/jexer/io/ECMA48Screen.java
index 15dee50..7e14317 100644
--- a/src/jexer/io/ECMA48Screen.java
+++ b/src/jexer/io/ECMA48Screen.java
@@ -34,9 +34,10 @@ import jexer.bits.Cell;
 import jexer.bits.CellAttributes;
 
 /**
- * This Screen class draws to an xterm/ANSI X3.64/ECMA-48 type terminal.
+ * This Screen implementation draws to an xterm/ANSI X3.64/ECMA-48 type
+ * terminal.
  */
-public class ECMA48Screen extends Screen {
+public final class ECMA48Screen extends Screen {
 
     /**
      * Emit debugging to stderr.
@@ -91,7 +92,7 @@ public class ECMA48Screen extends Screen {
             Cell lCell = logical[x][y];
             Cell pCell = physical[x][y];
 
-            if ((lCell != pCell) || reallyCleared) {
+            if (!lCell.equals(pCell) || reallyCleared) {
 
                 if (debugToStderr) {
                     System.err.printf("\n--\n");
@@ -132,10 +133,10 @@ public class ECMA48Screen extends Screen {
                 // Now emit only the modified attributes
                 if ((lCell.getForeColor() != lastAttr.getForeColor())
                     && (lCell.getBackColor() != lastAttr.getBackColor())
-                    && (lCell.getBold() == lastAttr.getBold())
-                    && (lCell.getReverse() == lastAttr.getReverse())
-                    && (lCell.getUnderline() == lastAttr.getUnderline())
-                    && (lCell.getBlink() == lastAttr.getBlink())
+                    && (lCell.isBold() == lastAttr.isBold())
+                    && (lCell.isReverse() == lastAttr.isReverse())
+                    && (lCell.isUnderline() == lastAttr.isUnderline())
+                    && (lCell.isBlink() == lastAttr.isBlink())
                 ) {
                     // Both colors changed, attributes the same
                     sb.append(terminal.color(lCell.getForeColor(),
@@ -146,27 +147,27 @@ public class ECMA48Screen extends Screen {
                     }
                 } else if ((lCell.getForeColor() != lastAttr.getForeColor())
                     && (lCell.getBackColor() != lastAttr.getBackColor())
-                    && (lCell.getBold() != lastAttr.getBold())
-                    && (lCell.getReverse() != lastAttr.getReverse())
-                    && (lCell.getUnderline() != lastAttr.getUnderline())
-                    && (lCell.getBlink() != lastAttr.getBlink())
+                    && (lCell.isBold() != lastAttr.isBold())
+                    && (lCell.isReverse() != lastAttr.isReverse())
+                    && (lCell.isUnderline() != lastAttr.isUnderline())
+                    && (lCell.isBlink() != lastAttr.isBlink())
                 ) {
                     // Everything is different
                     sb.append(terminal.color(lCell.getForeColor(),
                             lCell.getBackColor(),
-                            lCell.getBold(), lCell.getReverse(),
-                            lCell.getBlink(),
-                            lCell.getUnderline()));
+                            lCell.isBold(), lCell.isReverse(),
+                            lCell.isBlink(),
+                            lCell.isUnderline()));
 
                     if (debugToStderr) {
                         System.err.printf("2 Set all attributes\n");
                     }
                 } else if ((lCell.getForeColor() != lastAttr.getForeColor())
                     && (lCell.getBackColor() == lastAttr.getBackColor())
-                    && (lCell.getBold() == lastAttr.getBold())
-                    && (lCell.getReverse() == lastAttr.getReverse())
-                    && (lCell.getUnderline() == lastAttr.getUnderline())
-                    && (lCell.getBlink() == lastAttr.getBlink())
+                    && (lCell.isBold() == lastAttr.isBold())
+                    && (lCell.isReverse() == lastAttr.isReverse())
+                    && (lCell.isUnderline() == lastAttr.isUnderline())
+                    && (lCell.isBlink() == lastAttr.isBlink())
                 ) {
 
                     // Attributes same, foreColor different
@@ -177,10 +178,10 @@ public class ECMA48Screen extends Screen {
                     }
                 } else if ((lCell.getForeColor() == lastAttr.getForeColor())
                     && (lCell.getBackColor() != lastAttr.getBackColor())
-                    && (lCell.getBold() == lastAttr.getBold())
-                    && (lCell.getReverse() == lastAttr.getReverse())
-                    && (lCell.getUnderline() == lastAttr.getUnderline())
-                    && (lCell.getBlink() == lastAttr.getBlink())
+                    && (lCell.isBold() == lastAttr.isBold())
+                    && (lCell.isReverse() == lastAttr.isReverse())
+                    && (lCell.isUnderline() == lastAttr.isUnderline())
+                    && (lCell.isBlink() == lastAttr.isBlink())
                 ) {
                     // Attributes same, backColor different
                     sb.append(terminal.color(lCell.getBackColor(), false));
@@ -190,10 +191,10 @@ public class ECMA48Screen extends Screen {
                     }
                 } else if ((lCell.getForeColor() == lastAttr.getForeColor())
                     && (lCell.getBackColor() == lastAttr.getBackColor())
-                    && (lCell.getBold() == lastAttr.getBold())
-                    && (lCell.getReverse() == lastAttr.getReverse())
-                    && (lCell.getUnderline() == lastAttr.getUnderline())
-                    && (lCell.getBlink() == lastAttr.getBlink())
+                    && (lCell.isBold() == lastAttr.isBold())
+                    && (lCell.isReverse() == lastAttr.isReverse())
+                    && (lCell.isUnderline() == lastAttr.isUnderline())
+                    && (lCell.isBlink() == lastAttr.isBlink())
                 ) {
 
                     // All attributes the same, just print the char
@@ -206,10 +207,10 @@ public class ECMA48Screen extends Screen {
                     // Just reset everything again
                     sb.append(terminal.color(lCell.getForeColor(),
                             lCell.getBackColor(),
-                            lCell.getBold(),
-                            lCell.getReverse(),
-                            lCell.getBlink(),
-                            lCell.getUnderline()));
+                            lCell.isBold(),
+                            lCell.isReverse(),
+                            lCell.isBlink(),
+                            lCell.isUnderline()));
 
                     if (debugToStderr) {
                         System.err.printf("6 Change all attributes\n");
@@ -222,10 +223,10 @@ public class ECMA48Screen extends Screen {
                 lastX = x;
                 lastAttr.setTo(lCell);
 
-                // Physical is always updatesd
+                // Physical is always updated
                 physical[x][y].setTo(lCell);
 
-            } // if ((lCell != pCell) || (reallyCleared == true))
+            } // if (!lCell.equals(pCell) || (reallyCleared == true))
 
         } // for (int x = 0; x < width; x++)
     }
@@ -237,7 +238,7 @@ public class ECMA48Screen extends Screen {
      * @return escape sequences string that provides the updates to the
      * physical screen
      */
-    public String flushString() {
+    private String flushString() {
         if (!dirty) {
             assert (!reallyCleared);
             return "";