From 037473d13b6d4ed79119f4b257f7655c2d7bbca7 Mon Sep 17 00:00:00 2001
From: xeology <xeology@e251c2fe-e539-e718-e476-b85c1f46cddb>
Date: Mon, 2 May 2011 01:23:57 +0000
Subject: [PATCH] Fixed ugly decimals in messages and in balance.

git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1308 e251c2fe-e539-e718-e476-b85c1f46cddb
---
 Essentials/src/com/earth2me/essentials/User.java    | 13 +++++++++----
 .../essentials/commands/Commandbalance.java         | 12 ++++++++----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/Essentials/src/com/earth2me/essentials/User.java b/Essentials/src/com/earth2me/essentials/User.java
index 3077a88e7..aa0b16157 100644
--- a/Essentials/src/com/earth2me/essentials/User.java
+++ b/Essentials/src/com/earth2me/essentials/User.java
@@ -1,6 +1,7 @@
 package com.earth2me.essentials;
 
 import com.earth2me.essentials.commands.IEssentialsCommand;
+import java.text.DecimalFormat;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.logging.Logger;
@@ -18,6 +19,7 @@ public class User extends UserData implements Comparable<User>, IReplyTo
 	private boolean teleportRequestHere;
 	private Teleport teleport;
 	private long lastActivity;
+	private static DecimalFormat df = new DecimalFormat("0.##");
 
 	User(Player base, Essentials ess)
 	{
@@ -84,7 +86,8 @@ public class User extends UserData implements Comparable<User>, IReplyTo
 			return;
 		}
 		setMoney(getMoney() + value);
-		sendMessage("§a$" + value + " has been added to your account.");
+		String d = df.format(Double.parseDouble(Double.toString(value)));
+		sendMessage("§a$" + d + " has been added to your account.");
 	}
 
 	public void payUser(User reciever, double value) throws Exception
@@ -101,8 +104,9 @@ public class User extends UserData implements Comparable<User>, IReplyTo
 		{
 			setMoney(getMoney() - value);
 			reciever.setMoney(reciever.getMoney() + value);
-			sendMessage("§a$" + value + " has been sent to " + reciever.getDisplayName());
-			reciever.sendMessage("§a$" + value + " has been recieved from " + getDisplayName());
+			String d = df.format(Double.parseDouble(Double.toString(value)));
+			sendMessage("§a$" + d + " has been sent to " + reciever.getDisplayName());                        
+			reciever.sendMessage("§a$" + d + " has been recieved from " + getDisplayName());
 		}
 	}
 
@@ -113,7 +117,8 @@ public class User extends UserData implements Comparable<User>, IReplyTo
 			return;
 		}
 		setMoney(getMoney() - value);
-		sendMessage("§c$" + value + " has been taken from your account.");
+		String d = df.format(Double.parseDouble(Double.toString(value)));
+		sendMessage("§c$" + d + " has been taken from your account.");
 	}
 
 	public void charge(String cmd) throws Exception
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandbalance.java b/Essentials/src/com/earth2me/essentials/commands/Commandbalance.java
index f24a59107..2957e2d5c 100644
--- a/Essentials/src/com/earth2me/essentials/commands/Commandbalance.java
+++ b/Essentials/src/com/earth2me/essentials/commands/Commandbalance.java
@@ -2,11 +2,13 @@ package com.earth2me.essentials.commands;
 
 import org.bukkit.Server;
 import com.earth2me.essentials.User;
+import java.text.DecimalFormat;
 import org.bukkit.command.CommandSender;
 
 
 public class Commandbalance extends EssentialsCommand
 {
+	private static DecimalFormat df = new DecimalFormat("0.##");
 	public Commandbalance()
 	{
 		super("balance");
@@ -19,16 +21,18 @@ public class Commandbalance extends EssentialsCommand
 		{
 			throw new NotEnoughArgumentsException();
 		}
-
-		sender.sendMessage("§7Balance: $" + getPlayer(server, args, 0).getMoney());
+		String d = df.format(Double.parseDouble(Double.toString(getPlayer(server, args, 0).getMoney())));
+		sender.sendMessage("§7Balance: $" + d);
 	}
 
 	@Override
 	public void run(Server server, User user, String commandLabel, String[] args) throws Exception
 	{
 		charge(user);
-		user.sendMessage("§7Balance: $" + (args.length < 1 || !user.isAuthorized("essentials.balance.other")
+		double bal = (args.length < 1 || !user.isAuthorized("essentials.balance.other")
 										   ? user
-										   : getPlayer(server, args, 0)).getMoney());
+										   : getPlayer(server, args, 0)).getMoney();
+		String d = df.format(Double.parseDouble(Double.toString(bal)));
+		user.sendMessage("§7Balance: $" + d);
 	}
 }