Rename the class OpenRocketLoader to OpenRocketLoaderActivity to prevent confusion...

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@374 180e2498-e6e9-4542-8430-84ac67f01cd8

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index e0b9dba3513990d76a1907e8213f771684f0cd4f..dd01420b5b1f057054c7dd60ae17fde34844ce84 100644 (file)
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -27,7 +27,7 @@
             </intent-filter>\r
         </activity>\r
         <activity\r
-            android:name=".android.rocket.OpenRocketLoader"\r
+            android:name=".android.rocket.OpenRocketLoaderActivity"\r
             android:label="@string/app_name" >\r
 \r
             <!--\r

diff --git a/android/src/net/sf/openrocket/android/rocket/OpenRocketLoader.java b/android/src/net/sf/openrocket/android/rocket/OpenRocketLoader.java
deleted file mode 100644 (file)
index dbdd01c..0000000
--- a/android/src/net/sf/openrocket/android/rocket/OpenRocketLoader.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package net.sf.openrocket.android.rocket;\r
-\r
-import java.io.File;\r
-\r
-import net.sf.openrocket.R;\r
-import net.sf.openrocket.aerodynamics.WarningSet;\r
-import net.sf.openrocket.android.Application;\r
-import android.app.AlertDialog;\r
-import android.app.Dialog;\r
-import android.app.ProgressDialog;\r
-import android.content.DialogInterface;\r
-import android.content.Intent;\r
-import android.net.Uri;\r
-import android.os.Bundle;\r
-import android.support.v4.app.DialogFragment;\r
-import android.support.v4.app.FragmentActivity;\r
-import android.util.Log;\r
-\r
-public class OpenRocketLoader extends FragmentActivity {\r
-       private static final String TAG = "OpenRocketLoader";\r
-\r
-       private ProgressDialog progress;\r
-\r
-       @Override\r
-       protected void onCreate(Bundle savedInstanceState) {\r
-               super.onCreate(savedInstanceState);\r
-               setContentView(R.layout.main);\r
-               Intent i = getIntent();\r
-               Uri file = i.getData();\r
-               loadOrkFile(file);\r
-       }\r
-\r
-       @Override\r
-       protected void onDestroy() {\r
-               if ( progress != null ) {\r
-                       if ( progress.isShowing() ) {\r
-                               progress.dismiss();\r
-                       }\r
-                       progress = null;\r
-               }\r
-               super.onDestroy();\r
-       }\r
-\r
-       private void loadOrkFile( Uri file ) {\r
-               Log.d(TAG,"Use ork file: " + file);\r
-               String path = file.getPath();\r
-               File orkFile = new File(path);\r
-               progress = ProgressDialog.show(this, "Loading file", "");\r
-\r
-               final OpenRocketLoaderTask task = new OpenRocketLoaderTask() {\r
-\r
-                       /* (non-Javadoc)\r
-                        * @see android.os.AsyncTask#onPostExecute(java.lang.Object)\r
-                        */\r
-                       @Override\r
-                       protected void onPostExecute(OpenRocketLoaderResult result) {\r
-                               super.onPostExecute(result);\r
-                               Log.d(TAG,"Finished loading " + OpenRocketLoader.this);\r
-                               finishedLoading(result);\r
-                       }\r
-\r
-               };\r
-\r
-               task.execute(orkFile);\r
-\r
-       }\r
-       \r
-       private void finishedLoading(OpenRocketLoaderResult result) {\r
-               if ( progress.isShowing() ) {\r
-                       progress.dismiss();\r
-               }\r
-\r
-               WarningSet warnings = result.warnings;\r
-               if (warnings == null || warnings.isEmpty()) {\r
-                       ((Application)OpenRocketLoader.this.getApplication()).setRocketDocument( result.rocket );\r
-                       Intent i = new Intent(this,OpenRocketViewer.class);\r
-                       startActivity(i);\r
-                       finish();\r
-               } else {\r
-                       // TODO - Build a warning listing dialog\r
-                       DialogFragment newFragment = WarningDialogFragment.newInstance();\r
-                       newFragment.show(getSupportFragmentManager(), "dialog");\r
-               }\r
-       }\r
-\r
-    public void doPositiveClick() {\r
-        // Do stuff here.\r
-        Log.i("FragmentAlertDialog", "Positive click!");\r
-        finish();\r
-    }\r
-\r
-    public void doNegativeClick() {\r
-        // Do stuff here.\r
-        Log.i("FragmentAlertDialog", "Negative click!");\r
-        finish();\r
-    }\r
-\r
-    public static class WarningDialogFragment extends DialogFragment {\r
-\r
-           public static WarningDialogFragment newInstance() {\r
-               WarningDialogFragment frag = new WarningDialogFragment();\r
-               Bundle args = new Bundle();\r
-               frag.setArguments(args);\r
-               return frag;\r
-           }\r
-\r
-           @Override\r
-           public Dialog onCreateDialog(Bundle savedInstanceState) {\r
-\r
-               return new AlertDialog.Builder(getActivity())\r
-//                     .setIcon(android.R.drawable.alert_dialog_icon)\r
-                       .setTitle("Warnings")\r
-                       .setPositiveButton("OK",\r
-                           new DialogInterface.OnClickListener() {\r
-                               public void onClick(DialogInterface dialog, int whichButton) {\r
-                                   ((OpenRocketLoader)getActivity()).doPositiveClick();\r
-                               }\r
-                           }\r
-                       )\r
-                       .setNegativeButton("Cancel",\r
-                           new DialogInterface.OnClickListener() {\r
-                               public void onClick(DialogInterface dialog, int whichButton) {\r
-                                   ((OpenRocketLoader)getActivity()).doNegativeClick();\r
-                               }\r
-                           }\r
-                       )\r
-                       .create();\r
-           }\r
-       }\r
-}\r

