hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '13.09dev' into feature-configtab

Browse Source
This commit is contained in:
kruland2607 2013-10-10 11:35:41 -05:00
commit 1d36ab5eaf
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/build.xml
View File

@ -105,6 +105,7 @@
<exclude name="Test.class" /> <exclude name="Test.class" />
</fileset> </fileset>
<formatter type="xml"/> <formatter type="xml"/>
<formatter type="plain" usefile="false" />
</batchtest> </batchtest>
</junit> </junit>
<junitreport todir="${tmp.dir}"> <junitreport todir="${tmp.dir}">

2
core/src/net/sf/openrocket/unit/Unit.java
View File

@ -104,7 +104,7 @@ public abstract class Unit {
val = roundForDecimalFormat(val); val = roundForDecimalFormat(val);
// Check for approximate integer // 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 intFormat.format(val);
} }
return decFormat.format(val); return decFormat.format(val);

1
swing/build.xml
View File

@ -285,6 +285,7 @@ ${nonascii}</fail>
<exclude name="Test.class" /> <exclude name="Test.class" />
</fileset> </fileset>
<formatter type="xml"/> <formatter type="xml"/>
<formatter type="plain" usefile="false" />
</batchtest> </batchtest>
</junit> </junit>
<junitreport todir="${tmp.dir}"> <junitreport todir="${tmp.dir}">