From: kruland2607 <kruland2607@180e2498-e6e9-4542-8430-84ac67f01cd8>
Date: Thu, 16 Feb 2012 19:21:55 +0000 (+0000)
Subject: Populate the warning dialog with the messages.  Fix the onCLick and onCancel to not... 
X-Git-Tag: upstream/12.03~1^2~50
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=333ab0cba030a606c8af994833239695aef13156;p=debian%2Fopenrocket

Populate the warning dialog with the messages.  Fix the onCLick and onCancel to not finish the activity but instead make the workflow move on to the viewer.

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

diff --git a/android/src/net/sf/openrocket/android/rocket/WarningDialogFragment.java b/android/src/net/sf/openrocket/android/rocket/WarningDialogFragment.java
index e84c9739..bab2cc91 100644
--- a/android/src/net/sf/openrocket/android/rocket/WarningDialogFragment.java
+++ b/android/src/net/sf/openrocket/android/rocket/WarningDialogFragment.java
@@ -1,5 +1,8 @@
 package net.sf.openrocket.android.rocket;
 
+import net.sf.openrocket.aerodynamics.Warning;
+import net.sf.openrocket.aerodynamics.WarningSet;
+import net.sf.openrocket.android.Application;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.DialogInterface;
@@ -21,14 +24,20 @@ public class WarningDialogFragment extends DialogFragment {
 		AlertDialog.Builder builder =  new AlertDialog.Builder(getActivity());
 		//	                .setIcon(android.R.drawable.alert_dialog_icon)
 		builder.setTitle("Warnings");
+		WarningSet warnings = ((Application)(getActivity().getApplication())).getWarnings();
+		StringBuilder message = new StringBuilder();
+		for ( Warning w : warnings ) {
+			message.append(w.toString()).append("\n");
+		}
+		builder.setMessage(message.toString());
 		builder.setPositiveButton("OK", new DialogInterface.OnClickListener() {
 			public void onClick(DialogInterface dialog, int whichButton) {
-				getActivity().finish();
+				((OpenRocketLoaderActivity)getActivity()).moveOnToViewer();
 			}
 		});
 		builder.setOnCancelListener(new DialogInterface.OnCancelListener() {
 			public void onCancel(DialogInterface dialog) {
-				getActivity().finish();
+				((OpenRocketLoaderActivity)getActivity()).moveOnToViewer();
 			}
 		});
 		return builder.create();