Skip to content

Commit

Permalink
CheckStyle: Fix ModifierOrder violations
Browse files Browse the repository at this point in the history
  • Loading branch information
Pieter12345 committed Jun 9, 2018
1 parent bb96a7e commit 4421fe8
Show file tree
Hide file tree
Showing 38 changed files with 66 additions and 66 deletions.
Expand Up @@ -19,7 +19,7 @@ public class ModifierMirror implements Serializable {
/**
* This is the canonical order of modifiers, used in the toString method.
*/
private static transient final Object[] order = new Object[]{
private static final transient Object[] order = new Object[]{
Modifier.PUBLIC, "public",
Modifier.PRIVATE, "private",
Modifier.PROTECTED, "protected",
Expand Down
26 changes: 13 additions & 13 deletions src/main/java/com/laytonsmith/PureUtilities/Color.java
Expand Up @@ -15,67 +15,67 @@ public class Color implements java.io.Serializable {
/**
* The color white. In the default sRGB space.
*/
public final static Color WHITE = new Color(255, 255, 255);
public static final Color WHITE = new Color(255, 255, 255);

/**
* The color light gray. In the default sRGB space.
*/
public final static Color LIGHT_GRAY = new Color(192, 192, 192);
public static final Color LIGHT_GRAY = new Color(192, 192, 192);

/**
* The color gray. In the default sRGB space.
*/
public final static Color GRAY = new Color(128, 128, 128);
public static final Color GRAY = new Color(128, 128, 128);

/**
* The color dark gray. In the default sRGB space.
*/
public final static Color DARK_GRAY = new Color(64, 64, 64);
public static final Color DARK_GRAY = new Color(64, 64, 64);

/**
* The color black. In the default sRGB space.
*/
public final static Color BLACK = new Color(0, 0, 0);
public static final Color BLACK = new Color(0, 0, 0);

/**
* The color red. In the default sRGB space.
*/
public final static Color RED = new Color(255, 0, 0);
public static final Color RED = new Color(255, 0, 0);

/**
* The color pink. In the default sRGB space.
*/
public final static Color PINK = new Color(255, 175, 175);
public static final Color PINK = new Color(255, 175, 175);

/**
* The color orange. In the default sRGB space.
*/
public final static Color ORANGE = new Color(255, 200, 0);
public static final Color ORANGE = new Color(255, 200, 0);

/**
* The color yellow. In the default sRGB space.
*/
public final static Color YELLOW = new Color(255, 255, 0);
public static final Color YELLOW = new Color(255, 255, 0);

/**
* The color green. In the default sRGB space.
*/
public final static Color GREEN = new Color(0, 255, 0);
public static final Color GREEN = new Color(0, 255, 0);

/**
* The color magenta. In the default sRGB space.
*/
public final static Color MAGENTA = new Color(255, 0, 255);
public static final Color MAGENTA = new Color(255, 0, 255);

/**
* The color cyan. In the default sRGB space.
*/
public final static Color CYAN = new Color(0, 255, 255);
public static final Color CYAN = new Color(0, 255, 255);

/**
* The color blue. In the default sRGB space.
*/
public final static Color BLUE = new Color(0, 0, 255);
public static final Color BLUE = new Color(0, 0, 255);

/**
* The color value.
Expand Down
Expand Up @@ -15,9 +15,9 @@ public class FileLocations {

private static FileLocations defaultInstance = null;

private final static File USER_HOME;
private final static File USER_DIR;
private final static File JAVA_HOME;
private static final File USER_HOME;
private static final File USER_DIR;
private static final File JAVA_HOME;

static {
File userHome = null;
Expand Down
Expand Up @@ -151,7 +151,7 @@ public Object _GetObject() {
}

@abstraction(type = Implementation.Type.BUKKIT)
public static abstract class BukkitMCPlayerEvent implements MCPlayerEvent {
public abstract static class BukkitMCPlayerEvent implements MCPlayerEvent {

PlayerEvent pe;

Expand Down
Expand Up @@ -15,7 +15,7 @@

public final class BukkitWeatherEvents {

public static abstract class BukkitMCWeatherEvent implements MCWeatherEvent {
public abstract static class BukkitMCWeatherEvent implements MCWeatherEvent {

private final WeatherEvent _event;

Expand Down
Expand Up @@ -31,7 +31,7 @@ public final class BukkitWorldEvents {
private BukkitWorldEvents() {
}

public static abstract class BukkitMCWorldEvent implements MCWorldEvent {
public abstract static class BukkitMCWorldEvent implements MCWorldEvent {

private final WorldEvent _event;

Expand Down
Expand Up @@ -101,7 +101,7 @@ public enum MCChatColor {
PLAIN_WHITE('r');

private final char code;
private final static Map<Character, MCChatColor> charColors = new HashMap<>();
private static final Map<Character, MCChatColor> charColors = new HashMap<>();

MCChatColor(char code) {
this.code = code;
Expand Down
Expand Up @@ -69,7 +69,7 @@
*/
public final class MethodScriptCompiler {

private final static EnumSet<Optimizable.OptimizationOption> NO_OPTIMIZATIONS = EnumSet.noneOf(Optimizable.OptimizationOption.class);
private static final EnumSet<Optimizable.OptimizationOption> NO_OPTIMIZATIONS = EnumSet.noneOf(Optimizable.OptimizationOption.class);

private MethodScriptCompiler() {
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/laytonsmith/core/Profiles.java
Expand Up @@ -198,7 +198,7 @@ public static Profile getProfile(String type, Map<String, String> data) throws I
* (String id, Map&lt;String, String&gt; elements) that contains the parsed xml for that profile. validation can be
* done in the constructor, and an InvalidProfileException can be thrown if there is invalid or missing data.
*/
public static abstract class Profile implements Comparable<Profile> {
public abstract static class Profile implements Comparable<Profile> {

private final String id;

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/laytonsmith/core/UpgradeLog.java
Expand Up @@ -84,7 +84,7 @@ public void runTasks() throws IOException {
FileUtil.write(newJSON, logFile);
}

public static abstract class UpgradeTask implements Runnable {
public abstract static class UpgradeTask implements Runnable {

UpgradeLog that = null;

Expand Down
Expand Up @@ -17,7 +17,7 @@
@Keyword.keyword("for")
public class ForKeyword extends Keyword {

private final static String FORELSE = new DataHandling.forelse().getName();
private static final String FORELSE = new DataHandling.forelse().getName();

@Override
public int process(List<ParseTree> list, int keywordPosition) throws ConfigCompileException {
Expand Down
Expand Up @@ -17,7 +17,7 @@
@Keyword.keyword("foreach")
public class ForeachKeyword extends Keyword {

private final static String FOREACHELSE = new DataHandling.foreachelse().getName();
private static final String FOREACHELSE = new DataHandling.foreachelse().getName();

@Override
public int process(List<ParseTree> list, int keywordPosition) throws ConfigCompileException {
Expand Down
Expand Up @@ -17,7 +17,7 @@
@Keyword.keyword("if")
public class IfKeyword extends Keyword {

private final static String IFELSE = new BasicLogic.ifelse().getName();
private static final String IFELSE = new BasicLogic.ifelse().getName();

@Override
public int process(List<ParseTree> list, int keywordPosition) throws ConfigCompileException {
Expand Down
Expand Up @@ -15,7 +15,7 @@
@Keyword.keyword("instanceof")
public class InstanceofKeyword extends Keyword {

private final static String INSTANCEOF = new DataHandling._instanceof().getName();
private static final String INSTANCEOF = new DataHandling._instanceof().getName();

@Override
public int process(List<ParseTree> list, int keywordPosition) throws ConfigCompileException {
Expand Down
Expand Up @@ -16,8 +16,8 @@
@Keyword.keyword("notinstanceof")
public class NotInstanceofKeyword extends Keyword {

private final static String INSTANCEOF = new DataHandling._instanceof().getName();
private final static String NOT = new BasicLogic.not().getName();
private static final String INSTANCEOF = new DataHandling._instanceof().getName();
private static final String NOT = new BasicLogic.not().getName();

@Override
public int process(List<ParseTree> list, int keywordPosition) throws ConfigCompileException {
Expand Down
Expand Up @@ -17,7 +17,7 @@
@Keyword.keyword("proc")
public class ProcKeyword extends Keyword {

private final static String PROC = new DataHandling.proc().getName();
private static final String PROC = new DataHandling.proc().getName();

@Override
public int process(List<ParseTree> list, int keywordPosition) throws ConfigCompileException {
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/com/laytonsmith/core/constructs/IVariable.java
Expand Up @@ -13,10 +13,10 @@ public class IVariable extends Construct implements Cloneable {

public static final long serialVersionUID = 1L;
private Construct var_value;
final private String name;
final private CClassType type;
final private Target definedTarget;
final public static String VARIABLE_NAME_REGEX = "@[\\p{L}0-9_]+";
private final String name;
private final CClassType type;
private final Target definedTarget;
public static final String VARIABLE_NAME_REGEX = "@[\\p{L}0-9_]+";

public IVariable(String name, Target t) throws ConfigCompileException {
super(name, ConstructType.IVARIABLE, t);
Expand Down
Expand Up @@ -10,7 +10,7 @@
public class Variable extends Construct {

public static final long serialVersionUID = 1L;
final private String name;
private final String name;
private String def;
private boolean optional;
private boolean final_var;
Expand Down
Expand Up @@ -237,7 +237,7 @@ public final boolean appearInDocumentation() {
return this.getClass().getAnnotation(hide.class) != null;
}

private final static Class[] EMPTY_CLASS = new Class[0];
private static final Class[] EMPTY_CLASS = new Class[0];

@Override
public Class<? extends Documentation>[] seeAlso() {
Expand Down
Expand Up @@ -59,7 +59,7 @@ public static String docs() {
}

// Stub for actual events below.
public static abstract class piston_event extends AbstractEvent {
public abstract static class piston_event extends AbstractEvent {

@Override
public boolean matches(Map<String, Construct> prefilter, BindableEvent e) throws PrefilterNonMatchException {
Expand Down
Expand Up @@ -334,7 +334,7 @@ public Version since() {
}
}

private final static Map<MCLocation, Boolean> redstoneMonitors = Collections.synchronizedMap(new HashMap<MCLocation, Boolean>());
private static final Map<MCLocation, Boolean> redstoneMonitors = Collections.synchronizedMap(new HashMap<MCLocation, Boolean>());

/**
* Returns a synchronized set of redstone monitors. When iterating on the list, be sure to synchronize manually.
Expand Down
Expand Up @@ -37,7 +37,7 @@ public static String docs() {
return "Contains events related to the world.";
}

public static abstract class WorldEvent extends AbstractEvent {
public abstract static class WorldEvent extends AbstractEvent {

@Override
public Map<String, Construct> evaluate(BindableEvent e) throws EventException {
Expand Down
Expand Up @@ -28,7 +28,7 @@
*/
public abstract class AbstractCREException extends ConfigRuntimeException implements Documentation, Mixed, ArrayAccess {

private final static Class[] EMPTY_CLASS = new Class[0];
private static final Class[] EMPTY_CLASS = new Class[0];

private List<StackTraceElement> stackTrace = null;

Expand Down
Expand Up @@ -214,7 +214,7 @@ public URL getSourceJar() {
return ClassDiscovery.GetClassContainer(this.getClass());
}

private final static Class[] EMPTY_CLASS = new Class[0];
private static final Class[] EMPTY_CLASS = new Class[0];

/**
* Checks for the &#64;seealso annotation on this class, and returns the value listed there. This is to prevent
Expand Down
Expand Up @@ -2165,8 +2165,8 @@ public Set<OptimizationOption> optimizationOptions() {
@api
public static class array_unique extends AbstractFunction implements Optimizable {

private final static equals equals = new equals();
private final static BasicLogic.sequals sequals = new BasicLogic.sequals();
private static final equals equals = new equals();
private static final BasicLogic.sequals sequals = new BasicLogic.sequals();

@Override
public Class<? extends CREThrowable>[] thrown() {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/laytonsmith/core/functions/BossBar.java
Expand Up @@ -40,7 +40,7 @@ public static String docs() {

private static final Map<String, MCBossBar> bars = new HashMap<>();

public static abstract class BossBarFunction extends AbstractFunction {
public abstract static class BossBarFunction extends AbstractFunction {

@Override
public boolean isRestricted() {
Expand Down
Expand Up @@ -40,7 +40,7 @@ public static String docs() {
return "This class allows manipulation of entity metadata.";
}

public static abstract class MetadataFunction extends AbstractFunction {
public abstract static class MetadataFunction extends AbstractFunction {

@Override
public boolean isRestricted() {
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/laytonsmith/core/functions/ByteArrays.java
Expand Up @@ -853,7 +853,7 @@ private static Integer set_getPos(Construct[] args, Target t) {
}
}

private static abstract class ba extends AbstractFunction {
private abstract static class ba extends AbstractFunction {

@Override
public Class<? extends CREThrowable>[] thrown() {
Expand All @@ -871,7 +871,7 @@ public boolean isRestricted() {
}
}

public static abstract class ba_put extends ba {
public abstract static class ba_put extends ba {

@Override
public Integer[] numArgs() {
Expand All @@ -880,7 +880,7 @@ public Integer[] numArgs() {

}

public static abstract class ba_get extends ba {
public abstract static class ba_get extends ba {

@Override
public Class<? extends CREThrowable>[] thrown() {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/laytonsmith/core/functions/Compiler.java
Expand Up @@ -144,7 +144,7 @@ public ParseTree optimizeDynamic(Target t, List<ParseTree> list, FileOptions fil
return optimizeSpecial(list, true);
}

private final static String ASSIGN = new DataHandling.assign().getName();
private static final String ASSIGN = new DataHandling.assign().getName();

/**
* __autoconcat__ has special optimization techniques needed, since it's really a part of the compiler itself,
Expand Down
Expand Up @@ -142,7 +142,7 @@ public static String docs() {
return "This class of functions allow entities to be managed.";
}

public static abstract class EntityFunction extends AbstractFunction {
public abstract static class EntityFunction extends AbstractFunction {

@Override
public boolean isRestricted() {
Expand All @@ -155,7 +155,7 @@ public Boolean runAsync() {
}
}

public static abstract class EntityGetterFunction extends EntityFunction {
public abstract static class EntityGetterFunction extends EntityFunction {

@Override
public Class<? extends CREThrowable>[] thrown() {
Expand All @@ -168,7 +168,7 @@ public Integer[] numArgs() {
}
}

public static abstract class EntitySetterFunction extends EntityFunction {
public abstract static class EntitySetterFunction extends EntityFunction {

@Override
public Class<? extends CREThrowable>[] thrown() {
Expand Down

0 comments on commit 4421fe8

Please sign in to comment.