From 1f3332e279fb64234d34929705de038a47d7faf6 Mon Sep 17 00:00:00 2001
From: Tom Willemsen
Date: Wed, 8 Aug 2012 22:20:13 +0200
Subject: Rearrange

---
 src/ryuslash/org/dvdroid/DVDroidActivity.java | 52 +++++++++++++--------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/ryuslash/org/dvdroid/DVDroidActivity.java b/src/ryuslash/org/dvdroid/DVDroidActivity.java
index 5a46286..613620c 100644
--- a/src/ryuslash/org/dvdroid/DVDroidActivity.java
+++ b/src/ryuslash/org/dvdroid/DVDroidActivity.java
@@ -15,6 +15,30 @@ public class DVDroidActivity extends ListActivity
 {
     private DVDDataSource datasource;
 
+    public void addDVD(View view)
+    {
+        Intent intent = new Intent(this, AddDVDActivity.class);
+
+        datasource.close();
+        startActivityForResult(intent, 1);
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode,
+                                    int resultCode,
+                                    Intent data)
+    {
+        super.onActivityResult(requestCode, resultCode, data);
+        datasource.open();
+
+        ArrayAdapter<DVD> adapter = (ArrayAdapter<DVD>)getListAdapter();
+        List<DVD> dvds = datasource.getWishlist();
+
+        adapter.clear();
+        adapter.addAll(dvds);
+        adapter.notifyDataSetChanged();
+    }
+
     /** Called when the activity is first created. */
     @Override
     public void onCreate(Bundle savedInstanceState)
@@ -34,21 +58,6 @@ public class DVDroidActivity extends ListActivity
         setListAdapter(adapter);
     }
 
-    public void addDVD(View view)
-    {
-        Intent intent = new Intent(this, AddDVDActivity.class);
-
-        datasource.close();
-        startActivityForResult(intent, 1);
-    }
-
-    @Override
-    protected void onResume()
-    {
-        datasource.open();
-        super.onResume();
-    }
-
     @Override
     protected void onPause()
     {
@@ -57,18 +66,9 @@ public class DVDroidActivity extends ListActivity
     }
 
     @Override
-    protected void onActivityResult(int requestCode,
-                                    int resultCode,
-                                    Intent data)
+    protected void onResume()
     {
-        super.onActivityResult(requestCode, resultCode, data);
         datasource.open();
-
-        ArrayAdapter<DVD> adapter = (ArrayAdapter<DVD>)getListAdapter();
-        List<DVD> dvds = datasource.getWishlist();
-
-        adapter.clear();
-        adapter.addAll(dvds);
-        adapter.notifyDataSetChanged();
+        super.onResume();
     }
 }
-- 
cgit v1.2.3-54-g00ecf