From fea84a45b269b731136dd84cec1b372b6d2b3b44 Mon Sep 17 00:00:00 2001
From: FrozenCow <frozencow@gmail.com>
Date: Sun, 22 May 2011 17:09:42 +0200
Subject: [PATCH] Corrected JsonFile use of webpath.

---
 .../dynmap/JsonFileClientUpdateComponent.java | 27 ++++++++-----------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/main/java/org/dynmap/JsonFileClientUpdateComponent.java b/src/main/java/org/dynmap/JsonFileClientUpdateComponent.java
index 55545efc..2985967e 100644
--- a/src/main/java/org/dynmap/JsonFileClientUpdateComponent.java
+++ b/src/main/java/org/dynmap/JsonFileClientUpdateComponent.java
@@ -54,15 +54,19 @@ public class JsonFileClientUpdateComponent extends ClientUpdateComponent {
         });
     }
     
+    protected File getStandaloneFile(String filename) {
+        File webpath = new File(plugin.configuration.getString("webpath", "web"), "standalone/" + filename);
+        if (webpath.isAbsolute())
+            return webpath;
+        else
+            return new File(plugin.getDataFolder(), webpath.toString());
+    }
+    
     protected void writeConfiguration() {
         File outputFile;
         JSONObject clientConfiguration = new JSONObject();
         plugin.events.trigger("buildclientconfiguration", clientConfiguration);
-        File webpath = new File(plugin.configuration.getString("webpath", "web"), "standalone/dynmap_config.json");
-        if (webpath.isAbsolute())
-            outputFile = webpath;
-        else
-            outputFile = new File(plugin.getDataFolder(), webpath.toString());
+        outputFile = getStandaloneFile("dynmap_config.json");
 
         try {
             FileOutputStream fos = new FileOutputStream(outputFile);
@@ -89,12 +93,7 @@ public class JsonFileClientUpdateComponent extends ClientUpdateComponent {
             ClientUpdateEvent clientUpdate = new ClientUpdateEvent(current, dynmapWorld, update);
             plugin.events.trigger("buildclientupdate", clientUpdate);
 
-            File webWorldPath = new File(this.configuration.getString("webpath", "web"), "standalone/dynmap_" + world.getName() + ".json");
-            if (webWorldPath.isAbsolute())
-                outputFile = webWorldPath;
-            else {
-                outputFile = new File(plugin.getDataFolder(), webWorldPath.toString());
-            }
+            outputFile = getStandaloneFile("dynmap_" + world.getName() + ".json");
             try {
                 FileOutputStream fos = new FileOutputStream(outputFile);
                 fos.write(Json.stringifyJson(update).getBytes());
@@ -112,11 +111,7 @@ public class JsonFileClientUpdateComponent extends ClientUpdateComponent {
     }
     
     protected void handleWebChat() {
-        File webPath = new File(configuration.getString("webpath", "web"));
-        if (!webPath.isAbsolute()) {
-            webPath = new File(plugin.getDataFolder(), webPath.toString());
-        }
-        File webchatFile = new File(webPath, "standalone/dynmap_webchat.json");
+        File webchatFile = getStandaloneFile("dynmap_webchat.json");
         
         if (webchatFile.exists() && lastTimestamp != 0) {
             JSONArray jsonMsgs = null;