From 58e90cd6dc65e31ed3c444f41e243bd94a2a67df Mon Sep 17 00:00:00 2001 From: Pieter12345 Date: Fri, 21 Jun 2019 00:01:27 +0200 Subject: [PATCH 1/2] Fix CheckStyle violations --- src/main/java/com/laytonsmith/core/constructs/CFunction.java | 2 +- .../java/com/laytonsmith/core/objects/ElementDefinition.java | 1 - .../java/com/laytonsmith/core/objects/ObjectDefinition.java | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/com/laytonsmith/core/constructs/CFunction.java b/src/main/java/com/laytonsmith/core/constructs/CFunction.java index de08abd056..e42570c9d3 100644 --- a/src/main/java/com/laytonsmith/core/constructs/CFunction.java +++ b/src/main/java/com/laytonsmith/core/constructs/CFunction.java @@ -100,7 +100,7 @@ public static boolean CanDryEval(ParseTree data) { } else { return false; } - } catch(ConfigCompileException ex) { + } catch (ConfigCompileException ex) { return false; } } diff --git a/src/main/java/com/laytonsmith/core/objects/ElementDefinition.java b/src/main/java/com/laytonsmith/core/objects/ElementDefinition.java index ebe0c85baf..3a6a56750d 100644 --- a/src/main/java/com/laytonsmith/core/objects/ElementDefinition.java +++ b/src/main/java/com/laytonsmith/core/objects/ElementDefinition.java @@ -9,7 +9,6 @@ import com.laytonsmith.core.constructs.CNull; import com.laytonsmith.core.constructs.Construct; import com.laytonsmith.core.constructs.Target; -import com.laytonsmith.core.environments.Environment; import com.laytonsmith.core.natives.interfaces.Mixed; import java.lang.reflect.Field; import java.util.Objects; diff --git a/src/main/java/com/laytonsmith/core/objects/ObjectDefinition.java b/src/main/java/com/laytonsmith/core/objects/ObjectDefinition.java index 2a053a1a4a..fe0c6253f9 100644 --- a/src/main/java/com/laytonsmith/core/objects/ObjectDefinition.java +++ b/src/main/java/com/laytonsmith/core/objects/ObjectDefinition.java @@ -20,7 +20,6 @@ import java.util.EnumSet; import java.util.HashSet; import java.util.List; -import java.util.Map; import java.util.Objects; import java.util.Set; From 7a1e29f4c54a530ff4bfa11823ce26d73605ca95 Mon Sep 17 00:00:00 2001 From: Pieter12345 Date: Fri, 21 Jun 2019 00:03:02 +0200 Subject: [PATCH 2/2] Add missing override annotations The PureUtilities CheckOverrides causes the build to fail when @Override annotations are missing. --- src/main/java/com/laytonsmith/core/objects/Element.java | 2 ++ .../java/com/laytonsmith/core/objects/ElementDefinition.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/main/java/com/laytonsmith/core/objects/Element.java b/src/main/java/com/laytonsmith/core/objects/Element.java index ddeb36d622..5f6845536f 100644 --- a/src/main/java/com/laytonsmith/core/objects/Element.java +++ b/src/main/java/com/laytonsmith/core/objects/Element.java @@ -113,6 +113,7 @@ public boolean isNativeField() { * The access modifier of the element. * @return */ + @Override public AccessModifier getAccessModifier() { return accessModifier; } @@ -159,6 +160,7 @@ public String getElementName() { return name; } + @Override public Target getTarget() { return t; } diff --git a/src/main/java/com/laytonsmith/core/objects/ElementDefinition.java b/src/main/java/com/laytonsmith/core/objects/ElementDefinition.java index 3a6a56750d..d019348e34 100644 --- a/src/main/java/com/laytonsmith/core/objects/ElementDefinition.java +++ b/src/main/java/com/laytonsmith/core/objects/ElementDefinition.java @@ -134,6 +134,7 @@ public boolean isNativeField() { * The access modifier of the element. * @return */ + @Override public AccessModifier getAccessModifier() { return accessModifier; } @@ -173,6 +174,7 @@ public String getElementName() { return name; } + @Override public Target getTarget() { return t; }