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

lint warnings fixed

Browse Source
This commit is contained in:
Sergey Solovyev
2013-06-26 13:00:02 +04:00
parent 6aa5802dea
commit 545cdf2319
5 changed files with 17 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android-app-core/src/main/java/org/solovyev/android/calculator/model/AndroidCalculatorEngine.java
View File

@@ -128,8 +128,8 @@ public class AndroidCalculatorEngine implements CalculatorEngine, SharedPreferen
final JsclMathEngine engine = JsclMathEngine.getInstance();
this.calculatorEngine = new CalculatorEngineImpl(engine,
new CalculatorVarsRegistry(engine.getConstantsRegistry(), new AndroidMathEntityDao<Var>(R.string.p_calc_vars, application, Vars.class)),
new CalculatorFunctionsMathRegistry(engine.getFunctionsRegistry(), new AndroidMathEntityDao<AFunction>(R.string.p_calc_functions, application, Functions.class)),
new CalculatorVarsRegistry(engine.getConstantsRegistry(), new AndroidMathEntityDao<Var>("org.solovyev.android.calculator.CalculatorModel_vars", application, Vars.class)),
new CalculatorFunctionsMathRegistry(engine.getFunctionsRegistry(), new AndroidMathEntityDao<AFunction>("org.solovyev.android.calculator.CalculatorModel_functions", application, Functions.class)),
new CalculatorOperatorsMathRegistry(engine.getOperatorsRegistry(), new AndroidMathEntityDao<MathPersistenceEntity>(null, application, null)),
new CalculatorPostfixFunctionsRegistry(engine.getPostfixFunctionsRegistry(), new AndroidMathEntityDao<MathPersistenceEntity>(null, application, null)),
this.lock);

14
android-app-core/src/main/java/org/solovyev/android/calculator/model/AndroidMathEntityDao.java
View File

@@ -51,7 +51,7 @@ public class AndroidMathEntityDao<T extends MathPersistenceEntity> implements Ma
private static final String TAG = AndroidMathEntityDao.class.getSimpleName();
@Nullable
private final Integer preferenceStringId;
private final String preferenceString;
@Nonnull
private final Context context;
@@ -59,17 +59,17 @@ public class AndroidMathEntityDao<T extends MathPersistenceEntity> implements Ma
@Nullable
private final Class<? extends MathEntityPersistenceContainer<T>> persistenceContainerClass;
public AndroidMathEntityDao(@Nullable Integer preferenceStringId,
public AndroidMathEntityDao(@Nullable String preferenceString,
@Nonnull Application application,
@Nullable Class<? extends MathEntityPersistenceContainer<T>> persistenceContainerClass) {
this.preferenceStringId = preferenceStringId;
this.preferenceString = preferenceString;
this.context = application;
this.persistenceContainerClass = persistenceContainerClass;
}
@Override
public void save(@Nonnull MathEntityPersistenceContainer<T> container) {
if (preferenceStringId != null) {
if (preferenceString != null) {
final SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(context);
final SharedPreferences.Editor editor = settings.edit();
@@ -81,7 +81,7 @@ public class AndroidMathEntityDao<T extends MathPersistenceEntity> implements Ma
throw new RuntimeException(e);
}
editor.putString(context.getString(preferenceStringId), sw.toString());
editor.putString(preferenceString, sw.toString());
editor.commit();
}
@@ -90,11 +90,11 @@ public class AndroidMathEntityDao<T extends MathPersistenceEntity> implements Ma
@Nullable
@Override
public MathEntityPersistenceContainer<T> load() {
if (persistenceContainerClass != null && preferenceStringId != null) {
if (persistenceContainerClass != null && preferenceString != null) {
final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
if (preferences != null) {
final String value = preferences.getString(context.getString(preferenceStringId), null);
final String value = preferences.getString(preferenceString, null);
if (value != null) {
final Serializer serializer = new Persister();
try {