mirror
/
DMDirc-Client
mirror of https://github.com/DMDirc/DMDirc.git
Watch 1
Star 0
Fork 0
Code Issues 0 Releases 49 Wiki Activity
Browse Source

Only have DMDirc checks for checkstyle now 


git-svn-id: http://svn.dmdirc.com/trunk@1288 00569f92-eb28-0410-84fd-f71c24880f
tags/0.4
Gregory Holmes 17 years ago
parent
adfe4c03e2
commit
5c2056e36e
7 changed files with 70 additions and 543 deletions
Split View Show Diff Stats
  1. 52
    310
      checkstyle/build.xml
  2. 5
    1
      checkstyle/dmdirc_checks.xml
  3. 0
    10
      checkstyle/duplicate_code_checks.xml
  4. 11
    55
      checkstyle/index.html
  5. 0
    144
      checkstyle/sun_checks.xml
  6. 0
    21
      checkstyle/todo_checks.xml
  7. 2
    2
      src/uk/org/ownage/dmdirc/ui/components/StatusBar.java

+ 52
- 310
checkstyle/build.xml View File 

@@ -1,375 +1,117 @@
1 1 
 <?xml version="1.0" encoding="UTF-8"?>
2 
-<!-- You may freely edit this file. See commented blocks below for -->
3 
-<!-- some examples of how to customize the build. -->
4 
-<!-- (If you delete it and reopen the project it will be recreated.) -->
5 2 
 <project name="DMDirc" default="default" basedir=".">
6 3 
     <description>Builds, tests, and runs the project DMDirc.</description>
7 4 
     <import file="nbproject/build-impl.xml"/>
8 
-    <!--
9 
-
10 
-    There exist several targets which are by default empty and which can be
11 
-    used for execution of your tasks. These targets are usually executed
12 
-    before and after some main targets. They are:
13 
-
14 
-      -pre-init:                 called before initialization of project properties
15 
-      -post-init:                called after initialization of project properties
16 
-      -pre-compile:              called before javac compilation
17 
-      -post-compile:             called after javac compilation
18 
-      -pre-compile-single:       called before javac compilation of single file
19 
-      -post-compile-single:      called after javac compilation of single file
20 
-      -pre-compile-test:         called before javac compilation of JUnit tests
21 
-      -post-compile-test:        called after javac compilation of JUnit tests
22 
-      -pre-compile-test-single:  called before javac compilation of single JUnit test
23 
-      -post-compile-test-single: called after javac compilation of single JUunit test
24 
-      -pre-jar:                  called before JAR building
25 
-      -post-jar:                 called after JAR building
26 
-      -post-clean:               called after cleaning build products
27 
-
28 
-    (Targets beginning with '-' are not intended to be called on their own.)
29 
-
30 
-    Example of inserting an obfuscator after compilation could look like this:
31 
-
32 
-        <target name="-post-compile">
33 
-            <obfuscate>
34 
-                <fileset dir="${build.classes.dir}"/>
35 
-            </obfuscate>
36 
-        </target>
37 
-
38 
-    For list of available properties check the imported
39 
-    nbproject/build-impl.xml file.
40 
-
41 
-
42 
-    Another way to customize the build is by overriding existing main targets.
43 
-    The targets of interest are:
44 
-
45 
-      -init-macrodef-javac:     defines macro for javac compilation
46 
-      -init-macrodef-junit:     defines macro for junit execution
47 
-      -init-macrodef-debug:     defines macro for class debugging
48 
-      -init-macrodef-java:      defines macro for class execution
49 
-      -do-jar-with-manifest:    JAR building (if you are using a manifest)
50 
-      -do-jar-without-manifest: JAR building (if you are not using a manifest)
51 
-      run:                      execution of project
52 
-      -javadoc-build:           Javadoc generation
53 
-      test-report:              JUnit report generation
54 
-
55 
-    An example of overriding the target for project execution could look like this:
56 
-
57 
-        <target name="run" depends="DMDirc-impl.jar">
58 
-            <exec dir="bin" executable="launcher.exe">
59 
-                <arg file="${dist.jar}"/>
60 
-            </exec>
61 
-        </target>
62 
-
63 
-    Notice that the overridden target depends on the jar target and not only on
64 
-    the compile target as the regular run target does. Again, for a list of available
65 
-    properties which you can use, check the target you are overriding in the
66 
-    nbproject/build-impl.xml file.
67 
-
68 
-    -->
69 5 
     <target name="checkstyle" depends="
70 
-	    checkstyle-dmdirc-all, checkstyle-sun-all, checkstyle-duplicate-all, checkstyle-todo-all,
71 
-	    checkstyle-dmdirc-core, checkstyle-sun-core, checkstyle-duplicate-core, checkstyle-todo-core,
72 
-	    checkstyle-dmdirc-commandparser, checkstyle-sun-commandparser, checkstyle-duplicate-commandparser, checkstyle-todo-commandparser,
73 
-	    checkstyle-dmdirc-identities, checkstyle-sun-identities, checkstyle-duplicate-identities, checkstyle-todo-identities,
74 
-	    checkstyle-dmdirc-logger, checkstyle-sun-logger, checkstyle-duplicate-logger, checkstyle-todo-logger,
75 
-	    checkstyle-dmdirc-parser, checkstyle-sun-parser, checkstyle-duplicate-parser, checkstyle-todo-parser,
76 
-	    checkstyle-dmdirc-ui, checkstyle-sun-ui, checkstyle-duplicate-ui, checkstyle-todo-ui,
6 
+	    checkstyle-all,
7 
+            checkstyle-actions,
8 
+	    checkstyle-core,
9 
+	    checkstyle-commandparser,
10 
+	    checkstyle-identities,
11 
+	    checkstyle-logger,
12 
+	    checkstyle-parser,
13 
+            checkstyle-plugins,
14 
+	    checkstyle-ui,
77 15 
 	    remove-xml-files, move-index" />
