From 34942aac6416026407fca02e314297e338474fb7 Mon Sep 17 00:00:00 2001 From: Matt Date: Sun, 20 Apr 2014 19:46:35 -0400 Subject: [PATCH] Sort scripts by script name --- parabotv2/src/org/parabot/core/desc/ScriptDescription.java | 7 ++++++- .../src/org/parabot/core/parsers/scripts/ScriptParser.java | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/parabotv2/src/org/parabot/core/desc/ScriptDescription.java b/parabotv2/src/org/parabot/core/desc/ScriptDescription.java index e5819ea..94d99c1 100644 --- a/parabotv2/src/org/parabot/core/desc/ScriptDescription.java +++ b/parabotv2/src/org/parabot/core/desc/ScriptDescription.java @@ -6,7 +6,7 @@ package org.parabot.core.desc; * @author Everel * */ -public class ScriptDescription { +public class ScriptDescription implements Comparable { public String scriptName; public String author; public String category; @@ -131,4 +131,9 @@ public class ScriptDescription { return b.toString(); } + + @Override + public int compareTo( ScriptDescription o ) { + return scriptName.compareTo( o.scriptName ); + } } diff --git a/parabotv2/src/org/parabot/core/parsers/scripts/ScriptParser.java b/parabotv2/src/org/parabot/core/parsers/scripts/ScriptParser.java index 1a75f65..ad6e80a 100644 --- a/parabotv2/src/org/parabot/core/parsers/scripts/ScriptParser.java +++ b/parabotv2/src/org/parabot/core/parsers/scripts/ScriptParser.java @@ -2,12 +2,15 @@ package org.parabot.core.parsers.scripts; import org.parabot.core.Core; import org.parabot.core.desc.ScriptDescription; +import org.parabot.core.desc.ServerDescription; import org.parabot.core.lib.jython.Jython; import org.parabot.environment.scripts.ScriptExecuter; +import org.parabot.environment.servers.ServerExecuter; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; +import java.util.TreeMap; /** * Abstract class for parsing scripts @@ -49,8 +52,10 @@ public abstract class ScriptParser { } Core.verbose("Scripts parsed."); } + + Map SORTED_SCRIPT_CACHE = new TreeMap( SCRIPT_CACHE ); - return SCRIPT_CACHE.keySet().toArray(new ScriptDescription[SCRIPT_CACHE.size()]); + return SORTED_SCRIPT_CACHE.keySet().toArray(new ScriptDescription[SORTED_SCRIPT_CACHE.size()]); } } \ No newline at end of file