Merge branch 'upstream' into subtree

diff --cc TApplication.java
Simple merge

diff --cc TApplication.properties
Simple merge

diff --cc TEditorWidget.java
Simple merge

diff --cc TEditorWindow.java
Simple merge

diff --cc TExceptionDialog.java
Simple merge

diff --cc TExceptionDialog.properties
Simple merge

diff --cc TField.java
Simple merge

diff --cc TImage.java
Simple merge

diff --cc TKeypress.java
Simple merge

diff --cc TList.java
Simple merge

diff --cc TPasswordField.java
Simple merge

diff --cc TRadioButton.java
Simple merge

diff --cc TRadioGroup.java
Simple merge

diff --cc TSplitPane.java
Simple merge

diff --cc TTableWidget.java
Simple merge

diff --cc TTableWindow.java
Simple merge

diff --cc TTerminalWidget.java
Simple merge

diff --cc TTerminalWindow.java
Simple merge

diff --cc TTerminalWindow.properties
Simple merge

diff --cc TText.java
Simple merge

diff --cc TWidget.java
index eb06175092d9a8dcd53c20a4d8e75b856d200967,5c93712084a9b6f90bd9728ed17d368de82dfaa4..32ed80656882ec6f6267d042d8c52febbb3fd4dc
--- 1/TWidget.java
--- 2/src/jexer/TWidget.java
+++ b/TWidget.java
@@@ -1138,8 -1157,7 +1150,8 @@@ public abstract class TWidget implement
       * @return difference between this.tabOrder and that.tabOrder, or
       * difference between this.z and that.z, or String.compareTo(text)
       */
-     public final int compareTo(final TWidget that) {
 +    @Override
+     public int compareTo(final TWidget that) {
          if ((this instanceof TWindow)
              && (that instanceof TWindow)
          ) {

diff --cc TWindow.java
Simple merge

diff --cc backend/ECMA48Terminal.java
Simple merge

diff --cc backend/GlyphMaker.java
Simple merge

diff --cc backend/LogicalScreen.java
Simple merge

diff --cc backend/MultiScreen.java
Simple merge

diff --cc backend/Screen.java
Simple merge

diff --cc backend/SwingComponent.java
Simple merge

diff --cc backend/SwingTerminal.java
Simple merge

diff --cc bits/Cell.java
Simple merge

diff --cc bits/CellAttributes.java
Simple merge

diff --cc bits/ColorTheme.java
Simple merge

diff --cc bits/StringUtils.java
Simple merge

diff --cc demos/Demo6.java
Simple merge

diff --cc demos/DemoCheckBoxWindow.java
Simple merge

diff --cc event/TMouseEvent.java
Simple merge

diff --cc io/TimeoutInputStream.java
Simple merge

diff --cc layout/StretchLayoutManager.java
Simple merge

diff --cc menu/TMenu.java
Simple merge

diff --cc menu/TMenu.properties
Simple merge

diff --cc menu/TMenuItem.java
Simple merge

diff --cc menu/TSubMenu.java
Simple merge

diff --cc teditor/Document.java
Simple merge

diff --cc teditor/Highlighter.java
Simple merge

diff --cc teditor/Line.java
Simple merge

diff --cc teditor/Word.java
Simple merge

diff --cc tterminal/DisplayLine.java
Simple merge

diff --cc tterminal/ECMA48.java
Simple merge

diff --cc tterminal/Sixel.java
Simple merge

diff --cc ttree/TTreeViewWidget.java
Simple merge