78 
-
16 
+
17 
+    <target name="checkstyle-plugins">
18 
+            <taskdef resource="checkstyletask.properties"
19 
+                     classpath="checkstyle-all-4.3.jar"/>
20 
+            <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
21 
+                        failOnViolation="false">
22 
+                    <fileset dir="src/uk/org/ownage/dmdirc/plugins/" includes="**/*.java"/>
23 
+                    <formatter type="xml" tofile="reports/report-plugins.xml"/>
24 
+            </checkstyle>
25 
+            <xslt in="reports/report-plugins.xml" out="reports/report-plugins.html" style="checkstyle/checkstyle.xsl"/>
26 
+    </target>
27 
+
28 
+    <target name="checkstyle-actions">
29 
+            <taskdef resource="checkstyletask.properties"
30 
+                     classpath="checkstyle-all-4.3.jar"/>
31 
+            <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
32 
+                        failOnViolation="false">
33 
+                    <fileset dir="src/uk/org/ownage/dmdirc/actions/" includes="**/*.java"/>
34 
+                    <formatter type="xml" tofile="reports/report-actions.xml"/>
35 
+            </checkstyle>
36 
+            <xslt in="reports/report-actions.xml" out="reports/report-actions.html" style="checkstyle/checkstyle.xsl"/>
37 
+    </target>
79 38
80 
-    <target name="checkstyle-dmdirc-ui">
39 
+    <target name="checkstyle-ui">
81 40 
 	    <taskdef resource="checkstyletask.properties"
82 41 
 		     classpath="checkstyle-all-4.3.jar"/>
83 42 
 	    <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
84 43 
 			failOnViolation="false">
85 44 
 		    <fileset dir="src/uk/org/ownage/dmdirc/ui/" includes="**/*.java"/>
86 
-		    <formatter type="xml" tofile="reports/report-ui-dmdirc.xml"/>
87 
-	    </checkstyle>
88 
-	    <xslt in="reports/report-ui-dmdirc.xml" out="reports/report-ui-dmdirc.html" style="checkstyle/checkstyle.xsl"/>
89 
-    </target>
90 
-    <target name="checkstyle-sun-ui">
91 
-	    <taskdef resource="checkstyletask.properties"
92 
-		     classpath="checkstyle-all-4.3.jar"/>
93 
-	    <checkstyle config="checkstyle/sun_checks.xml" failureProperty="checkstyle.failure"
94 
-			failOnViolation="false">
95 
-		    <fileset dir="src/uk/org/ownage/dmdirc/ui/" includes="**/*.java"/>
96 
-		    <formatter type="xml" tofile="reports/report-ui-sun.xml"/>
97 
-	    </checkstyle>
98 
-	    <xslt in="reports/report-ui-sun.xml" out="reports/report-ui-sun.html" style="checkstyle/checkstyle.xsl"/>
99 
-    </target>
100 
-    <target name="checkstyle-duplicate-ui">
101 
-	    <taskdef resource="checkstyletask.properties"
102 
-		     classpath="checkstyle-all-4.3.jar"/>
103 
-	    <checkstyle config="checkstyle/duplicate_code_checks.xml" failureProperty="checkstyle.failure"
104 
-			failOnViolation="false">
105 
-		    <fileset dir="src/uk/org/ownage/dmdirc/ui/" includes="**/*.java"/>
106 
-		    <formatter type="xml" tofile="reports/report-ui-duplicate.xml"/>
45 
+		    <formatter type="xml" tofile="reports/report-ui.xml"/>
107 46 
 	    </checkstyle>
108 
-	    <xslt in="reports/report-ui-duplicate.xml" out="reports/report-ui-duplicate.html" style="checkstyle/checkstyle.xsl"/>
109 
-    </target>
110 
-    <target name="checkstyle-todo-ui">
111 
-	    <taskdef resource="checkstyletask.properties"
112 
-		     classpath="checkstyle-all-4.3.jar"/>
113 
-	    <checkstyle config="checkstyle/todo_checks.xml" failureProperty="checkstyle.failure"
114 
-			failOnViolation="false">
115 
-		    <fileset dir="src/uk/org/ownage/dmdirc/ui/" includes="**/*.java"/>
116 
-		    <formatter type="xml" tofile="reports/report-ui-todo.xml"/>
117 
-	    </checkstyle>
118 
-	    <xslt in="reports/report-ui-todo.xml" out="reports/report-ui-todo.html" style="checkstyle/checkstyle.xsl"/>
47 
+	    <xslt in="reports/report-ui.xml" out="reports/report-ui.html" style="checkstyle/checkstyle.xsl"/>
119 48 
     </target>
120 49
121 
-
122 
-    <target name="checkstyle-dmdirc-parser">
50 
+    <target name="checkstyle-parser">
123 51 
 	    <taskdef resource="checkstyletask.properties"
124 52 
 		     classpath="checkstyle-all-4.3.jar"/>
125 53 
 	    <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
126 54 
 			failOnViolation="false">
127 55 
 		    <fileset dir="src/uk/org/ownage/dmdirc/parser/" includes="**/*.java"/>
128 
-		    <formatter type="xml" tofile="reports/report-parser-dmdirc.xml"/>
56 
+		    <formatter type="xml" tofile="reports/report-parser.xml"/>
129 57 
 	    </checkstyle>
