Merge commit '42b2e5ca519766e37ce6941ba4faecc9691cc403' into upstream

[debian/openrocket] / android / src / net / sf / openrocket / android / rocket / WarningDialogFragment.java

diff --git a/android/src/net/sf/openrocket/android/rocket/WarningDialogFragment.java b/android/src/net/sf/openrocket/android/rocket/WarningDialogFragment.java
index e84c9739267a7be545fa3bf4d7710c47d1a1c949..891062bfe0ca28e49cd43cfd537c502a05c93a32 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.CurrentRocketHolder;\r
 import android.app.AlertDialog;\r
 import android.app.Dialog;\r
 import android.content.DialogInterface;\r
@@ -12,6 +15,7 @@ public class WarningDialogFragment extends DialogFragment {
                WarningDialogFragment frag = new WarningDialogFragment();\r
                Bundle args = new Bundle();\r
                frag.setArguments(args);\r
+               frag.setCancelable(false);\r
                return frag;\r
        }\r
 \r
@@ -21,16 +25,18 @@ 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 = CurrentRocketHolder.getCurrentRocket().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
-                       }\r
-               });\r
-               return builder.create();\r
+               Dialog dialog = builder.create();\r
+               return dialog;\r
        }\r
 }\r