summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2012-09-24 03:10:54 +0100
committerKHobbits <rob@khobbits.co.uk>2012-09-24 03:16:15 +0100
commitf2b4bb00b69d91e2c9f1fe4ee38ae89a43197c74 (patch)
treef3d56c3d3c0ab666f0b0e1c8fd46583bdb0cc731
parentf1930e76d6940bb3ff1e526c7eff8dfc51a60e99 (diff)
downloadEssentials-f2b4bb00b69d91e2c9f1fe4ee38ae89a43197c74.tar
Essentials-f2b4bb00b69d91e2c9f1fe4ee38ae89a43197c74.tar.gz
Essentials-f2b4bb00b69d91e2c9f1fe4ee38ae89a43197c74.tar.lz
Essentials-f2b4bb00b69d91e2c9f1fe4ee38ae89a43197c74.tar.xz
Essentials-f2b4bb00b69d91e2c9f1fe4ee38ae89a43197c74.zip
Minor cleanup
-rw-r--r--Essentials/src/com/earth2me/essentials/DescParseTickFormat.java4
-rw-r--r--Essentials/src/com/earth2me/essentials/I18n.java2
-rw-r--r--Essentials/src/com/earth2me/essentials/Teleport.java4
-rw-r--r--Essentials/src/com/earth2me/essentials/perm/ConfigPermissionsHandler.java1
-rw-r--r--Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java4
-rw-r--r--Essentials/src/com/earth2me/essentials/storage/AsyncStorageObjectHolder.java4
-rw-r--r--Essentials/src/com/earth2me/essentials/textreader/SimpleTextInput.java9
-rw-r--r--EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java14
8 files changed, 18 insertions, 24 deletions
diff --git a/Essentials/src/com/earth2me/essentials/DescParseTickFormat.java b/Essentials/src/com/earth2me/essentials/DescParseTickFormat.java
index 9c40acacc..91efe3c0a 100644
--- a/Essentials/src/com/earth2me/essentials/DescParseTickFormat.java
+++ b/Essentials/src/com/earth2me/essentials/DescParseTickFormat.java
@@ -269,11 +269,11 @@ public final class DescParseTickFormat
// How many ingame days have passed since the server start?
final long days = ticks / ticksPerDay;
- ticks = ticks - days * ticksPerDay;
+ ticks -= days * ticksPerDay;
// How many hours on the last day?
final long hours = ticks / ticksPerHour;
- ticks = ticks - hours * ticksPerHour;
+ ticks -= hours * ticksPerHour;
// How many minutes on the last day?
final long minutes = (long)Math.floor(ticks / ticksPerMinute);
diff --git a/Essentials/src/com/earth2me/essentials/I18n.java b/Essentials/src/com/earth2me/essentials/I18n.java
index c00180087..93f743140 100644
--- a/Essentials/src/com/earth2me/essentials/I18n.java
+++ b/Essentials/src/com/earth2me/essentials/I18n.java
@@ -143,7 +143,7 @@ public class I18n implements II18n
{
private final transient File dataFolder;
- public FileResClassLoader(final ClassLoader classLoader, final IEssentials ess)
+ FileResClassLoader(final ClassLoader classLoader, final IEssentials ess)
{
super(classLoader);
this.dataFolder = ess.getDataFolder();
diff --git a/Essentials/src/com/earth2me/essentials/Teleport.java b/Essentials/src/com/earth2me/essentials/Teleport.java
index b6179c0a5..c6106ad24 100644
--- a/Essentials/src/com/earth2me/essentials/Teleport.java
+++ b/Essentials/src/com/earth2me/essentials/Teleport.java
@@ -21,13 +21,13 @@ public class Teleport implements Runnable, ITeleport
private final Location location;
private final String name;
- public Target(Location location)
+ Target(Location location)
{
this.location = location;
this.name = null;
}
- public Target(Player entity)
+ Target(Player entity)
{
this.name = entity.getName();
this.location = null;
diff --git a/Essentials/src/com/earth2me/essentials/perm/ConfigPermissionsHandler.java b/Essentials/src/com/earth2me/essentials/perm/ConfigPermissionsHandler.java
index f51ce4518..9396bd4ad 100644
--- a/Essentials/src/com/earth2me/essentials/perm/ConfigPermissionsHandler.java
+++ b/Essentials/src/com/earth2me/essentials/perm/ConfigPermissionsHandler.java
@@ -1,7 +1,6 @@
package com.earth2me.essentials.perm;
import com.earth2me.essentials.IEssentials;
-import java.util.List;
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
diff --git a/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java b/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java
index 1e1b87ff7..e5f125cf8 100644
--- a/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java
+++ b/Essentials/src/com/earth2me/essentials/signs/EssentialsSign.java
@@ -440,7 +440,7 @@ public class EssentialsSign
private final transient Block block;
private final transient Sign sign;
- public EventSign(final SignChangeEvent event)
+ EventSign(final SignChangeEvent event)
{
this.event = event;
this.block = event.getBlock();
@@ -480,7 +480,7 @@ public class EssentialsSign
private final transient Sign sign;
private final transient Block block;
- public BlockSign(final Block block)
+ BlockSign(final Block block)
{
this.block = block;
this.sign = (Sign)block.getState();
diff --git a/Essentials/src/com/earth2me/essentials/storage/AsyncStorageObjectHolder.java b/Essentials/src/com/earth2me/essentials/storage/AsyncStorageObjectHolder.java
index b651dd40b..39ab28bd9 100644
--- a/Essentials/src/com/earth2me/essentials/storage/AsyncStorageObjectHolder.java
+++ b/Essentials/src/com/earth2me/essentials/storage/AsyncStorageObjectHolder.java
@@ -89,7 +89,7 @@ public abstract class AsyncStorageObjectHolder<T extends StorageObject> implemen
private class StorageObjectDataWriter extends AbstractDelayedYamlFileWriter
{
- public StorageObjectDataWriter()
+ StorageObjectDataWriter()
{
super(ess, getStorageFile());
}
@@ -112,7 +112,7 @@ public abstract class AsyncStorageObjectHolder<T extends StorageObject> implemen
private class StorageObjectDataReader extends AbstractDelayedYamlFileReader<T>
{
- public StorageObjectDataReader()
+ StorageObjectDataReader()
{
super(ess, getStorageFile(), clazz);
}
diff --git a/Essentials/src/com/earth2me/essentials/textreader/SimpleTextInput.java b/Essentials/src/com/earth2me/essentials/textreader/SimpleTextInput.java
index 068efcf34..57e599ff2 100644
--- a/Essentials/src/com/earth2me/essentials/textreader/SimpleTextInput.java
+++ b/Essentials/src/com/earth2me/essentials/textreader/SimpleTextInput.java
@@ -1,9 +1,6 @@
package com.earth2me.essentials.textreader;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
public class SimpleTextInput implements IText
@@ -11,9 +8,7 @@ public class SimpleTextInput implements IText
private final transient List<String> lines = new ArrayList<String>();
public SimpleTextInput (final String input) {
- for (String line : input.split("\\n")) {
- lines.add(line);
- }
+ lines.addAll(Arrays.asList(input.split("\\n")));
}
@Override
diff --git a/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java b/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java
index f061beed4..e57ba8864 100644
--- a/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java
+++ b/EssentialsAntiBuild/src/com/earth2me/essentials/antibuild/EssentialsAntiBuildListener.java
@@ -32,7 +32,7 @@ public class EssentialsAntiBuildListener implements Listener
this.ess = prot.getEssentialsConnect().getEssentials();
}
- private boolean metaPermCheck(User user, String action, Block block)
+ private boolean metaPermCheck(final User user, final String action, final Block block)
{
if (block == null)
{
@@ -41,13 +41,13 @@ public class EssentialsAntiBuildListener implements Listener
return metaPermCheck(user, action, block.getTypeId(), block.getData());
}
- private boolean metaPermCheck(User user, String action, int blockId)
+ private boolean metaPermCheck(final User user, final String action, final int blockId)
{
final String blockPerm = "essentials.build." + action + "." + blockId;
return user.isAuthorized(blockPerm);
}
- private boolean metaPermCheck(User user, String action, int blockId, byte data)
+ private boolean metaPermCheck(final User user, final String action, final int blockId, final byte data)
{
final String blockPerm = "essentials.build." + action + "." + blockId;
final String dataPerm = blockPerm + ":" + data;
@@ -141,7 +141,7 @@ public class EssentialsAntiBuildListener implements Listener
}
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
- public void onPaintingBreak(PaintingBreakByEntityEvent event)
+ public void onPaintingBreak(final PaintingBreakByEntityEvent event)
{
final Entity entity = event.getRemover();
if (entity instanceof Player)
@@ -160,7 +160,7 @@ public class EssentialsAntiBuildListener implements Listener
}
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
- public void onBlockPistonExtend(BlockPistonExtendEvent event)
+ public void onBlockPistonExtend(final BlockPistonExtendEvent event)
{
for (Block block : event.getBlocks())
{
@@ -173,7 +173,7 @@ public class EssentialsAntiBuildListener implements Listener
}
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
- public void onBlockPistonRetract(BlockPistonRetractEvent event)
+ public void onBlockPistonRetract(final BlockPistonRetractEvent event)
{
if (!event.isSticky())
{
@@ -272,7 +272,7 @@ public class EssentialsAntiBuildListener implements Listener
}
@EventHandler(priority = EventPriority.LOW, ignoreCancelled = true)
- public void onPlayerDropItem(PlayerDropItemEvent event)
+ public void onPlayerDropItem(final PlayerDropItemEvent event)
{
final User user = ess.getUser(event.getPlayer());