Back to debian stable, fix indent/comments after merge

diff --git a/build.xml b/build.xml
index c212a757d345c2351ca795e7635e23fabcf657bf..8398701abcd3c4ee94bb5d891f669a0cb7a9a3b6 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -85,7 +85,13 @@
 
   <target name="doc" depends="docs"/>
 
-  <target name="docs" depends="jar">
+  <!--
+      For Java 11+, add additionalparam="dash-dash-frames".  My
+      workflow is back to Java 8, so leaving this comment here for
+      myself when Debian stables moves to Java 11.
+  -->
+
+<target name="docs" depends="jar">
     <javadoc
         destdir="${apidocs.dir}"
         author="true"
@@ -93,7 +99,6 @@
         use="true"
         access="protected"
         windowtitle="Jexer - Java Text User Interface - API docs"
-        additionalparam="--frames"
         >
       <fileset dir="${src.dir}" defaultexcludes="yes">
         <include name="jexer/**/*.java"/>

diff --git a/src/jexer/TButton.java b/src/jexer/TButton.java
index 964035fc5a0ee47241aed898cb59c63c5354746d..33fe73328b1773f9b42225537a70771fc8c8b6d6 100644 (file)
--- a/src/jexer/TButton.java
+++ b/src/jexer/TButton.java
@@ -34,7 +34,8 @@ import jexer.bits.GraphicsChars;
 import jexer.bits.MnemonicString;
 import jexer.event.TKeypressEvent;
 import jexer.event.TMouseEvent;
-import static jexer.TKeypress.*;
+import static jexer.TKeypress.kbEnter;
+import static jexer.TKeypress.kbSpace;
 
 /**
  * TButton implements a simple button.  To make the button do something, pass
@@ -69,10 +70,11 @@ public class TButton extends TWidget {
     private TAction action;
 
     /**
-     * The background color used for the button "shadow", or NULL for "no shadow".
+     * The background color used for the button "shadow", or null for "no
+     * shadow".
      */
     private CellAttributes shadowColor;
-    
+
     // ------------------------------------------------------------------------
     // Constructors -----------------------------------------------------------
     // ------------------------------------------------------------------------
@@ -232,19 +234,19 @@ public class TButton extends TWidget {
         }
 
         if (inButtonPress) {
-               putCharXY(1, 0, ' ', buttonColor);
-               putStringXY(2, 0, mnemonic.getRawLabel(), buttonColor);
+            putCharXY(1, 0, ' ', buttonColor);
+            putStringXY(2, 0, mnemonic.getRawLabel(), buttonColor);
             putCharXY(getWidth() - 1, 0, ' ', buttonColor);
         } else {
             putCharXY(0, 0, ' ', buttonColor);
             putStringXY(1, 0, mnemonic.getRawLabel(), buttonColor);
             putCharXY(getWidth() - 2, 0, ' ', buttonColor);
-               
+
             if (shadowColor != null) {
-                   putCharXY(getWidth() - 1, 0,
-                       GraphicsChars.CP437[0xDC], shadowColor);
-                   hLineXY(1, 1, getWidth() - 1,
-                       GraphicsChars.CP437[0xDF], shadowColor);
+                putCharXY(getWidth() - 1, 0,
+                    GraphicsChars.CP437[0xDC], shadowColor);
+                hLineXY(1, 1, getWidth() - 1,
+                    GraphicsChars.CP437[0xDF], shadowColor);
             }
         }
         if (mnemonic.getShortcutIdx() >= 0) {
@@ -283,21 +285,20 @@ public class TButton extends TWidget {
     }
 
     /**
-     * Set the background color used for the button "shadow".
-     * <p>
-     * Can be NULL for "no shadow".
+     * Set the background color used for the button "shadow".  If null, no
+     * shadow will be drawn.
      *
-     * @param color the new background color, or NULL if none
+     * @param color the new background color, or null for no shadow
      */
     public void setShadowColor(final CellAttributes color) {
-       if (color != null) {
-               shadowColor = new CellAttributes();
-               shadowColor.setTo(color);
-               shadowColor.setForeColor(Color.BLACK);
-               shadowColor.setBold(false);
-       } else {
-               shadowColor = null;
-       }
+        if (color != null) {
+            shadowColor = new CellAttributes();
+            shadowColor.setTo(color);
+            shadowColor.setForeColor(Color.BLACK);
+            shadowColor.setBold(false);
+        } else {
+            shadowColor = null;
+        }
     }
 
 }