Fix some import order and code style

Author: foxykeep

generator/res/content_class.txt

@@ -1,14 +1,14 @@
 package %1$s.%4$s;
 
+import %1$s.%5$s.ColumnMetadata;
+
 import android.content.ContentValues;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteStatement;
 import android.net.Uri;
 import android.provider.BaseColumns;
 import android.util.Log;
 
-import %1$s.%5$s.ColumnMetadata;
-
 /**
  * This class was generated by the ContentProviderCodeGenerator project made by Foxykeep
  * <p>

generator/res/content_subclass.txt

@@ -56,7 +56,7 @@
 %16$s        public static void upgradeTable(SQLiteDatabase db, int oldVersion, int newVersion) {
 
             if (oldVersion < 1) {
-                Log.i(LOG_TAG, "Upgrading from version " + oldVersion + " to " + newVersion 
+                Log.i(LOG_TAG, "Upgrading from version " + oldVersion + " to " + newVersion
                         + ", data will be lost!");
 
                 db.execSQL("DROP TABLE IF EXISTS " + TABLE_NAME + ";");
@@ -66,7 +66,7 @@
 %17$s
 
             if (oldVersion != newVersion) {
-                throw new IllegalStateException("Error upgrading the database to version " 
+                throw new IllegalStateException("Error upgrading the database to version "
                         + newVersion);
             }
         }

generator/res/provider.txt

@@ -1,5 +1,6 @@
 package %1$s.%11$s;
 
+%2$s
 import android.content.ContentProvider;
 import android.content.ContentProviderOperation;
 import android.content.ContentProviderResult;
@@ -16,7 +17,6 @@ import android.net.Uri;
 import android.provider.BaseColumns;
 import android.util.Log;
 
-%2$s
 import java.util.ArrayList;
 
 /**