Bladeren bron

Remove unused private fields

Make having unused fields or formal params a PMD error

Change-Id: Ief1c8e499af7e3a43328046dc140ba941d8cb010
Depends-On: I970b49db0abac46d15a11e2b71dc0b50bd3a8faf
Reviewed-on: http://gerrit.dmdirc.com/2034
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager
tags/0.6.6b1
Chris Smith 13 jaren geleden
bovenliggende
commit
bb70d16d7b
3 gewijzigde bestanden met toevoegingen van 10 en 13 verwijderingen
  1. 2
    2
      checkstyle/pmd_checks.xml
  2. 0
    3
      src/com/dmdirc/config/CipherUtils.java
  3. 8
    8
      test/com/dmdirc/ui/WindowManagerTest.java

+ 2
- 2
checkstyle/pmd_checks.xml Bestand weergeven

@@ -220,9 +220,9 @@
220 220
 <rule ref="rulesets/typeresolution.xml/UnusedImports"><priority>1</priority></rule>
221 221
 <rule ref="rulesets/typeresolution.xml/SignatureDeclareThrowsException"><priority>1</priority></rule>
222 222
 
223
-<rule ref="rulesets/unusedcode.xml/UnusedPrivateField"><priority>2</priority></rule>
223
+<rule ref="rulesets/unusedcode.xml/UnusedPrivateField"><priority>1</priority></rule>
224 224
 <rule ref="rulesets/unusedcode.xml/UnusedLocalVariable"><priority>1</priority></rule>
225 225
 <rule ref="rulesets/unusedcode.xml/UnusedPrivateMethod"><priority>1</priority></rule>
226
-<rule ref="rulesets/unusedcode.xml/UnusedFormalParameter"><priority>2</priority></rule>
226
+<rule ref="rulesets/unusedcode.xml/UnusedFormalParameter"><priority>1</priority></rule>
227 227
 
228 228
 </ruleset>

+ 0
- 3
src/com/dmdirc/config/CipherUtils.java Bestand weergeven

@@ -52,9 +52,6 @@ import net.miginfocom.Base64;
52 52
  */
53 53
 public abstract class CipherUtils {
54 54
 
55
-    /** Singleton instance. */
56
-    private static CipherUtils me;
57
-
58 55
     /** Salt. */
59 56
     private static final byte[] SALT = {
60 57
         (byte) 0xA9, (byte) 0x9B, (byte) 0xC8, (byte) 0x32,

+ 8
- 8
test/com/dmdirc/ui/WindowManagerTest.java Bestand weergeven

@@ -44,7 +44,7 @@ public class WindowManagerTest {
44 44
     public void testAddRoot() {
45 45
         final WindowManager manager = new WindowManager();
46 46
         final FrameListener tfm = mock(FrameListener.class);
47
-        final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512, DummyInputWindow.class), null);
47
+        final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512, DummyInputWindow.class));
48 48
 
49 49
         manager.addListener(tfm);
50 50
 
@@ -61,8 +61,8 @@ public class WindowManagerTest {
61 61
     public void testAddChild() {
62 62
         final WindowManager manager = new WindowManager();
63 63
         final FrameListener tfm = mock(FrameListener.class);
64
-        final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512, DummyInputWindow.class), null);
65
-        final Window child = new DummyInputWindow(new TestWritableFrameContainer(512, DummyInputWindow.class), null);
64
+        final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512, DummyInputWindow.class));
65
+        final Window child = new DummyInputWindow(new TestWritableFrameContainer(512, DummyInputWindow.class));
66 66
         manager.addWindow(parent.getContainer());
67 67
         manager.addListener(tfm);
68 68
 
@@ -76,7 +76,7 @@ public class WindowManagerTest {
76 76
     public void testRemoveRoot() {
77 77
         final WindowManager manager = new WindowManager();
78 78
         final FrameListener tfm = mock(FrameListener.class);
79
-        final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512, DummyInputWindow.class), null);
79
+        final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512, DummyInputWindow.class));
80 80
         manager.addWindow(parent.getContainer());
81 81
         manager.addListener(tfm);
82 82
 
@@ -89,8 +89,8 @@ public class WindowManagerTest {
89 89
     public void testRemoveChild() {
90 90
         final WindowManager manager = new WindowManager();
91 91
         final FrameListener tfm = mock(FrameListener.class);
92
-        final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512, DummyInputWindow.class), null);
93
-        final Window child = new DummyInputWindow(new TestWritableFrameContainer(512, DummyInputWindow.class), null);
92
+        final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512, DummyInputWindow.class));
93
+        final Window child = new DummyInputWindow(new TestWritableFrameContainer(512, DummyInputWindow.class));
94 94
         manager.addWindow(parent.getContainer());
95 95
         manager.addWindow(parent.getContainer(), child.getContainer());
96 96
         manager.addListener(tfm);
@@ -107,8 +107,8 @@ public class WindowManagerTest {
107 107
     public void testRemoveFrameManager() {
108 108
         final WindowManager manager = new WindowManager();
109 109
         final FrameListener tfm = mock(FrameListener.class);
110
-        final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512, DummyInputWindow.class), null);
111
-        final Window child = new DummyInputWindow(new TestWritableFrameContainer(512, DummyInputWindow.class), null);
110
+        final Window parent = new DummyInputWindow(new TestWritableFrameContainer(512, DummyInputWindow.class));
111
+        final Window child = new DummyInputWindow(new TestWritableFrameContainer(512, DummyInputWindow.class));
112 112
         manager.addWindow(parent.getContainer());
113 113
 
114 114
         manager.addListener(tfm);

Laden…
Annuleren
Opslaan