--- android/Calculator/src/dk/thoerup/calculator/CalculatorActivity.java	2010/06/28 09:02:51	936
+++ android/Calculator/src/dk/thoerup/calculator/CalculatorActivity.java	2010/06/28 09:37:34	937
@@ -131,7 +131,7 @@
 			
 			double val2 = Double.parseDouble( mEdit.getText().toString() );
 
-			Double res = 0.0;
+			double res = 0.0;
 			switch (mOperation) {
 			case Addition:
 				res = mVal1 + val2;
@@ -147,11 +147,12 @@
 				break;				
 			}
 			
-			if ( res.isInfinite() || res.isNaN() ) {
+			if ( Double.isInfinite(res) || Double.isNaN(res) ) {
 				mClear = true;
 			}
 			
-			mEdit.setText( res.toString() );
+			
+			mEdit.setText( Double.toString(res) );
 			mOperation = Ops.None;
 			mVal1 = res;
 		}