Moved factories into their own package and gave them their own instances

bziemons · Dec 23, 2013 · abe5f25 · abe5f25
1 parent dc577b9
commit abe5f25
Show file tree

Hide file tree

Showing 13 changed files with 52 additions and 47 deletions.
diff --git a/src/main/java/com/thezorro266/bukkit/srm/CommandHandler.java b/src/main/java/com/thezorro266/bukkit/srm/CommandHandler.java
@@ -29,8 +29,9 @@
 import org.bukkit.entity.Player;
 
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
+import com.thezorro266.bukkit.srm.factories.RegionFactory;
+import com.thezorro266.bukkit.srm.factories.RegionFactory.Region;
 import com.thezorro266.bukkit.srm.helpers.Permission;
-import com.thezorro266.bukkit.srm.helpers.RegionFactory.Region;
 import com.thezorro266.bukkit.srm.templates.Template;
 import com.thezorro266.bukkit.srm.templates.interfaces.OwnableTemplate;
 
@@ -126,7 +127,7 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
 							}
 						}
 
-						SimpleRegionMarket.getInstance().getRegionFactory().destroyRegion(realRegion);
+						RegionFactory.instance.destroyRegion(realRegion);
 						sender.sendMessage(String.format("Region %s in world %s was removed.", region, world));
 					}
 				}

diff --git a/src/main/java/com/thezorro266/bukkit/srm/EventListener.java b/src/main/java/com/thezorro266/bukkit/srm/EventListener.java
@@ -26,8 +26,9 @@
 import org.bukkit.event.block.SignChangeEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
 
+import com.thezorro266.bukkit.srm.factories.SignFactory;
+import com.thezorro266.bukkit.srm.factories.SignFactory.Sign;
 import com.thezorro266.bukkit.srm.helpers.Location;
