Module separation

calculatorpp-core/pom.xml

@@ -35,6 +35,11 @@
             <artifactId>jscl</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.simpleframework</groupId>
+            <artifactId>simple-xml</artifactId>
+        </dependency>
+
     </dependencies>
 
     

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

@@ -6,7 +6,6 @@
 
 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.Transient;

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.CalculatorParseException;
-import org.solovyev.android.calculator.model.TextProcessor;
+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.text.DummyTextProcessor;
-import org.solovyev.android.calculator.model.FromJsclSimplifyTextProcessor;
+import org.solovyev.android.calculator.text.FromJsclSimplifyTextProcessor;
-import org.solovyev.android.calculator.model.TextProcessor;
+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

calculatorpp/pom.xml

@@ -102,17 +102,6 @@
         <dependency>
             <groupId>org.simpleframework</groupId>
             <artifactId>simple-xml</artifactId>
-            <version>2.6.1</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>stax-api</artifactId>
-                    <groupId>stax</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>xpp3</artifactId>
-                    <groupId>xpp3</groupId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>

calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorDisplay.java

@@ -18,8 +18,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.solovyev.android.calculator.jscl.JsclOperation;
 import org.solovyev.android.calculator.model.CalculatorEngine;
-import org.solovyev.android.calculator.model.CalculatorParseException;
+import org.solovyev.android.calculator.text.TextProcessor;
-import org.solovyev.android.calculator.model.TextProcessor;
 import org.solovyev.android.calculator.model.ToJsclTextProcessor;
 import org.solovyev.android.calculator.view.NumeralBaseConverterDialog;
 import org.solovyev.android.calculator.view.TextHighlighter;

calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorEditor.java

@@ -16,8 +16,7 @@ import android.view.ContextMenu;
 import android.widget.EditText;
 import org.jetbrains.annotations.NotNull;
 import org.solovyev.android.calculator.model.CalculatorEngine;
-import org.solovyev.android.calculator.model.CalculatorParseException;
+import org.solovyev.android.calculator.text.TextProcessor;
-import org.solovyev.android.calculator.model.TextProcessor;
 import org.solovyev.android.calculator.view.TextHighlighter;
 import org.solovyev.common.collections.CollectionsUtils;
 

calculatorpp/src/main/java/org/solovyev/android/calculator/CalculatorModel.java

@@ -27,7 +27,6 @@ import org.solovyev.android.calculator.jscl.JsclOperation;
 import org.solovyev.android.calculator.math.MathType;
 import org.solovyev.android.calculator.model.CalculatorEngine;
 import org.solovyev.android.calculator.model.CalculatorEvalException;
-import org.solovyev.android.calculator.model.CalculatorParseException;
 import org.solovyev.android.history.HistoryControl;
 import org.solovyev.android.menu.AMenuBuilder;
 import org.solovyev.android.menu.MenuImpl;

calculatorpp/src/main/java/org/solovyev/android/calculator/model/CalculatorEngine.java

@@ -16,9 +16,11 @@ import jscl.text.ParseInterruptedException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.solovyev.android.calculator.CalculatorApplication;
+import org.solovyev.android.calculator.CalculatorParseException;
 import org.solovyev.android.calculator.JCalculatorEngine;
 import org.solovyev.android.calculator.R;
 import org.solovyev.android.calculator.jscl.JsclOperation;
+import org.solovyev.android.calculator.text.TextProcessor;
 import org.solovyev.android.msg.AndroidMessage;
 import org.solovyev.android.prefs.BooleanPreference;
 import org.solovyev.android.prefs.Preference;

calculatorpp/src/main/java/org/solovyev/android/calculator/model/ToJsclTextProcessor.java

@@ -9,7 +9,9 @@ package org.solovyev.android.calculator.model;
 import jscl.math.function.IConstant;
 import org.jetbrains.annotations.NotNull;
 import org.solovyev.android.calculator.CalculatorApplication;
+import org.solovyev.android.calculator.CalculatorParseException;
 import org.solovyev.android.calculator.R;
+import org.solovyev.android.calculator.text.TextProcessor;
 import org.solovyev.android.msg.AndroidMessage;
 import org.solovyev.common.StartsWithFinder;
 import org.solovyev.android.calculator.math.MathType;

