From bfe89e893de49937b001b39842f745f440a98683 Mon Sep 17 00:00:00 2001 From: Sergey Solovyev Date: Tue, 15 Jan 2013 21:54:25 +0400 Subject: [PATCH] fix with logger + jscl version update --- android-app/project.properties | 28 +++++++++---------- .../calculator/AndroidCalculatorLogger.java | 4 +-- .../AbstractCalculatorMathRegistry.java | 12 +++++--- .../android/calculator/CalculatorLogger.java | 4 +-- .../calculator/CalculatorParseException.java | 2 +- .../calculator/SystemOutCalculatorLogger.java | 6 ++-- .../android/calculator/model/AFunction.java | 2 +- pom.xml | 2 +- 8 files changed, 32 insertions(+), 28 deletions(-) diff --git a/android-app/project.properties b/android-app/project.properties index 1b8a55be..542cf64d 100644 --- a/android-app/project.properties +++ b/android-app/project.properties @@ -12,19 +12,19 @@ target=android-15 android.library.reference.1=../android-app-core android.library.reference.2=../android-app-widget android.library.reference.3=../android-app-onscreen -android.library.reference.4=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-all_1.0.6 -android.library.reference.5=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-ads_1.0.6 -android.library.reference.6=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-core_1.0.6 -android.library.reference.7=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-billing_1.0.6 -android.library.reference.8=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-db_1.0.6 -android.library.reference.9=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-http_1.0.6 -android.library.reference.10=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-list_1.0.6 -android.library.reference.11=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-view_1.0.6 -android.library.reference.12=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-preferences_1.0.6 -android.library.reference.13=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-menu_1.0.6 -android.library.reference.14=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-other_1.0.6 -android.library.reference.15=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-sherlock_1.0.6 -android.library.reference.16=../android-app-core/gen-external-apklibs/com.actionbarsherlock_actionbarsherlock_4.2.0 -android.library.reference.17=../android-app-core/gen-external-apklibs/org.solovyev.android_android-common-keyboard_1.0.6 +android.library.reference.4=gen-external-apklibs/org.solovyev.android_android-common-all_1.0.6 +android.library.reference.5=gen-external-apklibs/org.solovyev.android_android-common-ads_1.0.6 +android.library.reference.6=gen-external-apklibs/org.solovyev.android_android-common-core_1.0.6 +android.library.reference.7=gen-external-apklibs/org.solovyev.android_android-common-billing_1.0.6 +android.library.reference.8=gen-external-apklibs/org.solovyev.android_android-common-db_1.0.6 +android.library.reference.9=gen-external-apklibs/org.solovyev.android_android-common-http_1.0.6 +android.library.reference.10=gen-external-apklibs/org.solovyev.android_android-common-list_1.0.6 +android.library.reference.11=gen-external-apklibs/org.solovyev.android_android-common-view_1.0.6 +android.library.reference.12=gen-external-apklibs/org.solovyev.android_android-common-preferences_1.0.6 +android.library.reference.13=gen-external-apklibs/org.solovyev.android_android-common-menu_1.0.6 +android.library.reference.14=gen-external-apklibs/org.solovyev.android_android-common-other_1.0.6 +android.library.reference.15=gen-external-apklibs/org.solovyev.android_android-common-sherlock_1.0.6 +android.library.reference.16=gen-external-apklibs/com.actionbarsherlock_actionbarsherlock_4.2.0 +android.library.reference.17=gen-external-apklibs/org.solovyev.android_android-common-keyboard_1.0.6 diff --git a/android-app/src/main/java/org/solovyev/android/calculator/AndroidCalculatorLogger.java b/android-app/src/main/java/org/solovyev/android/calculator/AndroidCalculatorLogger.java index 4bb0a7fa..95832935 100644 --- a/android-app/src/main/java/org/solovyev/android/calculator/AndroidCalculatorLogger.java +++ b/android-app/src/main/java/org/solovyev/android/calculator/AndroidCalculatorLogger.java @@ -25,12 +25,12 @@ public class AndroidCalculatorLogger implements CalculatorLogger { } @Override - public void debug(@Nullable String tag, @NotNull String message, @NotNull Throwable e) { + public void debug(@Nullable String tag, @Nullable String message, @NotNull Throwable e) { Log.d(getTag(tag), message, e); } @Override - public void error(@Nullable String tag, @NotNull String message, @NotNull Throwable e) { + public void error(@Nullable String tag, @Nullable String message, @NotNull Throwable e) { Log.e(getTag(tag), message, e); } } diff --git a/core/src/main/java/org/solovyev/android/calculator/AbstractCalculatorMathRegistry.java b/core/src/main/java/org/solovyev/android/calculator/AbstractCalculatorMathRegistry.java index 4025556f..4d214eb3 100644 --- a/core/src/main/java/org/solovyev/android/calculator/AbstractCalculatorMathRegistry.java +++ b/core/src/main/java/org/solovyev/android/calculator/AbstractCalculatorMathRegistry.java @@ -6,12 +6,12 @@ package org.solovyev.android.calculator; -import jscl.CustomFunctionCalculationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.solovyev.common.JBuilder; import org.solovyev.common.math.MathEntity; import org.solovyev.common.math.MathRegistry; +import org.solovyev.common.msg.Message; import java.util.List; import java.util.Map; @@ -68,9 +68,13 @@ public abstract class AbstractCalculatorMathRegistry builder = createBuilder(entity); + add(builder); + } catch (ArithmeticException e) { + Locator.getInstance().getLogger().error(null, e.getLocalizedMessage(), e); + if (e instanceof Message) { + Locator.getInstance().getNotifier().showMessage((Message)e); + } } } } diff --git a/core/src/main/java/org/solovyev/android/calculator/CalculatorLogger.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorLogger.java index 741a4cb4..568e218f 100644 --- a/core/src/main/java/org/solovyev/android/calculator/CalculatorLogger.java +++ b/core/src/main/java/org/solovyev/android/calculator/CalculatorLogger.java @@ -12,8 +12,8 @@ public interface CalculatorLogger { void debug(@Nullable String tag, @NotNull String message); - void debug(@Nullable String tag, @NotNull String message, @NotNull Throwable e); + void debug(@Nullable String tag, @Nullable String message, @NotNull Throwable e); - void error(@Nullable String tag, @NotNull String message, @NotNull Throwable e); + void error(@Nullable String tag, @Nullable String message, @NotNull Throwable e); } diff --git a/core/src/main/java/org/solovyev/android/calculator/CalculatorParseException.java b/core/src/main/java/org/solovyev/android/calculator/CalculatorParseException.java index 8ebfccf7..cecbba48 100644 --- a/core/src/main/java/org/solovyev/android/calculator/CalculatorParseException.java +++ b/core/src/main/java/org/solovyev/android/calculator/CalculatorParseException.java @@ -79,7 +79,7 @@ public class CalculatorParseException extends SersoException implements Message } @Override - @Nullable + @NotNull public String getLocalizedMessage() { return this.message.getLocalizedMessage(Locale.getDefault()); } diff --git a/core/src/main/java/org/solovyev/android/calculator/SystemOutCalculatorLogger.java b/core/src/main/java/org/solovyev/android/calculator/SystemOutCalculatorLogger.java index a245c761..0146f95e 100644 --- a/core/src/main/java/org/solovyev/android/calculator/SystemOutCalculatorLogger.java +++ b/core/src/main/java/org/solovyev/android/calculator/SystemOutCalculatorLogger.java @@ -14,7 +14,7 @@ public class SystemOutCalculatorLogger implements CalculatorLogger { private static final String TAG = SystemOutCalculatorLogger.class.getSimpleName(); @Override - public void debug(@Nullable String tag, @NotNull String message) { + public void debug(@Nullable String tag, @Nullable String message) { System.out.println(getTag(tag) + ": " + message); } @@ -24,13 +24,13 @@ public class SystemOutCalculatorLogger implements CalculatorLogger { } @Override - public void debug(@Nullable String tag, @NotNull String message, @NotNull Throwable e) { + public void debug(@Nullable String tag, @Nullable String message, @NotNull Throwable e) { debug(tag, message); e.printStackTrace(System.out); } @Override - public void error(@Nullable String tag, @NotNull String message, @NotNull Throwable e) { + public void error(@Nullable String tag, @Nullable String message, @NotNull Throwable e) { System.out.println(getTag(tag) + ": " + message); e.printStackTrace(System.out); } diff --git a/core/src/main/java/org/solovyev/android/calculator/model/AFunction.java b/core/src/main/java/org/solovyev/android/calculator/model/AFunction.java index a6f35175..b86aaecb 100644 --- a/core/src/main/java/org/solovyev/android/calculator/model/AFunction.java +++ b/core/src/main/java/org/solovyev/android/calculator/model/AFunction.java @@ -308,7 +308,7 @@ public class AFunction implements IFunction, MathPersistenceEntity, Serializable } @Override - @Nullable + @NotNull public String getLocalizedMessage() { return message.getLocalizedMessage(); } diff --git a/pom.xml b/pom.xml index 32faf05c..df8c9e08 100644 --- a/pom.xml +++ b/pom.xml @@ -160,7 +160,7 @@ org.solovyev jscl - 1.0.0 + 1.0.1 xercesImpl