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

Library update

Browse Source
This commit is contained in:
Sergey Solovyev
2012-09-16 18:25:50 +04:00
parent 024e211dd3
commit 0ca88fb95d
122 changed files with 325 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,11 +46,11 @@ import org.solovyev.android.menu.LayoutActivityMenu;
import org.solovyev.android.prefs.Preference;
import org.solovyev.android.view.ColorButton;
import org.solovyev.android.view.drag.*;
import org.solovyev.common.utils.Announcer;
import org.solovyev.common.utils.EqualsTool;
import org.solovyev.common.utils.Point2d;
import org.solovyev.common.utils.StringUtils;
import org.solovyev.common.utils.history.HistoryAction;
import org.solovyev.common.Announcer;
import org.solovyev.common.equals.EqualsTool;
import org.solovyev.common.math.Point2d;
import org.solovyev.common.text.StringUtils;
import org.solovyev.common.history.HistoryAction;
public class CalculatorActivity extends Activity implements FontSizeAdjuster, SharedPreferences.OnSharedPreferenceChangeListener, ServiceConnection {
@@ -469,7 +469,7 @@ public class CalculatorActivity extends Activity implements FontSizeAdjuster, Sh
dialogShown = showSpecialWindow(preferences, CalculatorPreferences.Gui.notesppAnnounceShown, R.layout.notespp_announce, R.id.notespp_announce);
}
ResourceCache.instance.init(R.id.class, this);
ResourceCache.instance.initCaptions(this, R.id.class);
initialized = true;
}

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