130 
-	    <xslt in="reports/report-parser-dmdirc.xml" out="reports/report-parser-dmdirc.html" style="checkstyle/checkstyle.xsl"/>
131 
-    </target>
132 
-    <target name="checkstyle-sun-parser">
133 
-	    <taskdef resource="checkstyletask.properties"
134 
-		     classpath="checkstyle-all-4.3.jar"/>
135 
-	    <checkstyle config="checkstyle/sun_checks.xml" failureProperty="checkstyle.failure"
136 
-			failOnViolation="false">
137 
-		    <fileset dir="src/uk/org/ownage/dmdirc/parser/" includes="**/*.java"/>
138 
-		    <formatter type="xml" tofile="reports/report-parser-sun.xml"/>
139 
-	    </checkstyle>
140 
-	    <xslt in="reports/report-parser-sun.xml" out="reports/report-parser-sun.html" style="checkstyle/checkstyle.xsl"/>
141 
-    </target>
142 
-    <target name="checkstyle-duplicate-parser">
143 
-	    <taskdef resource="checkstyletask.properties"
144 
-		     classpath="checkstyle-all-4.3.jar"/>
145 
-	    <checkstyle config="checkstyle/duplicate_code_checks.xml" failureProperty="checkstyle.failure"
146 
-			failOnViolation="false">
147 
-		    <fileset dir="src/uk/org/ownage/dmdirc/parser/" includes="**/*.java"/>
148 
-		    <formatter type="xml" tofile="reports/report-parser-duplicate.xml"/>
149 
-	    </checkstyle>
150 
-	    <xslt in="reports/report-parser-duplicate.xml" out="reports/report-parser-duplicate.html" style="checkstyle/checkstyle.xsl"/>
151 
-    </target>
152 
-    <target name="checkstyle-todo-parser">
153 
-	    <taskdef resource="checkstyletask.properties"
154 
-		     classpath="checkstyle-all-4.3.jar"/>
155 
-	    <checkstyle config="checkstyle/todo_checks.xml" failureProperty="checkstyle.failure"
156 
-			failOnViolation="false">
157 
-		    <fileset dir="src/uk/org/ownage/dmdirc/parser/" includes="**/*.java"/>
158 
-		    <formatter type="xml" tofile="reports/report-parser-todo.xml"/>
159 
-	    </checkstyle>
160 
-	    <xslt in="reports/report-parser-todo.xml" out="reports/report-parser-todo.html" style="checkstyle/checkstyle.xsl"/>
58 
+	    <xslt in="reports/report-parser.xml" out="reports/report-parser.html" style="checkstyle/checkstyle.xsl"/>
161 59 
     </target>
162 60
163 
-
164 
-    <target name="checkstyle-dmdirc-logger">
61 
+    <target name="checkstyle-logger">
165 62 
 	    <taskdef resource="checkstyletask.properties"
166 63 
 		     classpath="checkstyle-all-4.3.jar"/>
167 64 
 	    <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
168 65 
 			failOnViolation="false">
169 66 
 		    <fileset dir="src/uk/org/ownage/dmdirc/logger/" includes="**/*.java"/>
170 
-		    <formatter type="xml" tofile="reports/report-logger-dmdirc.xml"/>
67 
+		    <formatter type="xml" tofile="reports/report-logger.xml"/>
171 68 
 	    </checkstyle>
172 
-	    <xslt in="reports/report-logger-dmdirc.xml" out="reports/report-logger-dmdirc.html" style="checkstyle/checkstyle.xsl"/>
69 
+	    <xslt in="reports/report-logger.xml" out="reports/report-logger.html" style="checkstyle/checkstyle.xsl"/>
173 70 
     </target>
174 
-    <target name="checkstyle-sun-logger">
175 
-	    <taskdef resource="checkstyletask.properties"
176 
-		     classpath="checkstyle-all-4.3.jar"/>
177 
-	    <checkstyle config="checkstyle/sun_checks.xml" failureProperty="checkstyle.failure"
178 
-			failOnViolation="false">
179 
-		    <fileset dir="src/uk/org/ownage/dmdirc/logger/" includes="**/*.java"/>
180 
-		    <formatter type="xml" tofile="reports/report-logger-sun.xml"/>
181 
-	    </checkstyle>
182 
-	    <xslt in="reports/report-logger-sun.xml" out="reports/report-logger-sun.html" style="checkstyle/checkstyle.xsl"/>
183 
-    </target>
184 
-    <target name="checkstyle-duplicate-logger">
185 
-	    <taskdef resource="checkstyletask.properties"
186 
-		     classpath="checkstyle-all-4.3.jar"/>
187 
-	    <checkstyle config="checkstyle/duplicate_code_checks.xml" failureProperty="checkstyle.failure"
188 
-			failOnViolation="false">
189 
-		    <fileset dir="src/uk/org/ownage/dmdirc/logger/" includes="**/*.java"/>
190 
-		    <formatter type="xml" tofile="reports/report-logger-duplicate.xml"/>
191 
-	    </checkstyle>
192 
-	    <xslt in="reports/report-logger-duplicate.xml" out="reports/report-logger-duplicate.html" style="checkstyle/checkstyle.xsl"/>
193 
-    </target>
194 
-    <target name="checkstyle-todo-logger">
195 
-	    <taskdef resource="checkstyletask.properties"
196 
-		     classpath="checkstyle-all-4.3.jar"/>
197 
-	    <checkstyle config="checkstyle/todo_checks.xml" failureProperty="checkstyle.failure"
198 
-			failOnViolation="false">
199 
-		    <fileset dir="src/uk/org/ownage/dmdirc/logger/" includes="**/*.java"/>
200 
-		    <formatter type="xml" tofile="reports/report-logger-todo.xml"/>
201 
-	    </checkstyle>
202 
-	    <xslt in="reports/report-logger-todo.xml" out="reports/report-logger-todo.html" style="checkstyle/checkstyle.xsl"/>
203 
-    </target>
204 
-
205 71
206 
-    <target name="checkstyle-dmdirc-identities">
72 
+    <target name="checkstyle-identities">
207 73 
 	    <taskdef resource="checkstyletask.properties"
