From 96954e4eb249193e100fd0d8be440ca60a13029f Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Sun, 14 Apr 2013 21:20:34 +0200 Subject: [PATCH] Fixing some comments. --- src/com/massivecraft/factions/Rel.java | 18 ++++++++++++++++++ .../massivecraft/factions/cmd/CmdFactions.java | 3 --- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/com/massivecraft/factions/Rel.java b/src/com/massivecraft/factions/Rel.java index c19cc83b..b9a03165 100644 --- a/src/com/massivecraft/factions/Rel.java +++ b/src/com/massivecraft/factions/Rel.java @@ -5,6 +5,10 @@ import org.bukkit.ChatColor; public enum Rel { + // -------------------------------------------- // + // ENUM + // -------------------------------------------- // + LEADER (70, "your faction leader", "your faction leader", "", ""), OFFICER (60, "an officer in your faction", "officers in your faction", "", ""), MEMBER (50, "a member in your faction", "members in your faction", "your faction", "your factions"), @@ -13,8 +17,14 @@ public enum Rel TRUCE (30, "someone in truce with you", "those in truce with you", "a faction in truce", "factions in truce"), NEUTRAL (20, "someone neutral to you", "those neutral to you", "a neutral faction", "neutral factions"), ENEMY (10, "an enemy", "enemies", "an enemy faction", "enemy factions"), + + // END OF LIST ; + // -------------------------------------------- // + // FIELDS + // -------------------------------------------- // + private final int value; private final String descPlayerOne; public String getDescPlayerOne() { return this.descPlayerOne; } @@ -28,6 +38,10 @@ public enum Rel private final String descFactionMany; public String getDescFactionMany() { return this.descFactionMany; } + // -------------------------------------------- // + // CONSTRUCT + // -------------------------------------------- // + private Rel(final int value, final String descPlayerOne, final String descPlayerMany, final String descFactionOne, final String descFactionMany) { this.value = value; @@ -37,6 +51,10 @@ public enum Rel this.descFactionMany = descFactionMany; } + // -------------------------------------------- // + // UTIL + // -------------------------------------------- // + public static Rel parse(String str) { if (str == null || str.length() < 1) return null; diff --git a/src/com/massivecraft/factions/cmd/CmdFactions.java b/src/com/massivecraft/factions/cmd/CmdFactions.java index 881614c1..8fbce7f8 100644 --- a/src/com/massivecraft/factions/cmd/CmdFactions.java +++ b/src/com/massivecraft/factions/cmd/CmdFactions.java @@ -56,9 +56,6 @@ public class CmdFactions extends FCommand // TODO: When is this required? Should this be added to MCore? this.aliases.removeAll(Collections.singletonList(null)); - //this.requiredArgs.add(""); - //this.optionalArgs.put("","") - senderMustBePlayer = false; senderMustBeMember = false; senderMustBeOfficer = false;