From d525b27d4492990867ca410d866629760e63925f Mon Sep 17 00:00:00 2001 From: Tom Willemsen Date: Wed, 8 Aug 2012 23:07:28 +0200 Subject: Rearrange --- src/ryuslash/org/dvdroid/AddDVDActivity.java | 46 ++++++++++++++-------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/src/ryuslash/org/dvdroid/AddDVDActivity.java b/src/ryuslash/org/dvdroid/AddDVDActivity.java index d25affd..f5244c3 100644 --- a/src/ryuslash/org/dvdroid/AddDVDActivity.java +++ b/src/ryuslash/org/dvdroid/AddDVDActivity.java @@ -14,16 +14,6 @@ public class AddDVDActivity extends Activity { private DVDDataSource datasource; - @Override - public void onCreate(Bundle savedInstanceState) - { - super.onCreate(savedInstanceState); - setContentView(R.layout.add); - - datasource = new DVDDataSource(this); - datasource.open(); - } - public void createDVD() { EditText name_entry = (EditText)findViewById(R.id.name_entry); @@ -38,17 +28,21 @@ public class AddDVDActivity extends Activity } @Override - protected void onResume() + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.add); + + datasource = new DVDDataSource(this); datasource.open(); - super.onResume(); } @Override - protected void onPause() + public boolean onCreateOptionsMenu(Menu menu) { - datasource.close(); - super.onPause(); + MenuInflater inflater = getMenuInflater(); + inflater.inflate(R.menu.add_activity, menu); + return true; } @Override @@ -58,14 +52,6 @@ public class AddDVDActivity extends Activity super.onDestroy(); } - @Override - public boolean onCreateOptionsMenu(Menu menu) - { - MenuInflater inflater = getMenuInflater(); - inflater.inflate(R.menu.add_activity, menu); - return true; - } - @Override public boolean onOptionsItemSelected(MenuItem item) { @@ -78,4 +64,18 @@ public class AddDVDActivity extends Activity return false; } + + @Override + protected void onPause() + { + datasource.close(); + super.onPause(); + } + + @Override + protected void onResume() + { + datasource.open(); + super.onResume(); + } } -- cgit v1.2.3-54-g00ecf