Module separation

calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorParseException.java

@@ -4,7 +4,7 @@
  * or visit http://se.solovyev.org
  */
 
-package org.solovyev.android.calculator.model;
+package org.solovyev.android.calculator;
 
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/AbstractHistoryState.java

@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2009-2011. Created by serso aka se.solovyev.
+ * For more information, please, contact se.solovyev@gmail.com
+ * or visit http://se.solovyev.org
+ */
+
+package org.solovyev.android.calculator.history;
+
+import org.jetbrains.annotations.Nullable;
+import org.simpleframework.xml.Element;
+import org.simpleframework.xml.Transient;
+
+import java.util.Date;
+
+/**
+ * User: serso
+ * Date: 10/15/11
+ * Time: 1:45 PM
+ */
+public class AbstractHistoryState implements Cloneable{
+
+	@Element
+	private long time = new Date().getTime();
+
+	@Element(required = false)
+	@Nullable
+	private String comment;
+
+	@Transient
+	private boolean saved;
+
+	@Transient
+	private int id = 0;
+
+	public int getId() {
+		return id;
+	}
+
+	public void setId(int id) {
+		this.id = id;
+	}
+
+	public long getTime() {
+		return time;
+	}
+
+	public void setTime(long time) {
+		this.time = time;
+	}
+
+	@Nullable
+	public String getComment() {
+		return comment;
+	}
+
+	public void setComment(@Nullable String comment) {
+		this.comment = comment;
+	}
+
+	public boolean isSaved() {
+		return saved;
+	}
+
+	public void setSaved(boolean saved) {
+		this.saved = saved;
+	}
+
+	@Override
+	protected AbstractHistoryState clone() {
+		AbstractHistoryState clone;
+
+		try {
+			clone = (AbstractHistoryState)super.clone();
+		} catch (CloneNotSupportedException e) {
+			throw new UnsupportedOperationException(e);
+		}
+
+		return clone;
+	}
+}

calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/CalculatorDisplayHistoryState.java

@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2009-2011. Created by serso aka se.solovyev.
+ * For more information, please, contact se.solovyev@gmail.com
+ */
+
+package org.solovyev.android.calculator.history;
+
+import jscl.math.Generic;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.simpleframework.xml.Element;
+import org.simpleframework.xml.Root;
+import org.simpleframework.xml.Transient;
+import org.solovyev.android.calculator.ICalculatorDisplay;
+import org.solovyev.android.calculator.jscl.JsclOperation;
+
+/**
+ * User: serso
+ * Date: 9/17/11
+ * Time: 11:05 PM
+ */
+
+@Root
+public class CalculatorDisplayHistoryState implements Cloneable {
+
+	@Transient
+	private boolean valid = true;
+
+	@Transient
+	@Nullable
+	private String errorMessage = null;
+
+	@Element
+	@NotNull
+	private EditorHistoryState editorState;
+
+	@Element
+	@NotNull
+	private JsclOperation jsclOperation;
+
+	@Transient
+	@Nullable
+	private Generic genericResult;
+
+	private CalculatorDisplayHistoryState() {
+		// for xml
+	}
+
+	@NotNull
+	public static CalculatorDisplayHistoryState newInstance(@NotNull ICalculatorDisplay display) {
+		final CalculatorDisplayHistoryState result = new CalculatorDisplayHistoryState();
+
+		result.editorState = EditorHistoryState.newInstance(display);
+		result.valid = display.isValid();
+		result.jsclOperation = display.getJsclOperation();
+		result.genericResult = display.getGenericResult();
+		result.errorMessage = display.getErrorMessage();
+
+		return result;
+	}
+
+	public void setValuesFromHistory(@NotNull ICalculatorDisplay display) {
+		this.getEditorState().setValuesFromHistory(display);
+		display.setValid(this.isValid());
+		display.setErrorMessage(this.getErrorMessage());
+		display.setJsclOperation(this.getJsclOperation());
+		display.setGenericResult(this.getGenericResult());
+	}
+
+
+	public boolean isValid() {
+		return valid;
+	}
+
+	@NotNull
+	public EditorHistoryState getEditorState() {
+		return editorState;
+	}
+
+	@NotNull
+	public JsclOperation getJsclOperation() {
+		return jsclOperation;
+	}
+
+	@Nullable
+	public String getErrorMessage() {
+		return errorMessage;
+	}
+
+	@Nullable
+	public Generic getGenericResult() {
+		return genericResult;
+	}
+
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
+
+		CalculatorDisplayHistoryState that = (CalculatorDisplayHistoryState) o;
+
+		if (!editorState.equals(that.editorState)) return false;
+		if (jsclOperation != that.jsclOperation) return false;
+
+		return true;
+	}
+
+	@Override
+	public int hashCode() {
+		int result = editorState.hashCode();
+		result = 31 * result + jsclOperation.hashCode();
+		return result;
+	}
+
+	@Override
+	public String toString() {
+		return "CalculatorDisplayHistoryState{" +
+				"valid=" + valid +
+				", errorMessage='" + errorMessage + '\'' +
+				", editorHistoryState=" + editorState +
+				", jsclOperation=" + jsclOperation +
+				'}';
+	}
+
+	@Override
+	protected CalculatorDisplayHistoryState clone() {
+		try {
+			final CalculatorDisplayHistoryState clone = (CalculatorDisplayHistoryState) super.clone();
+
+			clone.editorState = this.editorState.clone();
+
+			return clone;
+		} catch (CloneNotSupportedException e) {
+			throw new RuntimeException(e);
+		}
+	}
+}

calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryState.java

@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2009-2011. Created by serso aka se.solovyev.
+ * For more information, please, contact se.solovyev@gmail.com
+ */
+
+package org.solovyev.android.calculator.history;
+
+import org.jetbrains.annotations.NotNull;
+import org.simpleframework.xml.Element;
+import org.simpleframework.xml.Root;
+import org.solovyev.android.calculator.Editor;
+import org.solovyev.android.calculator.ICalculatorDisplay;
+
+/**
+ * User: serso
+ * Date: 9/11/11
+ * Time: 12:16 AM
+ */
+
+@Root
+public class CalculatorHistoryState extends AbstractHistoryState {
+
+	@Element
+	@NotNull
+	private EditorHistoryState editorState;
+
+	@Element
+	@NotNull
+	private CalculatorDisplayHistoryState displayState;
+
+	private CalculatorHistoryState() {
+		// for xml
+	}
+
+	private CalculatorHistoryState(@NotNull EditorHistoryState editorState,
+								  @NotNull CalculatorDisplayHistoryState displayState) {
+		this.editorState = editorState;
+		this.displayState = displayState;
+	}
+
+	public static CalculatorHistoryState newInstance(@NotNull Editor editor, @NotNull ICalculatorDisplay display) {
+		final EditorHistoryState editorHistoryState = EditorHistoryState.newInstance(editor);
+		final CalculatorDisplayHistoryState displayHistoryState = CalculatorDisplayHistoryState.newInstance(display);
+		return new CalculatorHistoryState(editorHistoryState, displayHistoryState);
+	}
+
+	@NotNull
+	public EditorHistoryState getEditorState() {
+		return editorState;
+	}
+
+	public void setEditorState(@NotNull EditorHistoryState editorState) {
+		this.editorState = editorState;
+	}
+
+	@NotNull
+	public CalculatorDisplayHistoryState getDisplayState() {
+		return displayState;
+	}
+
+	public void setDisplayState(@NotNull CalculatorDisplayHistoryState displayState) {
+		this.displayState = displayState;
+	}
+
+	@Override
+	public String toString() {
+		return "CalculatorHistoryState{" +
+				"editorState=" + editorState +
+				", displayState=" + displayState +
+				'}';
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
+
+		CalculatorHistoryState that = (CalculatorHistoryState) o;
+
+		if (this.isSaved() != that.isSaved()) return false;
+		if (this.getId() != that.getId()) return false;
+		if (!displayState.equals(that.displayState)) return false;
+		if (!editorState.equals(that.editorState)) return false;
+
+		return true;
+	}
+
+	@Override
+	public int hashCode() {
+		int result = Boolean.valueOf(isSaved()).hashCode();
+		result = 31 * result + getId();
+		result = 31 * result + editorState.hashCode();
+		result = 31 * result + displayState.hashCode();
+		return result;
+	}
+
+	public void setValuesFromHistory(@NotNull Editor editor, @NotNull ICalculatorDisplay display) {
+		this.getEditorState().setValuesFromHistory(editor);
+		this.getDisplayState().setValuesFromHistory(display);
+	}
+
+	@Override
+	protected CalculatorHistoryState clone() {
+		final CalculatorHistoryState clone = (CalculatorHistoryState)super.clone();
+
+		clone.editorState = this.editorState.clone();
+		clone.displayState = this.displayState.clone();
+
+		return clone;
+	}
+}

calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/EditorHistoryState.java

@@ -0,0 +1,88 @@
+/*
+ * Copyright (c) 2009-2011. Created by serso aka se.solovyev.
+ * For more information, please, contact se.solovyev@gmail.com
+ */
+
+package org.solovyev.android.calculator.history;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.simpleframework.xml.Element;
+import org.simpleframework.xml.Root;
+import org.solovyev.android.calculator.Editor;
+
+@Root
+public class EditorHistoryState implements Cloneable{
+
+	@Element
+	private int cursorPosition;
+
+	@Element(required = false)
+	@Nullable
+	private String text;
+
+	private EditorHistoryState() {
+		// for xml
+	}
+
+	@NotNull
+	public static EditorHistoryState newInstance(@NotNull Editor editor) {
+		final EditorHistoryState result = new EditorHistoryState();
+
+		result.text = String.valueOf(editor.getText());
+		result.cursorPosition = editor.getSelection();
+
+		return result;
+	}
+
+	public void setValuesFromHistory(@NotNull Editor editor) {
+		editor.setText(this.getText());
+		editor.setSelection(this.getCursorPosition());
+	}
+
+	@Nullable
+	public String getText() {
+		return text;
+	}
+
+	public int getCursorPosition() {
+		return cursorPosition;
+	}
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (!(o instanceof EditorHistoryState)) return false;
+
+		EditorHistoryState that = (EditorHistoryState) o;
+
+		if (cursorPosition != that.cursorPosition) return false;
+		if (text != null ? !text.equals(that.text) : that.text != null) return false;
+
+		return true;
+	}
+
+	@Override
+	public int hashCode() {
+		int result = cursorPosition;
+		result = 31 * result + (text != null ? text.hashCode() : 0);
+		return result;
+	}
+
+	@Override
+	public String toString() {
+		return "EditorHistoryState{" +
+				"cursorPosition=" + cursorPosition +
+				", text='" + text + '\'' +
+				'}';
+	}
+
+	@Override
+	protected EditorHistoryState clone() {
+		try {
+			return (EditorHistoryState)super.clone();
+		} catch (CloneNotSupportedException e) {
+			throw new UnsupportedOperationException(e);
+		}
+	}
+}

calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/History.java

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2009-2011. Created by serso aka se.solovyev.
+ * For more information, please, contact se.solovyev@gmail.com
+ * or visit http://se.solovyev.org
+ */
+
+package org.solovyev.android.calculator.history;
+
+import org.simpleframework.xml.ElementList;
+import org.simpleframework.xml.Root;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * User: serso
+ * Date: 12/17/11
+ * Time: 9:30 PM
+ */
+
+@Root
+public class History {
+
+	@ElementList
+	private List<CalculatorHistoryState> historyItems = new ArrayList<CalculatorHistoryState>();
+
+	public History() {
+	}
+
+	public List<CalculatorHistoryState> getHistoryItems() {
+		return historyItems;
+	}
+}

calculatorpp-core/src/main/java/org/solovyev/android/calculator/history/HistoryUtils.java

