X-Git-Url: http://git.nikiroo.be/?a=blobdiff_plain;f=src%2Fjexer%2FTCheckbox.java;h=86933a73afd147519393c98757abe027929f6760;hb=d36057dfab8def933a64be042b039d76708ac5ba;hp=78c83c83cfe59ba17e245cf1db2878d97b8c820a;hpb=eb29bbb5ec70c43895dd0f053630c7e3cd402cba;p=fanfix.git

diff --git a/src/jexer/TCheckbox.java b/src/jexer/TCheckbox.java
index 78c83c8..86933a7 100644
--- a/src/jexer/TCheckbox.java
+++ b/src/jexer/TCheckbox.java
@@ -39,34 +39,24 @@ import jexer.event.TMouseEvent;
  */
 public final class TCheckbox extends TWidget {
 
+    // ------------------------------------------------------------------------
+    // Variables --------------------------------------------------------------
+    // ------------------------------------------------------------------------
+
     /**
      * Checkbox state, true means checked.
      */
     private boolean checked = false;
 
-    /**
-     * Get checked value.
-     *
-     * @return if true, this is checked
-     */
-    public boolean isChecked() {
-        return checked;
-    }
-
-    /**
-     * Set checked value.
-     *
-     * @param checked new checked value.
-     */
-    public void setChecked(final boolean checked) {
-        this.checked = checked;
-    }
-
     /**
      * Label for this checkbox.
      */
     private String label;
 
+    // ------------------------------------------------------------------------
+    // Constructors -----------------------------------------------------------
+    // ------------------------------------------------------------------------
+
     /**
      * Public constructor.
      *
@@ -77,7 +67,7 @@ public final class TCheckbox extends TWidget {
      * @param checked initial check state
      */
     public TCheckbox(final TWidget parent, final int x, final int y,
-            final String label, final boolean checked) {
+        final String label, final boolean checked) {
 
         // Set parent and window
         super(parent, x, y, label.length() + 4, 1);
@@ -89,6 +79,10 @@ public final class TCheckbox extends TWidget {
         setCursorX(1);
     }
 
+    // ------------------------------------------------------------------------
+    // Event handlers ---------------------------------------------------------
+    // ------------------------------------------------------------------------
+
     /**
      * Returns true if the mouse is currently on the checkbox.
      *
@@ -97,14 +91,47 @@ public final class TCheckbox extends TWidget {
      */
     private boolean mouseOnCheckbox(final TMouseEvent mouse) {
         if ((mouse.getY() == 0)
-                && (mouse.getX() >= 0)
-                && (mouse.getX() <= 2)
-                ) {
+            && (mouse.getX() >= 0)
+            && (mouse.getX() <= 2)
+        ) {
             return true;
         }
         return false;
     }
 
+    /**
+     * Handle mouse checkbox presses.
+     *
+     * @param mouse mouse button down event
+     */
+    @Override
+    public void onMouseDown(final TMouseEvent mouse) {
+        if ((mouseOnCheckbox(mouse)) && (mouse.isMouse1())) {
+            // Switch state
+            checked = !checked;
+        }
+    }
+
+    /**
+     * Handle keystrokes.
+     *
+     * @param keypress keystroke event
+     */
+    @Override
+    public void onKeypress(final TKeypressEvent keypress) {
+        if (keypress.equals(kbSpace)) {
+            checked = !checked;
+            return;
+        }
+
+        // Pass to parent for the things we don't care about.
+        super.onKeypress(keypress);
+    }
+
+    // ------------------------------------------------------------------------
+    // TWidget ----------------------------------------------------------------
+    // ------------------------------------------------------------------------
+
     /**
      * Draw a checkbox with label.
      */
@@ -128,33 +155,26 @@ public final class TCheckbox extends TWidget {
         getScreen().putStringXY(4, 0, label, checkboxColor);
     }
 
+    // ------------------------------------------------------------------------
+    // TCheckbox --------------------------------------------------------------
+    // ------------------------------------------------------------------------
+
     /**
-     * Handle mouse checkbox presses.
+     * Get checked value.
      *
-     * @param mouse mouse button down event
+     * @return if true, this is checked
      */
-    @Override
-    public void onMouseDown(final TMouseEvent mouse) {
-        if ((mouseOnCheckbox(mouse)) && (mouse.isMouse1())) {
-            // Switch state
-            checked = !checked;
-        }
+    public boolean isChecked() {
+        return checked;
     }
 
     /**
-     * Handle keystrokes.
+     * Set checked value.
      *
-     * @param keypress keystroke event
+     * @param checked new checked value.
      */
-    @Override
-    public void onKeypress(final TKeypressEvent keypress) {
-        if (keypress.equals(kbSpace)) {
-            checked = !checked;
-            return;
-        }
-
-        // Pass to parent for the things we don't care about.
-        super.onKeypress(keypress);
+    public void setChecked(final boolean checked) {
+        this.checked = checked;
     }
 
 }