@@ -15,7 +15,7 @@ import org.solovyev.android.calculator.math.edit.CalculatorOperatorsActivity;
import org.solovyev.android.calculator.math.edit.CalculatorVarsTabActivity;
import org.solovyev.android.calculator.math.edit.CalculatorVarsActivity;
import org.solovyev.android.calculator.plot.CalculatorPlotActivity;
import org.solovyev.common.utils.StringUtils;
import org.solovyev.common.text.StringUtils;
/**
* User: serso

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

@@ -27,8 +27,8 @@ import org.solovyev.android.calculator.view.UnitConverterViewBuilder;
import org.solovyev.android.menu.AMenuItem;
import org.solovyev.android.menu.LabeledMenuItem;
import org.solovyev.android.view.AutoResizeTextView;
import org.solovyev.common.utils.CollectionsUtils;
import org.solovyev.common.utils.StringUtils;
import org.solovyev.common.collections.CollectionsUtils;
import org.solovyev.common.text.StringUtils;
import java.util.HashSet;
import java.util.Set;

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

@@ -19,7 +19,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.common.utils.CollectionsUtils;
import org.solovyev.common.collections.CollectionsUtils;
/**
* User: serso

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

@@ -13,7 +13,7 @@ import org.solovyev.android.menu.IdentifiableMenuItem;
* Date: 4/23/12
* Time: 2:25 PM
*/
enum CalculatorMenu implements IdentifiableMenuItem {
enum CalculatorMenu implements IdentifiableMenuItem<MenuItem> {
settings(R.id.main_menu_item_settings){
@Override

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

@@ -31,10 +31,10 @@ 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;
import org.solovyev.common.MutableObject;
import org.solovyev.common.history.HistoryAction;
import org.solovyev.common.msg.Message;
import org.solovyev.common.utils.MutableObject;
import org.solovyev.common.utils.StringUtils;
import org.solovyev.common.utils.history.HistoryAction;
import org.solovyev.common.text.StringUtils;
import java.util.ArrayList;
import java.util.List;
@@ -329,19 +329,19 @@ public enum CalculatorModel implements CursorControl, HistoryControl<CalculatorH
}
@Override
public void doHistoryAction(@NotNull HistoryAction historyAction) {
synchronized (CalculatorHistory.instance) {
if (CalculatorHistory.instance.isActionAvailable(historyAction)) {
final CalculatorHistoryState newState = CalculatorHistory.instance.doAction(historyAction, getCurrentHistoryState());
if (newState != null) {
setCurrentHistoryState(newState);
}
}
}
}
@Override
public void doHistoryAction(@NotNull HistoryAction historyAction) {
synchronized (CalculatorHistory.instance) {
if (CalculatorHistory.instance.isActionAvailable(historyAction)) {
final CalculatorHistoryState newState = CalculatorHistory.instance.doAction(historyAction, getCurrentHistoryState());
if (newState != null) {
setCurrentHistoryState(newState);
}
}
}
}
@Override
@Override
public void setCurrentHistoryState(@NotNull CalculatorHistoryState editorHistoryState) {
synchronized (CalculatorHistory.instance) {
Log.d(this.getClass().getName(), "Saved history found: " + editorHistoryState);

6
calculatorpp/src/main/java/org/solovyev/android/calculator/CharacterAtPositionFinder.java
View File

@@ -8,14 +8,14 @@ package org.solovyev.android.calculator;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.solovyev.common.utils.Finder;
import org.solovyev.common.JPredicate;
/**
* User: serso
* Date: 10/3/11
* Time: 12:54 AM
*/
public class CharacterAtPositionFinder implements Finder<Character> {
public class CharacterAtPositionFinder implements JPredicate<Character> {
private int i;
@@ -28,7 +28,7 @@ public class CharacterAtPositionFinder implements Finder<Character> {
}
@Override
public boolean isFound(@Nullable Character s) {
public boolean apply(@Nullable Character s) {
return s != null && s.equals(targetString.charAt(i));
}

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

@@ -12,7 +12,7 @@ import org.solovyev.android.view.drag.DragDirection;
import org.solovyev.android.view.drag.SimpleOnDragListener;
import org.solovyev.android.view.drag.DirectionDragButton;
import org.solovyev.android.view.drag.DragButton;
import org.solovyev.common.utils.Point2d;
import org.solovyev.common.math.Point2d;
/**
* User: serso

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

@@ -11,7 +11,7 @@ import org.solovyev.android.view.drag.DragDirection;
import org.solovyev.android.view.drag.SimpleOnDragListener;
import org.solovyev.android.view.drag.DirectionDragButton;
import org.solovyev.android.view.drag.DragButton;
import org.solovyev.common.utils.Point2d;
import org.solovyev.common.math.Point2d;
/**
* User: serso

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

@@ -12,7 +12,7 @@ import org.solovyev.android.view.drag.DragDirection;
import org.solovyev.android.view.drag.SimpleOnDragListener;
import org.solovyev.android.view.drag.DirectionDragButton;
import org.solovyev.android.view.drag.DragButton;
import org.solovyev.common.utils.Point2d;
import org.solovyev.common.math.Point2d;
/**
* User: serso

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

@@ -18,7 +18,7 @@ import org.solovyev.android.AndroidUtils;
import org.solovyev.android.ResourceCache;
import org.solovyev.android.calculator.CalculatorActivity;
import org.solovyev.android.calculator.R;
import org.solovyev.common.utils.StringUtils;
import org.solovyev.common.text.StringUtils;
/**
* User: serso

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

@@ -25,7 +25,12 @@ import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.jscl.JsclOperation;
import org.solovyev.android.menu.AMenuBuilder;
import org.solovyev.android.menu.MenuImpl;
import org.solovyev.common.utils.*;
import org.solovyev.common.collections.CollectionsUtils;
import org.solovyev.common.equals.Equalizer;
import org.solovyev.common.filter.Filter;
import org.solovyev.common.filter.FilterRule;
import org.solovyev.common.filter.FilterRulesChain;
import org.solovyev.common.text.StringUtils;
import java.util.ArrayList;
import java.util.Collections;

6
calculatorpp/src/main/java/org/solovyev/android/calculator/history/CalculatorHistory.java
View File

@@ -12,9 +12,9 @@ import android.preference.PreferenceManager;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.solovyev.android.calculator.R;
import org.solovyev.common.utils.history.HistoryAction;
import org.solovyev.common.utils.history.HistoryHelper;
import org.solovyev.common.utils.history.SimpleHistoryHelper;
import org.solovyev.common.history.HistoryAction;
import org.solovyev.common.history.HistoryHelper;
import org.solovyev.common.history.SimpleHistoryHelper;
import java.util.ArrayList;
import java.util.Collections;

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

@@ -13,7 +13,7 @@ import android.widget.ArrayAdapter;
import android.widget.TextView;
import org.jetbrains.annotations.NotNull;
import org.solovyev.android.calculator.R;
import org.solovyev.common.utils.StringUtils;
import org.solovyev.common.text.StringUtils;
import java.text.SimpleDateFormat;
import java.util.Date;

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

@@ -20,7 +20,7 @@ import android.widget.Toast;
import org.jetbrains.annotations.NotNull;
import org.solovyev.android.calculator.R;
import org.solovyev.android.menu.LabeledMenuItem;
import org.solovyev.common.utils.StringUtils;
import org.solovyev.common.text.StringUtils;
/**
* User: serso

8
calculatorpp/src/main/java/org/solovyev/android/calculator/math/MathType.java
View File

@@ -10,11 +10,11 @@ import jscl.NumeralBase;
import jscl.math.function.Constants;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.solovyev.common.JPredicate;
import org.solovyev.common.StartsWithFinder;
import org.solovyev.android.calculator.model.CalculatorEngine;
import org.solovyev.android.calculator.model.CalculatorParseException;
import org.solovyev.common.utils.CollectionsUtils;
import org.solovyev.common.utils.Finder;
import org.solovyev.common.collections.CollectionsUtils;
import java.util.*;
@@ -425,7 +425,7 @@ public enum MathType {
}
}
private static class EndsWithFinder implements Finder<String> {
private static class EndsWithFinder implements JPredicate<String> {
private int i;
@@ -437,7 +437,7 @@ public enum MathType {
}
@Override
public boolean isFound(@Nullable String s) {
public boolean apply(@Nullable String s) {
return targetString.subSequence(0, i).toString().endsWith(s);
}

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

@@ -23,14 +23,13 @@ import org.solovyev.android.calculator.CalculatorModel;
import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.model.AndroidMathRegistry;
import org.solovyev.android.menu.AMenuBuilder;
import org.solovyev.android.menu.AMenuItem;
import org.solovyev.android.menu.LabeledMenuItem;
import org.solovyev.android.menu.MenuImpl;
import org.solovyev.common.equals.EqualsTool;
import org.solovyev.common.filter.FilterRule;
import org.solovyev.common.filter.Filter;
import org.solovyev.common.math.MathEntity;
import org.solovyev.common.utils.EqualsTool;
import org.solovyev.common.utils.Filter;
import org.solovyev.common.utils.FilterRule;
import org.solovyev.common.utils.StringUtils;
import org.solovyev.common.text.StringUtils;
import java.util.Arrays;
import java.util.Comparator;
@@ -161,7 +160,7 @@ public abstract class AbstractMathEntityListActivity<T extends MathEntity> exten
return !isInCategory(t);
}
}).filter(result.iterator());
return result;
}

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

@@ -15,9 +15,8 @@ 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.menu.AMenuItem;
import org.solovyev.android.menu.LabeledMenuItem;
import org.solovyev.common.utils.StringUtils;
import org.solovyev.common.text.StringUtils;
import java.util.ArrayList;
import java.util.Arrays;

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

@@ -8,9 +8,8 @@ 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.menu.AMenuItem;
import org.solovyev.android.menu.LabeledMenuItem;
import org.solovyev.common.utils.StringUtils;
import org.solovyev.common.text.StringUtils;
import java.util.ArrayList;
import java.util.Arrays;

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

@@ -27,9 +27,9 @@ 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.menu.LabeledMenuItem;
import org.solovyev.common.utils.CollectionsUtils;
import org.solovyev.common.utils.Finder;
import org.solovyev.common.utils.StringUtils;
import org.solovyev.common.JPredicate;
import org.solovyev.common.collections.CollectionsUtils;
import org.solovyev.common.text.StringUtils;
import java.util.ArrayList;
import java.util.Arrays;
@@ -165,9 +165,9 @@ public class CalculatorVarsActivity extends AbstractMathEntityListActivity<ICons
protected List<IConstant> getMathEntities() {
final List<IConstant> result = new ArrayList<IConstant>(CalculatorEngine.instance.getVarsRegistry().getEntities());
CollectionsUtils.removeAll(result, new Finder<IConstant>() {
CollectionsUtils.removeAll(result, new JPredicate<IConstant>() {
@Override
public boolean isFound(@Nullable IConstant var) {
public boolean apply(@Nullable IConstant var) {
return var != null && CollectionsUtils.contains(var.getName(), MathType.INFINITY_JSCL, MathType.NAN);
}
});

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

@@ -24,7 +24,7 @@ import org.solovyev.android.calculator.model.AndroidMathRegistry;
import org.solovyev.android.calculator.model.CalculatorEngine;
import org.solovyev.android.calculator.model.MathEntityBuilder;
import org.solovyev.common.math.MathEntity;
import org.solovyev.common.utils.StringUtils;
import org.solovyev.common.text.StringUtils;
/**
* User: serso

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

@@ -22,7 +22,7 @@ import org.solovyev.android.calculator.model.AndroidMathRegistry;
import org.solovyev.android.calculator.model.CalculatorEngine;
import org.solovyev.android.calculator.model.MathEntityBuilder;
import org.solovyev.common.math.MathEntity;
import org.solovyev.common.utils.StringUtils;
import org.solovyev.common.text.StringUtils;
/**
* User: serso

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

@@ -10,8 +10,9 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
import org.solovyev.common.collections.CollectionsUtils;
import org.solovyev.common.text.CollectionTransformations;
import org.solovyev.common.text.StringMapper;
import org.solovyev.common.utils.CollectionsUtils;
import java.util.List;
@@ -62,7 +63,7 @@ public class AFunction implements MathPersistenceEntity {
}
public void setParameterNames(@Nullable String[] parameterNames) {
this.parameterNames = CollectionsUtils.formatValue(CollectionsUtils.asList(parameterNames), ";", new StringMapper());
this.parameterNames = CollectionTransformations.formatValue(CollectionsUtils.asList(parameterNames), ";", new StringMapper());
}
public void setParameterNames(@Nullable String parameterNames) {
@@ -71,7 +72,7 @@ public class AFunction implements MathPersistenceEntity {
@NotNull
public String[] getParameterNamesAsArray() {
final List<String> parameterNamesAsList = CollectionsUtils.split(parameterNames, ";");
final List<String> parameterNamesAsList = CollectionTransformations.split(parameterNames, ";");
return parameterNamesAsList.toArray(new String[parameterNamesAsList.size()]);
}
}

9
calculatorpp/src/main/java/org/solovyev/android/calculator/model/AbstractAndroidMathRegistry.java
View File

@@ -13,10 +13,9 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.simpleframework.xml.Serializer;
import org.simpleframework.xml.core.Persister;
import org.solovyev.android.ResourceCache;
import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.about.TextHelper;
import org.solovyev.common.definitions.IBuilder;
import org.solovyev.common.JBuilder;
import org.solovyev.common.math.MathEntity;
import org.solovyev.common.math.MathRegistry;
@@ -90,7 +89,7 @@ public abstract class AbstractAndroidMathRegistry<T extends MathEntity, P extend
}
@NotNull
protected abstract IBuilder<? extends T> createBuilder(@NotNull P entity);
protected abstract JBuilder<? extends T> createBuilder(@NotNull P entity);
@NotNull
protected abstract Class<? extends MathEntityPersistenceContainer<P>> getPersistenceContainerClass();
@@ -150,8 +149,8 @@ public abstract class AbstractAndroidMathRegistry<T extends MathEntity, P extend
}
@Override
public T add(@NotNull IBuilder<? extends T> IBuilder) {
return mathRegistry.add(IBuilder);
public T add(@NotNull JBuilder<? extends T> JBuilder) {
return mathRegistry.add(JBuilder);
}
@Override

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

@@ -11,7 +11,7 @@ import jscl.NumeralBase;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.solovyev.android.calculator.math.MathType;
import org.solovyev.common.utils.StringUtils;
import org.solovyev.common.text.StringUtils;
/**
* User: serso

6
calculatorpp/src/main/java/org/solovyev/android/calculator/model/AndroidFunctionsMathRegistry.java
View File

@@ -12,9 +12,9 @@ import jscl.math.function.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.solovyev.android.calculator.R;
import org.solovyev.common.definitions.IBuilder;
import org.solovyev.common.JBuilder;
import org.solovyev.common.collections.CollectionsUtils;
import org.solovyev.common.math.MathRegistry;
import org.solovyev.common.utils.CollectionsUtils;
import java.util.*;
@@ -145,7 +145,7 @@ public class AndroidFunctionsMathRegistry extends AbstractAndroidMathRegistry<Fu
@NotNull
@Override
protected IBuilder<? extends Function> createBuilder(@NotNull AFunction entity) {
protected JBuilder<? extends Function> createBuilder(@NotNull AFunction entity) {
return new CustomFunction.Builder(entity.getName(), entity.getParameterNamesAsArray(), entity.getContent());
}

4
calculatorpp/src/main/java/org/solovyev/android/calculator/model/AndroidOperatorsMathRegistry.java
View File

@@ -11,7 +11,7 @@ import android.content.SharedPreferences;
import jscl.math.operator.Operator;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.solovyev.common.definitions.IBuilder;
import org.solovyev.common.JBuilder;
import org.solovyev.common.math.MathRegistry;
import java.util.HashMap;
@@ -60,7 +60,7 @@ public class AndroidOperatorsMathRegistry extends AbstractAndroidMathRegistry<Op
@NotNull
@Override
protected IBuilder<? extends Operator> createBuilder(@NotNull MathPersistenceEntity entity) {
protected JBuilder<? extends Operator> createBuilder(@NotNull MathPersistenceEntity entity) {
return null; //To change body of implemented methods use File | Settings | File Templates.
}

4
calculatorpp/src/main/java/org/solovyev/android/calculator/model/AndroidPostfixFunctionsRegistry.java
View File

@@ -11,7 +11,7 @@ import android.content.SharedPreferences;
import jscl.math.operator.Operator;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.solovyev.common.definitions.IBuilder;
import org.solovyev.common.JBuilder;
import org.solovyev.common.math.MathRegistry;
import java.util.HashMap;
@@ -59,7 +59,7 @@ public class AndroidPostfixFunctionsRegistry extends AbstractAndroidMathRegistry
@NotNull
@Override
protected IBuilder<? extends Operator> createBuilder(@NotNull MathPersistenceEntity entity) {
protected JBuilder<? extends Operator> createBuilder(@NotNull MathPersistenceEntity entity) {
return null; //To change body of implemented methods use File | Settings | File Templates.
}

4
calculatorpp/src/main/java/org/solovyev/android/calculator/model/AndroidVarsRegistryImpl.java
View File

@@ -12,7 +12,7 @@ import jscl.math.function.IConstant;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.solovyev.android.calculator.R;
import org.solovyev.common.definitions.IBuilder;
import org.solovyev.common.JBuilder;
import org.solovyev.common.math.MathRegistry;
import java.util.HashMap;
@@ -63,7 +63,7 @@ class AndroidVarsRegistryImpl extends AbstractAndroidMathRegistry<IConstant, Var
@NotNull
@Override
protected IBuilder<? extends IConstant> createBuilder(@NotNull Var entity) {
protected JBuilder<? extends IConstant> createBuilder(@NotNull Var entity) {
return new Var.Builder(entity);
}

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

@@ -17,13 +17,13 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.solovyev.android.calculator.jscl.JsclOperation;
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.MutableObject;
import org.solovyev.common.msg.MessageRegistry;
import org.solovyev.common.text.EnumMapper;
import org.solovyev.common.text.NumberMapper;
import org.solovyev.common.utils.MutableObject;
import org.solovyev.common.utils.StringUtils;
import org.solovyev.common.text.StringUtils;
import java.text.DecimalFormatSymbols;
import java.util.ArrayList;

4
calculatorpp/src/main/java/org/solovyev/android/calculator/model/MathEntityBuilder.java
View File

@@ -8,7 +8,7 @@ package org.solovyev.android.calculator.model;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.solovyev.common.definitions.IBuilder;
import org.solovyev.common.JBuilder;
import org.solovyev.common.math.MathEntity;
/**
@@ -16,7 +16,7 @@ import org.solovyev.common.math.MathEntity;
* Date: 12/22/11
* Time: 9:21 PM
*/
public interface MathEntityBuilder<T extends MathEntity> extends IBuilder<T> {
public interface MathEntityBuilder<T extends MathEntity> extends JBuilder<T> {
@NotNull
public MathEntityBuilder<T> setName(@NotNull String name);

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

@@ -14,7 +14,7 @@ import jscl.text.*;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.solovyev.android.calculator.math.MathType;
import org.solovyev.common.utils.MutableObject;
import org.solovyev.common.MutableObject;
import java.util.ArrayList;
import java.util.List;

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

@@ -10,7 +10,7 @@ import jscl.math.function.IConstant;
import org.jetbrains.annotations.NotNull;
import org.solovyev.common.StartsWithFinder;
import org.solovyev.android.calculator.math.MathType;
import org.solovyev.common.utils.CollectionsUtils;
import org.solovyev.common.collections.CollectionsUtils;
import java.util.ArrayList;
import java.util.List;

6
calculatorpp/src/main/java/org/solovyev/android/calculator/model/Var.java
View File

@@ -14,9 +14,9 @@ import org.jetbrains.annotations.Nullable;
import org.simpleframework.xml.Element;
import org.simpleframework.xml.Root;
import org.simpleframework.xml.Transient;
import org.solovyev.common.definitions.IBuilder;
import org.solovyev.common.JBuilder;
import org.solovyev.common.math.MathEntity;
import org.solovyev.common.utils.StringUtils;
import org.solovyev.common.text.StringUtils;
/**
* User: serso
@@ -48,7 +48,7 @@ public class Var implements IConstant, MathPersistenceEntity {
@Transient
private Constant constant;
public static class Builder implements IBuilder<Var>, MathEntityBuilder<Var> {
public static class Builder implements JBuilder<Var>, MathEntityBuilder<Var> {
@NotNull
private String name;

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

@@ -3,7 +3,7 @@ package org.solovyev.android.calculator.model;
import jscl.math.function.IConstant;
import org.jetbrains.annotations.NotNull;
import org.solovyev.android.calculator.R;
import org.solovyev.common.utils.CollectionsUtils;
import org.solovyev.common.collections.CollectionsUtils;
import java.util.Collections;
import java.util.Comparator;

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

@@ -38,7 +38,7 @@ import org.solovyev.android.calculator.R;
import org.solovyev.android.calculator.model.CalculatorParseException;
import org.solovyev.android.calculator.model.PreparedExpression;
import org.solovyev.android.calculator.model.ToJsclTextProcessor;
import org.solovyev.common.utils.MutableObject;
import org.solovyev.common.MutableObject;
import java.io.Serializable;

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

@@ -14,8 +14,8 @@ 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.model.ToJsclTextProcessor;
import org.solovyev.common.utils.MutableObject;
import org.solovyev.common.utils.StringUtils;
import org.solovyev.common.MutableObject;
import org.solovyev.common.text.StringUtils;
import java.util.Arrays;

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

@@ -11,7 +11,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.solovyev.android.calculator.math.MathType;
import org.solovyev.android.calculator.model.*;
import org.solovyev.common.utils.MutableObject;
import org.solovyev.common.MutableObject;
import java.util.HashMap;
import java.util.Map;

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

@@ -17,7 +17,7 @@ import org.solovyev.android.UnitType;
import org.solovyev.android.calculator.R;
import org.solovyev.android.view.ViewBuilder;
import org.solovyev.android.view.ViewFromLayoutBuilder;
import org.solovyev.common.utils.StringUtils;
import org.solovyev.common.text.StringUtils;
import java.util.Collections;
import java.util.List;