208 74 
 		     classpath="checkstyle-all-4.3.jar"/>
209 75 
 	    <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
210 76 
 			failOnViolation="false">
211 77 
 		    <fileset dir="src/uk/org/ownage/dmdirc/identities/" includes="**/*.java"/>
212 
-		    <formatter type="xml" tofile="reports/report-identities-dmdirc.xml"/>
78 
+		    <formatter type="xml" tofile="reports/report-identities.xml"/>
213 79 
 	    </checkstyle>
214 
-	    <xslt in="reports/report-identities-dmdirc.xml" out="reports/report-identities-dmdirc.html" style="checkstyle/checkstyle.xsl"/>
80 
+	    <xslt in="reports/report-identities.xml" out="reports/report-identities.html" style="checkstyle/checkstyle.xsl"/>
215 81 
     </target>
216 
-    <target name="checkstyle-sun-identities">
217 
-	    <taskdef resource="checkstyletask.properties"
218 
-		     classpath="checkstyle-all-4.3.jar"/>
219 
-	    <checkstyle config="checkstyle/sun_checks.xml" failureProperty="checkstyle.failure"
220 
-			failOnViolation="false">
221 
-		    <fileset dir="src/uk/org/ownage/dmdirc/identities/" includes="**/*.java"/>
222 
-		    <formatter type="xml" tofile="reports/report-identities-sun.xml"/>
223 
-	    </checkstyle>
224 
-	    <xslt in="reports/report-identities-sun.xml" out="reports/report-identities-sun.html" style="checkstyle/checkstyle.xsl"/>
225 
-    </target>
226 
-    <target name="checkstyle-duplicate-identities">
227 
-	    <taskdef resource="checkstyletask.properties"
228 
-		     classpath="checkstyle-all-4.3.jar"/>
229 
-	    <checkstyle config="checkstyle/duplicate_code_checks.xml" failureProperty="checkstyle.failure"
230 
-			failOnViolation="false">
231 
-		    <fileset dir="src/uk/org/ownage/dmdirc/identities/" includes="**/*.java"/>
232 
-		    <formatter type="xml" tofile="reports/report-identities-duplicate.xml"/>
233 
-	    </checkstyle>
234 
-	    <xslt in="reports/report-identities-duplicate.xml" out="reports/report-identities-duplicate.html" style="checkstyle/checkstyle.xsl"/>
235 
-    </target>
236 
-    <target name="checkstyle-todo-identities">
237 
-	    <taskdef resource="checkstyletask.properties"
238 
-		     classpath="checkstyle-all-4.3.jar"/>
239 
-	    <checkstyle config="checkstyle/todo_checks.xml" failureProperty="checkstyle.failure"
240 
-			failOnViolation="false">
241 
-		    <fileset dir="src/uk/org/ownage/dmdirc/identities/" includes="**/*.java"/>
242 
-		    <formatter type="xml" tofile="reports/report-identities-todo.xml"/>
243 
-	    </checkstyle>
244 
-	    <xslt in="reports/report-identities-todo.xml" out="reports/report-identities-todo.html" style="checkstyle/checkstyle.xsl"/>
245 
-    </target>
246 
-
247 82
248 
-    <target name="checkstyle-dmdirc-commandparser">
83 
+    <target name="checkstyle-commandparser">
249 84 
 	    <taskdef resource="checkstyletask.properties"
250 85 
 		     classpath="checkstyle-all-4.3.jar"/>
251 86 
 	    <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
252 87 
 			failOnViolation="false">
253 88 
 		    <fileset dir="src/uk/org/ownage/dmdirc/commandparser/" includes="**/*.java"/>
254 
-		    <formatter type="xml" tofile="reports/report-commandparser-dmdirc.xml"/>
89 
+		    <formatter type="xml" tofile="reports/report-commandparser.xml"/>
255 90 
 	    </checkstyle>
256 
-	    <xslt in="reports/report-commandparser-dmdirc.xml" out="reports/report-commandparser-dmdirc.html" style="checkstyle/checkstyle.xsl"/>
257 
-    </target>
258 
-    <target name="checkstyle-sun-commandparser">
259 
-	    <taskdef resource="checkstyletask.properties"
260 
-		     classpath="checkstyle-all-4.3.jar"/>
261 
-	    <checkstyle config="checkstyle/sun_checks.xml" failureProperty="checkstyle.failure"
262 
-			failOnViolation="false">
263 
-		    <fileset dir="src/uk/org/ownage/dmdirc/commandparser/" includes="**/*.java"/>
264 
-		    <formatter type="xml" tofile="reports/report-commandparser-sun.xml"/>
265 
-	    </checkstyle>
266 
-	    <xslt in="reports/report-commandparser-sun.xml" out="reports/report-commandparser-sun.html" style="checkstyle/checkstyle.xsl"/>
267 
-    </target>
268 
-    <target name="checkstyle-duplicate-commandparser">
269 
-	    <taskdef resource="checkstyletask.properties"
270 
-		     classpath="checkstyle-all-4.3.jar"/>
271 
-	    <checkstyle config="checkstyle/duplicate_code_checks.xml" failureProperty="checkstyle.failure"
272 
-			failOnViolation="false">
273 
-		    <fileset dir="src/uk/org/ownage/dmdirc/commandparser/" includes="**/*.java"/>
274 
-		    <formatter type="xml" tofile="reports/report-commandparser-duplicate.xml"/>
275 
-	    </checkstyle>
276 
-	    <xslt in="reports/report-commandparser-duplicate.xml" out="reports/report-commandparser-duplicate.html" style="checkstyle/checkstyle.xsl"/>
277 
-    </target>
278 
-    <target name="checkstyle-todo-commandparser">
279 
-	    <taskdef resource="checkstyletask.properties"
280 
-		     classpath="checkstyle-all-4.3.jar"/>
281 
-	    <checkstyle config="checkstyle/todo_checks.xml" failureProperty="checkstyle.failure"
282 
-			failOnViolation="false">
283 
-		    <fileset dir="src/uk/org/ownage/dmdirc/commandparser/" includes="**/*.java"/>
284 
-		    <formatter type="xml" tofile="reports/report-commandparser-todo.xml"/>
285 
-	    </checkstyle>
286 
-	    <xslt in="reports/report-commandparser-todo.xml" out="reports/report-commandparser-todo.html" style="checkstyle/checkstyle.xsl"/>
91 
+	    <xslt in="reports/report-commandparser.xml" out="reports/report-commandparser.html" style="checkstyle/checkstyle.xsl"/>
287 92 
     </target>
