function package changed to functions

app/src/main/AndroidManifest.xml

@@ -83,7 +83,7 @@
             android:label="@string/c_about" />
 
         <activity
-            android:name=".math.edit.FunctionsActivity"
+            android:name=".functions.FunctionsActivity"
             android:label="@string/c_functions" />
 
         <activity

app/src/main/java/org/solovyev/android/calculator/AppComponent.java

@@ -1,6 +1,6 @@
 package org.solovyev.android.calculator;
 
-import org.solovyev.android.calculator.function.EditFunctionFragment;
+import org.solovyev.android.calculator.functions.EditFunctionFragment;
 import org.solovyev.android.calculator.history.BaseHistoryFragment;
 import org.solovyev.android.calculator.history.EditHistoryFragment;
 import org.solovyev.android.calculator.math.edit.FunctionsFragment;

app/src/main/java/org/solovyev/android/calculator/CalculatorActivityLauncher.java

@@ -36,10 +36,10 @@ import android.widget.TextView;
 
 import org.solovyev.android.Activities;
 import org.solovyev.android.calculator.about.CalculatorAboutActivity;
-import org.solovyev.android.calculator.function.CppFunction;
+import org.solovyev.android.calculator.functions.CppFunction;
-import org.solovyev.android.calculator.function.EditFunctionFragment;
+import org.solovyev.android.calculator.functions.EditFunctionFragment;
 import org.solovyev.android.calculator.history.CalculatorHistoryActivity;
-import org.solovyev.android.calculator.math.edit.FunctionsActivity;
+import org.solovyev.android.calculator.functions.FunctionsActivity;
 import org.solovyev.android.calculator.math.edit.OperatorsActivity;
 import org.solovyev.android.calculator.math.edit.CalculatorVarsActivity;
 import org.solovyev.android.calculator.math.edit.VarEditDialogFragment;

app/src/main/java/org/solovyev/android/calculator/CalculatorImpl.java

@@ -35,6 +35,7 @@ import jscl.math.Generic;
 import jscl.math.function.IConstant;
 import jscl.math.operator.Operator;
 import jscl.text.ParseInterruptedException;
+import org.solovyev.android.calculator.functions.FunctionsRegistry;
 import org.solovyev.android.calculator.jscl.JsclOperation;
 import org.solovyev.android.calculator.units.CalculatorNumeralBase;
 import org.solovyev.android.calculator.variables.CppVariable;

app/src/main/java/org/solovyev/android/calculator/Engine.java

@@ -27,6 +27,7 @@ import android.content.SharedPreferences;
 import com.squareup.otto.Bus;
 
 import org.solovyev.android.Check;
+import org.solovyev.android.calculator.functions.FunctionsRegistry;
 import org.solovyev.android.prefs.BooleanPreference;
 import org.solovyev.android.prefs.IntegerPreference;
 import org.solovyev.android.prefs.Preference;

app/src/main/java/org/solovyev/android/calculator/OperatorsRegistry.java

@@ -24,9 +24,9 @@ package org.solovyev.android.calculator;
 
 import android.support.annotation.NonNull;
 
+import org.solovyev.android.calculator.entities.BaseEntitiesRegistry;
 import org.solovyev.android.calculator.entities.Category;
 import org.solovyev.android.calculator.entities.Entities;
-import org.solovyev.android.calculator.function.FunctionCategory;
 import org.solovyev.android.calculator.json.Jsonable;
 import org.solovyev.android.calculator.operators.OperatorCategory;
 import org.solovyev.common.math.MathRegistry;

app/src/main/java/org/solovyev/android/calculator/PostfixFunctionsRegistry.java

@@ -24,6 +24,7 @@ package org.solovyev.android.calculator;
 
 import android.support.annotation.NonNull;
 
+import org.solovyev.android.calculator.entities.BaseEntitiesRegistry;
 import org.solovyev.android.calculator.entities.Category;
 import org.solovyev.android.calculator.entities.Entities;
 import org.solovyev.android.calculator.json.Jsonable;

app/src/main/java/org/solovyev/android/calculator/VariablesRegistry.java

