Database

src/ch/spherIC/recurvebowsight/database/RBSDatabaseHelper.java

@@ -8,6 +8,7 @@ import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 
+import ch.spherIC.recurvebowsight.database.dao.ArcherySetupDao;
 import ch.spherIC.recurvebowsight.database.dao.RiserDao;
 import ch.spherIC.recurvebowsight.database.dao.SightDao;
 import ch.spherIC.recurvebowsight.database.scheme.data.TblRBSArcherySetup;
@@ -37,7 +38,6 @@ public final class RBSDatabaseHelper extends SQLiteOpenHelper {
     private static RBSDatabaseHelper instance;
     private static Context context;
     private static String actualDBName = DB_NAME;
-    private SQLiteDatabase database;
     private boolean databaseCreated = false;
 
 
@@ -75,7 +75,8 @@ public final class RBSDatabaseHelper extends SQLiteOpenHelper {
 
 
     public void initializeDB() {
-        this.database = getWritableDatabase();
+        this.databaseCreated = false;
+        getWritableDatabase();
 
         if (this.databaseCreated) {
             insertMasterData();
@@ -89,6 +90,7 @@ public final class RBSDatabaseHelper extends SQLiteOpenHelper {
         db.execSQL(TblRBSRiser.getCreateStatement());
         db.execSQL(TblRBSSight.getCreateStatement());
         db.execSQL(TblRBSArcherySetup.getCreateStatement());
+
         this.databaseCreated = true;
     }
 
@@ -96,6 +98,11 @@ public final class RBSDatabaseHelper extends SQLiteOpenHelper {
      * Masterdaten einfügen.
      */
     public void insertMasterData() {
+
+        IRiser riserFS;
+        ISight sightFS;
+        IArcherySetup archerySetup = getArcherySetupMasterData();
+
         for (IRiser riser : getRiserMasterData()) {
             riser = RiserDao.getInstance().insert(riser);
         }
@@ -103,6 +110,12 @@ public final class RBSDatabaseHelper extends SQLiteOpenHelper {
         for (ISight sight : getSightMasterData()) {
             sight = SightDao.getInstance().insert(sight);
         }
+
+        riserFS = RiserDao.getInstance().loadById(1);
+        sightFS = SightDao.getInstance().loadById(1);
+        archerySetup.setRiser(riserFS);
+        archerySetup.setSight(sightFS);
+        ArcherySetupDao.getInstance().insert(archerySetup);
     }
 
 
@@ -131,13 +144,7 @@ public final class RBSDatabaseHelper extends SQLiteOpenHelper {
         return sights;
     }
 
-    private List<IArcherySetup> getArcherySetupMasterData() {
-
-        List<IArcherySetup> sights = new ArrayList<IArcherySetup>();
-
-        sights.add(new ArcherySetup(0, null, null, 5.8, 3.10, 21d, 64.25, 1.30, 71d, 1.57, 14.8, 0.001, 0.1, 55d,
-                                    260d));
-
-        return sights;
+    private IArcherySetup getArcherySetupMasterData() {
+        return new ArcherySetup(0, null, null, 5.8, 3.10, 21d, 64.25, 1.30, 71d, 1.57, 14.8, 0.001, 0.1, 55d, 260d);
     }
 }