calculatorpp/src/main/java/org/solovyev/android/calculator/plot/CalculatorPlotActivity.java

@@ -35,7 +35,7 @@ import org.achartengine.tools.ZoomListener;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.solovyev.android.calculator.R;
-import org.solovyev.android.calculator.model.CalculatorParseException;
+import org.solovyev.android.calculator.CalculatorParseException;
 import org.solovyev.android.calculator.model.PreparedExpression;
 import org.solovyev.android.calculator.model.ToJsclTextProcessor;
 import org.solovyev.common.MutableObject;

calculatorpp/src/main/java/org/solovyev/android/calculator/view/NumeralBaseConverterDialog.java

@@ -12,7 +12,7 @@ import org.solovyev.android.calculator.AndroidNumeralBase;
 import org.solovyev.android.calculator.CalculatorModel;
 import org.solovyev.android.calculator.R;
 import org.solovyev.android.calculator.model.CalculatorEngine;
-import org.solovyev.android.calculator.model.CalculatorParseException;
+import org.solovyev.android.calculator.CalculatorParseException;
 import org.solovyev.android.calculator.model.ToJsclTextProcessor;
 import org.solovyev.common.MutableObject;
 import org.solovyev.common.text.StringUtils;

calculatorpp/src/main/java/org/solovyev/android/calculator/view/TextHighlighter.java

@@ -9,8 +9,10 @@ package org.solovyev.android.calculator.view;
 import jscl.MathContext;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.solovyev.android.calculator.CalculatorParseException;
 import org.solovyev.android.calculator.math.MathType;
 import org.solovyev.android.calculator.model.*;
+import org.solovyev.android.calculator.text.TextProcessor;
 import org.solovyev.common.MutableObject;
 
 import java.util.HashMap;

calculatorpp/src/test/java/org/solovyev/android/calculator/TextHighlighterTest.java

@@ -12,7 +12,7 @@ import jscl.NumeralBase;
 import junit.framework.Assert;
 import org.junit.Test;
 import org.solovyev.android.calculator.model.CalculatorEngine;
-import org.solovyev.android.calculator.model.TextProcessor;
+import org.solovyev.android.calculator.text.TextProcessor;
 import org.solovyev.android.calculator.view.TextHighlighter;
 
 import java.util.Date;

calculatorpp/src/test/java/org/solovyev/android/calculator/model/CalculatorEngineTest.java

@@ -15,6 +15,7 @@ import jscl.math.function.CustomFunction;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.solovyev.android.calculator.CalculatorParseException;
 import org.solovyev.android.calculator.jscl.JsclOperation;
 
 import java.text.DecimalFormatSymbols;

calculatorpp/src/test/java/org/solovyev/android/calculator/model/FromJsclSimplifyTextProcessorTest.java

@@ -3,6 +3,7 @@ package org.solovyev.android.calculator.model;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.solovyev.android.calculator.text.FromJsclSimplifyTextProcessor;
 
 import java.text.DecimalFormatSymbols;
 

calculatorpp/src/test/java/org/solovyev/android/calculator/model/NumeralBaseTest.java

@@ -10,6 +10,7 @@ import org.jetbrains.annotations.NotNull;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.solovyev.android.calculator.CalculatorParseException;
 import org.solovyev.android.calculator.jscl.JsclOperation;
 import org.solovyev.common.Converter;
 

calculatorpp/src/test/java/org/solovyev/android/calculator/model/ToJsclTextProcessorTest.java

@@ -11,6 +11,8 @@ import jscl.NumeralBase;
 import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import org.solovyev.android.calculator.CalculatorParseException;
+import org.solovyev.android.calculator.text.TextProcessor;
 
 /**
  * User: serso

pom.xml

@@ -122,6 +122,22 @@
                 <version>11.0.2</version>
             </dependency>
 
+            <dependency>
+                <groupId>org.simpleframework</groupId>
+                <artifactId>simple-xml</artifactId>
+                <version>2.6.1</version>
+                <exclusions>
+                    <exclusion>
+                        <artifactId>stax-api</artifactId>
+                        <groupId>stax</groupId>
+                    </exclusion>
+                    <exclusion>
+                        <artifactId>xpp3</artifactId>
+                        <groupId>xpp3</groupId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>