@@ -29,6 +29,7 @@ import com.google.common.base.Strings;
 import org.simpleframework.xml.Serializer;
 import org.simpleframework.xml.core.Persister;
 import org.solovyev.android.Check;
+import org.solovyev.android.calculator.entities.BaseEntitiesRegistry;
 import org.solovyev.android.calculator.entities.Category;
 import org.solovyev.android.calculator.entities.Entities;
 import org.solovyev.android.calculator.json.Json;

app/src/main/java/org/solovyev/android/calculator/entities/BaseEntitiesRegistry.java

@@ -20,7 +20,7 @@
  * Site:  http://se.solovyev.org
  */
 
-package org.solovyev.android.calculator;
+package org.solovyev.android.calculator.entities;
 
 import android.app.Application;
 import android.content.Context;
@@ -28,12 +28,11 @@ import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.os.Handler;
 import android.support.annotation.NonNull;
-
 import com.squareup.otto.Bus;
-
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.solovyev.android.Check;
+import org.solovyev.android.calculator.*;
 import org.solovyev.android.calculator.json.Json;
 import org.solovyev.android.calculator.json.Jsonable;
 import org.solovyev.android.io.FileSaver;
@@ -41,6 +40,10 @@ import org.solovyev.common.JBuilder;
 import org.solovyev.common.math.MathEntity;
 import org.solovyev.common.math.MathRegistry;
 
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import javax.inject.Inject;
+import javax.inject.Named;
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
@@ -49,11 +52,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Executor;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import javax.inject.Inject;
-import javax.inject.Named;
-
 public abstract class BaseEntitiesRegistry<T extends MathEntity> implements EntitiesRegistry<T> {
 
     @Nonnull
@@ -65,18 +63,18 @@ public abstract class BaseEntitiesRegistry<T extends MathEntity> implements Enti
     @NonNull
     private final WriteTask writeTask = new WriteTask();
     @Inject
-    Handler handler;
+    public Handler handler;
     @Inject
-    SharedPreferences preferences;
+    public SharedPreferences preferences;
     @Inject
-    Application application;
+    public Application application;
     @Inject
-    Bus bus;
+    public Bus bus;
     @Inject
-    ErrorReporter errorReporter;
+    public ErrorReporter errorReporter;
     @Inject
     @Named(AppModule.THREAD_BACKGROUND)
-    Executor backgroundThread;
+    public Executor backgroundThread;
 
     // synchronized on lock
     private boolean initialized;

app/src/main/java/org/solovyev/android/calculator/functions/CppFunction.java

@@ -1,4 +1,4 @@
-package org.solovyev.android.calculator.function;
+package org.solovyev.android.calculator.functions;
 
 import android.os.Parcel;
 import android.os.Parcelable;

app/src/main/java/org/solovyev/android/calculator/functions/EditFunctionFragment.java

@@ -20,7 +20,7 @@
  * Site:  http://se.solovyev.org
  */
 
-package org.solovyev.android.calculator.function;
+package org.solovyev.android.calculator.functions;
 
 import android.annotation.SuppressLint;
 import android.content.Context;
@@ -45,7 +45,6 @@ import butterknife.ButterKnife;
 import jscl.math.function.Function;
 import org.solovyev.android.Check;
 import org.solovyev.android.calculator.*;
-import org.solovyev.android.calculator.math.edit.FunctionsActivity;
 import org.solovyev.android.calculator.math.edit.VarEditorSaver;
 import org.solovyev.android.calculator.view.EditTextCompat;
 import org.solovyev.common.math.MathRegistry;
@@ -55,7 +54,7 @@ import javax.annotation.Nullable;
 import javax.inject.Inject;
 import java.util.*;
 
-import static org.solovyev.android.calculator.function.CppFunction.NO_ID;
+import static org.solovyev.android.calculator.functions.CppFunction.NO_ID;
 
 public class EditFunctionFragment extends BaseDialogFragment implements View.OnClickListener, View.OnFocusChangeListener, View.OnKeyListener {
 

app/src/main/java/org/solovyev/android/calculator/functions/FunctionCategory.java

@@ -20,7 +20,7 @@
  * Site:  http://se.solovyev.org
  */
 
-package org.solovyev.android.calculator.function;
+package org.solovyev.android.calculator.functions;
 
 import android.support.annotation.StringRes;
 

app/src/main/java/org/solovyev/android/calculator/functions/FunctionParamsView.java

@@ -20,7 +20,7 @@
  * Site:  http://se.solovyev.org
  */
 
-package org.solovyev.android.calculator.function;
+package org.solovyev.android.calculator.functions;
 
 import android.annotation.TargetApi;
 import android.content.Context;

app/src/main/java/org/solovyev/android/calculator/functions/FunctionRemovalDialog.java

@@ -1,4 +1,4 @@
-package org.solovyev.android.calculator.function;
+package org.solovyev.android.calculator.functions;
 
 import android.app.Activity;
 import android.content.DialogInterface;

app/src/main/java/org/solovyev/android/calculator/functions/FunctionsActivity.java

@@ -20,14 +20,14 @@
  * Site:  http://se.solovyev.org
  */
 
-package org.solovyev.android.calculator.math.edit;
+package org.solovyev.android.calculator.functions;
 
 import android.os.Bundle;
 import android.os.Parcelable;
 import org.solovyev.android.calculator.BaseActivity;
 import org.solovyev.android.calculator.CalculatorFragmentType;
-import org.solovyev.android.calculator.function.FunctionCategory;
 import org.solovyev.android.calculator.R;
+import org.solovyev.android.calculator.math.edit.FunctionsFragment;
 
 import javax.annotation.Nullable;
 
@@ -46,15 +46,13 @@ public class FunctionsActivity extends BaseActivity {
         final Bundle extras = getIntent().getExtras();
         final Parcelable function = extras != null ? extras.getParcelable(EXTRA_FUNCTION) : null;
 
-        final CalculatorFragmentType fragmentType = CalculatorFragmentType.functions;
-
         for (FunctionCategory category : FunctionCategory.values()) {
             final Bundle arguments = new Bundle(2);
             if (category == FunctionCategory.my && function != null) {
                 arguments.putParcelable(FunctionsFragment.ARG_FUNCTION, function);
             }
             arguments.putString(FunctionsFragment.ARG_CATEGORY, category.name());
-            ui.addTab(this, fragmentType.createSubFragmentTag(category.name()), fragmentType.getFragmentClass(), arguments, category.title, R.id.main_layout);
+            ui.addTab(this, CalculatorFragmentType.functions.createSubFragmentTag(category.name()), CalculatorFragmentType.functions.getFragmentClass(), arguments, category.title, R.id.main_layout);
         }
     }
 }

app/src/main/java/org/solovyev/android/calculator/functions/FunctionsRegistry.java

@@ -20,40 +20,32 @@
  * Site:  http://se.solovyev.org
  */
 
-package org.solovyev.android.calculator;
+package org.solovyev.android.calculator.functions;
 
 import android.support.annotation.NonNull;
-
+import jscl.JsclMathEngine;
+import jscl.math.function.CustomFunction;
+import jscl.math.function.Function;
+import jscl.math.function.IFunction;
 import org.simpleframework.xml.Serializer;
 import org.simpleframework.xml.core.Persister;
 import org.solovyev.android.Check;
+import org.solovyev.android.calculator.entities.BaseEntitiesRegistry;
+import org.solovyev.android.calculator.Calculator;
 import org.solovyev.android.calculator.entities.Category;
 import org.solovyev.android.calculator.entities.Entities;
-import org.solovyev.android.calculator.function.CppFunction;
-import org.solovyev.android.calculator.function.FunctionCategory;
 import org.solovyev.android.calculator.json.Json;
 import org.solovyev.android.calculator.json.Jsonable;
-import org.solovyev.android.calculator.function.OldFunctions;
 import org.solovyev.android.io.FileSaver;
 import org.solovyev.common.JBuilder;
 import org.solovyev.common.text.Strings;
 
-import java.io.File;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.inject.Inject;
 import javax.inject.Singleton;
-
+import java.io.File;
-import jscl.JsclMathEngine;
+import java.util.*;
-import jscl.math.function.CustomFunction;
-import jscl.math.function.Function;
-import jscl.math.function.IFunction;
 
 import static android.text.TextUtils.isEmpty;
 

app/src/main/java/org/solovyev/android/calculator/functions/OldFunction.java

@@ -20,7 +20,7 @@
  * Site:  http://se.solovyev.org
  */
 
-package org.solovyev.android.calculator.function;
+package org.solovyev.android.calculator.functions;
 
 import org.simpleframework.xml.Element;
 import org.simpleframework.xml.ElementList;

app/src/main/java/org/solovyev/android/calculator/functions/OldFunctions.java

@@ -20,7 +20,7 @@
  * Site:  http://se.solovyev.org
  */
 
-package org.solovyev.android.calculator.function;
+package org.solovyev.android.calculator.functions;
 
 import android.text.TextUtils;
 

app/src/main/java/org/solovyev/android/calculator/math/edit/FunctionsFragment.java

@@ -34,9 +34,7 @@ import jscl.math.function.IFunction;
 import org.solovyev.android.Check;
 import org.solovyev.android.calculator.*;
 import org.solovyev.android.calculator.entities.Category;
-import org.solovyev.android.calculator.function.CppFunction;
+import org.solovyev.android.calculator.functions.*;
-import org.solovyev.android.calculator.function.EditFunctionFragment;
-import org.solovyev.android.calculator.function.FunctionRemovalDialog;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;

app/src/main/java/org/solovyev/android/calculator/variables/CppVariable.java

@@ -6,7 +6,7 @@ import android.text.TextUtils;
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.solovyev.android.Check;
-import org.solovyev.android.calculator.function.CppFunction;
+import org.solovyev.android.calculator.functions.CppFunction;
 import org.solovyev.android.calculator.json.Json;
 import org.solovyev.android.calculator.json.Jsonable;
 import org.solovyev.common.JBuilder;

app/src/main/java/org/solovyev/android/calculator/variables/JsclConstant.java

@@ -1,16 +1,14 @@
 package org.solovyev.android.calculator.variables;
 
 import com.google.common.base.Strings;
-
+import jscl.math.function.Constant;
-import org.solovyev.android.calculator.function.CppFunction;
+import jscl.math.function.IConstant;
+import org.solovyev.android.calculator.functions.CppFunction;
 import org.solovyev.common.math.MathEntity;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import jscl.math.function.Constant;
-import jscl.math.function.IConstant;
-
 class JsclConstant extends CppVariable implements IConstant {
 
     private Double doubleValue;

app/src/main/res/layout/fragment_function_edit.xml

@@ -44,7 +44,7 @@
                 a:inputType="text" />
         </android.support.design.widget.TextInputLayout>
 
-        <org.solovyev.android.calculator.function.FunctionParamsView
+        <org.solovyev.android.calculator.functions.FunctionParamsView
             a:id="@+id/function_params"
             a:layout_width="match_parent"
             a:layout_height="wrap_content"

app/src/test/java/org/solovyev/android/calculator/CalculatorTestUtils.java

@@ -29,6 +29,7 @@ import com.squareup.otto.Bus;
 import org.junit.Assert;
 import org.mockito.Mockito;
 import org.robolectric.fakes.RoboSharedPreferences;
+import org.solovyev.android.calculator.functions.FunctionsRegistry;
 import org.solovyev.android.calculator.jscl.JsclOperation;
 import org.solovyev.android.calculator.language.Languages;
 import org.solovyev.android.calculator.plot.CalculatorPlotter;

app/src/test/java/org/solovyev/android/calculator/model/OldFunctionsTest.java

@@ -30,8 +30,8 @@ import org.junit.Test;
 import org.simpleframework.xml.Serializer;
 import org.simpleframework.xml.core.Persister;
 import org.solovyev.android.calculator.CalculatorTestUtils;
-import org.solovyev.android.calculator.function.OldFunction;
+import org.solovyev.android.calculator.functions.OldFunction;
-import org.solovyev.android.calculator.function.OldFunctions;
+import org.solovyev.android.calculator.functions.OldFunctions;
 import org.solovyev.common.Objects;
 import org.solovyev.common.equals.CollectionEqualizer;