From 27acc364ec4a8a7f4fecf86a29da8b1e76ca806c Mon Sep 17 00:00:00 2001
From: Kevin Ruland <kruland@sunflower.com>
Date: Thu, 26 Jan 2012 00:56:18 +0000
Subject: [PATCH] Rename the class OpenRocketLoader to OpenRocketLoaderActivity
 to prevent confusion with the core's OpenRocketLoader.

---
 android/AndroidManifest.xml                            |  2 +-
 ...RocketLoader.java => OpenRocketLoaderActivity.java} | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename android/src/net/sf/openrocket/android/rocket/{OpenRocketLoader.java => OpenRocketLoaderActivity.java} (86%)

diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index e0b9dba35..dd01420b5 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -27,7 +27,7 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".android.rocket.OpenRocketLoader"
+            android:name=".android.rocket.OpenRocketLoaderActivity"
             android:label="@string/app_name" >
 
             <!--
diff --git a/android/src/net/sf/openrocket/android/rocket/OpenRocketLoader.java b/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderActivity.java
similarity index 86%
rename from android/src/net/sf/openrocket/android/rocket/OpenRocketLoader.java
rename to android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderActivity.java
index dbdd01c1d..366581407 100644
--- a/android/src/net/sf/openrocket/android/rocket/OpenRocketLoader.java
+++ b/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderActivity.java
@@ -16,7 +16,7 @@ import android.support.v4.app.DialogFragment;
 import android.support.v4.app.FragmentActivity;
 import android.util.Log;
 
-public class OpenRocketLoader extends FragmentActivity {
+public class OpenRocketLoaderActivity extends FragmentActivity {
 	private static final String TAG = "OpenRocketLoader";
 
 	private ProgressDialog progress;
@@ -55,7 +55,7 @@ public class OpenRocketLoader extends FragmentActivity {
 			@Override
 			protected void onPostExecute(OpenRocketLoaderResult result) {
 				super.onPostExecute(result);
-				Log.d(TAG,"Finished loading " + OpenRocketLoader.this);
+				Log.d(TAG,"Finished loading " + OpenRocketLoaderActivity.this);
 				finishedLoading(result);
 			}
 
@@ -72,7 +72,7 @@ public class OpenRocketLoader extends FragmentActivity {
 
 		WarningSet warnings = result.warnings;
 		if (warnings == null || warnings.isEmpty()) {
-			((Application)OpenRocketLoader.this.getApplication()).setRocketDocument( result.rocket );
+			((Application)OpenRocketLoaderActivity.this.getApplication()).setRocketDocument( result.rocket );
 			Intent i = new Intent(this,OpenRocketViewer.class);
 			startActivity(i);
 			finish();
@@ -113,14 +113,14 @@ public class OpenRocketLoader extends FragmentActivity {
 	                .setPositiveButton("OK",
 	                    new DialogInterface.OnClickListener() {
 	                        public void onClick(DialogInterface dialog, int whichButton) {
-	                            ((OpenRocketLoader)getActivity()).doPositiveClick();
+	                            ((OpenRocketLoaderActivity)getActivity()).doPositiveClick();
 	                        }
 	                    }
 	                )
 	                .setNegativeButton("Cancel",
 	                    new DialogInterface.OnClickListener() {
 	                        public void onClick(DialogInterface dialog, int whichButton) {
-	                            ((OpenRocketLoader)getActivity()).doNegativeClick();
+	                            ((OpenRocketLoaderActivity)getActivity()).doNegativeClick();
 	                        }
 	                    }
 	                )