From 2a7cc37d255831b876d7468fb07e1fd8c9e964af Mon Sep 17 00:00:00 2001
From: kruland2607 <kruland2607@github.com>
Date: Wed, 9 Oct 2013 14:35:23 -0500
Subject: [PATCH 1/2] Added in plain junit formatter to get output from travis.

---
 core/build.xml  | 1 +
 swing/build.xml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/core/build.xml b/core/build.xml
index 819548e25..bc94e848c 100644
--- a/core/build.xml
+++ b/core/build.xml
@@ -105,6 +105,7 @@
 					<exclude name="Test.class" />
 				</fileset>
 				<formatter type="xml"/>
+				<formatter type="plain" usefile="false" />
 			</batchtest>
 		</junit>
 		<junitreport todir="${tmp.dir}">
diff --git a/swing/build.xml b/swing/build.xml
index 748b52946..53afdf087 100644
--- a/swing/build.xml
+++ b/swing/build.xml
@@ -285,6 +285,7 @@ ${nonascii}</fail>
 					<exclude name="Test.class" />
 				</fileset>
 				<formatter type="xml"/>
+				<formatter type="plain" usefile="false" />
 			</batchtest>
 		</junit>
 		<junitreport todir="${tmp.dir}">

From a601788dcdd244abd2d76b8dcebf67796b6bf708 Mon Sep 17 00:00:00 2001
From: kruland2607 <kruland2607@github.com>
Date: Wed, 9 Oct 2013 14:52:36 -0500
Subject: [PATCH 2/2] Fixed integer test value.  Thank goodness for unit tests.

---
 core/src/net/sf/openrocket/unit/Unit.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/net/sf/openrocket/unit/Unit.java b/core/src/net/sf/openrocket/unit/Unit.java
index a0522c2ba..75931d050 100644
--- a/core/src/net/sf/openrocket/unit/Unit.java
+++ b/core/src/net/sf/openrocket/unit/Unit.java
@@ -104,7 +104,7 @@ public abstract class Unit {
 		
 		val = roundForDecimalFormat(val);
 		// Check for approximate integer
-		if (Math.abs(val - Math.floor(val)) < 0.001) {
+		if (Math.abs(val - Math.floor(val)) < 0.0001) {
 			return intFormat.format(val);
 		}
 		return decFormat.format(val);