Changed getSafe*File to accept varargs instead of arrays.

This commit is contained in:
TomyLobo
2011-11-27 05:29:49 +01:00
parent c8180e641f
commit 5d59dd764e
4 changed files with 11 additions and 13 deletions

View File

@ -646,7 +646,7 @@ public class WorldEdit {
* @throws FilenameException
*/
public File getSafeSaveFile(LocalPlayer player, File dir, String filename,
String defaultExt, String[] extensions)
String defaultExt, String... extensions)
throws FilenameException {
return getSafeFile(player, dir, filename, defaultExt, extensions, true);
}
@ -666,7 +666,7 @@ public class WorldEdit {
* @throws FilenameException
*/
public File getSafeOpenFile(LocalPlayer player, File dir, String filename,
String defaultExt, String[] extensions)
String defaultExt, String... extensions)
throws FilenameException {
return getSafeFile(player, dir, filename, defaultExt, extensions, false);
}
@ -686,6 +686,8 @@ public class WorldEdit {
private File getSafeFile(LocalPlayer player, File dir, String filename,
String defaultExt, String[] extensions, boolean isSave)
throws FilenameException {
if (extensions.length == 1 && extensions[0] == null) extensions = null;
File f;
if (filename.equals("#")) {