summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsnowleo <schneeleo@gmail.com>2011-11-29 18:40:13 +0100
committersnowleo <schneeleo@gmail.com>2011-11-29 18:40:13 +0100
commitc9b7dde6ee4a0cff570130534f191225a7008b72 (patch)
tree6cbfa6da2b141a2435bba1ec6a4e2dfeef38513d
parent47e7d609644ef2844b3225b5d52251d04caf886e (diff)
downloadEssentials-c9b7dde6ee4a0cff570130534f191225a7008b72.tar
Essentials-c9b7dde6ee4a0cff570130534f191225a7008b72.tar.gz
Essentials-c9b7dde6ee4a0cff570130534f191225a7008b72.tar.lz
Essentials-c9b7dde6ee4a0cff570130534f191225a7008b72.tar.xz
Essentials-c9b7dde6ee4a0cff570130534f191225a7008b72.zip
Allow joinList to understand Collections.
-rw-r--r--Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java4
-rw-r--r--Essentials/src/com/earth2me/essentials/Util.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java b/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java
index a16f8031a..d15a86d7e 100644
--- a/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java
+++ b/Essentials/src/com/earth2me/essentials/AlternativeCommandsHandler.java
@@ -121,8 +121,8 @@ public class AlternativeCommandsHandler
executed.add(label);
}
- public List<String> disabledCommands()
+ public Set<String> disabledCommands()
{
- return new ArrayList<String>(executed);
+ return executed;
}
}
diff --git a/Essentials/src/com/earth2me/essentials/Util.java b/Essentials/src/com/earth2me/essentials/Util.java
index 8fc7da3af..5ee3e3123 100644
--- a/Essentials/src/com/earth2me/essentials/Util.java
+++ b/Essentials/src/com/earth2me/essentials/Util.java
@@ -376,9 +376,9 @@ public class Util
buf.append(seperator);
}
- if (each instanceof List)
+ if (each instanceof Collection)
{
- buf.append(joinList(seperator, ((List)each).toArray()));
+ buf.append(joinList(seperator, ((Collection)each).toArray()));
}
else
{