From 0657d9c559fcd8649072b53b6d0eeb4a1be58094 Mon Sep 17 00:00:00 2001 From: FrozenCow Date: Thu, 10 Mar 2011 15:59:19 +0100 Subject: [PATCH] Code cleanup. --- src/main/java/org/dynmap/JsonTimerTask.java | 22 +++++++--------- src/main/java/org/dynmap/flat/FlatMap.java | 28 ++++++++++----------- src/main/java/org/dynmap/web/Json.java | 1 - 3 files changed, 22 insertions(+), 29 deletions(-) diff --git a/src/main/java/org/dynmap/JsonTimerTask.java b/src/main/java/org/dynmap/JsonTimerTask.java index 08981f1f..9b936776 100644 --- a/src/main/java/org/dynmap/JsonTimerTask.java +++ b/src/main/java/org/dynmap/JsonTimerTask.java @@ -15,7 +15,6 @@ import org.bukkit.Server; import org.bukkit.World; import org.bukkit.entity.Player; import org.bukkit.util.config.Configuration; -import org.dynmap.Event; import org.dynmap.web.Json; import org.json.simple.JSONArray; import org.json.simple.JSONObject; @@ -24,7 +23,7 @@ import org.json.simple.parser.ParseException; class JsonTimerTask extends TimerTask { protected static final Logger log = Logger.getLogger("Minecraft"); - + private final DynmapPlugin plugin; private Server server; private MapManager mapManager; @@ -45,33 +44,30 @@ class JsonTimerTask extends TimerTask { File outputFile; //Handles Reading WebChat - if(configuration.getNode("web").getBoolean("allowwebchat", false)) - { + if (configuration.getNode("web").getBoolean("allowwebchat", false)) { File webChatPath = new File(this.configuration.getString("webpath", "web"), "standalone/dynmap_webchat.json"); if (webChatPath.isAbsolute()) outputFile = webChatPath; else { outputFile = new File(plugin.getDataFolder(), webChatPath.toString()); } - if(webChatPath.exists() && lastTimestamp != 0) - { + if (webChatPath.exists() && lastTimestamp != 0) { JSONArray jsonMsgs = null; try { FileReader inputFileReader = new FileReader(webChatPath); jsonMsgs = (JSONArray) parser.parse(inputFileReader); inputFileReader.close(); - } catch(IOException ex){ + } catch (IOException ex) { log.log(Level.SEVERE, "Exception while reading JSON-file.", ex); - } catch(ParseException ex) { + } catch (ParseException ex) { log.log(Level.SEVERE, "Exception while parsing JSON-file.", ex); } - if(jsonMsgs != null) { + if (jsonMsgs != null) { Iterator iter = jsonMsgs.iterator(); - while(iter.hasNext()) { - JSONObject o = (JSONObject)iter.next(); - if(Long.parseLong(String.valueOf(o.get("timestamp"))) >= (lastTimestamp)) - { + while (iter.hasNext()) { + JSONObject o = (JSONObject) iter.next(); + if (Long.parseLong(String.valueOf(o.get("timestamp"))) >= (lastTimestamp)) { plugin.webChat(String.valueOf(o.get("name")), String.valueOf(o.get("message"))); } } diff --git a/src/main/java/org/dynmap/flat/FlatMap.java b/src/main/java/org/dynmap/flat/FlatMap.java index 5cd52d54..19ae1f86 100644 --- a/src/main/java/org/dynmap/flat/FlatMap.java +++ b/src/main/java/org/dynmap/flat/FlatMap.java @@ -1,7 +1,6 @@ package org.dynmap.flat; import java.awt.Color; -import java.awt.color.ColorSpace; import java.awt.image.BufferedImage; import java.awt.image.WritableRaster; import java.io.File; @@ -23,8 +22,8 @@ public class FlatMap extends MapType { private ColorScheme colorScheme; public FlatMap(Map configuration) { - prefix = (String)configuration.get("prefix"); - colorScheme = ColorScheme.getScheme((String)configuration.get("colorscheme")); + prefix = (String) configuration.get("prefix"); + colorScheme = ColorScheme.getScheme((String) configuration.get("colorscheme")); } @Override @@ -71,7 +70,7 @@ public class FlatMap extends MapType { boolean rendered = false; BufferedImage im = new BufferedImage(t.size, t.size, BufferedImage.TYPE_INT_RGB); WritableRaster raster = im.getRaster(); - + float[] hsb = new float[4]; int[] pixel = new int[4]; @@ -87,25 +86,24 @@ public class FlatMap extends MapType { Color c = colors[0]; if (c == null) continue; - - + Color.RGBtoHSB(c.getRed(), c.getGreen(), c.getBlue(), hsb); - + float normalheight = 64; float below = Math.min(my, normalheight) / normalheight; - float above = 1.0f - Math.max(0, my - normalheight) / (128 - normalheight); - + float above = 1.0f - Math.max(0, my - normalheight) / (128 - normalheight); + // Saturation will be changed when going higher. hsb[1] *= above; - + // Brightness will change when going lower hsb[2] *= below; - + int rgb = Color.HSBtoRGB(hsb[0], hsb[1], hsb[2]); - pixel[0] = (rgb&0xff0000) >> 16; - pixel[1] = (rgb&0x00ff00) >> 8; - pixel[2] = (rgb&0x0000ff)/* >> 0*/; - + pixel[0] = (rgb & 0xff0000) >> 16; + pixel[1] = (rgb & 0x00ff00) >> 8; + pixel[2] = (rgb & 0x0000ff)/* >> 0 */; + raster.setPixel(x, y, pixel); rendered = true; } diff --git a/src/main/java/org/dynmap/web/Json.java b/src/main/java/org/dynmap/web/Json.java index b1b95f38..dd3a86a0 100644 --- a/src/main/java/org/dynmap/web/Json.java +++ b/src/main/java/org/dynmap/web/Json.java @@ -3,7 +3,6 @@ package org.dynmap.web; import java.lang.reflect.Array; import java.lang.reflect.Field; import java.lang.reflect.Modifier; -import java.security.KeyStore.Entry; import java.util.LinkedHashMap; import java.util.List; import java.util.Map;