From d55afc9f9a8a5c2b755ae89e1fc3cad34ba2f972 Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Wed, 6 May 2015 12:25:02 +0200 Subject: [PATCH] Use generics instead of casting. --- .../massivecraft/massivecore/cmd/HelpCommand.java | 2 +- .../massivecore/cmd/MassiveCommand.java | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/com/massivecraft/massivecore/cmd/HelpCommand.java b/src/com/massivecraft/massivecore/cmd/HelpCommand.java index 42ec0edb..70dd5855 100644 --- a/src/com/massivecraft/massivecore/cmd/HelpCommand.java +++ b/src/com/massivecraft/massivecore/cmd/HelpCommand.java @@ -35,7 +35,7 @@ public class HelpCommand extends MassiveCommand public void perform() throws MassiveException { // Args - int pagenumber = (Integer) this.readArg(1); + int pagenumber = this.readArg(1); // Get parent command if ( ! this.hasParentCommand()) return; diff --git a/src/com/massivecraft/massivecore/cmd/MassiveCommand.java b/src/com/massivecraft/massivecore/cmd/MassiveCommand.java index 2df2c16d..b3083271 100644 --- a/src/com/massivecraft/massivecore/cmd/MassiveCommand.java +++ b/src/com/massivecraft/massivecore/cmd/MassiveCommand.java @@ -1003,12 +1003,12 @@ public class MassiveCommand return this.argAt(nextArg); } - public Object readArg() throws MassiveException + public T readArg() throws MassiveException { return this.readArgAt(nextArg); } - public Object readArg(Object defaultNotSet) throws MassiveException + public T readArg(T defaultNotSet) throws MassiveException { return this.readArgAt(nextArg, defaultNotSet); } @@ -1022,19 +1022,20 @@ public class MassiveCommand return this.getArgs().get(idx); } - public Object readArgAt(int idx) throws MassiveException + @SuppressWarnings("unchecked") + public T readArgAt(int idx) throws MassiveException { if ( ! this.hasArgSettingForIndex(idx)) throw new IllegalArgumentException(idx + " is out of range. ArgSettings size: " + this.getArgSettings().size()); String str = this.argAt(idx); - return this.readArgFrom(str, this.getArgSettings().get(idx).getReader()); + return this.readArgFrom(str, (AR)this.getArgSettings().get(idx).getReader()); } @SuppressWarnings("unchecked") - public Object readArgAt(int idx, Object defaultNotSet) throws MassiveException + public T readArgAt(int idx, T defaultNotSet) throws MassiveException { if ( ! this.hasArgSettingForIndex(idx)) throw new IllegalArgumentException(idx + " is out of range. ArgSettings size: " + this.getArgSettings().size()); String str = this.argAt(idx); - return this.readArgFrom(str, (AR)this.getArgSettings().get(idx).getReader(), defaultNotSet); + return this.readArgFrom(str, (AR)this.getArgSettings().get(idx).getReader(), defaultNotSet); } // Core Logic