From: Niki Roo <niki@nikiroo.be>
Date: Thu, 2 Jan 2020 15:04:07 +0000 (+0100)
Subject: Merge branch 'upstream' into subtree
X-Git-Tag: fanfix-swing-0.0.1~12^2~13^2
X-Git-Url: https://git.nikiroo.be/?a=commitdiff_plain;h=e6bb1700749980e69b5e913acbfd276f129c24dc;p=fanfix-swing.git

Merge branch 'upstream' into subtree
---

e6bb1700749980e69b5e913acbfd276f129c24dc
diff --cc TWidget.java
index eb061750,5c937120..32ed8065
--- a/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)
       */
 +    @Override
-     public final int compareTo(final TWidget that) {
+     public int compareTo(final TWidget that) {
          if ((this instanceof TWindow)
              && (that instanceof TWindow)
          ) {