Uncluttered code by reordering methods. Method code is untouched

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / db / DbHandler.java

diff --git a/src/eu/alefzero/owncloud/db/DbHandler.java b/src/eu/alefzero/owncloud/db/DbHandler.java
index d2e0b11..ab35dda 100644 (file)
--- a/src/eu/alefzero/owncloud/db/DbHandler.java
+++ b/src/eu/alefzero/owncloud/db/DbHandler.java
@@ -26,78 +26,81 @@ import android.content.Context;
 import android.database.Cursor;\r
 import android.database.sqlite.SQLiteDatabase;\r
 import android.database.sqlite.SQLiteOpenHelper;\r
 import android.database.Cursor;\r
 import android.database.sqlite.SQLiteDatabase;\r
 import android.database.sqlite.SQLiteOpenHelper;\r

-import android.util.Log;\r

 \r
 /**\r
  * Custom database helper for ownCloud\r
 \r
 /**\r
  * Custom database helper for ownCloud\r

+ * \r

  * @author Bartek Przybylski\r
  * @author Bartek Przybylski\r

- *\r
+ * \r

  */\r
 public class DbHandler {\r
  */\r
 public class DbHandler {\r

-  private SQLiteDatabase mDB;\r
-  private OpenerHepler mHelper;\r
-  private final String mDatabaseName = "ownCloud";\r
-  private final String TABLE_SESSIONS = "sessions";\r
-  private final int mDatabaseVersion = 1;\r
-  \r
-  public DbHandler(Context context) {\r
-    mHelper = new OpenerHepler(context);\r
-    mDB = mHelper.getWritableDatabase();\r
-  }\r
-  \r
-  public Vector<OwnCloudSession> getSessionList() {\r
-    Cursor c = mDB.query(TABLE_SESSIONS, null, null, null, null, null, null);\r
-    Vector<OwnCloudSession> v = new Vector<OwnCloudSession>();\r
-    if (!c.moveToFirst()) {\r
-      return v;\r
+    private SQLiteDatabase mDB;\r
+    private OpenerHepler mHelper;\r
+    private final String mDatabaseName = "ownCloud";\r
+    private final String TABLE_SESSIONS = "sessions";\r
+    private final int mDatabaseVersion = 1;\r
+\r
+    public DbHandler(Context context) {\r
+        mHelper = new OpenerHepler(context);\r
+        mDB = mHelper.getWritableDatabase();\r

     }\r
     }\r

-    while (!c.isAfterLast()) {\r
-      v.add(new OwnCloudSession(c.getString(c.getColumnIndex("sessionName")),\r
-                                c.getString(c.getColumnIndex("sessionUrl")),\r
-                                c.getInt(c.getColumnIndex("_id"))));\r
-      c.moveToNext();\r
+\r
+    public Vector<OwnCloudSession> getSessionList() {\r
+        Cursor c = mDB\r
+                .query(TABLE_SESSIONS, null, null, null, null, null, null);\r
+        Vector<OwnCloudSession> v = new Vector<OwnCloudSession>();\r
+        if (!c.moveToFirst()) {\r
+            return v;\r
+        }\r
+        while (!c.isAfterLast()) {\r
+            v.add(new OwnCloudSession(c.getString(c\r
+                    .getColumnIndex("sessionName")), c.getString(c\r
+                    .getColumnIndex("sessionUrl")), c.getInt(c\r
+                    .getColumnIndex("_id"))));\r
+            c.moveToNext();\r
+        }\r
+        c.close();\r
+        return v;\r
+    }\r
+\r
+    public void addSession(String sessionName, String uri) {\r
+        ContentValues cv = new ContentValues();\r
+        cv.put("sessionName", sessionName);\r
+        cv.put("sessionUrl", uri);\r
+        mDB.insert(TABLE_SESSIONS, null, cv);\r

     }\r
     }\r

-    c.close();\r
-    return v;\r
-  }\r
-  \r
-  public void addSession(String sessionName, String uri) {\r
-    ContentValues cv = new ContentValues();\r
-    cv.put("sessionName", sessionName);\r
-    cv.put("sessionUrl", uri);\r
-    mDB.insert(TABLE_SESSIONS, null, cv);\r
-  }\r
-  \r
-  public void removeSessionWithId(int sessionId) {\r
-    mDB.delete(TABLE_SESSIONS, "_id = ?", new String[] {String.valueOf(sessionId)});\r
-  }\r

 \r
 \r

-  public void changeSessionFields(int id, String hostname, String uri) {\r
-    ContentValues cv = new ContentValues();\r
-    cv.put("sessionName", hostname);\r
-    cv.put("sessionUrl", uri);\r
-    mDB.update(TABLE_SESSIONS, cv, "_id = ?", new String[] {String.valueOf(id)});\r
-  }\r
-  \r
-  public void close() {\r
-    mDB.close();\r
-  }\r
-  \r
-  private class OpenerHepler extends SQLiteOpenHelper {\r
-    public OpenerHepler(Context context) {\r
-      super(context, mDatabaseName, null, mDatabaseVersion);\r
+    public void removeSessionWithId(int sessionId) {\r
+        mDB.delete(TABLE_SESSIONS, "_id = ?",\r
+                new String[] { String.valueOf(sessionId) });\r

     }\r
 \r
     }\r
 \r

-    @Override\r
-    public void onCreate(SQLiteDatabase db) {\r
-      db.execSQL("CREATE TABLE " + TABLE_SESSIONS + " (" +\r
-                 " _id INTEGER PRIMARY KEY, " +\r
-                 " sessionName TEXT, " +\r
-                 " sessionUrl  TEXT);");\r
+    public void changeSessionFields(int id, String hostname, String uri) {\r
+        ContentValues cv = new ContentValues();\r
+        cv.put("sessionName", hostname);\r
+        cv.put("sessionUrl", uri);\r
+        mDB.update(TABLE_SESSIONS, cv, "_id = ?",\r
+                new String[] { String.valueOf(id) });\r

     }\r
 \r
     }\r
 \r

-    @Override\r
-    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {\r
+    public void close() {\r
+        mDB.close();\r
+    }\r
+\r
+    private class OpenerHepler extends SQLiteOpenHelper {\r
+        public OpenerHepler(Context context) {\r
+            super(context, mDatabaseName, null, mDatabaseVersion);\r
+        }\r
+\r
+        @Override\r
+        public void onCreate(SQLiteDatabase db) {\r
+            db.execSQL("CREATE TABLE " + TABLE_SESSIONS + " ("\r
+                    + " _id INTEGER PRIMARY KEY, " + " sessionName TEXT, "\r
+                    + " sessionUrl  TEXT);");\r
+        }\r
+\r
+        @Override\r
+        public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {\r
+        }\r

     }\r
     }\r

-  }\r

 }\r
 }\r