Permalink
Browse files

Clean up other compiler warnings

  • Loading branch information...
kenzierocks committed Dec 27, 2018
1 parent de7d942 commit 386668d2212d247c406aae90bc45ff3b31d68dc6
@@ -37,6 +37,7 @@
import com.sk89q.worldedit.extension.platform.Capability;
import com.sk89q.worldedit.extension.platform.Platform;
import com.sk89q.worldedit.extent.inventory.BlockBag;

import org.bstats.bukkit.Metrics;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
@@ -181,41 +182,27 @@ protected void loadConfiguration() {
protected void createDefaultConfiguration(String name) {
File actual = new File(getDataFolder(), name);
if (!actual.exists()) {
InputStream input = null;
try {
JarFile file = new JarFile(getFile());
try (JarFile file = new JarFile(getFile())) {
ZipEntry copy = file.getEntry("defaults/" + name);
if (copy == null) throw new FileNotFoundException();
input = file.getInputStream(copy);
copyDefaultConfig(file.getInputStream(copy), actual, name);
} catch (IOException e) {
getLogger().severe("Unable to read default configuration: " + name);
}
if (input != null) {
FileOutputStream output = null;

try {
output = new FileOutputStream(actual);
byte[] buf = new byte[8192];
int length;
while ((length = input.read(buf)) > 0) {
output.write(buf, 0, length);
}

getLogger().info("Default configuration file written: " + name);
} catch (IOException e) {
getLogger().log(Level.WARNING, "Failed to write default config file", e);
} finally {
try {
input.close();
} catch (IOException ignored) {}

try {
if (output != null) {
output.close();
}
} catch (IOException ignored) {}
}
}
}

private void copyDefaultConfig(InputStream input, File actual, String name) {
try (FileOutputStream output = new FileOutputStream(actual)) {
byte[] buf = new byte[8192];
int length;
while ((length = input.read(buf)) > 0) {
output.write(buf, 0, length);
}

getLogger().info("Default configuration file written: " + name);
} catch (IOException e) {
getLogger().log(Level.WARNING, "Failed to write default config file", e);
}
}

@@ -97,7 +97,7 @@ public static ListTagBuilder create(Class<? extends Tag> type) {
*
* @return a new builder
*/
public static <T extends Tag> ListTagBuilder createWith(T ... entries) {
public static ListTagBuilder createWith(Tag... entries) {
checkNotNull(entries);

if (entries.length == 0) {
@@ -85,7 +85,7 @@ public boolean accept(File f) {
if (index == -1 || index == path.length() - 1) {
return false;
} else {
return exts.contains(path.indexOf(index + 1));
return exts.contains(path.substring(index + 1));
}
}

@@ -133,9 +133,10 @@ private ChunkStore internalGetChunkStore() throws IOException, DataException {
public boolean containsWorld(String worldname) {
try {
if (file.getName().toLowerCase().endsWith(".zip")) {
ZipFile entry = new ZipFile(file);
return (entry.getEntry(worldname) != null
|| entry.getEntry(worldname + "/level.dat") != null);
try (ZipFile entry = new ZipFile(file)) {
return (entry.getEntry(worldname) != null
|| entry.getEntry(worldname + "/level.dat") != null);
}
} else if (file.getName().toLowerCase().endsWith(".tar.bz2")
|| file.getName().toLowerCase().endsWith(".tar.gz")
|| file.getName().toLowerCase().endsWith(".tar")) {

0 comments on commit 386668d

Please sign in to comment.