From 07dfdab9af8754eed21b4bfa7cec21f1e2b6d023 Mon Sep 17 00:00:00 2001
From: Sergey Solovyev <se.solovyev@gmail.com>
Date: Sun, 15 Jan 2012 02:29:53 +0400
Subject: [PATCH] refactor

---
 pom.xml                                                |  2 +-
 res/xml/main_preferences.xml                           |  4 ++--
 .../android/calculator/CalculatorActivity.java         |  4 ++--
 .../solovyev/android/calculator/model/AFunction.java   |  2 +-
 .../android/calculator/model/CalculatorEngine.java     | 10 +++++-----
 .../org/solovyev/common/FloatIntervalMapperTest.java   |  3 ++-
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/pom.xml b/pom.xml
index 603af87e..75994b9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
 		<dependency>
 			<groupId>org.solovyev</groupId>
 			<artifactId>common</artifactId>
-			<version>0.2</version>
+			<version>0.3</version>
 		</dependency>
 
 		<dependency>
diff --git a/res/xml/main_preferences.xml b/res/xml/main_preferences.xml
index 90061590..91f2e057 100644
--- a/res/xml/main_preferences.xml
+++ b/res/xml/main_preferences.xml
@@ -114,7 +114,7 @@
 				a:title="@string/c_calc_use_back_button_as_prev_title"
 				a:defaultValue="false"/>
 
-<!--	  <org.solovyev.android.view.prefs.FloatRangeSeekBarPreference
+<!--	  <org.solovyev.android.prefs.FloatRangeSeekBarPreference
 			  a:key="@string/p_drag_duration_key"
 			  a:title="Duration of drag event"
 			  a:text=" ms"
@@ -122,7 +122,7 @@
 			  range:steps="10"
 			  range:boundaries="5;4000"/>
 
-	  <org.solovyev.android.view.prefs.FloatRangeSeekBarPreference
+	  <org.solovyev.android.prefs.FloatRangeSeekBarPreference
 			  a:key="@string/p_drag_angle_key"
 			  a:title="Angle of drag event"
 			  a:text=" degrees"
diff --git a/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java b/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
index 207984a7..19b97d82 100644
--- a/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
+++ b/src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
@@ -40,8 +40,8 @@ import org.solovyev.android.calculator.model.CalculatorEngine;
 import org.solovyev.android.calculator.view.AngleUnitsButton;
 import org.solovyev.android.calculator.view.NumeralBasesButton;
 import org.solovyev.android.view.FontSizeAdjuster;
-import org.solovyev.android.view.prefs.IntegerPreference;
-import org.solovyev.android.view.prefs.Preference;
+import org.solovyev.android.prefs.IntegerPreference;
+import org.solovyev.android.prefs.Preference;
 import org.solovyev.android.view.widgets.*;
 import org.solovyev.android.view.widgets.DragEvent;
 import org.solovyev.common.utils.Announcer;
diff --git a/src/main/java/org/solovyev/android/calculator/model/AFunction.java b/src/main/java/org/solovyev/android/calculator/model/AFunction.java
index 68a9ac7d..3f87cfcc 100644
--- a/src/main/java/org/solovyev/android/calculator/model/AFunction.java
+++ b/src/main/java/org/solovyev/android/calculator/model/AFunction.java
@@ -10,8 +10,8 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.simpleframework.xml.Element;
 import org.simpleframework.xml.Root;
+import org.solovyev.common.text.StringMapper;
 import org.solovyev.common.utils.CollectionsUtils;
-import org.solovyev.common.utils.StringMapper;
 
 import java.util.List;
 
diff --git a/src/main/java/org/solovyev/android/calculator/model/CalculatorEngine.java b/src/main/java/org/solovyev/android/calculator/model/CalculatorEngine.java
index 33555938..dcc659a7 100644
--- a/src/main/java/org/solovyev/android/calculator/model/CalculatorEngine.java
+++ b/src/main/java/org/solovyev/android/calculator/model/CalculatorEngine.java
@@ -16,12 +16,12 @@ import jscl.text.ParseInterruptedException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.solovyev.android.calculator.jscl.JsclOperation;
-import org.solovyev.android.view.prefs.BooleanPreference;
-import org.solovyev.android.view.prefs.EnumMapper;
-import org.solovyev.android.view.prefs.Preference;
-import org.solovyev.android.view.prefs.StringPreference;
-import org.solovyev.common.NumberMapper;
+import org.solovyev.android.prefs.BooleanPreference;
+import org.solovyev.common.text.EnumMapper;
+import org.solovyev.android.prefs.Preference;
+import org.solovyev.android.prefs.StringPreference;
 import org.solovyev.common.msg.MessageRegistry;
+import org.solovyev.common.text.NumberMapper;
 import org.solovyev.common.utils.MutableObject;
 import org.solovyev.common.utils.StringUtils;
 
diff --git a/src/test/java/org/solovyev/common/FloatIntervalMapperTest.java b/src/test/java/org/solovyev/common/FloatIntervalMapperTest.java
index 2fc0f46c..fb91e359 100644
--- a/src/test/java/org/solovyev/common/FloatIntervalMapperTest.java
+++ b/src/test/java/org/solovyev/common/FloatIntervalMapperTest.java
@@ -2,8 +2,9 @@ package org.solovyev.common;
 
 import junit.framework.Assert;
 import org.junit.Test;
+import org.solovyev.common.text.Mapper;
+import org.solovyev.common.text.NumberIntervalMapper;
 import org.solovyev.common.utils.Interval;
-import org.solovyev.common.utils.Mapper;
 import org.solovyev.common.utils.NumberInterval;
 
 /**