Calculator++ core module

calculatorpp-core/pom.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.solovyev.android</groupId>
+        <artifactId>calculatorpp-parent</artifactId>
+        <version>1.3.1</version>
+    </parent>
+
+    <groupId>org.solovyev.android</groupId>
+    <artifactId>calculatorpp-core</artifactId>
+    <version>1.3.1</version>
+    <name>Calculator++ Application Core</name>
+
+    <packaging>jar</packaging>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.intellij</groupId>
+            <artifactId>annotations</artifactId>
+        </dependency>
+
+    </dependencies>
+
+    
+</project>

calculatorpp-core/src/main/java/org/solovyev/math/units/Unit.java

@@ -1,4 +1,4 @@
-package org.solovyev.android;
+package org.solovyev.math.units;
 
 import org.jetbrains.annotations.NotNull;
 

calculatorpp-core/src/main/java/org/solovyev/math/units/UnitConverter.java

@@ -1,4 +1,4 @@
-package org.solovyev.android;
+package org.solovyev.math.units;
 
 import org.jetbrains.annotations.NotNull;
 

calculatorpp-core/src/main/java/org/solovyev/math/units/UnitImpl.java

@@ -1,4 +1,4 @@
-package org.solovyev.android;
+package org.solovyev.math.units;
 
 import org.jetbrains.annotations.NotNull;
 

calculatorpp-core/src/main/java/org/solovyev/math/units/UnitType.java

@@ -1,4 +1,4 @@
-package org.solovyev.android;
+package org.solovyev.math.units;
 
 import org.jetbrains.annotations.NotNull;
 

calculatorpp-service/pom.xml

@@ -22,7 +22,6 @@
         <dependency>
             <groupId>com.intellij</groupId>
             <artifactId>annotations</artifactId>
-            <version>7.0.3</version>
         </dependency>
 
         <dependency>

calculatorpp/pom.xml

@@ -19,6 +19,13 @@
     <dependencies>
 
         <!-- OWN -->
+
+        <dependency>
+            <groupId>org.solovyev.android</groupId>
+            <artifactId>calculatorpp-core</artifactId>
+            <version>1.3.1</version>
+        </dependency>
+
         <dependency>
             <groupId>org.solovyev</groupId>
             <artifactId>common-core</artifactId>
@@ -92,13 +99,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.8.2</version>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>net.sf.opencsv</groupId>
             <artifactId>opencsv</artifactId>
@@ -147,10 +147,15 @@
             <version>11.0.2</version>
         </dependency>
 
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>com.intellij</groupId>
             <artifactId>annotations</artifactId>
-            <version>7.0.3</version>
         </dependency>
 
     </dependencies>

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

@@ -3,10 +3,10 @@ package org.solovyev.android.calculator;
 import android.app.Activity;
 import jscl.NumeralBase;
 import org.jetbrains.annotations.NotNull;
-import org.solovyev.android.Unit;
-import org.solovyev.android.UnitConverter;
-import org.solovyev.android.UnitImpl;
-import org.solovyev.android.UnitType;
+import org.solovyev.math.units.Unit;
+import org.solovyev.math.units.UnitConverter;
+import org.solovyev.math.units.UnitImpl;
+import org.solovyev.math.units.UnitType;
 import org.solovyev.android.view.drag.DirectionDragButton;
 import org.solovyev.android.view.drag.DragDirection;
 

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

@@ -6,8 +6,8 @@ import android.view.View;
 import android.view.WindowManager;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.solovyev.android.Unit;
-import org.solovyev.android.UnitImpl;
+import org.solovyev.math.units.Unit;
+import org.solovyev.math.units.UnitImpl;
 import org.solovyev.android.calculator.AndroidNumeralBase;
 import org.solovyev.android.calculator.CalculatorModel;
 import org.solovyev.android.calculator.R;

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

@@ -10,10 +10,10 @@ import android.view.ViewGroup;
 import android.widget.*;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.solovyev.android.Unit;
-import org.solovyev.android.UnitConverter;
-import org.solovyev.android.UnitImpl;
-import org.solovyev.android.UnitType;
+import org.solovyev.math.units.Unit;
+import org.solovyev.math.units.UnitConverter;
+import org.solovyev.math.units.UnitImpl;
+import org.solovyev.math.units.UnitType;
 import org.solovyev.android.calculator.R;
 import org.solovyev.android.view.ViewBuilder;
 import org.solovyev.android.view.ViewFromLayoutBuilder;

calculatorpp/src/test/java/org/solovyev/android/AndroidNumeralBaseTest.java

@@ -4,6 +4,8 @@ import junit.framework.Assert;
 import org.jetbrains.annotations.NotNull;
 import org.junit.Test;
 import org.solovyev.android.calculator.AndroidNumeralBase;
+import org.solovyev.math.units.Unit;
+import org.solovyev.math.units.UnitConverter;
 
 import java.util.Date;
 import java.util.Random;

pom.xml

@@ -15,6 +15,7 @@
 		<module>calculatorpp</module>
         <module>calculatorpp-service</module>
         <module>calculatorpp-test</module>
+        <module>calculatorpp-core</module>
     </modules>
 
     <properties>
@@ -81,7 +82,13 @@
             <dependency>
                 <groupId>junit</groupId>
                 <artifactId>junit</artifactId>
-                <version>4.8.1</version>
+                <version>4.8.2</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.intellij</groupId>
+                <artifactId>annotations</artifactId>
+                <version>7.0.3</version>
             </dependency>
 
             <dependency>