hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Kevin Ruland 2012-01-26 00:56:18 +00:00
parent 787407fae4
commit 27acc364ec
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/AndroidManifest.xml
View File

@ -27,7 +27,7 @@
</intent-filter> </intent-filter>
</activity> </activity>
<activity <activity
android:name=".android.rocket.OpenRocketLoader" android:name=".android.rocket.OpenRocketLoaderActivity"
android:label="@string/app_name" > android:label="@string/app_name" >
<!-- <!--

10
android/src/net/sf/openrocket/android/rocket/OpenRocketLoader.java → android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderActivity.java
View File

@ -16,7 +16,7 @@ import android.support.v4.app.DialogFragment;
import android.support.v4.app.FragmentActivity; import android.support.v4.app.FragmentActivity;
import android.util.Log; import android.util.Log;
public class OpenRocketLoader extends FragmentActivity { public class OpenRocketLoaderActivity extends FragmentActivity {
private static final String TAG = "OpenRocketLoader"; private static final String TAG = "OpenRocketLoader";
private ProgressDialog progress; private ProgressDialog progress;
@ -55,7 +55,7 @@ public class OpenRocketLoader extends FragmentActivity {
@Override @Override
protected void onPostExecute(OpenRocketLoaderResult result) { protected void onPostExecute(OpenRocketLoaderResult result) {
super.onPostExecute(result); super.onPostExecute(result);
Log.d(TAG,"Finished loading " + OpenRocketLoader.this); Log.d(TAG,"Finished loading " + OpenRocketLoaderActivity.this);
finishedLoading(result); finishedLoading(result);
} }
@ -72,7 +72,7 @@ public class OpenRocketLoader extends FragmentActivity {
WarningSet warnings = result.warnings; WarningSet warnings = result.warnings;
if (warnings == null || warnings.isEmpty()) { 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); Intent i = new Intent(this,OpenRocketViewer.class);
startActivity(i); startActivity(i);
finish(); finish();
@ -113,14 +113,14 @@ public class OpenRocketLoader extends FragmentActivity {
.setPositiveButton("OK", .setPositiveButton("OK",
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) { public void onClick(DialogInterface dialog, int whichButton) {
((OpenRocketLoader)getActivity()).doPositiveClick(); ((OpenRocketLoaderActivity)getActivity()).doPositiveClick();
} }
} }
) )
.setNegativeButton("Cancel", .setNegativeButton("Cancel",
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) { public void onClick(DialogInterface dialog, int whichButton) {
((OpenRocketLoader)getActivity()).doNegativeClick(); ((OpenRocketLoaderActivity)getActivity()).doNegativeClick();
} }
} }
) )