fix eclipse warnings

diff --git a/.gitignore b/.gitignore
index 1b71ff20f08aeb57d08887e9f2759b50b79cf7c1..61a8a45287430656aa568d0ce32d0eab86c20e40 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -17,4 +17,6 @@ hs_err_pid*
 # Editor backup files
 *.java~
 *.xml~
-*Makefile~
+
+# Scratch space
+misc/**

diff --git a/README.md b/README.md
index dc1b8f8bf763ba20ad403d6a95a0238ddc52c3e8..583957cf11414fe93e2df0a7a3ae7e3edbed1a80 100644 (file)
--- a/README.md
+++ b/README.md
@@ -129,6 +129,7 @@ Many tasks remain before calling this version 1.0:
 
 0.0.3:
 
+- TStatusBar
 - TEditor
 
 0.0.4:
@@ -168,6 +169,5 @@ Screenshots
 
 ![Several Windows Open Including A Terminal](/screenshots/screenshot1.png?raw=true "Several Windows Open Including A Terminal")
 
-![Yo Dawg...](/screenshots/yodawg.png?raw=true "Yo Dawg, I heard you
- like text windowing systems, so I ran a text windowing system inside your
- text windowing system so you can have a terminal in your terminal.")
+![Yo Dawg...](/screenshots/yodawg.png?raw=true "Yo Dawg, I heard you like text windowing systems, so I ran a text windowing system inside your text windowing system so you can have a terminal in your terminal.")
+

diff --git a/build.xml b/build.xml
index e6d7bbb7850f52f6115c4f4ee1d244bc9cb16df1..35d82d30a05a652726d68bfb79f6b469751722b5 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -70,13 +70,15 @@
 
     <target name="main" depends="clean,run"/>
 
+    <target name="doc" depends="docs"/>
+
     <target name="docs" depends="jar">
       <javadoc
          destdir="docs/api"
          author="true"
          version="true"
          use="true"
-         access="private"
+         access="protected"
          failonwarning="true"
          windowtitle="Jexer - Java Text User Interface - API docs">
 

diff --git a/src/jexer/TApplication.java b/src/jexer/TApplication.java
index 0e5020a05896d3a843c0bc3303a5d77d3851b752..6bec9006c9a2e95ee057a7d042b61666e354b322 100644 (file)
--- a/src/jexer/TApplication.java
+++ b/src/jexer/TApplication.java
@@ -57,7 +57,6 @@ import jexer.io.Screen;
 import jexer.menu.TMenu;
 import jexer.menu.TMenuItem;
 import static jexer.TCommand.*;
-import static jexer.TKeypress.*;
 
 /**
  * TApplication sets up a full Text User Interface application.

diff --git a/src/jexer/bits/ColorTheme.java b/src/jexer/bits/ColorTheme.java
index 6f406994e8314e494f00646a62b34ff89dabfbdb..60f706e3b10574d6dd40461194cf22525674a3c4 100644 (file)
--- a/src/jexer/bits/ColorTheme.java
+++ b/src/jexer/bits/ColorTheme.java
@@ -129,6 +129,8 @@ public final class ColorTheme {
             color.setBackColor(Color.getColor(backColor));
             colors.put(key, color);
         }
+        // All done.
+        reader.close();
     }
 
     /**

diff --git a/src/jexer/io/AWTScreen.java b/src/jexer/io/AWTScreen.java
index 308a285c38074f5055bf8db292df0202e27b9f5b..20bd440cd7dbf2ea34e6b43234ac7d0d082e0c53 100644 (file)
--- a/src/jexer/io/AWTScreen.java
+++ b/src/jexer/io/AWTScreen.java
@@ -38,7 +38,6 @@ import java.awt.Color;
 import java.awt.Cursor;
 import java.awt.Font;
 import java.awt.FontMetrics;
-import java.awt.Frame;
 import java.awt.Graphics;
 import java.awt.Insets;
 import java.awt.Point;
@@ -107,6 +106,11 @@ public final class AWTScreen extends Screen {
      */
     class AWTFrame extends JFrame {
 
+        /**
+         * Serializable version.
+         */
+        private static final long serialVersionUID = 1;
+
         /**
          * The terminus font resource filename.
          */

diff --git a/src/jexer/io/AWTTerminal.java b/src/jexer/io/AWTTerminal.java
index 38f6734b96fcea4c8aac2c97cb5e774c636a7caa..da521ddb0fc3c7fa435bef3ae8aee22d9b3217c3 100644 (file)
--- a/src/jexer/io/AWTTerminal.java
+++ b/src/jexer/io/AWTTerminal.java
@@ -91,11 +91,6 @@ public final class AWTTerminal implements ComponentListener, KeyListener,
      */
     private List<TInputEvent> eventQueue;
 
-    /**
-     * The reader thread.
-     */
-    private Thread readerThread;
-
     /**
      * The last reported mouse X position.
      */
@@ -212,7 +207,6 @@ public final class AWTTerminal implements ComponentListener, KeyListener,
         boolean ctrl = false;
         char ch = ' ';
         boolean isKey = false;
-        int fnKey = 0;
         if (key.isActionKey()) {
             isKey = true;
         } else {
@@ -386,7 +380,7 @@ public final class AWTTerminal implements ComponentListener, KeyListener,
                 break;
             default:
                 if (!alt && ctrl && !shift) {
-                    ch = key.getKeyText(key.getKeyCode()).charAt(0);
+                    ch = KeyEvent.getKeyText(key.getKeyCode()).charAt(0);
                 }
                 // Not a special key, put it together
                 keypress = new TKeypress(false, 0, ch, alt, ctrl, shift);

diff --git a/src/jexer/io/ECMA48Terminal.java b/src/jexer/io/ECMA48Terminal.java
index 7721330f8d852480d186c424c8965075ca89829d..14ea20f6dadff8ab4151222d8fd0f4ccf05326dd 100644 (file)
--- a/src/jexer/io/ECMA48Terminal.java
+++ b/src/jexer/io/ECMA48Terminal.java
@@ -711,8 +711,6 @@ public final class ECMA48Terminal implements Runnable {
         boolean ctrl = false;
         boolean alt = false;
         boolean shift = false;
-        char keyCh = ch;
-        TKeypress key;
 
         // System.err.printf("state: %s ch %c\r\n", state, ch);
 

diff --git a/src/jexer/io/Screen.java b/src/jexer/io/Screen.java
index 1ecc4b185e0ee1eb8352211882c55bb39003d27b..a0497b8f1756dbd34fa55c344208ea705ee53aab 100644 (file)
--- a/src/jexer/io/Screen.java
+++ b/src/jexer/io/Screen.java
@@ -644,8 +644,6 @@ public abstract class Screen {
         final CellAttributes border, final CellAttributes background,
         final int borderType, final boolean shadow) {
 
-        int boxTop = top;
-        int boxLeft = left;
         int boxWidth = right - left;
         int boxHeight = bottom - top;
 

diff --git a/src/jexer/menu/TMenu.java b/src/jexer/menu/TMenu.java
index ee1af554092ad442adb6b87c8318f15cc9ab1af8..56cbad5be6661425575ea9039f2392f785b03405 100644 (file)
--- a/src/jexer/menu/TMenu.java
+++ b/src/jexer/menu/TMenu.java
@@ -126,15 +126,8 @@ public final class TMenu extends TWindow {
      */
     @Override
     public void draw() {
-        CellAttributes menuColor;
         CellAttributes background = getTheme().getColor("tmenu");
 
-        if (getAbsoluteActive()) {
-            menuColor = getTheme().getColor("tmenu.highlighted");
-        } else {
-            menuColor = getTheme().getColor("tmenu");
-        }
-
         assert (getAbsoluteActive());
 
         // Fill in the interior background
@@ -490,7 +483,9 @@ public final class TMenu extends TWindow {
         int newY = getChildren().size() + 1;
         assert (newY < getHeight());
 
-        TMenuItem menuItem = new TMenuSeparator(this, 1, newY);
+        // We just have to construct it, don't need to hang onto what it
+        // makes.
+        new TMenuSeparator(this, 1, newY);
         setHeight(getHeight() + 1);
     }
 

diff --git a/src/jexer/menu/TSubMenu.java b/src/jexer/menu/TSubMenu.java
index 4720a701e3c90e787614c8f263014b8ff8cbb3e3..bd1815f9e6bcfa5cc155694063b47dc192874d8a 100644 (file)
--- a/src/jexer/menu/TSubMenu.java
+++ b/src/jexer/menu/TSubMenu.java
@@ -76,19 +76,14 @@ public final class TSubMenu extends TMenuItem {
     public void draw() {
         super.draw();
 
-        CellAttributes background = getTheme().getColor("tmenu");
         CellAttributes menuColor;
-        CellAttributes menuMnemonicColor;
         if (getAbsoluteActive()) {
             menuColor = getTheme().getColor("tmenu.highlighted");
-            menuMnemonicColor = getTheme().getColor("tmenu.mnemonic.highlighted");
         } else {
             if (getEnabled()) {
                 menuColor = getTheme().getColor("tmenu");
-                menuMnemonicColor = getTheme().getColor("tmenu.mnemonic");
             } else {
                 menuColor = getTheme().getColor("tmenu.disabled");
-                menuMnemonicColor = getTheme().getColor("tmenu.disabled");
             }
         }
 

diff --git a/src/jexer/tterminal/ECMA48.java b/src/jexer/tterminal/ECMA48.java
index d148b39ba00e8d88d906bb9b998e73564903229b..22867e1d1c6e7c45e549dfdfc55999940e6aee53 100644 (file)
--- a/src/jexer/tterminal/ECMA48.java
+++ b/src/jexer/tterminal/ECMA48.java
@@ -179,7 +179,7 @@ public class ECMA48 implements Runnable {
      * @param deviceType DeviceType.VT100, DeviceType, XTERM, etc.
      * @param baseLang a base language without UTF-8 flag such as "C" or
      * "en_US"
-     * @return "LANG=en_US", "LANG=en_US.UTF-8", etc.
+     * @return "en_US", "en_US.UTF-8", etc.
      */
     public static String deviceTypeLang(final DeviceType deviceType,
         final String baseLang) {
@@ -690,6 +690,15 @@ public class ECMA48 implements Runnable {
     private boolean columns132 = false;
 
     /**
+     * Get 132 columns value.
+     *
+     * @return if true, the terminal is in 132 column mode
+     */
+    public final boolean isColumns132() {
+                return columns132;
+        }
+
+        /**
      * true = reverse video.  Set by DECSCNM.
      */
     private boolean reverseVideo = false;
@@ -891,7 +900,7 @@ public class ECMA48 implements Runnable {
      * @param type one of the DeviceType constants to select VT100, VT102,
      * VT220, or XTERM
      * @param inputStream an InputStream connected to the remote side.  For
-     * type == XTERM, inputStrem is converted to a Reader with UTF-8
+     * type == XTERM, inputStream is converted to a Reader with UTF-8
      * encoding.
      * @param outputStream an OutputStream connected to the remote user.  For
      * type == XTERM, outputStream is converted to a Writer with UTF-8
@@ -978,7 +987,6 @@ public class ECMA48 implements Runnable {
      * Handle a linefeed.
      */
     private void linefeed() {
-        int i;
 
         if (currentState.cursorY < scrollRegionBottom) {
             // Increment screen y
@@ -3697,7 +3705,7 @@ public class ECMA48 implements Runnable {
      *
      * @param ch character from the remote side
      */
-    public void consume(char ch) {
+    private void consume(char ch) {
 
         // DEBUG
         // System.err.printf("%c", ch);