From 6dfc26dc2abee2dc2a6b49a6ad8f9df195d1b1de Mon Sep 17 00:00:00 2001
From: Sergey Solovyev <se.solovyev@gmail.com>
Date: Thu, 15 Nov 2012 23:28:28 +0400
Subject: [PATCH] Im and Re

---
 .../calculator/AbstractCalculatorMathRegistry.java |  7 ++++++-
 .../android/calculator/CalculatorLogger.java       |  3 +++
 .../calculator/SystemOutCalculatorLogger.java      |  6 ++++++
 calculatorpp/res/values-ru/text_strings.xml        | 14 ++++++++++++++
 calculatorpp/res/values/text_strings.xml           |  1 -
 .../calculator/AndroidCalculatorLogger.java        |  5 +++++
 6 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/AbstractCalculatorMathRegistry.java b/calculatorpp-core/src/main/java/org/solovyev/android/calculator/AbstractCalculatorMathRegistry.java
index b8be5c95..c40f159d 100644
--- a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/AbstractCalculatorMathRegistry.java
+++ b/calculatorpp-core/src/main/java/org/solovyev/android/calculator/AbstractCalculatorMathRegistry.java
@@ -6,6 +6,7 @@
 
 package org.solovyev.android.calculator;
 
+import jscl.CustomFunctionCalculationException;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.solovyev.common.JBuilder;
@@ -66,7 +67,11 @@ public abstract class AbstractCalculatorMathRegistry<T extends MathEntity, P ext
         if (persistenceContainer != null) {
             for (P entity : persistenceContainer.getEntities()) {
                 if (!contains(entity.getName())) {
-                    add(createBuilder(entity));
+                    try {
+                        add(createBuilder(entity));
+                    } catch (CustomFunctionCalculationException e) {
+                        CalculatorLocatorImpl.getInstance().getLogger().error(null, e.getMessage(), e);
+                    }
                 }
             }
         }
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorLogger.java b/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorLogger.java
index 60057cf8..741a4cb4 100644
--- a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorLogger.java
+++ b/calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorLogger.java
@@ -13,4 +13,7 @@ public interface CalculatorLogger {
     void debug(@Nullable String tag, @NotNull String message);
 
     void debug(@Nullable String tag, @NotNull String message, @NotNull Throwable e);
+
+    void error(@Nullable String tag, @NotNull String message, @NotNull Throwable e);
+
 }
diff --git a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/SystemOutCalculatorLogger.java b/calculatorpp-core/src/main/java/org/solovyev/android/calculator/SystemOutCalculatorLogger.java
index 09656a52..a245c761 100644
--- a/calculatorpp-core/src/main/java/org/solovyev/android/calculator/SystemOutCalculatorLogger.java
+++ b/calculatorpp-core/src/main/java/org/solovyev/android/calculator/SystemOutCalculatorLogger.java
@@ -28,4 +28,10 @@ public class SystemOutCalculatorLogger implements CalculatorLogger {
         debug(tag, message);
         e.printStackTrace(System.out);
     }
+
+    @Override
+    public void error(@Nullable String tag, @NotNull String message, @NotNull Throwable e) {
+        System.out.println(getTag(tag) + ": " + message);
+        e.printStackTrace(System.out);
+    }
 }
diff --git a/calculatorpp/res/values-ru/text_strings.xml b/calculatorpp/res/values-ru/text_strings.xml
index 07cb1e78..8d8c6894 100644
--- a/calculatorpp/res/values-ru/text_strings.xml
+++ b/calculatorpp/res/values-ru/text_strings.xml
@@ -234,4 +234,18 @@
     <string name="p_blue_line_color">Синий</string>
     <string name="p_green_line_color">Зелёный</string>
 
+    <string name="c_function_name">Имя</string>
+    <string name="c_function_value">Тело функции</string>
+    <string name="c_function_description">Описание</string>
+    <string name="c_function_parameters">Параметры</string>
+
+    <string name="function_create_function">Создать функцию</string>
+    <string name="function_edit_function">Редактировать функцию</string>
+    <string name="function_name_is_not_valid">Не правильное имя функции: имя должно начинаться с буквы, должно сожержать буквы, цифры и знаки подчёркивания.</string>
+    <string name="function_already_exists">Функция с таким именем уже существует!</string>
+    <string name="function_is_empty">Тело функции не должно быть пустым!</string>
+    <string name="function_param_not_empty">Имя параметра не должно быть пустым!</string>
+    <string name="function_removal_confirmation_question">Вы действительно хотите удалить функцию \'%s\'?</string>
+    <string name="empty_function_error">Невозможно создать пустую функцию!</string>
+
 </resources>
\ No newline at end of file
diff --git a/calculatorpp/res/values/text_strings.xml b/calculatorpp/res/values/text_strings.xml
index 0d178a94..22836cfa 100644
--- a/calculatorpp/res/values/text_strings.xml
+++ b/calculatorpp/res/values/text_strings.xml
@@ -243,7 +243,6 @@
 	<string name="function_edit_function">Edit function</string>
 	<string name="function_name_is_not_valid">Name of function is not valid: name must start with letter, can contain letters, digits and underscore.</string>
 	<string name="function_already_exists">Function with same name already exists!</string>
-	<string name="function_name_clashes">Function name clashes with function name!</string>
 	<string name="function_is_empty">Function body could not be empty!</string>
 	<string name="function_param_not_empty">Function parameter should not be empty!</string>
     <string name="function_removal_confirmation_question">Do you really want to delete \'%s\' function?</string>
diff --git a/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorLogger.java b/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorLogger.java
index 3eaa63c0..2aba58c6 100644
--- a/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorLogger.java
+++ b/calculatorpp/src/main/java/org/solovyev/android/calculator/AndroidCalculatorLogger.java
@@ -28,4 +28,9 @@ public class AndroidCalculatorLogger implements CalculatorLogger {
     public void debug(@Nullable String tag, @NotNull String message, @NotNull Throwable e) {
         Log.d(getTag(tag), message, e);
     }
+
+    @Override
+    public void error(@Nullable String tag, @NotNull String message, @NotNull Throwable e) {
+        Log.e(getTag(tag), message, e);
+    }
 }