Remove dependencies

2016-03-02 08:25:41 +01:00
parent 62aad904d4
commit 4fa55d6bbc
33 changed files with 2321 additions and 111 deletions
--- a/app/src/main/java/org/solovyev/android/calculator/App.java
+++ b/app/src/main/java/org/solovyev/android/calculator/App.java
@@ -48,9 +48,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.TextView;
-
 import com.squareup.otto.Bus;
-
 import org.solovyev.android.Check;
 import org.solovyev.android.calculator.floating.FloatingCalculatorService;
 import org.solovyev.android.calculator.ga.Ga;
@@ -60,12 +58,10 @@ import org.solovyev.android.calculator.wizard.CalculatorWizards;
 import org.solovyev.android.wizard.Wizards;
 import org.solovyev.common.JPredicate;

-import java.util.Collection;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
-
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;

 /**
 * This class aggregates several useful in any Android application interfaces and provides access to {@link android.app.Application} object from a static context.
@@ -262,18 +258,6 @@ public final class App {
        return null;
    }

-    public static <T> T find(@Nullable Collection<T> collection, @Nonnull JPredicate<T> finder) {
-        if (collection == null || collection.isEmpty()) {
-            return null;
-        }
-        for (T t : collection) {
-            if (finder.apply(t)) {
-                return t;
-            }
-        }
-        return null;
-    }
-
    @Nullable
    public static String find(@Nonnull List<String> tokens, @Nonnull String text, int position) {
        for (int i = 0; i < tokens.size(); i++) {
--- a/app/src/main/java/org/solovyev/android/calculator/BaseNumberBuilder.java
+++ b/app/src/main/java/org/solovyev/android/calculator/BaseNumberBuilder.java
@@ -23,9 +23,9 @@
 package org.solovyev.android.calculator;

 import android.text.SpannableStringBuilder;
+import android.text.TextUtils;
 import jscl.NumeralBase;
 import org.solovyev.android.calculator.math.MathType;
-import org.solovyev.common.text.Strings;

 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -60,7 +60,7 @@ public abstract class BaseNumberBuilder {
    }

    private boolean spaceBefore(@Nonnull MathType.Result mathTypeResult) {
-        return numberBuilder == null && Strings.isEmpty(mathTypeResult.match.trim());
+        return numberBuilder == null && TextUtils.isEmpty(mathTypeResult.match.trim());
    }

    private boolean numeralBaseInTheStart(@Nonnull MathType mathType) {
--- a/app/src/main/java/org/solovyev/android/calculator/Calculator.java
+++ b/app/src/main/java/org/solovyev/android/calculator/Calculator.java
@@ -26,39 +26,8 @@ import android.content.SharedPreferences;
 import android.support.annotation.NonNull;
 import android.text.TextUtils;
 import android.util.Log;
-
 import com.squareup.otto.Bus;
 import com.squareup.otto.Subscribe;
-
-import org.solovyev.android.Check;
-import org.solovyev.android.calculator.calculations.CalculationCancelledEvent;
-import org.solovyev.android.calculator.calculations.CalculationFailedEvent;
-import org.solovyev.android.calculator.calculations.CalculationFinishedEvent;
-import org.solovyev.android.calculator.calculations.ConversionFailedEvent;
-import org.solovyev.android.calculator.calculations.ConversionFinishedEvent;
-import org.solovyev.android.calculator.functions.FunctionsRegistry;
-import org.solovyev.android.calculator.jscl.JsclOperation;
-import org.solovyev.android.calculator.variables.CppVariable;
-import org.solovyev.common.msg.ListMessageRegistry;
-import org.solovyev.common.msg.Message;
-import org.solovyev.common.msg.MessageRegistry;
-import org.solovyev.common.msg.MessageType;
-import org.solovyev.common.text.Strings;
-import org.solovyev.common.units.ConversionException;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.Executor;
-import java.util.concurrent.atomic.AtomicLong;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Named;
-import javax.inject.Singleton;
-
 import jscl.JsclArithmeticException;
 import jscl.MathEngine;
 import jscl.NumeralBase;
@@ -67,6 +36,28 @@ import jscl.math.Generic;
 import jscl.math.function.Constants;
 import jscl.math.function.IConstant;
 import jscl.text.ParseInterruptedException;
+import org.solovyev.android.Check;
+import org.solovyev.android.calculator.calculations.*;
+import org.solovyev.android.calculator.functions.FunctionsRegistry;
+import org.solovyev.android.calculator.jscl.JsclOperation;
+import org.solovyev.android.calculator.variables.CppVariable;
+import org.solovyev.common.msg.ListMessageRegistry;
+import org.solovyev.common.msg.Message;
+import org.solovyev.common.msg.MessageRegistry;
+import org.solovyev.common.msg.MessageType;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Named;
+import javax.inject.Singleton;
+import javax.measure.converter.ConversionException;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.Executor;
+import java.util.concurrent.atomic.AtomicLong;

@Singleton
 public class Calculator implements SharedPreferences.OnSharedPreferenceChangeListener {
@@ -166,7 +157,7 @@ public class Calculator implements SharedPreferences.OnSharedPreferenceChangeLis
                               @Nonnull String e,
                               @Nonnull MessageRegistry mr) {
        e = e.trim();
-        if (Strings.isEmpty(e)) {
+        if (TextUtils.isEmpty(e)) {
            bus.post(new CalculationFinishedEvent(o, e, sequence));
            return;
        }
--- a/app/src/main/java/org/solovyev/android/calculator/Engine.java
+++ b/app/src/main/java/org/solovyev/android/calculator/Engine.java
@@ -23,13 +23,15 @@
 package org.solovyev.android.calculator;

 import android.content.SharedPreferences;
+import android.text.TextUtils;
 import com.squareup.otto.Bus;
 import jscl.AngleUnit;
 import jscl.JsclMathEngine;
 import jscl.MathEngine;
 import jscl.NumeralBase;
 import jscl.math.operator.Operator;
-import jscl.text.*;
+import jscl.text.Identifier;
+import jscl.text.Parser;
 import org.solovyev.android.Check;
 import org.solovyev.android.calculator.functions.FunctionsRegistry;
 import org.solovyev.android.calculator.operators.OperatorsRegistry;
@@ -40,7 +42,6 @@ import org.solovyev.android.prefs.Preference;
 import org.solovyev.android.prefs.StringPreference;
 import org.solovyev.common.text.EnumMapper;
 import org.solovyev.common.text.NumberMapper;
-import org.solovyev.common.text.Strings;

 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -104,7 +105,7 @@ public class Engine implements SharedPreferences.OnSharedPreferenceChangeListene
    }

    public static boolean isValidName(@Nullable String name) {
-        if (!Strings.isEmpty(name)) {
+        if (!TextUtils.isEmpty(name)) {
            try {
                Identifier.parser.parse(Parser.Parameters.get(name), null);
                return true;
@@ -205,7 +206,7 @@ public class Engine implements SharedPreferences.OnSharedPreferenceChangeListene
        mathEngine.setRoundResult(Preferences.Output.round.getPreference(preferences));

        final String groupingSeparator = Preferences.groupingSeparator.getPreference(preferences);
-        if (Strings.isEmpty(groupingSeparator)) {
+        if (TextUtils.isEmpty(groupingSeparator)) {
            mathEngine.setUseGroupingSeparator(false);
        } else {
            mathEngine.setUseGroupingSeparator(true);
--- a/app/src/main/java/org/solovyev/android/calculator/variables/VariablesFragment.java
+++ b/app/src/main/java/org/solovyev/android/calculator/variables/VariablesFragment.java
@@ -34,16 +34,14 @@ import org.solovyev.android.Check;
 import org.solovyev.android.calculator.*;
 import org.solovyev.android.calculator.entities.BaseEntitiesFragment;
 import org.solovyev.android.calculator.entities.Category;
-import org.solovyev.android.calculator.RemovalConfirmationDialog;
 import org.solovyev.android.calculator.math.MathType;
-import org.solovyev.common.JPredicate;
-import org.solovyev.common.collections.Collections;
 import org.solovyev.common.text.Strings;

 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;

 public class VariablesFragment extends BaseEntitiesFragment<IConstant> {
@@ -77,16 +75,17 @@ public class VariablesFragment extends BaseEntitiesFragment<IConstant> {
    @Nonnull
    @Override
    protected List<IConstant> getEntities() {
-        final List<IConstant> result = new ArrayList<>(registry.getEntities());
-
-        Collections.removeAll(result, new JPredicate<IConstant>() {
-            @Override
-            public boolean apply(@Nullable IConstant var) {
-                return var != null && Collections.contains(var.getName(), MathType.INFINITY_JSCL, MathType.NAN);
+        final List<IConstant> entities = new ArrayList<>(registry.getEntities());
+        for (Iterator<IConstant> it = entities.iterator(); it.hasNext(); ) {
+            final IConstant constant = it.next();
+            switch (constant.getName()) {
+                case MathType.INFINITY_JSCL:
+                case MathType.NAN:
+                    it.remove();
+                    break;
            }
-        });
-
-        return result;
+        }
+        return entities;
    }

    @Override