X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2FTLabel.java;h=2eeea915793e0568db485f82cccc89efb9f2ae8a;hb=43ad7b6c509c45c8f261e77ea059c10fed8c9f1c;hp=d56be67f7d3815a42dc25c6f43c7e9a416db9cb8;hpb=d502a0e90eacad7ec676b0abf4686db553b794b1;p=fanfix.git

diff --git a/src/jexer/TLabel.java b/src/jexer/TLabel.java
index d56be67..2eeea91 100644
--- a/src/jexer/TLabel.java
+++ b/src/jexer/TLabel.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
@@ -37,34 +35,24 @@ import jexer.bits.CellAttributes;
  */
 public final class TLabel extends TWidget {
 
-    /**
-     * Label text.
-     */
-    private String text = "";
-
-    /**
-     * Get label text.
-     *
-     * @return label text
-     */
-    public String getText() {
-        return text;
-    }
+    // ------------------------------------------------------------------------
+    // Variables --------------------------------------------------------------
+    // ------------------------------------------------------------------------
 
     /**
-     * Set label text.
-     *
-     * @param text new label text
+     * Label text.
      */
-    public void setText(final String text) {
-        this.text = text;
-    }
+    private String label = "";
 
     /**
      * Label color.
      */
     private String colorKey;
 
+    // ------------------------------------------------------------------------
+    // Constructors -----------------------------------------------------------
+    // ------------------------------------------------------------------------
+
     /**
      * Public constructor, using the default "tlabel" for colorKey.
      *
@@ -92,27 +80,50 @@ public final class TLabel extends TWidget {
         final int y, final String colorKey) {
 
         // Set parent and window
-        super(parent, false);
+        super(parent, false, x, y, text.length(), 1);
 
-        this.text = text;
-        setX(x);
-        setY(y);
-        setHeight(1);
-        setWidth(text.length());
+        this.label = text;
         this.colorKey = colorKey;
     }
 
+    // ------------------------------------------------------------------------
+    // TWidget ----------------------------------------------------------------
+    // ------------------------------------------------------------------------
+
     /**
      * Draw a static label.
      */
-    @Override public void draw() {
+    @Override
+    public void draw() {
         // Setup my color
         CellAttributes color = new CellAttributes();
         color.setTo(getTheme().getColor(colorKey));
         CellAttributes background = getWindow().getBackground();
         color.setBackColor(background.getBackColor());
 
-        getScreen().putStrXY(0, 0, text, color);
+        getScreen().putStringXY(0, 0, label, color);
+    }
+
+    // ------------------------------------------------------------------------
+    // TLabel -----------------------------------------------------------------
+    // ------------------------------------------------------------------------
+
+    /**
+     * Get label text.
+     *
+     * @return label text
+     */
+    public String getLabel() {
+        return label;
+    }
+
+    /**
+     * Set label text.
+     *
+     * @param label new label text
+     */
+    public void setLabel(final String label) {
+        this.label = label;
     }
 
 }