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
commit57a0ec9912a16261a2c2cf341eabf0b11b57a0b2 (patch)
tree98a7d2b5f1d09821151ea8b1adf1993904c62b79
parente5435f24db17b81f020b681d4229b3819cff3e89 (diff)
downloadEssentials-57a0ec9912a16261a2c2cf341eabf0b11b57a0b2.tar
Essentials-57a0ec9912a16261a2c2cf341eabf0b11b57a0b2.tar.gz
Essentials-57a0ec9912a16261a2c2cf341eabf0b11b57a0b2.tar.lz
Essentials-57a0ec9912a16261a2c2cf341eabf0b11b57a0b2.tar.xz
Essentials-57a0ec9912a16261a2c2cf341eabf0b11b57a0b2.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
{