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

Calculation fixable messages

Browse Source
This commit is contained in:
Sergey Solovyev
2012-11-17 23:53:56 +04:00
parent 1ab714b044
commit ef11120244
14 changed files with 192 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorFixableError.java
View File

@@ -20,6 +20,20 @@ public enum CalculatorFixableError {
public void fix() {
CalculatorLocatorImpl.getInstance().getPreferenceService().setAngleUnits(AngleUnit.rad);
}
},
preferred_numeral_base() {
@Override
public void fix() {
CalculatorLocatorImpl.getInstance().getPreferenceService().setPreferredNumeralBase();
}
},
preferred_angle_units() {
@Override
public void fix() {
CalculatorLocatorImpl.getInstance().getPreferenceService().setPreferredAngleUnits();
}
};
@NotNull

2
calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorImpl.java
View File

@@ -163,6 +163,8 @@ public class CalculatorImpl implements Calculator, CalculatorEventListener {
@NotNull String expression,
@Nullable MessageRegistry mr) {
CalculatorLocatorImpl.getInstance().getPreferenceService().checkPreferredPreferences(false);
PreparedExpression preparedExpression = null;
try {

7
calculatorpp-core/src/main/java/org/solovyev/android/calculator/CalculatorPreferenceService.java
View File

@@ -1,6 +1,7 @@
package org.solovyev.android.calculator;
import jscl.AngleUnit;
import jscl.NumeralBase;
import org.jetbrains.annotations.NotNull;
/**
@@ -10,5 +11,11 @@ import org.jetbrains.annotations.NotNull;
*/
public interface CalculatorPreferenceService {
void setPreferredAngleUnits();
void setAngleUnits(@NotNull AngleUnit angleUnit);
void setPreferredNumeralBase();
void setNumeralBase(@NotNull NumeralBase numeralBase);
void checkPreferredPreferences(boolean force);
}