X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2Fbits%2FCellAttributes.java;h=c14557679ee4ff28298021d492b502661ebd0e2a;hb=a0d734e68fc28e441d74075e4d8d0166bbcde180;hp=d1aea2cfded151f64b7fab265f48e328afa1ebd7;hpb=e826b451baf0d1e66d09ce03a6fefee2eb8386f5;p=fanfix.git

diff --git a/src/jexer/bits/CellAttributes.java b/src/jexer/bits/CellAttributes.java
index d1aea2c..c145576 100644
--- a/src/jexer/bits/CellAttributes.java
+++ b/src/jexer/bits/CellAttributes.java
@@ -1,29 +1,27 @@
-/**
+/*
  * Jexer - Java Text User Interface
  *
- * License: LGPLv3 or later
- *
- * This module is licensed under the GNU Lesser General Public License
- * Version 3.  Please see the file "COPYING" in this directory for more
- * information about the GNU Lesser General Public License Version 3.
+ * The MIT License (MIT)
  *
- *     Copyright (C) 2015  Kevin Lamonte
+ * Copyright (C) 2017 Kevin Lamonte
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 3 of
- * the License, or (at your option) any later version.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
  *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, see
- * http://www.gnu.org/licenses/, or write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
  *
  * @author Kevin Lamonte [kevin.lamonte@gmail.com]
  * @version 1
@@ -45,7 +43,7 @@ public class CellAttributes {
      *
      * @return bold value
      */
-    public final boolean getBold() {
+    public final boolean isBold() {
         return bold;
     }
 
@@ -68,7 +66,7 @@ public class CellAttributes {
      *
      * @return blink value
      */
-    public final boolean getBlink() {
+    public final boolean isBlink() {
         return blink;
     }
 
@@ -91,7 +89,7 @@ public class CellAttributes {
      *
      * @return reverse value
      */
-    public final boolean getReverse() {
+    public final boolean isReverse() {
         return reverse;
     }
 
@@ -114,7 +112,7 @@ public class CellAttributes {
      *
      * @return underline value
      */
-    public final boolean getUnderline() {
+    public final boolean isUnderline() {
         return underline;
     }
 
@@ -137,7 +135,7 @@ public class CellAttributes {
      *
      * @return protect value
      */
-    public final boolean getProtect() {
+    public final boolean isProtect() {
         return protect;
     }
 
@@ -220,6 +218,16 @@ public class CellAttributes {
         reset();
     }
 
+    /**
+     * Public constructor makes a copy from another instance.
+     *
+     * @param that another CellAttributes instance
+     * @see #reset()
+     */
+    public CellAttributes(final CellAttributes that) {
+        setTo(that);
+    }
+
     /**
      * Comparison check.  All fields must match to return true.
      *
@@ -233,13 +241,13 @@ public class CellAttributes {
         }
 
         CellAttributes that = (CellAttributes) rhs;
-        return ((bold == that.bold)
-            && (blink == that.blink)
+        return ((foreColor == that.foreColor)
+            && (backColor == that.backColor)
+            && (bold == that.bold)
             && (reverse == that.reverse)
             && (underline == that.underline)
-            && (protect == that.protect)
-            && (foreColor == that.foreColor)
-            && (backColor == that.backColor));
+            && (blink == that.blink)
+            && (protect == that.protect));
     }
 
     /**
@@ -286,12 +294,8 @@ public class CellAttributes {
      */
     @Override
     public String toString() {
-        if (bold) {
-            return String.format("bold %s on %s",
-                foreColor, backColor);
-        } else {
-            return String.format("%s on %s", foreColor, backColor);
-        }
+        return String.format("%s%s%s on %s", (bold == true ? "bold " : ""),
+            (blink == true ? "blink " : ""), foreColor, backColor);
     }
 
 }