Improved message provided during progress.

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

diff --git a/android/src/net/sf/openrocket/android/thrustcurve/TCQueryAction.java b/android/src/net/sf/openrocket/android/thrustcurve/TCQueryAction.java
index 69714cbdc263eb58ee87b150549f45daf8b34abc..81ce21044ded21c684a0121b22b036d0b48261fb 100644 (file)
--- a/android/src/net/sf/openrocket/android/thrustcurve/TCQueryAction.java
+++ b/android/src/net/sf/openrocket/android/thrustcurve/TCQueryAction.java
@@ -64,7 +64,7 @@ public class TCQueryAction {
        public void setOnCompleteListener(OnComplete onCompleteListener) {\r
                this.onCompleteListener = onCompleteListener;\r
        }\r
-       \r
+\r
        public void start( SearchRequest request) {\r
                Downloader d = new Downloader(request);\r
 \r
@@ -78,14 +78,14 @@ public class TCQueryAction {
 \r
        public void dismiss() {\r
                // TODO - need to kill the thread.\r
-               \r
+\r
                mDbHelper.close();\r
-               \r
+\r
                if ( progress != null && progress.isShowing() ) {\r
                        progress.dismiss();\r
                }\r
        }\r
-       \r
+\r
        private class UpdateMessage implements Runnable {\r
                private String newMessage;\r
                UpdateMessage( String message ) {\r
@@ -147,7 +147,18 @@ public class TCQueryAction {
                                int total = res.getResults().size();\r
                                int count = 1;\r
                                for( TCMotor mi : res.getResults() ) {\r
-                                       handler.post(new UpdateMessage("Downloading details " + count + " of " + total));\r
+                                       StringBuilder message = new StringBuilder();\r
+                                       message.append("Downloading details ");\r
+                                       if ( total > 1 ) {\r
+                                               message.append(count);\r
+                                               message.append(" of " );\r
+                                               message.append(total);\r
+                                               message.append("\n");\r
+                                       }\r
+                                       message.append(mi.getManufacturer());\r
+                                       message.append(" ");\r
+                                       message.append(mi.getCommon_name());\r
+                                       handler.post(new UpdateMessage(message.toString()));\r
                                        count++;\r
                                        if ( mi.getData_files() == null || mi.getData_files().intValue() == 0 ) {\r
                                                continue;\r