288 93
289 
-
290 
-    <target name="checkstyle-dmdirc-core">
94 
+    <target name="checkstyle-core">
291 95 
 	    <taskdef resource="checkstyletask.properties"
292 96 
 		     classpath="checkstyle-all-4.3.jar"/>
293 97 
 	    <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
294 98 
 			failOnViolation="false">
295 99 
 		    <fileset dir="src/uk/org/ownage/dmdirc/" includes="*.java"/>
296 
-		    <formatter type="xml" tofile="reports/report-core-dmdirc.xml"/>
297 
-	    </checkstyle>
298 
-	    <xslt in="reports/report-core-dmdirc.xml" out="reports/report-core-dmdirc.html" style="checkstyle/checkstyle.xsl"/>
299 
-    </target>
300 
-    <target name="checkstyle-sun-core">
301 
-	    <taskdef resource="checkstyletask.properties"
302 
-		     classpath="checkstyle-all-4.3.jar"/>
303 
-	    <checkstyle config="checkstyle/sun_checks.xml" failureProperty="checkstyle.failure"
304 
-			failOnViolation="false">
305 
-		    <fileset dir="src/uk/org/ownage/dmdirc/" includes="*.java"/>
306 
-		    <formatter type="xml" tofile="reports/report-core-sun.xml"/>
100 
+		    <formatter type="xml" tofile="reports/report-core.xml"/>
307 101 
 	    </checkstyle>
308 
-	    <xslt in="reports/report-core-sun.xml" out="reports/report-core-sun.html" style="checkstyle/checkstyle.xsl"/>
309 
-    </target>
310 
-    <target name="checkstyle-duplicate-core">
311 
-	    <taskdef resource="checkstyletask.properties"
312 
-		     classpath="checkstyle-all-4.3.jar"/>
313 
-	    <checkstyle config="checkstyle/duplicate_code_checks.xml" failureProperty="checkstyle.failure"
314 
-			failOnViolation="false">
315 
-		    <fileset dir="src/uk/org/ownage/dmdirc/" includes="*.java"/>
316 
-		    <formatter type="xml" tofile="reports/report-core-duplicate.xml"/>
317 
-	    </checkstyle>
318 
-	    <xslt in="reports/report-core-duplicate.xml" out="reports/report-core-duplicate.html" style="checkstyle/checkstyle.xsl"/>
319 
-    </target>
320 
-    <target name="checkstyle-todo-core">
321 
-	    <taskdef resource="checkstyletask.properties"
322 
-		     classpath="checkstyle-all-4.3.jar"/>
323 
-	    <checkstyle config="checkstyle/todo_checks.xml" failureProperty="checkstyle.failure"
324 
-			failOnViolation="false">
325 
-		    <fileset dir="src/uk/org/ownage/dmdirc/" includes="*.java"/>
326 
-		    <formatter type="xml" tofile="reports/report-core-todo.xml"/>
327 
-	    </checkstyle>
328 
-	    <xslt in="reports/report-core-todo.xml" out="reports/report-core-todo.html" style="checkstyle/checkstyle.xsl"/>
102 
+	    <xslt in="reports/report-core.xml" out="reports/report-core.html" style="checkstyle/checkstyle.xsl"/>
329 103 
     </target>
330 104
331 
-
332 
-    <target name="checkstyle-dmdirc-all">
105 
+    <target name="checkstyle-all">
333 106 
 	    <taskdef resource="checkstyletask.properties"
334 107 
 		     classpath="checkstyle-all-4.3.jar"/>
335 108 
 	    <checkstyle config="checkstyle/dmdirc_checks.xml" failureProperty="checkstyle.failure"
336 109 
 			failOnViolation="false">
337 110 
 		    <fileset dir="src/" includes="**/*.java"/>
338 
-		    <formatter type="xml" tofile="reports/report-all-dmdirc.xml"/>
111 
+		    <formatter type="xml" tofile="reports/report-all.xml"/>
339 112 
 	    </checkstyle>
340 
-	    <xslt in="reports/report-all-dmdirc.xml" out="reports/report-all-dmdirc.html" style="checkstyle/checkstyle.xsl"/>
113 
+	    <xslt in="reports/report-all.xml" out="reports/report-all.html" style="checkstyle/checkstyle.xsl"/>
341 114 
     </target>
