From ff4cfb0c7ca04d70ac540480a02a8895570da169 Mon Sep 17 00:00:00 2001 From: Acrobot Date: Sun, 21 Jul 2013 16:49:55 +0200 Subject: [PATCH] Automatic code re-format and re-organisation --- .../Breeze/Configuration/Annotations/PrecededBySpace.java | 1 + .../com/Acrobot/Breeze/Configuration/Configuration.java | 1 + .../java/com/Acrobot/Breeze/Utils/Encoding/Base64.java | 8 ++++---- src/main/java/com/Acrobot/ChestShop/ChestShop.java | 1 - .../Acrobot/ChestShop/Listeners/Economy/TaxModule.java | 1 - .../Listeners/PostTransaction/EconomicModule.java | 1 - .../ChestShop/Listeners/PreShopCreation/NameChecker.java | 2 -- .../Listeners/PreTransaction/AmountAndPriceChecker.java | 1 - .../java/com/Acrobot/ChestShop/Metadata/ItemDatabase.java | 1 + 9 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/Acrobot/Breeze/Configuration/Annotations/PrecededBySpace.java b/src/main/java/com/Acrobot/Breeze/Configuration/Annotations/PrecededBySpace.java index 068c993..c54aea8 100644 --- a/src/main/java/com/Acrobot/Breeze/Configuration/Annotations/PrecededBySpace.java +++ b/src/main/java/com/Acrobot/Breeze/Configuration/Annotations/PrecededBySpace.java @@ -7,6 +7,7 @@ import java.lang.annotation.Target; /** * Annotation indicating that the value should be followed by a blank space + * * @author Acrobot */ @Retention(RetentionPolicy.RUNTIME) diff --git a/src/main/java/com/Acrobot/Breeze/Configuration/Configuration.java b/src/main/java/com/Acrobot/Breeze/Configuration/Configuration.java index d05857c..bc8833f 100644 --- a/src/main/java/com/Acrobot/Breeze/Configuration/Configuration.java +++ b/src/main/java/com/Acrobot/Breeze/Configuration/Configuration.java @@ -66,6 +66,7 @@ public class Configuration { /** * Checks if the file ends with space + * * @param file File to check * @return If the file ends with space */ diff --git a/src/main/java/com/Acrobot/Breeze/Utils/Encoding/Base64.java b/src/main/java/com/Acrobot/Breeze/Utils/Encoding/Base64.java index d511383..14658eb 100644 --- a/src/main/java/com/Acrobot/Breeze/Utils/Encoding/Base64.java +++ b/src/main/java/com/Acrobot/Breeze/Utils/Encoding/Base64.java @@ -1027,11 +1027,11 @@ public class Base64 { public static byte[] decode(byte[] source) throws java.io.IOException { byte[] decoded = null; -// try { + // try { decoded = decode(source, 0, source.length, Base64.NO_OPTIONS); -// } catch( java.io.IOException ex ) { -// assert false : "IOExceptions only come from GZipping, which is turned off: " + ex.getMessage(); -// } + // } catch( java.io.IOException ex ) { + // assert false : "IOExceptions only come from GZipping, which is turned off: " + ex.getMessage(); + // } return decoded; } diff --git a/src/main/java/com/Acrobot/ChestShop/ChestShop.java b/src/main/java/com/Acrobot/ChestShop/ChestShop.java index d45db5d..f68bd4a 100644 --- a/src/main/java/com/Acrobot/ChestShop/ChestShop.java +++ b/src/main/java/com/Acrobot/ChestShop/ChestShop.java @@ -12,7 +12,6 @@ import com.Acrobot.ChestShop.Listeners.Block.BlockPlace; import com.Acrobot.ChestShop.Listeners.Block.Break.ChestBreak; import com.Acrobot.ChestShop.Listeners.Block.Break.SignBreak; import com.Acrobot.ChestShop.Listeners.Block.SignCreate; -import com.Acrobot.ChestShop.Listeners.Economy.Plugins.RegisterListener; import com.Acrobot.ChestShop.Listeners.Economy.ServerAccountCorrector; import com.Acrobot.ChestShop.Listeners.Economy.TaxModule; import com.Acrobot.ChestShop.Listeners.Item.ItemMoveListener; diff --git a/src/main/java/com/Acrobot/ChestShop/Listeners/Economy/TaxModule.java b/src/main/java/com/Acrobot/ChestShop/Listeners/Economy/TaxModule.java index e0166fa..cb8024d 100644 --- a/src/main/java/com/Acrobot/ChestShop/Listeners/Economy/TaxModule.java +++ b/src/main/java/com/Acrobot/ChestShop/Listeners/Economy/TaxModule.java @@ -4,7 +4,6 @@ import com.Acrobot.ChestShop.ChestShop; import com.Acrobot.ChestShop.Configuration.Properties; import com.Acrobot.ChestShop.Economy.Economy; import com.Acrobot.ChestShop.Events.Economy.CurrencyAddEvent; -import com.Acrobot.ChestShop.Events.Economy.CurrencySubtractEvent; import com.Acrobot.ChestShop.Signs.ChestShopSign; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; diff --git a/src/main/java/com/Acrobot/ChestShop/Listeners/PostTransaction/EconomicModule.java b/src/main/java/com/Acrobot/ChestShop/Listeners/PostTransaction/EconomicModule.java index ad07164..47b06db 100644 --- a/src/main/java/com/Acrobot/ChestShop/Listeners/PostTransaction/EconomicModule.java +++ b/src/main/java/com/Acrobot/ChestShop/Listeners/PostTransaction/EconomicModule.java @@ -1,7 +1,6 @@ package com.Acrobot.ChestShop.Listeners.PostTransaction; import com.Acrobot.ChestShop.ChestShop; -import com.Acrobot.ChestShop.Economy.Economy; import com.Acrobot.ChestShop.Events.Economy.CurrencyAddEvent; import com.Acrobot.ChestShop.Events.Economy.CurrencySubtractEvent; import com.Acrobot.ChestShop.Events.TransactionEvent; diff --git a/src/main/java/com/Acrobot/ChestShop/Listeners/PreShopCreation/NameChecker.java b/src/main/java/com/Acrobot/ChestShop/Listeners/PreShopCreation/NameChecker.java index 2f7cc5a..6a991c3 100644 --- a/src/main/java/com/Acrobot/ChestShop/Listeners/PreShopCreation/NameChecker.java +++ b/src/main/java/com/Acrobot/ChestShop/Listeners/PreShopCreation/NameChecker.java @@ -1,7 +1,5 @@ package com.Acrobot.ChestShop.Listeners.PreShopCreation; -import com.Acrobot.ChestShop.Configuration.Properties; -import com.Acrobot.ChestShop.Economy.Economy; import com.Acrobot.ChestShop.Events.PreShopCreationEvent; import com.Acrobot.ChestShop.Permission; import com.Acrobot.ChestShop.Utils.uName; diff --git a/src/main/java/com/Acrobot/ChestShop/Listeners/PreTransaction/AmountAndPriceChecker.java b/src/main/java/com/Acrobot/ChestShop/Listeners/PreTransaction/AmountAndPriceChecker.java index 139a256..7b44305 100644 --- a/src/main/java/com/Acrobot/ChestShop/Listeners/PreTransaction/AmountAndPriceChecker.java +++ b/src/main/java/com/Acrobot/ChestShop/Listeners/PreTransaction/AmountAndPriceChecker.java @@ -2,7 +2,6 @@ package com.Acrobot.ChestShop.Listeners.PreTransaction; import com.Acrobot.Breeze.Utils.InventoryUtil; import com.Acrobot.ChestShop.ChestShop; -import com.Acrobot.ChestShop.Economy.Economy; import com.Acrobot.ChestShop.Events.Economy.CurrencyCheckEvent; import com.Acrobot.ChestShop.Events.PreTransactionEvent; import org.bukkit.event.EventHandler; diff --git a/src/main/java/com/Acrobot/ChestShop/Metadata/ItemDatabase.java b/src/main/java/com/Acrobot/ChestShop/Metadata/ItemDatabase.java index c96df23..6f84c31 100644 --- a/src/main/java/com/Acrobot/ChestShop/Metadata/ItemDatabase.java +++ b/src/main/java/com/Acrobot/ChestShop/Metadata/ItemDatabase.java @@ -18,6 +18,7 @@ import java.sql.Statement; /** * Saves items with Metadata in database, which allows for saving items on signs easily. + * * @author Acrobot */ public class ItemDatabase {