diff --git a/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderActivity.java b/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderActivity.java
new file mode 100644 (file)
index 0000000..3665814
--- /dev/null
+++ b/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderActivity.java
@@ -0,0 +1,130 @@
+package net.sf.openrocket.android.rocket;\r
+\r
+import java.io.File;\r
+\r
+import net.sf.openrocket.R;\r
+import net.sf.openrocket.aerodynamics.WarningSet;\r
+import net.sf.openrocket.android.Application;\r
+import android.app.AlertDialog;\r
+import android.app.Dialog;\r
+import android.app.ProgressDialog;\r
+import android.content.DialogInterface;\r
+import android.content.Intent;\r
+import android.net.Uri;\r
+import android.os.Bundle;\r
+import android.support.v4.app.DialogFragment;\r
+import android.support.v4.app.FragmentActivity;\r
+import android.util.Log;\r
+\r
+public class OpenRocketLoaderActivity extends FragmentActivity {\r
+       private static final String TAG = "OpenRocketLoader";\r
+\r
+       private ProgressDialog progress;\r
+\r
+       @Override\r
+       protected void onCreate(Bundle savedInstanceState) {\r
+               super.onCreate(savedInstanceState);\r
+               setContentView(R.layout.main);\r
+               Intent i = getIntent();\r
+               Uri file = i.getData();\r
+               loadOrkFile(file);\r
+       }\r
+\r
+       @Override\r
+       protected void onDestroy() {\r
+               if ( progress != null ) {\r
+                       if ( progress.isShowing() ) {\r
+                               progress.dismiss();\r
+                       }\r
+                       progress = null;\r
+               }\r
+               super.onDestroy();\r
+       }\r
+\r
+       private void loadOrkFile( Uri file ) {\r
+               Log.d(TAG,"Use ork file: " + file);\r
+               String path = file.getPath();\r
+               File orkFile = new File(path);\r
+               progress = ProgressDialog.show(this, "Loading file", "");\r
+\r
+               final OpenRocketLoaderTask task = new OpenRocketLoaderTask() {\r
+\r
+                       /* (non-Javadoc)\r
+                        * @see android.os.AsyncTask#onPostExecute(java.lang.Object)\r
+                        */\r
+                       @Override\r
+                       protected void onPostExecute(OpenRocketLoaderResult result) {\r
+                               super.onPostExecute(result);\r
+                               Log.d(TAG,"Finished loading " + OpenRocketLoaderActivity.this);\r
+                               finishedLoading(result);\r
+                       }\r
+\r
+               };\r
+\r
+               task.execute(orkFile);\r
+\r
+       }\r
+       \r
+       private void finishedLoading(OpenRocketLoaderResult result) {\r
+               if ( progress.isShowing() ) {\r
+                       progress.dismiss();\r
+               }\r
+\r
+               WarningSet warnings = result.warnings;\r
+               if (warnings == null || warnings.isEmpty()) {\r
+                       ((Application)OpenRocketLoaderActivity.this.getApplication()).setRocketDocument( result.rocket );\r
+                       Intent i = new Intent(this,OpenRocketViewer.class);\r
+                       startActivity(i);\r
+                       finish();\r
+               } else {\r
+                       // TODO - Build a warning listing dialog\r
+                       DialogFragment newFragment = WarningDialogFragment.newInstance();\r
+                       newFragment.show(getSupportFragmentManager(), "dialog");\r
+               }\r
+       }\r
+\r
+    public void doPositiveClick() {\r
+        // Do stuff here.\r
+        Log.i("FragmentAlertDialog", "Positive click!");\r
+        finish();\r
+    }\r
+\r
+    public void doNegativeClick() {\r
+        // Do stuff here.\r
+        Log.i("FragmentAlertDialog", "Negative click!");\r
+        finish();\r
+    }\r
+\r
+    public static class WarningDialogFragment extends DialogFragment {\r
+\r
+           public static WarningDialogFragment newInstance() {\r
+               WarningDialogFragment frag = new WarningDialogFragment();\r
+               Bundle args = new Bundle();\r
+               frag.setArguments(args);\r
+               return frag;\r
+           }\r
+\r
+           @Override\r
+           public Dialog onCreateDialog(Bundle savedInstanceState) {\r
+\r
+               return new AlertDialog.Builder(getActivity())\r
+//                     .setIcon(android.R.drawable.alert_dialog_icon)\r
+                       .setTitle("Warnings")\r
+                       .setPositiveButton("OK",\r
+                           new DialogInterface.OnClickListener() {\r
+                               public void onClick(DialogInterface dialog, int whichButton) {\r
+                                   ((OpenRocketLoaderActivity)getActivity()).doPositiveClick();\r
+                               }\r
+                           }\r
+                       )\r
+                       .setNegativeButton("Cancel",\r
+                           new DialogInterface.OnClickListener() {\r
+                               public void onClick(DialogInterface dialog, int whichButton) {\r
+                                   ((OpenRocketLoaderActivity)getActivity()).doNegativeClick();\r
+                               }\r
+                           }\r
+                       )\r
+                       .create();\r
+           }\r
+       }\r
+}\r