342 
-    <target name="checkstyle-sun-all">
343 
-	    <taskdef resource="checkstyletask.properties"
344 
-		     classpath="checkstyle-all-4.3.jar"/>
345 
-	    <checkstyle config="checkstyle/sun_checks.xml" failureProperty="checkstyle.failure"
346 
-			failOnViolation="false">
347 
-		    <fileset dir="src/" includes="**/*.java"/>
348 
-		    <formatter type="xml" tofile="reports/report-all-sun.xml"/>
349 
-	    </checkstyle>
350 
-	    <xslt in="reports/report-all-sun.xml" out="reports/report-all-sun.html" style="checkstyle/checkstyle.xsl"/>
351 
-    </target>
352 
-    <target name="checkstyle-duplicate-all">
353 
-	    <taskdef resource="checkstyletask.properties"
354 
-		     classpath="checkstyle-all-4.3.jar"/>
355 
-	    <checkstyle config="checkstyle/duplicate_code_checks.xml" failureProperty="checkstyle.failure"
356 
-			failOnViolation="false">
357 
-		    <fileset dir="src/" includes="**/*.java"/>
358 
-		    <formatter type="xml" tofile="reports/report-all-duplicate.xml"/>
359 
-	    </checkstyle>
360 
-	    <xslt in="reports/report-all-duplicate.xml" out="reports/report-all-duplicate.html" style="checkstyle/checkstyle.xsl"/>
361 
-    </target>
362 
-    <target name="checkstyle-todo-all">
363 
-	    <taskdef resource="checkstyletask.properties"
364 
-		     classpath="checkstyle-all-4.3.jar"/>
365 
-	    <checkstyle config="checkstyle/todo_checks.xml" failureProperty="checkstyle.failure"
366 
-			failOnViolation="false">
367 
-		    <fileset dir="src/" includes="**/*.java"/>
368 
-		    <formatter type="xml" tofile="reports/report-all-todo.xml"/>
369 
-	    </checkstyle>
370 
-	    <xslt in="reports/report-all-todo.xml" out="reports/report-all-todo.html" style="checkstyle/checkstyle.xsl"/>
371 
-    </target>
372 
-
373 115
374 116 
     <target name="remove-xml-files">
375 117 
 	<delete>

+ 5
- 1
checkstyle/dmdirc_checks.xml View File 

@@ -120,7 +120,11 @@
120 120 
         <module name="DoubleCheckedLocking"/>    <!-- MY FAVOURITE -->
121 121 
         <module name="EmptyStatement"/>
122 122 
         <module name="EqualsHashCode"/>
123 
-        <module name="HiddenField"/>
123 
+        <module name="HiddenField">
124 
+                <property name="ignoreConstructorParameter" value="true"/>
125 
+                <property name="ignoreSetter" value="true"/>
126 
+                <property name="ignoreAbstractMethods" value="true"/>
127 
+        </module>
124 128 
         <module name="IllegalInstantiation"/>
125 129 
         <module name="InnerAssignment"/>
126 130 
         <module name="MissingSwitchDefault"/>

+ 0
- 10
checkstyle/duplicate_code_checks.xml View File 

@@ -1,10 +0,0 @@
1 
-<?xml version="1.0"?>
2 
-<!DOCTYPE module PUBLIC
3 
-    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
4 
-    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
5 
-
6 
-<module name="Checker">
7 
-    <module name="StrictDuplicateCode">
8 
-	<property name="min" value="8"/>
9 
-    </module>
10 
-</module>

+ 11
- 55
checkstyle/index.html View File 

@@ -9,65 +9,21 @@
9 9 
    <img id="logo" src="/res/logo.png" alt="DMDirc logo">
10 10 
    <h1>DMDirc</h1>
11 11 
    <ul id="menu">
12 
-    <li><a href="/">About</a></li>
13 
-    <li><a href="/features.php">Feature comparison</a></li>
14 
-    <li><a href="/releases.html">Releases</a></li>
15 
-    <li><a href="/screenshots.html">Screenshots</a></li>
16 
-    <li><a href="http://code.google.com/p/dmdirc">Project page</a></li>
17 
-    <li><a href="/report/">Checkstyle reports</a></li>
18 
-    <li><a href="/javadoc/">Javadoc</a></li>
12 
+    <li><a href="/">Main Site</a></li>
19 13 
    </ul>
20 14 
    <div id="content">
21 15
22 16 
     <h1>DMDirc checkstyle reports</h1>
23 
-    <h2>All</h2>
24 17 
     <ul>
