From 09ba5a4eb2e84a5659b18614c773f30d82b21d5a Mon Sep 17 00:00:00 2001
From: benfry <fry@processing.org>
Date: Sun, 8 Aug 2010 19:58:45 +0000
Subject: [PATCH] fix width of the progress window, also fix a bug for the
 removed 'label' xml

---
 android/todo.txt                                   | 14 ++++++++------
 .../android/IndeterminateProgressMonitor.java      | 12 +++---------
 .../src/processing/app/tools/android/Manifest.java |  4 ----
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/android/todo.txt b/android/todo.txt
index 75701caa7..169c7d1ba 100644
--- a/android/todo.txt
+++ b/android/todo.txt
@@ -58,6 +58,9 @@ o remove SurfaceView2D/SurfaceView3D separation, or clean up
 o test controlp5 with android
 X get core.zip out of svn (once tool is separate, modes stuff working etc)
 _ StreamPump has been quieted, but maybe this needs to be a global log setting
+X fix the width of the build window
+X some sort of warning re: messing with AndroidManifest.xml
+X   added to the wiki
 
 earlier
 X if sketchRenderer() et al are used in android, need to add to desktop
@@ -66,11 +69,6 @@ X   http://dev.processing.org/bugs/show_bug.cgi?id=1401
 
 _ throw an error if a file in the 'data' dir ends with .gz
 
-_ application local storage: context.getFilesDir().getPath()
-"For those of you interested, the internal 8GB of storage on the phone
-is mounted at /emmc (r/w mode, of course) and microSD cards still
-shows up normally at /sdcard as expected." 
-
 P1 _ exceptions with StreamPump and adb devices on osx and linux
 P1 _   http://dev.processing.org/bugs/show_bug.cgi?id=1545
 P1 _   http://dev.processing.org/bugs/show_bug.cgi?id=1527
@@ -106,7 +104,6 @@ _ provide manifest/android:versionName ('pretty' version number)
 _ setting the default package: manifest/package
 _ application/android:label
 _   used on home screen, manage applications, my downloads, etc
-_ some sort of warning re: messing with AndroidManifest.xml
 _ http://developer.android.com/guide/publishing/preparing.html
 P1 _ implement certificates (self-signed) for distribution
 P1 _   http://developer.android.com/guide/publishing/app-signing.html
@@ -383,5 +380,10 @@ try {
     Log.e(TAG, "Could not write file " + e.getMessage());
 }
 
+_ application local storage: context.getFilesDir().getPath()
+"For those of you interested, the internal 8GB of storage on the phone
+is mounted at /emmc (r/w mode, of course) and microSD cards still
+shows up normally at /sdcard as expected." 
+
 _ other useful tidbits (handlers etc)
 _   http://developer.android.com/guide/appendix/faq/commontasks.html
diff --git a/android/tool/src/processing/app/tools/android/IndeterminateProgressMonitor.java b/android/tool/src/processing/app/tools/android/IndeterminateProgressMonitor.java
index c170903b6..23fb74277 100644
--- a/android/tool/src/processing/app/tools/android/IndeterminateProgressMonitor.java
+++ b/android/tool/src/processing/app/tools/android/IndeterminateProgressMonitor.java
@@ -18,9 +18,8 @@ class IndeterminateProgressMonitor {
 
   IndeterminateProgressMonitor(final Component parentComponent,
                                final Object message, final String note) {
-
-    cancelOption = new Object[] { UIManager
-        .getString("OptionPane.cancelButtonText") };
+    cancelOption = 
+      new Object[] { UIManager.getString("OptionPane.cancelButtonText") };
     progressBar = new JProgressBar();
     progressBar.setIndeterminate(true);
     noteLabel = new JLabel(note);
@@ -35,15 +34,10 @@ class IndeterminateProgressMonitor {
       super(messageList, JOptionPane.INFORMATION_MESSAGE,
             JOptionPane.DEFAULT_OPTION, null,
             IndeterminateProgressMonitor.this.cancelOption, null);
-      setPreferredSize(new Dimension(getPreferredSize().width + 80,
+      setPreferredSize(new Dimension(getPreferredSize().width + 120,
                                      getPreferredSize().height));
     }
 
-    @Override
-    public int getMaxCharactersPerLineCount() {
-      return 60;
-    }
-
     @Override
     public JDialog createDialog(final Component parentComponent,
                                 final String title) throws HeadlessException {
diff --git a/android/tool/src/processing/app/tools/android/Manifest.java b/android/tool/src/processing/app/tools/android/Manifest.java
index 267c12b70..52c2fe9fd 100644
--- a/android/tool/src/processing/app/tools/android/Manifest.java
+++ b/android/tool/src/processing/app/tools/android/Manifest.java
@@ -207,10 +207,6 @@ public class Manifest {
     // the '.' prefix is just an alias for the full package name
     // http://developer.android.com/guide/topics/manifest/activity-element.html#name
     activity.setString("android:name", "." + className);  // this has to be right
-    label = activity.getString("android:label");
-    if (label.length() == 0) {
-      activity.setString("android:label", className);
-    }
 
     PrintWriter writer = PApplet.createWriter(file);
     mf.write(writer);