Move the creation/update logs from the provider to the content class

This change makes the code more readable in the onCreate and onUpgrade
method in the Provider class.

Fixes foxykeep#14

Author: foxykeep

generator/res/content_subclass.txt

@@ -48,12 +48,21 @@
         }
 
         public static void createTable(SQLiteDatabase db) {
+            if (%2$sProvider.ACTIVATE_ALL_LOGS) {
+                Log.d(LOG_TAG, "%1$s | createTable start");
+            }
             db.execSQL("CREATE TABLE " + TABLE_NAME + " (" + %8$s%9$s + ");");
 
-%10$s        }
+%10$s            if (%2$sProvider.ACTIVATE_ALL_LOGS) {
+                Log.d(LOG_TAG, "%1$s | createTable end");
+            }
+        }
 
         // Version %15$d : Creation of the table
 %16$s        public static void upgradeTable(SQLiteDatabase db, int oldVersion, int newVersion) {
+            if (%2$sProvider.ACTIVATE_ALL_LOGS) {
+                Log.d(LOG_TAG, "%1$s | upgradeTable start");
+            }
 
             if (oldVersion < %15$d) {
                 Log.i(LOG_TAG, "Upgrading from version " + oldVersion + " to " + newVersion
@@ -69,6 +78,10 @@
                 throw new IllegalStateException("Error upgrading the database to version "
                         + newVersion);
             }
+
+            if (%2$sProvider.ACTIVATE_ALL_LOGS) {
+                Log.d(LOG_TAG, "%1$s | upgradeTable end");
+            }
         }
 
         static String getBulkInsertString() {

generator/res/provider.txt

@@ -28,7 +28,7 @@ public %14$sclass %3$sProvider extends ContentProvider {
 
     private static final String LOG_TAG = %3$sProvider.class.getSimpleName();
 
-    private static final boolean ACTIVATE_ALL_LOGS = false;
+    /* package */ static final boolean ACTIVATE_ALL_LOGS = false;
 
     protected static final String DATABASE_NAME = "%3$sProvider.db";
 

generator/src/com/foxykeep/cpcodegenerator/generator/DatabaseGenerator.java

@@ -441,31 +441,11 @@ private static void generateProviderClass(final String fileName, final String cl
                     tableData.dbClassName, " + \"/#\"", "TYPE_DIR_TYPE",
                     i != tableDataListSize - 1 ? "," : ";"));
 
-            sbCreateTables
-                    .append("            if (ACTIVATE_ALL_LOGS) {\n")
-                    .append("                Log.d(LOG_TAG, \"")
-                    .append(tableData.dbClassName)
-                    .append(" | createTable start\");\n            }\n");
             sbCreateTables.append("            ").append(tableData.dbClassName)
                     .append(".createTable(db);\n");
-            sbCreateTables
-                    .append("            if (ACTIVATE_ALL_LOGS) {\n")
-                    .append("                Log.d(LOG_TAG, \"")
-                    .append(tableData.dbClassName)
-                    .append(" | createTable end\");\n            }\n");
-
-            sbUpgradeTables
-                    .append("            if (ACTIVATE_ALL_LOGS) {\n")
-                    .append("                Log.d(LOG_TAG, \"")
-                    .append(tableData.dbClassName)
-                    .append(" | upgradeTable start\");\n            }\n");
+
             sbUpgradeTables.append("            ").append(tableData.dbClassName)
                     .append(".upgradeTable(db, oldVersion, newVersion);\n");
-            sbUpgradeTables
-                    .append("            if (ACTIVATE_ALL_LOGS) {\n")
-                    .append("                Log.d(LOG_TAG, \"")
-                    .append(tableData.dbClassName)
-                    .append(" | upgradeTable end\");\n            }\n");
 
             sbCaseWithId.append("            case ").append(tableData.dbConstantName)
                     .append("_ID:\n");