From f9264375e2853427a863cc7881b8edd5170c7830 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maty=C3=A1=C5=A1=20Latner?= <matyas.latner@nic.cz>
Date: Tue, 23 Jun 2015 10:12:50 +0200
Subject: [PATCH] #19 Tablexia initialization refaktor
---
.../cz/nic/tablexia/android/AndroidLauncher.java | 2 +-
core/src/cz/nic/tablexia/Tablexia.java | 12 ++----------
core/src/cz/nic/tablexia/TablexiaSettings.java | 4 ----
3 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/android/src/main/java/cz/nic/tablexia/android/AndroidLauncher.java b/android/src/main/java/cz/nic/tablexia/android/AndroidLauncher.java
index 7c6e899fa..2491f3a40 100644
--- a/android/src/main/java/cz/nic/tablexia/android/AndroidLauncher.java
+++ b/android/src/main/java/cz/nic/tablexia/android/AndroidLauncher.java
@@ -55,7 +55,7 @@ public class AndroidLauncher extends AndroidApplication {
Matrix matrixMirror = new Matrix();
matrixMirror.preScale(1.0f, -1.0f);
sb = Bitmap.createBitmap(sb, 0, 0, sb.getWidth(), sb.getHeight(), matrixMirror, false);
- // overvrite file
+ // overwrite file
FileOutputStream fOut = new FileOutputStream(file);
sb.compress(Bitmap.CompressFormat.PNG, 100, fOut);
sb.recycle();
diff --git a/core/src/cz/nic/tablexia/Tablexia.java b/core/src/cz/nic/tablexia/Tablexia.java
index 12e7a497c..7847e5932 100644
--- a/core/src/cz/nic/tablexia/Tablexia.java
+++ b/core/src/cz/nic/tablexia/Tablexia.java
@@ -53,20 +53,12 @@ public class Tablexia extends TablexiaApplication {
}
}
- public Tablexia(boolean debug, Locale systemLocale, String versionName, SQLConnectionType sqlConnectionType, Map<String, String> buildChecksums, boolean resetState) {
- this(sqlConnectionType, buildChecksums, resetState);
- TablexiaSettings.init(debug, systemLocale, versionName);
- }
-
public Tablexia(String buildTypeKey, Locale systemLocale, String versionName, SQLConnectionType sqlConnectionType, Map<String, String> buildChecksums, boolean resetState) {
- this(sqlConnectionType, buildChecksums, resetState);
- TablexiaSettings.init(buildTypeKey, systemLocale, versionName);
- }
-
- private Tablexia(SQLConnectionType sqlConnectionType, Map<String, String> buildChecksums, boolean resetState) {
this.resetState = resetState;
this.buildChecksums = buildChecksums;
this.sqlConnectionType = sqlConnectionType;
+
+ TablexiaSettings.init(buildTypeKey, systemLocale, versionName);
}
private void loadingComplete() {
diff --git a/core/src/cz/nic/tablexia/TablexiaSettings.java b/core/src/cz/nic/tablexia/TablexiaSettings.java
index d675ed733..dbec87ee7 100644
--- a/core/src/cz/nic/tablexia/TablexiaSettings.java
+++ b/core/src/cz/nic/tablexia/TablexiaSettings.java
@@ -157,10 +157,6 @@ public class TablexiaSettings {
return instance;
}
- static void init(boolean debug, Locale systemLocale, String versionName) {
- TablexiaSettings.init(debug ? BuildType.DEBUG : BuildType.RELEASE, systemLocale, versionName);
- }
-
static void init(String buildTypeKey, Locale systemLocale, String versionName) {
TablexiaSettings.init(BuildType.getBuildTypeForKey(buildTypeKey), systemLocale, versionName);
}
--
GitLab