25 
-      <li><a href="report-all-dmdirc.html" title="DMDirc Checks">DMDirc Checks</a></li>
26 
-      <li><a href="report-all-sun.html" title="Sun Checks">Sun Checks</a></li>
27 
-      <li><a href="report-all-duplicate.html" title="Duplicate code Checks">Duplicate code Checks</a></li>
28 
-      <li><a href="report-all-todo.html" title="Todo Checks">Todo Checks</a></li>
29 
-    </ul>
30 
-    <h2>Command Parser</h2>
31 
-    <ul>
32 
-      <li><a href="report-commandparser-dmdirc.html" title="DMDirc Checks">DMDirc Checks</a></li>
33 
-      <li><a href="report-commandparser-sun.html" title="Sun Checks">Sun Checks</a></li>
34 
-      <li><a href="report-commandparser-duplicate.html" title="Duplicate code Checks">DMDirc Checks</a></li>
35 
-      <li><a href="report-commandparser-todo.html" title="Todo Checks">Todo Checks</a></li>
36 
-    </ul>
37 
-    <h2>Core</h2>
38 
-    <ul>
39 
-      <li><a href="report-core-dmdirc.html" title="DMDirc Checks">DMDirc Checks</a></li>
40 
-      <li><a href="report-core-sun.html" title="Sun Checks">Sun Checks</a></li>
41 
-      <li><a href="report-core-duplicate.html" title="Duplicate code Checks">Duplicate code Checks</a></li>
42 
-      <li><a href="report-core-todo.html" title="Todo Checks">Todo Checks</a></li>
43 
-    </ul>
44 
-    <h2>Identities</h2>
45 
-    <ul>
46 
-      <li><a href="report-identities-dmdirc.html" title="DMDirc Checks">DMDirc Checks</a></li>
47 
-      <li><a href="report-identities-sun.html" title="Sun Checks">Sun Checks</a></li>
48 
-      <li><a href="report-identities-duplicate.html" title="Duplicate code Checks">Duplicate code Checks</a></li>
49 
-      <li><a href="report-identities-todo.html" title="Todo Checks">Todo Checks</a></li>
50 
-    </ul>
51 
-    <h2>Logger</h2>
52 
-    <ul>
53 
-      <li><a href="report-logger-dmdirc.html" title="DMDirc Checks">DMDirc Checks</a></li>
54 
-      <li><a href="report-logger-sun.html" title="Sun Checks">Sun Checks</a></li>
55 
-      <li><a href="report-logger-duplicate.html" title="Duplicate code Checks">Duplicate code Checks</a></li>
56 
-      <li><a href="report-logger-todo.html" title="Todo Checks">Todo Checks</a></li>
57 
-    </ul>
58 
-    <h2>Parser</h2>
59 
-    <ul>
60 
-      <li><a href="report-parser-dmdirc.html" title="DMDirc Checks">DMDirc Checks</a></li>
61 
-      <li><a href="report-parser-sun.html" title="Sun Checks">Sun Checks</a></li>
62 
-      <li><a href="report-parser-duplicate.html" title="Duplicate code Checks">Duplicate code Checks</a></li>
63 
-      <li><a href="report-parser-todo.html" title="Todo Checks">Todo Checks</a></li>
64 
-    </ul>
65 
-    <h2>UI</h2>
66 
-    <ul>
67 
-      <li><a href="report-ui-dmdirc.html" title="DMDirc Checks">DMDirc Checks</a></li>
68 
-      <li><a href="report-ui-sun.html" title="Sun Checks">Sun Checks</a></li>
69 
-      <li><a href="report-ui-duplicate.html" title="Duplicate code Checks">Duplicate code Checks</a></li>
70 
-      <li><a href="report-ui-todo.html" title="Todo Checks">Todo Checks</a></li>
18 
+      <li><a href="report-all.html" title="Whole project">Whole project</a></li>
19 
+      <li><a href="report-actions.html" title="Actions">Actions</a></li>
20 
+      <li><a href="report-commandparser.html" title="Command Parser">Command Parser</a></li>
21 
+      <li><a href="report-core.html" title="Core">Core</a></li>
22 
+      <li><a href="report-identities.html" title="Identities">Identities</a></li>
23 
+      <li><a href="report-logger.html" title="Logger">Logger</a></li>
24 
+      <li><a href="report-parser.html" title="Parser">Parser</a></li>
25 
+      <li><a href="report-plugins.html" title="Plugins">Plugins</a></li>
26 
+      <li><a href="report-ui.html" title="UI">UI</a></li>
71 27 
     </ul>
72 28
73 29 
    </div>
 
@@ -75,4 +31,4 @@
75 31 
    </div>
76 32 
   </div>
77 33 
  </body>
78 
-</html>
34 
+</html>

+ 0
- 144
checkstyle/sun_checks.xml View File 

