package org.nusco.narjillos.shared.utilities;

import java.text.DecimalFormat;

/**
 * Formats numbers for pretty printing.
 * 
 * For example, 2000 becomes 2K, 1200000 becomes 1.2M, and so on.
 */
public class NumberFormat {

	private final static DecimalFormat THOUSANDS_FORMAT = new DecimalFormat("##.#K");
	private final static DecimalFormat MILLIONS_FORMAT = new DecimalFormat("#.##M");

	public static String format(long number) {
		if (number < 1_000)
			return String.valueOf(number);

		if (number < 999_999) {
			double thousands = (double) number / 1000;
			return THOUSANDS_FORMAT.format(thousands);
		}

		double millions = (double) number / 1_000_000;
		return MILLIONS_FORMAT.format(millions);
	}

	public static String format(double number) {
		// two decimals
		return Double.toString(((long) number * 100) / 100.0);
	}
}

@@ -803,16 +803,17 @@
 ((long) 
+(
 number *
@@ -817,16 +817,17 @@
 r * 100)
+)
  / 100.0

Fix formatting of doubles in reports