From e096aeb9006c2de65c58a7482bda063d49b16eb4 Mon Sep 17 00:00:00 2001
From: Sergey Solovyev <serso1988@gmail.com>
Date: Thu, 27 Oct 2011 12:01:31 +0400
Subject: [PATCH] history changes

---
 AndroidManifest.xml                                   |  4 ++--
 .../solovyev/android/calculator/CalculatorModel.java  | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 05de47c6..379f4dc2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2,8 +2,8 @@
 
 <manifest xmlns:a="http://schemas.android.com/apk/res/android"
 		  package="org.solovyev.android.calculator"
-		  a:versionCode="5"
-		  a:versionName="1.1.3">
+		  a:versionCode="6"
+		  a:versionName="1.1.4">
 
 	<uses-permission a:name="android.permission.VIBRATE"/>
 
diff --git a/src/main/java/org/solovyev/android/calculator/CalculatorModel.java b/src/main/java/org/solovyev/android/calculator/CalculatorModel.java
index e7a22584..78cafe9a 100644
--- a/src/main/java/org/solovyev/android/calculator/CalculatorModel.java
+++ b/src/main/java/org/solovyev/android/calculator/CalculatorModel.java
@@ -145,6 +145,7 @@ public enum CalculatorModel implements CursorControl, HistoryControl<CalculatorH
 	private void evaluate(boolean delayEvaluate, @NotNull final String expression, @NotNull final JsclOperation operation, @Nullable CalculatorHistoryState historyState) {
 		final CalculatorHistoryState localHistoryState;
 		if (historyState == null) {
+			this.display.setText("");
 			localHistoryState = getCurrentHistoryState();
 		} else {
 			localHistoryState = historyState;
@@ -160,11 +161,10 @@ public enum CalculatorModel implements CursorControl, HistoryControl<CalculatorH
 						// actually nothing shall be logged while text operations are done
 						evaluate(expression, operation, this);
 
-						localHistoryState.setDisplayState(getCurrentHistoryState().getDisplayState());
-
 						if (pendingOperation.getObject() == this) {
 							// todo serso: of course there is small probability that someone will set pendingOperation after if statement but before .setObject(null)
 							pendingOperation.setObject(null);
+							localHistoryState.setDisplayState(getCurrentHistoryState().getDisplayState());
 						}
 					}
 				}
@@ -204,10 +204,10 @@ public enum CalculatorModel implements CursorControl, HistoryControl<CalculatorH
 				final CalculatorEngine.Result result = calculatorEngine.evaluate(operation, expression);
 				if (currentRunner == pendingOperation.getObject()) {
 					display.setText(result.getResult());
-					display.setJsclOperation(result.getUserOperation());
 				} else {
 					display.setText("");
 				}
+				display.setJsclOperation(result.getUserOperation());
 			} catch (EvalError e) {
 				handleEvaluationException(expression, display, operation, e);
 			} catch (ParseException e) {
@@ -215,8 +215,11 @@ public enum CalculatorModel implements CursorControl, HistoryControl<CalculatorH
 			}
 		} else {
 			this.display.setText("");
+			this.display.setJsclOperation(operation);
 		}
 
+
+
 		this.display.redraw();
 	}
 
@@ -300,7 +303,7 @@ public enum CalculatorModel implements CursorControl, HistoryControl<CalculatorH
 			final String expression = this.editor.getText().toString();
 			if ( !StringUtils.isEmpty(expression) ) {
 				if ( StringUtils.isEmpty(this.display.getText().toString()) ) {
-					evaluate(false, expression, JsclOperation.numeric, editorHistoryState);
+					evaluate(false, expression, this.display.getJsclOperation(), editorHistoryState);
 				}
 			}