@@ -1,144 +0,0 @@
1 
-<?xml version="1.0"?>
2 
-<!DOCTYPE module PUBLIC
3 
-    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
4 
-    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
5 
-
6 
-<module name="Checker">
7 
-
8 
-    <!-- Checks that a package.html file exists for each package.     -->
9 
-    <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
10 
-    <module name="PackageHtml"/>
11 
-
12 
-    <!-- Checks whether files end with a new line.                        -->
13 
-    <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
14 
-    <module name="NewlineAtEndOfFile"/>
15 
-
16 
-    <!-- Checks that property files contain the same keys.         -->
17 
-    <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
18 
-    <module name="Translation"/>
19 
-
20 
-
21 
-    <module name="TreeWalker">
22 
-
23 
-        <!-- Checks for Javadoc comments.                     -->
24 
-        <!-- See http://checkstyle.sf.net/config_javadoc.html -->
25 
-        <module name="JavadocMethod"/>
26 
-        <module name="JavadocType"/>
27 
-        <module name="JavadocVariable"/>
28 
-        <module name="JavadocStyle"/>
29 
-
30 
-
31 
-        <!-- Checks for Naming Conventions.                  -->
32 
-        <!-- See http://checkstyle.sf.net/config_naming.html -->
33 
-        <module name="ConstantName"/>
34 
-        <module name="LocalFinalVariableName"/>
35 
-        <module name="LocalVariableName"/>
36 
-        <module name="MemberName"/>
37 
-        <module name="MethodName"/>
38 
-        <module name="PackageName"/>
39 
-        <module name="ParameterName"/>
40 
-        <module name="StaticVariableName"/>
41 
-        <module name="TypeName"/>
42 
-
43 
-
44 
-        <!-- Checks for Headers                                -->
45 
-        <!-- See http://checkstyle.sf.net/config_header.html   -->
46 
-        <!-- <module name="Header">                            -->
47 
-            <!-- The follow property value demonstrates the ability     -->
48 
-            <!-- to have access to ANT properties. In this case it uses -->
49 
-            <!-- the ${basedir} property to allow Checkstyle to be run  -->
50 
-            <!-- from any directory within a project. See property      -->
51 
-            <!-- expansion,                                             -->
52 
-            <!-- http://checkstyle.sf.net/config.html#properties        -->
53 
-            <!-- <property                                              -->
54 
-            <!--     name="headerFile"                                  -->
55 
-            <!--     value="${basedir}/java.header"/>                   -->
56 
-        <!-- </module> -->
57 
-
58 
-        <!-- Following interprets the header file as regular expressions. -->
59 
-        <!-- <module name="RegexpHeader"/>                                -->
60 
-
61 
-
62 
-        <!-- Checks for imports                              -->
63 
-        <!-- See http://checkstyle.sf.net/config_import.html -->
64 
-        <module name="AvoidStarImport"/>
65 
-        <module name="IllegalImport"/> <!-- defaults to sun.* packages -->
66 
-        <module name="RedundantImport"/>
67 
-        <module name="UnusedImports"/>
68 
-
69 
-
70 
-        <!-- Checks for Size Violations.                    -->
71 
-        <!-- See http://checkstyle.sf.net/config_sizes.html -->
72 
-        <module name="FileLength"/>
73 
-        <module name="LineLength"/>
74 
-        <module name="MethodLength"/>
75 
-        <module name="ParameterNumber"/>
76 
-
77 
-
78 
-        <!-- Checks for whitespace                               -->
79 
-        <!-- See http://checkstyle.sf.net/config_whitespace.html -->
80 
-        <module name="EmptyForIteratorPad"/>
81 
-        <module name="MethodParamPad"/>
82 
-        <module name="NoWhitespaceAfter"/>
83 
-        <module name="NoWhitespaceBefore"/>
84 
-        <module name="OperatorWrap"/>
85 
-        <module name="ParenPad"/>
86 
-        <module name="TypecastParenPad"/>
87 
-        <module name="TabCharacter"/>
88 
-        <module name="WhitespaceAfter"/>
89 
-        <module name="WhitespaceAround"/>
90 
-
91 
-
92 
-        <!-- Modifier Checks                                    -->
93 
-        <!-- See http://checkstyle.sf.net/config_modifiers.html -->
94 
-        <module name="ModifierOrder"/>
95 
-        <module name="RedundantModifier"/>
96 
-
97 
-
98 
-        <!-- Checks for blocks. You know, those {}'s         -->
99 
-        <!-- See http://checkstyle.sf.net/config_blocks.html -->
100 
-        <module name="AvoidNestedBlocks"/>
101 
-        <module name="EmptyBlock"/>
102 
-        <module name="LeftCurly"/>
103 
-        <module name="NeedBraces"/>
104 
-        <module name="RightCurly"/>
105 
-
106 
-
107 
-        <!-- Checks for common coding problems               -->
108 
-        <!-- See http://checkstyle.sf.net/config_coding.html -->
109 
-        <module name="AvoidInlineConditionals"/>
110 
-        <module name="DoubleCheckedLocking"/>    <!-- MY FAVOURITE -->
111 
-        <module name="EmptyStatement"/>
112 
-        <module name="EqualsHashCode"/>
113 
-        <module name="HiddenField"/>
114 
-        <module name="IllegalInstantiation"/>
115 
-        <module name="InnerAssignment"/>
116 
-        <module name="MagicNumber"/>
117 
-        <module name="MissingSwitchDefault"/>
118 
-        <module name="RedundantThrows"/>
119 
-        <module name="SimplifyBooleanExpression"/>
120 
-        <module name="SimplifyBooleanReturn"/>
121 
-
122 
-        <!-- Checks for class design                         -->
123 
-        <!-- See http://checkstyle.sf.net/config_design.html -->
124 
-        <module name="DesignForExtension"/>
125 
-        <module name="FinalClass"/>
126 
-        <module name="HideUtilityClassConstructor"/>
127 
-        <module name="InterfaceIsType"/>
128 
-        <module name="VisibilityModifier"/>
129 
-
130 
-
131 
-        <!-- Miscellaneous other checks.                   -->
132 
-        <!-- See http://checkstyle.sf.net/config_misc.html -->
133 
-        <module name="ArrayTypeStyle"/>
134 
-        <module name="FinalParameters"/>
135 
-        <module name="GenericIllegalRegexp">
136 
-            <property name="format" value="\s+$"/>
137 
-            <property name="message" value="Line has trailing spaces."/>
138 
-        </module>
139 
-        <module name="TodoComment"/>
140 
-        <module name="UpperEll"/>
141 
-
142 
-    </module>
143 
-
144 
-</module>

+ 0
- 21
checkstyle/todo_checks.xml View File 

@@ -1,21 +0,0 @@
1 
-<?xml version="1.0"?>
2 
-<!DOCTYPE module PUBLIC
3 
-    "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
4 
-    "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
5 
-
6 
-<module name="Checker">
7 
-    <module name="TreeWalker">
8 
-	    <module name="TodoComment">
9 
-		    <property name="format" value="TODO |FIXME |BUG |HACK "/>
10 
-	    </module>
11 
-	    <module name="TodoComment">
12 
-		    <property name="format" value="TODO: |FIXME: |BUG: |HACK: "/>
13 
-	</module>
14 
-	<module name="TodoComment">
15 
-		<property name="format" value="todo |fixme |bug |hack "/>
16 
-	</module>
17 
-	<module name="TodoComment">
18 
-		<property name="format" value="todo: |fixme: |bug: |hack: "/>
19 
-	</module>
20 
-    </module>
21 
-</module>

+ 2
- 2
src/uk/org/ownage/dmdirc/ui/components/StatusBar.java View File 

@@ -182,7 +182,7 @@ public final class StatusBar extends JPanel implements MouseListener,
182 182 
             }
183 183 
         };
184 184 
         new Timer().schedule(messageTimer,
185 
-                new Date(System.currentTimeMillis() + timeout * 1000L));
185 
+                new Date(System.currentTimeMillis() + 250 + timeout * 1000L));
186 186 
     }
187 187
188 188 
     /**
 
@@ -226,7 +226,7 @@ public final class StatusBar extends JPanel implements MouseListener,
226 226 
             }
227 227 
         };
228 228 
         new Timer().schedule(errorTimer,
229 
-                new Date(System.currentTimeMillis() + displayLength));
229 
+                new Date(System.currentTimeMillis() + 250  + displayLength));
230 230 
     }
231 231
232 232 
     /**

Write Preview
Loading…
Cancel
Save