Populate the warning dialog with the messages. Fix the onCLick and onCancel to not...

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 e84c9739267a7be545fa3bf4d7710c47d1a1c949..bab2cc916170a096e78333e90da253f511230ac8 100644 (file)
--- 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;\r
 \r
+import net.sf.openrocket.aerodynamics.Warning;\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.content.DialogInterface;\r
@@ -21,14 +24,20 @@ public class WarningDialogFragment extends DialogFragment {
                AlertDialog.Builder builder =  new AlertDialog.Builder(getActivity());\r
                //                      .setIcon(android.R.drawable.alert_dialog_icon)\r
                builder.setTitle("Warnings");\r
+               WarningSet warnings = ((Application)(getActivity().getApplication())).getWarnings();\r
+               StringBuilder message = new StringBuilder();\r
+               for ( Warning w : warnings ) {\r
+                       message.append(w.toString()).append("\n");\r
+               }\r
+               builder.setMessage(message.toString());\r
                builder.setPositiveButton("OK", new DialogInterface.OnClickListener() {\r
                        public void onClick(DialogInterface dialog, int whichButton) {\r
-                               getActivity().finish();\r
+                               ((OpenRocketLoaderActivity)getActivity()).moveOnToViewer();\r
                        }\r
                });\r
                builder.setOnCancelListener(new DialogInterface.OnCancelListener() {\r
                        public void onCancel(DialogInterface dialog) {\r
-                               getActivity().finish();\r
+                               ((OpenRocketLoaderActivity)getActivity()).moveOnToViewer();\r
                        }\r
                });\r
                return builder.create();\r