Skip to content

Commit 1304fe5

Browse files
committed
Issue #451: add DeclarationOrder to checkstyle config
1 parent 986ce74 commit 1304fe5

6 files changed

Lines changed: 53 additions & 58 deletions

File tree

config/checkstyle-checks.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,7 @@
365365
<module name="AvoidDoubleBraceInitialization"/>
366366
<module name="AvoidNoArgumentSuperConstructorCall"/>
367367
<module name="CovariantEquals"/>
368+
<module name="DeclarationOrder"/>
368369
<module name="DefaultComesLast"/>
369370
<module name="EmptyStatement"/>
370371
<module name="EqualsHashCode"/>

net.sf.eclipsecs.core/src/net/sf/eclipsecs/core/Messages.java

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,6 @@
2727
*
2828
*/
2929
public final class Messages extends NLS {
30-
// CHECKSTYLE:OFF
31-
32-
private static final String BUNDLE_NAME = "net.sf.eclipsecs.core.messages"; //$NON-NLS-1$
33-
34-
static {
35-
// initialize resource bundle
36-
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
37-
}
38-
39-
private Messages() {
40-
}
4130

4231
public static String Auditor_msgCheckingConfig;
4332

@@ -113,5 +102,14 @@ private Messages() {
113102

114103
public static String TransformFormatterRulesJob_name;
115104

116-
// CHECKSTYLE:ON
105+
private static final String BUNDLE_NAME = "net.sf.eclipsecs.core.messages"; //$NON-NLS-1$
106+
107+
static {
108+
// initialize resource bundle
109+
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
110+
}
111+
112+
private Messages() {
113+
}
114+
117115
}

net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/Messages.java

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,6 @@
2828
*
2929
*/
3030
public final class Messages extends NLS {
31-
// CHECKSTYLE:OFF
32-
33-
private static final String BUNDLE_NAME = "net.sf.eclipsecs.ui.messages"; //$NON-NLS-1$
34-
35-
static {
36-
// initialize resource bundle
37-
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
38-
}
3931

4032
public static String ActivateProjectsPrintAction_msgActivateSelectedProjects;
4133

@@ -387,9 +379,6 @@ public final class Messages extends NLS {
387379

388380
public static String SimpleFileSetsEditor_titleSimpleConfig;
389381

390-
private Messages() {
391-
}
392-
393382
public static String FileSetEditDialog_msgBuildTestResults;
394383

395384
public static String RemoteConfigurationEditor_titleAdvancedOptions;
@@ -501,5 +490,15 @@ private Messages() {
501490
public static String MarkerPropertyPage_Description;
502491

503492
public static String MarkerPropertyPage_Id;
504-
// CHECKSTYLE:ON
493+
494+
private static final String BUNDLE_NAME = "net.sf.eclipsecs.ui.messages"; //$NON-NLS-1$
495+
496+
static {
497+
// initialize resource bundle
498+
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
499+
}
500+
501+
private Messages() {
502+
}
503+
505504
}

net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/Messages.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,9 @@
2020

2121
package net.sf.eclipsecs.ui.quickfixes;
2222

23-
//CHECKSTYLE:OFF
2423
import org.eclipse.osgi.util.NLS;
2524

2625
public final class Messages extends NLS {
27-
private static final String BUNDLE_NAME = "net.sf.eclipsecs.ui.quickfixes.messages"; //$NON-NLS-1$
28-
29-
private Messages() {
30-
}
31-
32-
static {
33-
// initialize resource bundle
34-
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
35-
}
3626

3727
public static String ModifierOrderQuickfix_description;
3828

@@ -111,5 +101,15 @@ private Messages() {
111101
public static String NeedBracesQuickfix_description;
112102

113103
public static String NeedBracesQuickfix_label;
104+
105+
private static final String BUNDLE_NAME = "net.sf.eclipsecs.ui.quickfixes.messages"; //$NON-NLS-1$
106+
107+
static {
108+
// initialize resource bundle
109+
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
110+
}
111+
112+
private Messages() {
113+
}
114+
114115
}
115-
// CHECKSTYLE:ON

net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/quickfixes/modifier/Messages.java

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,9 @@
2020

2121
package net.sf.eclipsecs.ui.quickfixes.modifier;
2222

23-
//CHECKSTYLE:OFF
2423
import org.eclipse.osgi.util.NLS;
2524

2625
public final class Messages extends NLS {
27-
private static final String BUNDLE_NAME = "net.sf.eclipsecs.ui.quickfixes.modifier.messages"; //$NON-NLS-1$
28-
29-
private Messages() {
30-
}
31-
32-
static {
33-
// initialize resource bundle
34-
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
35-
}
3626

3727
public static String ModifierOrderQuickfix_description;
3828

@@ -41,5 +31,14 @@ private Messages() {
4131
public static String RedundantModifierQuickfix_description;
4232

4333
public static String RedundantModifierQuickfix_label;
34+
35+
private static final String BUNDLE_NAME = "net.sf.eclipsecs.ui.quickfixes.modifier.messages"; //$NON-NLS-1$
36+
37+
static {
38+
// initialize resource bundle
39+
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
40+
}
41+
42+
private Messages() {
43+
}
4444
}
45-
// CHECKSTYLE:ON

net.sf.eclipsecs.ui/src/net/sf/eclipsecs/ui/stats/Messages.java

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,6 @@
2727
*
2828
*/
2929
public final class Messages extends NLS {
30-
// CHECKSTYLE:OFF
31-
32-
private static final String BUNDLE_NAME = "net.sf.eclipsecs.ui.stats.messages"; //$NON-NLS-1$
33-
34-
private Messages() {
35-
}
36-
37-
static {
38-
// initialize resource bundle
39-
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
40-
}
4130

4231
public static String PreferencePage_displayJavadocErrors;
4332

@@ -153,5 +142,14 @@ private Messages() {
153142

154143
public static String CheckstyleMarkerFilterDialog_msgEditRegex;
155144

156-
// CHECKSTYLE:ON
145+
private static final String BUNDLE_NAME = "net.sf.eclipsecs.ui.stats.messages"; //$NON-NLS-1$
146+
147+
static {
148+
// initialize resource bundle
149+
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
150+
}
151+
152+
private Messages() {
153+
}
154+
157155
}

0 commit comments

Comments
 (0)