@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2009-2011. Created by serso aka se.solovyev.
+ * For more information, please, contact se.solovyev@gmail.com
+ * or visit http://se.solovyev.org
+ */
+
+package org.solovyev.android.calculator.history;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+import org.simpleframework.xml.Serializer;
+import org.simpleframework.xml.core.Persister;
+
+import java.io.StringWriter;
+import java.util.List;
+
+/**
+ * User: serso
+ * Date: 12/17/11
+ * Time: 9:59 PM
+ */
+class HistoryUtils {
+
+	// not intended for instantiation
+	private HistoryUtils() {
+		throw new AssertionError();
+	}
+
+	public static void fromXml(@Nullable String xml, @NotNull List<CalculatorHistoryState> historyItems) {
+		if (xml != null) {
+			final Serializer serializer = new Persister();
+			try {
+				final History history = serializer.read(History.class, xml);
+				for (CalculatorHistoryState historyItem : history.getHistoryItems()) {
+					historyItems.add(historyItem);
+				}
+			} catch (Exception e) {
+				throw new RuntimeException(e);
+			}
+		}
+	}
+
+	@NotNull
+	public static String toXml(@NotNull List<CalculatorHistoryState> historyItems) {
+		final History history = new History();
+		for (CalculatorHistoryState historyState : historyItems) {
+			if (historyState.isSaved()) {
+				history.getHistoryItems().add(historyState);
+			}
+		}
+
+		final StringWriter xml = new StringWriter();
+		final Serializer serializer = new Persister();
+		try {
+			serializer.write(history, xml);
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+		return xml.toString();
+	}
+}

calculatorpp-core/src/main/java/org/solovyev/android/calculator/jscl/FromJsclNumericTextProcessor.java

@@ -8,8 +8,8 @@ package org.solovyev.android.calculator.jscl;
 
 import jscl.math.Generic;
 import org.jetbrains.annotations.NotNull;
-import org.solovyev.android.calculator.model.CalculatorParseException;
-import org.solovyev.android.calculator.model.TextProcessor;
+import org.solovyev.android.calculator.CalculatorParseException;
+import org.solovyev.android.calculator.text.TextProcessor;
 
 /**
  * User: serso

calculatorpp-core/src/main/java/org/solovyev/android/calculator/jscl/JsclOperation.java

@@ -10,9 +10,9 @@ import jscl.math.Generic;
 import jscl.text.ParseException;
 import org.jetbrains.annotations.NotNull;
 import org.solovyev.android.calculator.CalculatorLocatorImpl;
-import org.solovyev.android.calculator.model.DummyTextProcessor;
-import org.solovyev.android.calculator.model.FromJsclSimplifyTextProcessor;
-import org.solovyev.android.calculator.model.TextProcessor;
+import org.solovyev.android.calculator.text.DummyTextProcessor;
+import org.solovyev.android.calculator.text.FromJsclSimplifyTextProcessor;
+import org.solovyev.android.calculator.text.TextProcessor;
 
 public enum JsclOperation {
 

calculatorpp-core/src/main/java/org/solovyev/android/calculator/math/MathType.java

@@ -13,7 +13,7 @@ import org.jetbrains.annotations.Nullable;
 import org.solovyev.android.calculator.CalculatorLocatorImpl;
 import org.solovyev.common.JPredicate;
 import org.solovyev.common.StartsWithFinder;
-import org.solovyev.android.calculator.model.CalculatorParseException;
+import org.solovyev.android.calculator.CalculatorParseException;
 import org.solovyev.common.collections.CollectionsUtils;
 
 import java.util.*;

calculatorpp-core/src/main/java/org/solovyev/android/calculator/text/DummyTextProcessor.java

@@ -4,10 +4,11 @@
  * or visit http://se.solovyev.org
  */
 
-package org.solovyev.android.calculator.model;
+package org.solovyev.android.calculator.text;
 
 import jscl.math.Generic;
 import org.jetbrains.annotations.NotNull;
+import org.solovyev.android.calculator.CalculatorParseException;
 
 /**
  * User: serso

calculatorpp-core/src/main/java/org/solovyev/android/calculator/text/FromJsclSimplifyTextProcessor.java

@@ -1,11 +1,11 @@
-package org.solovyev.android.calculator.model;
+package org.solovyev.android.calculator.text;
 
 import jscl.math.Generic;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.solovyev.android.calculator.CalculatorLocator;
 import org.solovyev.android.calculator.CalculatorLocatorImpl;
 import org.solovyev.android.calculator.math.MathType;
+import org.solovyev.android.calculator.CalculatorParseException;
 
 import java.util.Arrays;
 import java.util.List;

calculatorpp-core/src/main/java/org/solovyev/android/calculator/text/TextProcessor.java

@@ -1,6 +1,7 @@
-package org.solovyev.android.calculator.model;
+package org.solovyev.android.calculator.text;
 
 import org.jetbrains.annotations.NotNull;
+import org.solovyev.android.calculator.CalculatorParseException;
 
 /**
  * User: serso