X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2FTRadioButton.java;h=13a73ffedd73dddd1f3e2fc5bc91d45f4a8bc7f7;hb=eb29bbb5ec70c43895dd0f053630c7e3cd402cba;hp=23663bb2c84d6ec0894d36bd033a3b47037711e8;hpb=00d2622b0fff2411dc81ee2a0cc43a5f3f52564c;p=fanfix.git

diff --git a/src/jexer/TRadioButton.java b/src/jexer/TRadioButton.java
index 23663bb..13a73ff 100644
--- a/src/jexer/TRadioButton.java
+++ b/src/jexer/TRadioButton.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
@@ -52,7 +50,7 @@ public final class TRadioButton extends TWidget {
      * @return if true then this is the one button in the group that is
      * selected
      */
-    public boolean getSelected() {
+    public boolean isSelected() {
         return selected;
     }
 
@@ -101,16 +99,12 @@ public final class TRadioButton extends TWidget {
         final String label, final int id) {
 
         // Set parent and window
-        super(parent);
+        super(parent, x, y, label.length() + 4, 1);
 
-        setX(x);
-        setY(y);
-        setHeight(1);
         this.label = label;
-        setWidth(label.length() + 4);
         this.id = id;
 
-        setHasCursor(true);
+        setCursorVisible(true);
         setCursorX(1);
     }
 
@@ -137,7 +131,7 @@ public final class TRadioButton extends TWidget {
     public void draw() {
         CellAttributes radioButtonColor;
 
-        if (getAbsoluteActive()) {
+        if (isAbsoluteActive()) {
             radioButtonColor = getTheme().getColor("tradiobutton.active");
         } else {
             radioButtonColor = getTheme().getColor("tradiobutton.inactive");
@@ -151,7 +145,7 @@ public final class TRadioButton extends TWidget {
             getScreen().putCharXY(1, 0, ' ', radioButtonColor);
         }
         getScreen().putCharXY(2, 0, ')', radioButtonColor);
-        getScreen().putStrXY(4, 0, label, radioButtonColor);
+        getScreen().putStringXY(4, 0, label, radioButtonColor);
     }
 
     /**
@@ -161,7 +155,7 @@ public final class TRadioButton extends TWidget {
      */
     @Override
     public void onMouseDown(final TMouseEvent mouse) {
-        if ((mouseOnRadioButton(mouse)) && (mouse.getMouse1())) {
+        if ((mouseOnRadioButton(mouse)) && (mouse.isMouse1())) {
             // Switch state
             selected = !selected;
             if (selected) {