Merge branch 'subtree'

[fanfix.git] / src / jexer / TMessageBox.java

diff --git a/src/jexer/TMessageBox.java b/src/jexer/TMessageBox.java
index cd4a514ea912aa92b5f353f2545e293639ef7ae6..6f1e8a69486b05141b085bda4b841ba474aef347 100644 (file)
--- a/src/jexer/TMessageBox.java
+++ b/src/jexer/TMessageBox.java
@@ -3,7 +3,7 @@
  *
  * The MIT License (MIT)
  *
- * Copyright (C) 2017 Kevin Lamonte
+ * Copyright (C) 2019 Kevin Lamonte
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -32,6 +32,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.ResourceBundle;
 
+import jexer.bits.StringUtils;
 import jexer.event.TKeypressEvent;
 import static jexer.TKeypress.*;
 
@@ -39,10 +40,9 @@ import static jexer.TKeypress.*;
  * TMessageBox is a system-modal dialog with buttons for OK, Cancel, Yes, or
  * No.  Call it like:
  *
- * <p>
  * <pre>
  * {@code
- *     box = application.messageBox(title, caption,
+ *     box = messageBox(title, caption,
  *         TMessageBox.Type.OK | TMessageBox.Type.CANCEL);
  *
  *     if (box.getResult() == TMessageBox.OK) {
@@ -59,6 +59,10 @@ public class TMessageBox extends TWindow {
      */
     private static final ResourceBundle i18n = ResourceBundle.getBundle(TMessageBox.class.getName());
 
+    // ------------------------------------------------------------------------
+    // Constants --------------------------------------------------------------
+    // ------------------------------------------------------------------------
+
     /**
      * Message boxes have these supported types.
      */
@@ -84,16 +88,6 @@ public class TMessageBox extends TWindow {
         YESNOCANCEL
     };
 
-    /**
-     * The type of this message box.
-     */
-    private Type type;
-
-    /**
-     * My buttons.
-     */
-    private List<TButton> buttons;
-
     /**
      * Message boxes have these possible results.
      */
@@ -119,19 +113,28 @@ public class TMessageBox extends TWindow {
         NO
     };
 
+    // ------------------------------------------------------------------------
+    // Variables --------------------------------------------------------------
+    // ------------------------------------------------------------------------
+
     /**
-     * Which button was clicked: OK, CANCEL, YES, or NO.
+     * The type of this message box.
      */
-    private Result result = Result.OK;
+    private Type type;
 
     /**
-     * Get the result.
-     *
-     * @return the result: OK, CANCEL, YES, or NO.
+     * My buttons.
      */
-    public final Result getResult() {
-        return result;
-    }
+    private List<TButton> buttons;
+
+    /**
+     * Which button was clicked: OK, CANCEL, YES, or NO.
+     */
+    private Result result = Result.OK;
+
+    // ------------------------------------------------------------------------
+    // Constructors -----------------------------------------------------------
+    // ------------------------------------------------------------------------
 
     /**
      * Public constructor.  The message box will be centered on screen.
@@ -176,7 +179,7 @@ public class TMessageBox extends TWindow {
     protected TMessageBox(final TApplication application, final String title,
         final String caption, final Type type, final boolean yield) {
 
-        // Start as 50x50 at (1, 1).  These will be changed later.
+        // Start as 100x100 at (1, 1).  These will be changed later.
         super(application, title, 1, 1, 100, 100, CENTERED | MODAL);
 
         // Hang onto type so that we can provide more convenience in
@@ -185,11 +188,11 @@ public class TMessageBox extends TWindow {
 
         // Determine width and height
         String [] lines = caption.split("\n");
-        int width = title.length() + 12;
+        int width = StringUtils.width(title) + 12;
         setHeight(6 + lines.length);
         for (String line: lines) {
-            if (line.length() + 4 > width) {
-                width = line.length() + 4;
+            if (StringUtils.width(line) + 4 > width) {
+                width = StringUtils.width(line) + 4;
             }
         }
         setWidth(width);
@@ -325,19 +328,24 @@ public class TMessageBox extends TWindow {
             break;
 
         default:
-            throw new IllegalArgumentException("Invalid message box type: " + type);
+            throw new IllegalArgumentException("Invalid message box type: " +
+                type);
         }
 
-        // Set the secondaryThread to run me
-        getApplication().enableSecondaryEventReceiver(this);
-
         if (yield) {
+            // Set the secondaryThread to run me
+            getApplication().enableSecondaryEventReceiver(this);
+
             // Yield to the secondary thread.  When I come back from the
             // constructor response will already be set.
             getApplication().yield();
         }
     }
 
+    // ------------------------------------------------------------------------
+    // TWindow ----------------------------------------------------------------
+    // ------------------------------------------------------------------------
+
     /**
      * Handle keystrokes.
      *
@@ -396,10 +404,60 @@ public class TMessageBox extends TWindow {
             break;
 
         default:
-            throw new IllegalArgumentException("Invalid message box type: " + type);
+            throw new IllegalArgumentException("Invalid message box type: " +
+                type);
         }
 
         super.onKeypress(keypress);
     }
 
+    // ------------------------------------------------------------------------
+    // TMessageBox ------------------------------------------------------------
+    // ------------------------------------------------------------------------
+
+    /**
+     * Get the result.
+     *
+     * @return the result: OK, CANCEL, YES, or NO.
+     */
+    public final Result getResult() {
+        return result;
+    }
+
+    /**
+     * See if the user clicked YES.
+     *
+     * @return true if the user clicked YES
+     */
+    public final boolean isYes() {
+        return (result == Result.YES);
+    }
+
+    /**
+     * See if the user clicked NO.
+     *
+     * @return true if the user clicked NO
+     */
+    public final boolean isNo() {
+        return (result == Result.NO);
+    }
+
+    /**
+     * See if the user clicked OK.
+     *
+     * @return true if the user clicked OK
+     */
+    public final boolean isOk() {
+        return (result == Result.OK);
+    }
+
+    /**
+     * See if the user clicked CANCEL.
+     *
+     * @return true if the user clicked CANCEL
+     */
+    public final boolean isCancel() {
+        return (result == Result.CANCEL);
+    }
+
 }