From: kruland2607 <kruland2607@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Thu, 26 Jan 2012 00:56:18 +0000 (+0000)
Subject: Rename the class OpenRocketLoader to OpenRocketLoaderActivity to prevent confusion... 
X-Git-Tag: upstream/12.03~1^2~97
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=b386dd853284fafcf1b3d17684c8e7eb3f918d51;p=debian%2Fopenrocket

Rename the class OpenRocketLoader to OpenRocketLoaderActivity to prevent confusion with the core's OpenRocketLoader.

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