summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Essentials/src/net/ess3/Jails.java10
-rw-r--r--Essentials/src/net/ess3/Kits.java10
-rw-r--r--Essentials/src/net/ess3/economy/MoneyHolder.java14
-rw-r--r--Essentials/src/net/ess3/economy/WorthHolder.java10
-rw-r--r--Essentials/src/net/ess3/ranks/RanksStorage.java10
-rw-r--r--Essentials/src/net/ess3/settings/SettingsHolder.java9
-rw-r--r--Essentials/src/net/ess3/settings/SpawnsHolder.java10
-rw-r--r--Essentials/src/net/ess3/settings/WarpHolder.java9
-rw-r--r--Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java11
-rw-r--r--Essentials/src/net/ess3/user/User.java10
-rw-r--r--EssentialsAntiBuild/src/net/ess3/antibuild/AntiBuildHolder.java11
-rw-r--r--EssentialsGeoIP/src/net/ess3/geoip/ConfigHolder.java10
-rw-r--r--EssentialsProtect/src/net/ess3/protect/ProtectHolder.java10
-rw-r--r--EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java10
14 files changed, 7 insertions, 137 deletions
diff --git a/Essentials/src/net/ess3/Jails.java b/Essentials/src/net/ess3/Jails.java
index 1ac51142b..c97239e1d 100644
--- a/Essentials/src/net/ess3/Jails.java
+++ b/Essentials/src/net/ess3/Jails.java
@@ -103,16 +103,6 @@ public class Jails extends AsyncStorageObjectHolder<net.ess3.settings.Jails> imp
}
@Override
- public void finishRead()
- {
- }
-
- @Override
- public void finishWrite()
- {
- }
-
- @Override
public int getCount()
{
throw new UnsupportedOperationException("Not supported yet.");
diff --git a/Essentials/src/net/ess3/Kits.java b/Essentials/src/net/ess3/Kits.java
index e464caf4e..7913ec977 100644
--- a/Essentials/src/net/ess3/Kits.java
+++ b/Essentials/src/net/ess3/Kits.java
@@ -70,16 +70,6 @@ public class Kits extends AsyncStorageObjectHolder<net.ess3.settings.Kits> imple
}
@Override
- public void finishRead()
- {
- }
-
- @Override
- public void finishWrite()
- {
- }
-
- @Override
public void checkTime(IUser user, Kit kit) throws NoChargeException
{
final Calendar time = new GregorianCalendar();
diff --git a/Essentials/src/net/ess3/economy/MoneyHolder.java b/Essentials/src/net/ess3/economy/MoneyHolder.java
index cc0d4c79a..135a7f9f2 100644
--- a/Essentials/src/net/ess3/economy/MoneyHolder.java
+++ b/Essentials/src/net/ess3/economy/MoneyHolder.java
@@ -7,20 +7,6 @@ import net.ess3.storage.AsyncStorageObjectHolder;
public class MoneyHolder extends AsyncStorageObjectHolder<Money>
{
-
- @Override
- public void finishRead()
- {
-
- }
-
- @Override
- public void finishWrite()
- {
-
- }
-
-
public MoneyHolder(IEssentials ess)
{
super(ess, Money.class, new File(ess.getPlugin().getDataFolder(), "economy_npcs.yml"));
diff --git a/Essentials/src/net/ess3/economy/WorthHolder.java b/Essentials/src/net/ess3/economy/WorthHolder.java
index 26ce23e31..3fb8f57fd 100644
--- a/Essentials/src/net/ess3/economy/WorthHolder.java
+++ b/Essentials/src/net/ess3/economy/WorthHolder.java
@@ -14,16 +14,6 @@ import org.bukkit.material.MaterialData;
public class WorthHolder extends AsyncStorageObjectHolder<net.ess3.economy.Worth> implements IWorth
{
- @Override
- public void finishRead()
- {
- }
-
- @Override
- public void finishWrite()
- {
- }
-
public WorthHolder(final IEssentials ess)
{
super(ess, net.ess3.economy.Worth.class, new File(ess.getPlugin().getDataFolder(), "worth.yml"));
diff --git a/Essentials/src/net/ess3/ranks/RanksStorage.java b/Essentials/src/net/ess3/ranks/RanksStorage.java
index 08909bdb7..d845a81c8 100644
--- a/Essentials/src/net/ess3/ranks/RanksStorage.java
+++ b/Essentials/src/net/ess3/ranks/RanksStorage.java
@@ -26,16 +26,6 @@ public class RanksStorage extends AsyncStorageObjectHolder<Ranks> implements IRa
}
};
- @Override
- public void finishRead()
- {
- }
-
- @Override
- public void finishWrite()
- {
- }
-
public RanksStorage(final IEssentials ess)
{
super(ess, Ranks.class, new File(ess.getPlugin().getDataFolder(), "ranks.yml"));
diff --git a/Essentials/src/net/ess3/settings/SettingsHolder.java b/Essentials/src/net/ess3/settings/SettingsHolder.java
index c0e7d6dd4..e9b7f8af3 100644
--- a/Essentials/src/net/ess3/settings/SettingsHolder.java
+++ b/Essentials/src/net/ess3/settings/SettingsHolder.java
@@ -8,15 +8,6 @@ import net.ess3.storage.AsyncStorageObjectHolder;
public class SettingsHolder extends AsyncStorageObjectHolder<Settings> implements ISettings
{
- @Override
- public void finishRead()
- {
- }
-
- @Override
- public void finishWrite()
- {
- }
private transient volatile boolean debug = false;
public SettingsHolder(final IEssentials ess)
diff --git a/Essentials/src/net/ess3/settings/SpawnsHolder.java b/Essentials/src/net/ess3/settings/SpawnsHolder.java
index 9460b0b62..e778ef052 100644
--- a/Essentials/src/net/ess3/settings/SpawnsHolder.java
+++ b/Essentials/src/net/ess3/settings/SpawnsHolder.java
@@ -28,16 +28,6 @@ import org.bukkit.plugin.EventExecutor;
public class SpawnsHolder extends AsyncStorageObjectHolder<Spawns> implements IEssentialsModule
{
- @Override
- public void finishRead()
- {
- }
-
- @Override
- public void finishWrite()
- {
- }
-
public SpawnsHolder(final IEssentials ess)
{
super(ess, Spawns.class, new File(ess.getPlugin().getDataFolder(), "spawn.yml"));
diff --git a/Essentials/src/net/ess3/settings/WarpHolder.java b/Essentials/src/net/ess3/settings/WarpHolder.java
index 6da9d8528..5d54532ef 100644
--- a/Essentials/src/net/ess3/settings/WarpHolder.java
+++ b/Essentials/src/net/ess3/settings/WarpHolder.java
@@ -8,15 +8,6 @@ import net.ess3.storage.AsyncStorageObjectHolder;
public class WarpHolder extends AsyncStorageObjectHolder<Warp> implements IWarp
{
- @Override
- public void finishRead()
- {
- }
-
- @Override
- public void finishWrite()
- {
- }
private final String name;
public WarpHolder(String name, IEssentials ess) throws InvalidNameException
diff --git a/Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java b/Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java
index 8f65e223c..4c909b1bb 100644
--- a/Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java
+++ b/Essentials/src/net/ess3/storage/AsyncStorageObjectHolder.java
@@ -2,10 +2,7 @@ package net.ess3.storage;
import java.io.File;
import java.io.FileNotFoundException;
-import java.io.IOException;
import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.locks.Lock;
-import java.util.concurrent.locks.ReentrantLock;
import java.util.logging.Level;
import net.ess3.api.IEssentials;
import org.bukkit.Bukkit;
@@ -78,9 +75,13 @@ public abstract class AsyncStorageObjectHolder<T extends StorageObject> implemen
return file.getAbsolutePath();
}
- public abstract void finishRead();
+ protected void finishRead()
+ {
+ }
- public abstract void finishWrite();
+ protected void finishWrite()
+ {
+ }
protected void fillWithDefaults()
{
diff --git a/Essentials/src/net/ess3/user/User.java b/Essentials/src/net/ess3/user/User.java
index a1ec0d8fa..f38d794b8 100644
--- a/Essentials/src/net/ess3/user/User.java
+++ b/Essentials/src/net/ess3/user/User.java
@@ -79,16 +79,6 @@ public class User extends UserBase implements IUser
}
@Override
- public void finishRead()
- {
- }
-
- @Override
- public void finishWrite()
- {
- }
-
- @Override
public void checkCooldown(final UserData.TimestampType cooldownType, final double cooldown, final boolean set, final IPermission bypassPermission) throws CooldownException
{
final Calendar now = new GregorianCalendar();
diff --git a/EssentialsAntiBuild/src/net/ess3/antibuild/AntiBuildHolder.java b/EssentialsAntiBuild/src/net/ess3/antibuild/AntiBuildHolder.java
index d8bf3623b..7e08defe8 100644
--- a/EssentialsAntiBuild/src/net/ess3/antibuild/AntiBuildHolder.java
+++ b/EssentialsAntiBuild/src/net/ess3/antibuild/AntiBuildHolder.java
@@ -5,6 +5,7 @@ import net.ess3.api.IEssentials;
import net.ess3.settings.antibuild.AntiBuild;
import net.ess3.storage.AsyncStorageObjectHolder;
+
public class AntiBuildHolder extends AsyncStorageObjectHolder<AntiBuild>
{
public AntiBuildHolder(final IEssentials ess)
@@ -12,14 +13,4 @@ public class AntiBuildHolder extends AsyncStorageObjectHolder<AntiBuild>
super(ess, AntiBuild.class, new File(ess.getPlugin().getDataFolder(), "antibuild.yml"));
onReload();
}
-
- @Override
- public void finishRead()
- {
- }
-
- @Override
- public void finishWrite()
- {
- }
}
diff --git a/EssentialsGeoIP/src/net/ess3/geoip/ConfigHolder.java b/EssentialsGeoIP/src/net/ess3/geoip/ConfigHolder.java
index 0edb7bc50..c535ed4a0 100644
--- a/EssentialsGeoIP/src/net/ess3/geoip/ConfigHolder.java
+++ b/EssentialsGeoIP/src/net/ess3/geoip/ConfigHolder.java
@@ -17,14 +17,4 @@ public class ConfigHolder extends AsyncStorageObjectHolder<GeoIP>
this.geoip = geoip;
onReload(true);
}
-
- @Override
- public void finishRead()
- {
- }
-
- @Override
- public void finishWrite()
- {
- }
}
diff --git a/EssentialsProtect/src/net/ess3/protect/ProtectHolder.java b/EssentialsProtect/src/net/ess3/protect/ProtectHolder.java
index 9718fbe79..140f70ffa 100644
--- a/EssentialsProtect/src/net/ess3/protect/ProtectHolder.java
+++ b/EssentialsProtect/src/net/ess3/protect/ProtectHolder.java
@@ -12,14 +12,4 @@ public class ProtectHolder extends AsyncStorageObjectHolder<Protect>
{
super(ess, Protect.class, new File(ess.getPlugin().getDataFolder(), "protect.yml"));
}
-
- @Override
- public void finishRead()
- {
- }
-
- @Override
- public void finishWrite()
- {
- }
}
diff --git a/EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java b/EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java
index 51937ee77..9c62337c4 100644
--- a/EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java
+++ b/EssentialsSigns/src/net/ess3/signs/SignsConfigHolder.java
@@ -52,14 +52,4 @@ public class SignsConfigHolder extends AsyncStorageObjectHolder<SignConfig>
{
return !signsEnabled;
}
-
- @Override
- public void finishRead()
- {
- }
-
- @Override
- public void finishWrite()
- {
- }
}