From 78af79cd4f182ba60d93906332c1e91a211a83aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Mart=C3=AD?= <mvdan@mvdan.cc>
Date: Thu, 5 May 2016 11:02:26 +0100
Subject: [PATCH] checkstyle: enable OneTopLevelClass

The only remaining error was ClipboardCompat, which was unnecessarily
exposing three top-level classes. Make the two implementation classes be
nested, private and static.
---
 .../fdroid/fdroid/compat/ClipboardCompat.java | 51 +++++++++----------
 config/checkstyle/checkstyle.xml              |  2 +-
 2 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/compat/ClipboardCompat.java b/app/src/main/java/org/fdroid/fdroid/compat/ClipboardCompat.java
index fd79497bb..808acacd1 100644
--- a/app/src/main/java/org/fdroid/fdroid/compat/ClipboardCompat.java
+++ b/app/src/main/java/org/fdroid/fdroid/compat/ClipboardCompat.java
@@ -17,34 +17,33 @@ public abstract class ClipboardCompat {
         return new OldClipboard();
     }
 
-}
+    @TargetApi(11)
+    private static class HoneycombClipboard extends ClipboardCompat {
 
-@TargetApi(11)
-class HoneycombClipboard extends ClipboardCompat {
+        private final ClipboardManager manager;
 
-    private final ClipboardManager manager;
-
-    HoneycombClipboard(Context context) {
-        this.manager = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
-    }
-
-    @Override
-    public String getText() {
-        CharSequence text = null;
-        if (manager.hasPrimaryClip()) {
-            ClipData data = manager.getPrimaryClip();
-            if (data.getItemCount() > 0) {
-                text = data.getItemAt(0).getText();
-            }
+        HoneycombClipboard(Context context) {
+            this.manager = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE);
+        }
+
+        @Override
+        public String getText() {
+            CharSequence text = null;
+            if (manager.hasPrimaryClip()) {
+                ClipData data = manager.getPrimaryClip();
+                if (data.getItemCount() > 0) {
+                    text = data.getItemAt(0).getText();
+                }
+            }
+            return text != null ? text.toString() : null;
+        }
+    }
+
+    private static class OldClipboard extends ClipboardCompat {
+
+        @Override
+        public String getText() {
+            return null;
         }
-        return text != null ? text.toString() : null;
-    }
-}
-
-class OldClipboard extends ClipboardCompat {
-
-    @Override
-    public String getText() {
-        return null;
     }
 }
diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml
index fb2da6279..8bb944a11 100644
--- a/config/checkstyle/checkstyle.xml
+++ b/config/checkstyle/checkstyle.xml
@@ -62,7 +62,7 @@
         </module>
         <module name="NoLineWrap"/>
 
-        <!--<module name="OneTopLevelClass" />-->
+        <module name="OneTopLevelClass" />
         <module name="OneStatementPerLine" />
 
         <module name="EmptyBlock">