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:35:06 +04:00
parent 07dfdab9af
commit 7101258662
51 changed files with 75 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,6 +31,7 @@ import net.robotmedia.billing.IBillingObserver;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.solovyev.android.AndroidUtils;
import org.solovyev.android.FontSizeAdjuster;
import org.solovyev.android.ResourceCache;
import org.solovyev.android.calculator.about.CalculatorReleaseNotesActivity;
import org.solovyev.android.calculator.history.CalculatorHistory;
@@ -39,11 +40,9 @@ import org.solovyev.android.calculator.math.MathType;
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.prefs.IntegerPreference;
import org.solovyev.android.prefs.Preference;
import org.solovyev.android.view.widgets.*;
import org.solovyev.android.view.widgets.DragEvent;
import org.solovyev.android.view.*;
import org.solovyev.common.utils.Announcer;
import org.solovyev.common.utils.Point2d;
import org.solovyev.common.utils.StringUtils;
@@ -344,7 +343,7 @@ public class CalculatorActivity extends Activity implements FontSizeAdjuster, Sh
}
@Override
public boolean onDrag(@NotNull DragButton dragButton, @NotNull DragEvent event) {
public boolean onDrag(@NotNull DragButton dragButton, @NotNull org.solovyev.android.view.DragEvent event) {
boolean result = super.onDrag(dragButton, event);
if (result) {

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

@@ -20,7 +20,7 @@ import org.solovyev.android.calculator.model.CalculatorEngine;
import org.solovyev.android.calculator.model.CalculatorParseException;
import org.solovyev.android.calculator.model.TextProcessor;
import org.solovyev.android.calculator.view.TextHighlighter;
import org.solovyev.android.view.AMenuItem;
import org.solovyev.android.menu.AMenuItem;
import org.solovyev.android.view.AutoResizeTextView;
import java.util.HashSet;

5
src/main/java/org/solovyev/android/calculator/CalculatorModel.java
View File

@@ -22,6 +22,8 @@ import jscl.math.function.Constant;
import jscl.math.function.IConstant;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.solovyev.android.CursorControl;
import org.solovyev.android.HistoryControl;
import org.solovyev.android.calculator.history.CalculatorHistory;
import org.solovyev.android.calculator.history.CalculatorHistoryState;
import org.solovyev.android.calculator.history.TextViewEditorAdapter;
@@ -30,7 +32,8 @@ 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.view.*;
import org.solovyev.android.menu.AMenuBuilder;
import org.solovyev.android.menu.AMenuItem;
import org.solovyev.common.msg.Message;
import org.solovyev.common.utils.CollectionsUtils;
import org.solovyev.common.utils.MutableObject;

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

@@ -20,7 +20,7 @@ import net.robotmedia.billing.model.Transaction;
import org.solovyev.android.AndroidUtils;
import org.solovyev.android.ads.AdsController;
import org.solovyev.android.calculator.model.CalculatorEngine;
import org.solovyev.android.view.widgets.VibratorContainer;
import org.solovyev.android.view.VibratorContainer;
/**
* User: serso

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

@@ -7,11 +7,11 @@ package org.solovyev.android.calculator;
import android.view.MotionEvent;
import org.jetbrains.annotations.NotNull;
import org.solovyev.android.view.*;
import org.solovyev.android.view.widgets.DirectionDragButton;
import org.solovyev.android.view.widgets.DragButton;
import org.solovyev.android.view.widgets.DragDirection;
import org.solovyev.android.view.widgets.SimpleOnDragListener;
import org.solovyev.android.CursorControl;
import org.solovyev.android.view.DirectionDragButton;
import org.solovyev.android.view.DragButton;
import org.solovyev.android.view.DragDirection;
import org.solovyev.android.view.SimpleOnDragListener;
import org.solovyev.common.utils.Point2d;
/**

8
src/main/java/org/solovyev/android/calculator/DigitButtonDragProcessor.java
View File

@@ -7,10 +7,10 @@ package org.solovyev.android.calculator;
import android.view.MotionEvent;
import org.jetbrains.annotations.NotNull;
import org.solovyev.android.view.widgets.DirectionDragButton;
import org.solovyev.android.view.widgets.DragButton;
import org.solovyev.android.view.widgets.DragDirection;
import org.solovyev.android.view.widgets.SimpleOnDragListener;
import org.solovyev.android.view.DirectionDragButton;
import org.solovyev.android.view.DragDirection;
import org.solovyev.android.view.DragButton;
import org.solovyev.android.view.SimpleOnDragListener;
import org.solovyev.common.utils.Point2d;
/**

8
src/main/java/org/solovyev/android/calculator/EvalDragProcessor.java
View File

@@ -8,10 +8,10 @@ package org.solovyev.android.calculator;
import android.view.MotionEvent;
import org.jetbrains.annotations.NotNull;
import org.solovyev.android.view.widgets.DirectionDragButton;
import org.solovyev.android.view.widgets.DragButton;
import org.solovyev.android.view.widgets.DragDirection;
import org.solovyev.android.view.widgets.SimpleOnDragListener;
import org.solovyev.android.view.DirectionDragButton;
import org.solovyev.android.view.DragButton;
import org.solovyev.android.view.DragDirection;
import org.solovyev.android.view.SimpleOnDragListener;
import org.solovyev.common.utils.Point2d;
/**

2
src/main/java/org/solovyev/android/calculator/about/CalculatorAboutTabActivity.java
View File

@@ -10,8 +10,8 @@ import android.os.Bundle;
import android.widget.TabHost;
import org.jetbrains.annotations.Nullable;
import org.solovyev.android.AndroidUtils;
import org.solovyev.android.LastTabSaver;
import org.solovyev.android.calculator.R;
import org.solovyev.android.view.LastTabSaver;
/**
* User: serso

2
src/main/java/org/solovyev/android/calculator/help/CalculatorHelpTabActivity.java
View File

@@ -14,8 +14,8 @@ import android.widget.TabHost;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.solovyev.android.AndroidUtils;
import org.solovyev.android.LastTabSaver;
import org.solovyev.android.calculator.R;
import org.solovyev.android.view.LastTabSaver;
/**
* User: serso

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

@@ -23,8 +23,8 @@ import org.solovyev.android.ads.AdsController;
import org.solovyev.android.calculator.CalculatorModel;
import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.jscl.JsclOperation;
import org.solovyev.android.view.AMenuBuilder;
import org.solovyev.android.view.MenuImpl;
import org.solovyev.android.menu.AMenuBuilder;
import org.solovyev.android.menu.MenuImpl;
import org.solovyev.common.utils.*;
import java.util.ArrayList;

2
src/main/java/org/solovyev/android/calculator/history/CalculatorHistoryTabActivity.java
View File

@@ -11,8 +11,8 @@ import android.os.Bundle;
import android.widget.TabHost;
import org.jetbrains.annotations.Nullable;
import org.solovyev.android.AndroidUtils;
import org.solovyev.android.LastTabSaver;
import org.solovyev.android.calculator.R;
import org.solovyev.android.view.LastTabSaver;
/**
* User: serso

2
src/main/java/org/solovyev/android/calculator/history/HistoryItemMenuItem.java
View File

@@ -19,7 +19,7 @@ import android.widget.TextView;
import android.widget.Toast;
import org.jetbrains.annotations.NotNull;
import org.solovyev.android.calculator.R;
import org.solovyev.android.view.AMenuItem;
import org.solovyev.android.menu.AMenuItem;
import org.solovyev.common.utils.StringUtils;
/**

6
src/main/java/org/solovyev/android/calculator/math/edit/AbstractMathEntityListActivity.java
View File

@@ -22,9 +22,9 @@ import org.solovyev.android.ads.AdsController;
import org.solovyev.android.calculator.CalculatorModel;
import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.model.AndroidMathRegistry;
import org.solovyev.android.view.AMenuBuilder;
import org.solovyev.android.view.AMenuItem;
import org.solovyev.android.view.MenuImpl;
import org.solovyev.android.menu.AMenuBuilder;
import org.solovyev.android.menu.AMenuItem;
import org.solovyev.android.menu.MenuImpl;
import org.solovyev.common.math.MathEntity;
import org.solovyev.common.utils.EqualsTool;
import org.solovyev.common.utils.Filter;

2
src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsActivity.java
View File

@@ -15,7 +15,7 @@ import org.jetbrains.annotations.NotNull;
import org.solovyev.android.calculator.CalculatorModel;
import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.model.CalculatorEngine;
import org.solovyev.android.view.AMenuItem;
import org.solovyev.android.menu.AMenuItem;
import org.solovyev.common.utils.StringUtils;
import java.util.ArrayList;

2
src/main/java/org/solovyev/android/calculator/math/edit/CalculatorFunctionsTabActivity.java
View File

@@ -11,9 +11,9 @@ import android.os.Bundle;
import android.widget.TabHost;
import org.jetbrains.annotations.Nullable;
import org.solovyev.android.AndroidUtils;
import org.solovyev.android.LastTabSaver;
import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.model.AndroidFunctionsMathRegistry;
import org.solovyev.android.view.LastTabSaver;
/**
* User: serso

2
src/main/java/org/solovyev/android/calculator/math/edit/CalculatorOperatorsActivity.java
View File

@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
import org.solovyev.android.calculator.CalculatorModel;
import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.model.CalculatorEngine;
import org.solovyev.android.view.AMenuItem;
import org.solovyev.android.menu.AMenuItem;
import org.solovyev.common.utils.StringUtils;
import java.util.ArrayList;

2
src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsActivity.java
View File

@@ -26,7 +26,7 @@ import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.math.MathType;
import org.solovyev.android.calculator.model.CalculatorEngine;
import org.solovyev.android.calculator.model.Var;
import org.solovyev.android.view.AMenuItem;
import org.solovyev.android.menu.AMenuItem;
import org.solovyev.common.utils.CollectionsUtils;
import org.solovyev.common.utils.Finder;
import org.solovyev.common.utils.StringUtils;

2
src/main/java/org/solovyev/android/calculator/math/edit/CalculatorVarsTabActivity.java
View File

@@ -11,9 +11,9 @@ import android.os.Bundle;
import android.widget.TabHost;
import org.jetbrains.annotations.Nullable;
import org.solovyev.android.AndroidUtils;
import org.solovyev.android.LastTabSaver;
import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.model.VarCategory;
import org.solovyev.android.view.LastTabSaver;
/**
* User: serso

2
src/main/java/org/solovyev/android/calculator/view/AngleUnitsButton.java
View File

@@ -14,7 +14,7 @@ import android.util.AttributeSet;
import org.jetbrains.annotations.NotNull;
import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.model.CalculatorEngine;
import org.solovyev.android.view.widgets.DirectionDragButton;
import org.solovyev.android.view.DirectionDragButton;
/**
* User: serso

2
src/main/java/org/solovyev/android/calculator/view/NumeralBasesButton.java
View File

@@ -14,7 +14,7 @@ import android.util.AttributeSet;
import org.jetbrains.annotations.NotNull;
import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.model.CalculatorEngine;
import org.solovyev.android.view.widgets.DirectionDragButton;
import org.solovyev.android.view.DirectionDragButton;
/**
* User: serso