TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
Sergey Solovyev 2012-01-15 02:29:53 +04:00
parent 495ce8a8e6
commit 07dfdab9af
6 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -36,7 +36,7 @@
<dependency> <dependency>
<groupId>org.solovyev</groupId> <groupId>org.solovyev</groupId>
<artifactId>common</artifactId> <artifactId>common</artifactId>
<version>0.2</version> <version>0.3</version>
</dependency> </dependency>
<dependency> <dependency>

4
res/xml/main_preferences.xml
View File

@ -114,7 +114,7 @@
a:title="@string/c_calc_use_back_button_as_prev_title" a:title="@string/c_calc_use_back_button_as_prev_title"
a:defaultValue="false"/> a:defaultValue="false"/>
<!-- <org.solovyev.android.view.prefs.FloatRangeSeekBarPreference <!-- <org.solovyev.android.prefs.FloatRangeSeekBarPreference
a:key="@string/p_drag_duration_key" a:key="@string/p_drag_duration_key"
a:title="Duration of drag event" a:title="Duration of drag event"
a:text=" ms" a:text=" ms"
@ -122,7 +122,7 @@
range:steps="10" range:steps="10"
range:boundaries="5;4000"/> range:boundaries="5;4000"/>
<org.solovyev.android.view.prefs.FloatRangeSeekBarPreference <org.solovyev.android.prefs.FloatRangeSeekBarPreference
a:key="@string/p_drag_angle_key" a:key="@string/p_drag_angle_key"
a:title="Angle of drag event" a:title="Angle of drag event"
a:text=" degrees" a:text=" degrees"

4
src/main/java/org/solovyev/android/calculator/CalculatorActivity.java
View File

@ -40,8 +40,8 @@ import org.solovyev.android.calculator.model.CalculatorEngine;
import org.solovyev.android.calculator.view.AngleUnitsButton; import org.solovyev.android.calculator.view.AngleUnitsButton;
import org.solovyev.android.calculator.view.NumeralBasesButton; import org.solovyev.android.calculator.view.NumeralBasesButton;
import org.solovyev.android.view.FontSizeAdjuster; import org.solovyev.android.view.FontSizeAdjuster;
import org.solovyev.android.view.prefs.IntegerPreference; import org.solovyev.android.prefs.IntegerPreference;
import org.solovyev.android.view.prefs.Preference; import org.solovyev.android.prefs.Preference;
import org.solovyev.android.view.widgets.*; import org.solovyev.android.view.widgets.*;
import org.solovyev.android.view.widgets.DragEvent; import org.solovyev.android.view.widgets.DragEvent;
import org.solovyev.common.utils.Announcer; import org.solovyev.common.utils.Announcer;

2
src/main/java/org/solovyev/android/calculator/model/AFunction.java
View File

@ -10,8 +10,8 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.simpleframework.xml.Element; import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root; import org.simpleframework.xml.Root;
import org.solovyev.common.text.StringMapper;
import org.solovyev.common.utils.CollectionsUtils; import org.solovyev.common.utils.CollectionsUtils;
import org.solovyev.common.utils.StringMapper;
import java.util.List; import java.util.List;

10
src/main/java/org/solovyev/android/calculator/model/CalculatorEngine.java
View File

@ -16,12 +16,12 @@ import jscl.text.ParseInterruptedException;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import org.solovyev.android.calculator.jscl.JsclOperation; import org.solovyev.android.calculator.jscl.JsclOperation;
import org.solovyev.android.view.prefs.BooleanPreference; import org.solovyev.android.prefs.BooleanPreference;
import org.solovyev.android.view.prefs.EnumMapper; import org.solovyev.common.text.EnumMapper;
import org.solovyev.android.view.prefs.Preference; import org.solovyev.android.prefs.Preference;
import org.solovyev.android.view.prefs.StringPreference; import org.solovyev.android.prefs.StringPreference;
import org.solovyev.common.NumberMapper;
import org.solovyev.common.msg.MessageRegistry; import org.solovyev.common.msg.MessageRegistry;
import org.solovyev.common.text.NumberMapper;
import org.solovyev.common.utils.MutableObject; import org.solovyev.common.utils.MutableObject;
import org.solovyev.common.utils.StringUtils; import org.solovyev.common.utils.StringUtils;

3
src/test/java/org/solovyev/common/FloatIntervalMapperTest.java
View File

@ -2,8 +2,9 @@ package org.solovyev.common;
import junit.framework.Assert; import junit.framework.Assert;
import org.junit.Test; 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.Interval;
import org.solovyev.common.utils.Mapper;
import org.solovyev.common.utils.NumberInterval; import org.solovyev.common.utils.NumberInterval;
/** /**