-import com.thezorro266.bukkit.srm.helpers.SignFactory.Sign;
 import com.thezorro266.bukkit.srm.templates.Template;
 
 public class EventListener implements Listener {
@@ -39,7 +40,7 @@ public EventListener() {
 	public void onSignChanged(SignChangeEvent event) {
 		if (!event.isCancelled()) {
 			Player player = event.getPlayer();
-			Sign sign = SimpleRegionMarket.getInstance().getSignFactory().getSignFromLocation(Location.fromBlock(event.getBlock()));
+			Sign sign = SignFactory.instance.getSignFromLocation(Location.fromBlock(event.getBlock()));
 			if (sign != null) {
 				if (!sign.getRegion().getTemplate().breakSign(player, sign)) {
 					event.setCancelled(true);
@@ -64,7 +65,7 @@ public void onSignChanged(SignChangeEvent event) {
 	@EventHandler
 	public void onBlockBreak(BlockBreakEvent event) {
 		if (!event.isCancelled()) {
-			Sign sign = SimpleRegionMarket.getInstance().getSignFactory().getSignFromLocation(Location.fromBlock(event.getBlock()));
+			Sign sign = SignFactory.instance.getSignFromLocation(Location.fromBlock(event.getBlock()));
 			if (sign != null) {
 				if (!sign.getRegion().getTemplate().breakSign(event.getPlayer(), sign)) {
 					event.setCancelled(true);
@@ -76,9 +77,9 @@ public void onBlockBreak(BlockBreakEvent event) {
 	@EventHandler
 	public void onPlayerInteract(PlayerInteractEvent event) {
 		if (event.hasBlock()) {
-			if (SimpleRegionMarket.getInstance().getSignFactory().isSign(event.getClickedBlock())) {
+			if (SignFactory.instance.isSign(event.getClickedBlock())) {
 				if (event.getAction().equals(Action.RIGHT_CLICK_BLOCK)) {
-					Sign sign = SimpleRegionMarket.getInstance().getSignFactory().getSignFromLocation(Location.fromBlock(event.getClickedBlock()));
+					Sign sign = SignFactory.instance.getSignFromLocation(Location.fromBlock(event.getClickedBlock()));
 					if (sign != null) {
 						sign.getRegion().getTemplate().clickSign(event.getPlayer(), sign);
 					}

diff --git a/src/main/java/com/thezorro266/bukkit/srm/SimpleRegionMarket.java b/src/main/java/com/thezorro266/bukkit/srm/SimpleRegionMarket.java
@@ -27,9 +27,8 @@
 import com.thezorro266.bukkit.srm.exceptions.ContentLoadException;
 import com.thezorro266.bukkit.srm.exceptions.ContentSaveException;
 import com.thezorro266.bukkit.srm.exceptions.TemplateFormatException;
+import com.thezorro266.bukkit.srm.factories.RegionFactory;
 import com.thezorro266.bukkit.srm.helpers.LocationSignHelper;
-import com.thezorro266.bukkit.srm.helpers.RegionFactory;
-import com.thezorro266.bukkit.srm.helpers.SignFactory;
 import com.thezorro266.bukkit.srm.helpers.WorldHelper;
 import com.thezorro266.bukkit.srm.templates.Template;
 import com.thezorro266.bukkit.srm.templates.interfaces.TimedTemplate;
@@ -44,10 +43,6 @@ public class SimpleRegionMarket extends JavaPlugin {
 	@Getter
 	private final WorldHelper worldHelper;
 	@Getter
-	private final SignFactory signFactory;
-	@Getter
-	private final RegionFactory regionFactory;
-	@Getter
 	private final TemplateManager templateManager;
 	@Getter
 	private final WorldGuardManager worldGuardManager;
@@ -62,8 +57,6 @@ public SimpleRegionMarket() {
 		instance = this;
 		locationSignHelper = new LocationSignHelper();
 		worldHelper = new WorldHelper();
-		signFactory = new SignFactory();
-		regionFactory = new RegionFactory();
 		templateManager = new TemplateManager();
 		worldGuardManager = new WorldGuardManager();
 		vaultHook = new VaultHook();
@@ -115,7 +108,7 @@ public void onEnable() {
 				except(e);
 			}
 		}
-		getLogger().info(String.format("Loaded %d regions in %dms", regionFactory.getRegionCount(), (System.nanoTime() - start) / 1000000L));
+		getLogger().info(String.format("Loaded %d regions in %dms", RegionFactory.instance.getRegionCount(), (System.nanoTime() - start) / 1000000L));
 
 		// Check if the plugin should be disabled because of an exception
 		if (disable) {
@@ -149,7 +142,7 @@ public void saveRegions() throws ContentSaveException {
 			{
 				templateManager.saveContent();
 			}
-			getLogger().info(String.format("Saved %d regions in %dms", regionFactory.getRegionCount(), (System.nanoTime() - start) / 1000000L));
+			getLogger().info(String.format("Saved %d regions in %dms", RegionFactory.instance.getRegionCount(), (System.nanoTime() - start) / 1000000L));
 		} else {
 			getLogger().info("Not saving anything, because I didn't even load");
 		}

diff --git a/src/main/java/com/thezorro266/bukkit/srm/TemplateManager.java b/src/main/java/com/thezorro266/bukkit/srm/TemplateManager.java
@@ -18,7 +18,7 @@
 
 package com.thezorro266.bukkit.srm;
 
-import static com.thezorro266.bukkit.srm.helpers.SignFactory.Sign.SIGN_LINE_COUNT;
+import static com.thezorro266.bukkit.srm.factories.SignFactory.Sign.SIGN_LINE_COUNT;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -39,7 +39,8 @@
 import com.thezorro266.bukkit.srm.exceptions.ContentSaveException;
 import com.thezorro266.bukkit.srm.exceptions.TemplateFormatException;
 import com.thezorro266.bukkit.srm.exceptions.ThisShouldNeverHappenException;
-import com.thezorro266.bukkit.srm.helpers.RegionFactory.Region;
+import com.thezorro266.bukkit.srm.factories.RegionFactory;
+import com.thezorro266.bukkit.srm.factories.RegionFactory.Region;
 import com.thezorro266.bukkit.srm.templates.Template;
 import com.thezorro266.bukkit.srm.templates.TemplateRent;
 import com.thezorro266.bukkit.srm.templates.TemplateSell;
@@ -324,7 +325,7 @@ public void loadContent() throws ContentLoadException {
 								}
 
 								// Let the RegionFactory do the rest
-								SimpleRegionMarket.getInstance().getRegionFactory().loadFromConfiguration(regionConfig, "");
+								RegionFactory.instance.loadFromConfiguration(regionConfig, "");
 							}
 						} else {
 							SimpleRegionMarket.getInstance().getLogger().warning(String.format("The world %s in the template %s was not found and could not be loaded.", worldStr, template.getId()));

diff --git a/src/main/java/com/thezorro266/bukkit/srm/exceptions/ContentSaveException.java b/src/main/java/com/thezorro266/bukkit/srm/exceptions/ContentSaveException.java
@@ -1,6 +1,6 @@
 package com.thezorro266.bukkit.srm.exceptions;
 
-import com.thezorro266.bukkit.srm.helpers.RegionFactory.Region;
+import com.thezorro266.bukkit.srm.factories.RegionFactory.Region;
 
 public class ContentSaveException extends Exception {
 

diff --git a/...266/bukkit/srm/helpers/RegionFactory.java → ...6/bukkit/srm/factories/RegionFactory.java b/...266/bukkit/srm/helpers/RegionFactory.java → ...6/bukkit/srm/factories/RegionFactory.java
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.thezorro266.bukkit.srm.helpers;
+package com.thezorro266.bukkit.srm.factories;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -37,11 +37,16 @@
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import com.thezorro266.bukkit.srm.SimpleRegionMarket;
 import com.thezorro266.bukkit.srm.exceptions.ContentLoadException;
-import com.thezorro266.bukkit.srm.helpers.SignFactory.Sign;
+import com.thezorro266.bukkit.srm.factories.SignFactory.Sign;
+import com.thezorro266.bukkit.srm.helpers.Location;
 import com.thezorro266.bukkit.srm.templates.SignTemplate;
 import com.thezorro266.bukkit.srm.templates.Template;
 
 public class RegionFactory {
+	public static final RegionFactory instance = new RegionFactory();
+
+	private RegionFactory() {
+	}
 
 	@Getter
 	private int regionCount = 0;
@@ -81,24 +86,24 @@ public String getName() {
 		}
 
 		public Sign addBlockAsSign(Block block) {
-			if (SimpleRegionMarket.getInstance().getSignFactory().isSign(block)) {
+			if (SignFactory.instance.isSign(block)) {
 				org.bukkit.material.Sign signMat = (org.bukkit.material.Sign) block.getState().getData();
-				Sign sign = SimpleRegionMarket.getInstance().getSignFactory().createSign(this, Location.fromBlock(block), block.getType().equals(Material.WALL_SIGN), signMat.getFacing());
+				Sign sign = SignFactory.instance.createSign(this, Location.fromBlock(block), block.getType().equals(Material.WALL_SIGN), signMat.getFacing());
 				return sign;
 			}
 			return null;
 		}
-		
+
 		public void updateSigns() {
 			for (Sign sign : signList) {
 				template.updateSign(sign);
 			}
 		}
-		
+
 		public boolean isOption(String optionAlias) {
 			return options.containsKey(optionAlias);
 		}
-		
+
 		public Object getOption(String optionAlias) {
 			return options.get(optionAlias);
 		}
@@ -192,7 +197,7 @@ public void loadFromConfiguration(Configuration config, String path) throws Cont
 		for (String signKey : config.getConfigurationSection(path + "signs").getKeys(false)) {
 			Sign sign;
 			try {
-				sign = SimpleRegionMarket.getInstance().getSignFactory().loadFromConfiguration(config, region, String.format("%ssigns.%s.", path, signKey));
+				sign = SignFactory.instance.loadFromConfiguration(config, region, String.format("%ssigns.%s.", path, signKey));
 			} catch (IllegalArgumentException e) {
 				throw new ContentLoadException("Could not create sign " + signKey, e);
 			}

diff --git a/...ro266/bukkit/srm/helpers/SignFactory.java → ...266/bukkit/srm/factories/SignFactory.java b/...ro266/bukkit/srm/helpers/SignFactory.java → ...266/bukkit/srm/factories/SignFactory.java
@@ -16,9 +16,10 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.thezorro266.bukkit.srm.helpers;
+package com.thezorro266.bukkit.srm.factories;
 
 import lombok.Data;
+import lombok.Getter;
 
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -27,9 +28,16 @@
 
 import com.thezorro266.bukkit.srm.SimpleRegionMarket;
 import com.thezorro266.bukkit.srm.exceptions.ContentLoadException;
-import com.thezorro266.bukkit.srm.helpers.RegionFactory.Region;
+import com.thezorro266.bukkit.srm.factories.RegionFactory.Region;
+import com.thezorro266.bukkit.srm.helpers.Location;
 
 public class SignFactory {
+	public static final SignFactory instance = new SignFactory();
+
+	private SignFactory() {
+	}
+
+	@Getter
 	private int signCount = 0;
 
 	public @Data
@@ -117,10 +125,6 @@ public void destroySign(Sign sign) {
 		--signCount;
 	}
 
-	public int getSignCount() {
-		return signCount;
-	}
-
 	public boolean isSign(Block block) {
 		if (block.getType().equals(Material.WALL_SIGN) || block.getType().equals(Material.SIGN_POST)) {
 			return true;

diff --git a/src/main/java/com/thezorro266/bukkit/srm/helpers/LocationSignHelper.java b/src/main/java/com/thezorro266/bukkit/srm/helpers/LocationSignHelper.java
@@ -2,7 +2,7 @@
 
 import java.util.ArrayList;
 
-import com.thezorro266.bukkit.srm.helpers.SignFactory.Sign;
+import com.thezorro266.bukkit.srm.factories.SignFactory.Sign;
 
 public class LocationSignHelper {
 	private ArrayList<Sign> signList = new ArrayList<Sign>();

diff --git a/src/main/java/com/thezorro266/bukkit/srm/helpers/WorldHelper.java b/src/main/java/com/thezorro266/bukkit/srm/helpers/WorldHelper.java
@@ -24,7 +24,7 @@
 
 import org.bukkit.World;
 
-import com.thezorro266.bukkit.srm.helpers.RegionFactory.Region;
+import com.thezorro266.bukkit.srm.factories.RegionFactory.Region;
 
 public class WorldHelper {
 	private WeakHashMap<Region, World> regionMap = new WeakHashMap<Region, World>();

diff --git a/src/main/java/com/thezorro266/bukkit/srm/templates/SignTemplate.java b/src/main/java/com/thezorro266/bukkit/srm/templates/SignTemplate.java
@@ -18,7 +18,7 @@
 
 package com.thezorro266.bukkit.srm.templates;
 
-import static com.thezorro266.bukkit.srm.helpers.SignFactory.Sign.SIGN_LINE_COUNT;
+import static com.thezorro266.bukkit.srm.factories.SignFactory.Sign.SIGN_LINE_COUNT;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -31,9 +31,9 @@
 import org.bukkit.entity.Player;
 
 import com.thezorro266.bukkit.srm.SimpleRegionMarket;
+import com.thezorro266.bukkit.srm.factories.RegionFactory.Region;
+import com.thezorro266.bukkit.srm.factories.SignFactory.Sign;
 import com.thezorro266.bukkit.srm.helpers.Location;
-import com.thezorro266.bukkit.srm.helpers.RegionFactory.Region;
-import com.thezorro266.bukkit.srm.helpers.SignFactory.Sign;
 
 public abstract class SignTemplate extends Template {
 	protected String[] signInput;

diff --git a/src/main/java/com/thezorro266/bukkit/srm/templates/Template.java b/src/main/java/com/thezorro266/bukkit/srm/templates/Template.java
@@ -30,9 +30,9 @@
 
 import com.thezorro266.bukkit.srm.SimpleRegionMarket;
 import com.thezorro266.bukkit.srm.exceptions.TemplateFormatException;
+import com.thezorro266.bukkit.srm.factories.RegionFactory.Region;
+import com.thezorro266.bukkit.srm.factories.SignFactory.Sign;
 import com.thezorro266.bukkit.srm.helpers.Location;
-import com.thezorro266.bukkit.srm.helpers.RegionFactory.Region;
-import com.thezorro266.bukkit.srm.helpers.SignFactory.Sign;
 
 public abstract class Template {
 

diff --git a/src/main/java/com/thezorro266/bukkit/srm/templates/TemplateSell.java b/src/main/java/com/thezorro266/bukkit/srm/templates/TemplateSell.java
@@ -28,10 +28,10 @@
 
 import com.sk89q.worldguard.protection.regions.ProtectedRegion;
 import com.thezorro266.bukkit.srm.SimpleRegionMarket;
+import com.thezorro266.bukkit.srm.factories.RegionFactory;
+import com.thezorro266.bukkit.srm.factories.RegionFactory.Region;
+import com.thezorro266.bukkit.srm.factories.SignFactory.Sign;
 import com.thezorro266.bukkit.srm.helpers.Location;
-import com.thezorro266.bukkit.srm.helpers.RegionFactory;
-import com.thezorro266.bukkit.srm.helpers.RegionFactory.Region;
-import com.thezorro266.bukkit.srm.helpers.SignFactory.Sign;
 import com.thezorro266.bukkit.srm.templates.interfaces.OwnableTemplate;
 
 public class TemplateSell extends SignTemplate implements OwnableTemplate {
@@ -218,7 +218,7 @@ public Sign makeSign(Player player, Block block, HashMap<String, String> inputMa
 			}
 
 			if (!existentRegion) {
-				Region region = SimpleRegionMarket.getInstance().getRegionFactory().createRegion(this, block.getWorld(), worldguardRegion);
+				Region region = RegionFactory.instance.createRegion(this, block.getWorld(), worldguardRegion);
 
 				double price;
 				if (SimpleRegionMarket.getInstance().getVaultHook().getEconomy() != null) {

diff --git a/src/main/java/com/thezorro266/bukkit/srm/templates/interfaces/OwnableTemplate.java b/src/main/java/com/thezorro266/bukkit/srm/templates/interfaces/OwnableTemplate.java
@@ -20,7 +20,7 @@
 
 import org.bukkit.OfflinePlayer;
 
-import com.thezorro266.bukkit.srm.helpers.RegionFactory.Region;
+import com.thezorro266.bukkit.srm.factories.RegionFactory.Region;
 
 /**
  * An interface that gives a template the general methods to manage owners and members and being able to set a region occupied.