checkstyle passes


git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@35 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/samples/hello/src/com/google/gwt/sample/hello/client/Hello.java b/samples/hello/src/com/google/gwt/sample/hello/client/Hello.java
index 0fff9eb..3bc72b7 100644
--- a/samples/hello/src/com/google/gwt/sample/hello/client/Hello.java
+++ b/samples/hello/src/com/google/gwt/sample/hello/client/Hello.java
@@ -22,6 +22,9 @@
 import com.google.gwt.user.client.ui.RootPanel;
 import com.google.gwt.user.client.ui.Widget;
 
+/**
+ * HelloWorld application.
+ */
 public class Hello implements EntryPoint {
 
   public void onModuleLoad() {
@@ -33,5 +36,4 @@
 
     RootPanel.get().add(b);
   }
-
 }
diff --git a/samples/i18n/src/com/google/gwt/sample/i18n/client/Colors.java b/samples/i18n/src/com/google/gwt/sample/i18n/client/Colors.java
index 0011e2a..13a8e9f 100644
--- a/samples/i18n/src/com/google/gwt/sample/i18n/client/Colors.java
+++ b/samples/i18n/src/com/google/gwt/sample/i18n/client/Colors.java
@@ -19,11 +19,27 @@
 import com.google.gwt.i18n.client.ConstantsWithLookup;
 
 /**
-  * Translated colors.
-  */
+ * Translated colors.
+ */
 public interface Colors extends ConstantsWithLookup {
 
   /**
+   * Translated "Black".
+   * 
+   * @return translated "Black"
+   * @gwt.key black
+   */
+  String black();
+
+  /**
+   * Translated "Blue".
+   * 
+   * @return translated "Blue"
+   * @gwt.key blue
+   */
+  String blue();
+
+  /**
    * Translated "Green".
    * 
    * @return translated "Green"
@@ -32,6 +48,22 @@
   String green();
 
   /**
+   * Translated "Grey".
+   * 
+   * @return translated "Grey"
+   * @gwt.key grey
+   */
+  String grey();
+
+  /**
+   * Translated "Light Grey".
+   * 
+   * @return translated "Light Grey"
+   * @gwt.key lightGrey
+   */
+  String lightGrey();
+
+  /**
    * Translated "Red".
    * 
    * @return translated "Red"
@@ -48,22 +80,6 @@
   String white();
 
   /**
-   * Translated "Grey".
-   * 
-   * @return translated "Grey"
-   * @gwt.key grey
-   */
-  String grey();
-
-  /**
-   * Translated "Blue".
-   * 
-   * @return translated "Blue"
-   * @gwt.key blue
-   */
-  String blue();
-
-  /**
    * Translated "Yellow".
    * 
    * @return translated "Yellow"
@@ -71,20 +87,4 @@
    */
   String yellow();
 
-  /**
-   * Translated "Black".
-   * 
-   * @return translated "Black"
-   * @gwt.key black
-   */
-  String black();
-  
-  /**
-   * Translated "Light Grey".
-   * 
-   * @return translated "Light Grey"
-   * @gwt.key lightGrey
-   */
-  String lightGrey();
-  
 }
diff --git a/samples/i18n/src/com/google/gwt/sample/i18n/client/I18N.java b/samples/i18n/src/com/google/gwt/sample/i18n/client/I18N.java
index 2c7aa72..bb6624c 100644
--- a/samples/i18n/src/com/google/gwt/sample/i18n/client/I18N.java
+++ b/samples/i18n/src/com/google/gwt/sample/i18n/client/I18N.java
@@ -128,6 +128,20 @@
     addItems(box, elements);
   }
 
+  private TextBox addTextBox(String label, String defaultValue, HTMLTable t,
+      int row, int column) {
+    HorizontalPanel panel = new HorizontalPanel();
+    final TextBox box = new TextBox();
+    box.setText(defaultValue);
+    panel.add(box);
+    Label l2 = new Label(label);
+    l2.setStyleName(MESSAGES_ARGUMENT_TYPE_STYLE);
+    panel.add(l2);
+    panel.setCellWidth(l2, "250");
+    t.setWidget(row, column, panel);
+    return box;
+  }
+
   /**
    * Creates tab to show off <code>Constants</code>.
    * 
@@ -159,7 +173,6 @@
     t.setWidget(2, 1, gender);
 
     panel.add(t);
-
   }
 
   /**
@@ -185,9 +198,9 @@
     String perm = messages.permission("{0}", "{1}");
     table.setText(1, 0, perm);
     final TextBox perm1 = addTextBox(constants.enterString(),
-      constants.defaultResource(), table, 1, 1);
+        constants.defaultResource(), table, 1, 1);
     final TextBox perm2 = addTextBox(constants.enterString(),
-      constants.defaultSecurity(), table, 1, 2);
+        constants.defaultSecurity(), table, 1, 2);
 
     Button b = new Button(constants.showMessage());
     b.addClickListener(new ClickListener() {
@@ -222,30 +235,15 @@
     String required = messages.requiredField("{0}");
     table.setText(3, 0, required);
     final TextBox required1 = addTextBox(constants.enterString(),
-      constants.defaultRequired(), table, 3, 1);
+        constants.defaultRequired(), table, 3, 1);
     Button b3 = new Button(constants.showMessage());
     b3.addClickListener(new ClickListener() {
       public void onClick(Widget sender) {
         Window.alert(messages.requiredField(required1.getText()));
-
       }
     });
+
     table.setWidget(3, 3, b3);
-
-  }
-
-  private TextBox addTextBox(String label, String defaultValue, HTMLTable t,
-      int row, int column) {
-    HorizontalPanel panel = new HorizontalPanel();
-    final TextBox box = new TextBox();
-    box.setText(defaultValue);
-    panel.add(box);
-    Label l2 = new Label(label);
-    l2.setStyleName(MESSAGES_ARGUMENT_TYPE_STYLE);
-    panel.add(l2);
-    panel.setCellWidth(l2, "250");
-    t.setWidget(row, column, panel);
-    return box;
   }
 
   /**
@@ -291,9 +289,7 @@
           t.setHTML(1, 1, constants.noResult());
         }
       }
-
     });
-
   }
 
   /**
@@ -306,7 +302,6 @@
     String details = constants.dictionaryExample() + constants.dictionaryHTML();
 
     addDetailedMessage(details, panel);
-    
 
     Dictionary userInfo = Dictionary.getDictionary("userInfo");
     FlexTable t = new FlexTable();
@@ -321,7 +316,5 @@
       t.setText(0, i, key);
       t.setText(1, i, userInfo.get(key));
     }
-
   }
-
-}
\ No newline at end of file
+}
diff --git a/samples/i18n/src/com/google/gwt/sample/i18n/client/MyMessages.java b/samples/i18n/src/com/google/gwt/sample/i18n/client/MyMessages.java
index 06161df..d5bfadc 100644
--- a/samples/i18n/src/com/google/gwt/sample/i18n/client/MyMessages.java
+++ b/samples/i18n/src/com/google/gwt/sample/i18n/client/MyMessages.java
@@ -39,15 +39,6 @@
   String intParseError(String text);
 
   /**
-   * Translated "''{0}'' is a required field.".
-   * 
-   * @param text text
-   * @return translated "''{0}'' is a required field."
-   * @gwt.key requiredField
-   */
-  String requiredField(String text);
-
-  /**
    * Translated "You only have security clearance {1}, so you cannot access
    * ''{0}''. ".
    * 
@@ -58,4 +49,13 @@
    * @gwt.key permission
    */
   String permission(String resource, String security);
+
+  /**
+   * Translated "''{0}'' is a required field.".
+   * 
+   * @param text text
+   * @return translated "''{0}'' is a required field."
+   * @gwt.key requiredField
+   */
+  String requiredField(String text);
 }
diff --git a/samples/json/src/com/google/gwt/sample/json/client/JSON.java b/samples/json/src/com/google/gwt/sample/json/client/JSON.java
index e738f06..280ccaf 100644
--- a/samples/json/src/com/google/gwt/sample/json/client/JSON.java
+++ b/samples/json/src/com/google/gwt/sample/json/client/JSON.java
@@ -91,6 +91,10 @@
    */
   private static final String SEARCH_BUTTON_WAITING_TEXT = "Waiting for JSON Response...";
 
+  private Tree jsonTree = new Tree();
+
+  private Button searchButton = new Button();
+
   /**
    * Entry point for this simple application. Currently, we build the
    * application's form and wait for events.
@@ -111,7 +115,7 @@
     if ((jsonArray = jsonValue.isArray()) != null) {
       for (int i = 0; i < jsonArray.size(); ++i) {
         TreeItem child = treeItem.addItem(getChildText("["
-          + Integer.toString(i) + "]"));
+            + Integer.toString(i) + "]"));
         addChildren(child, jsonArray.get(i));
       }
     } else if ((jsonObject = jsonValue.isObject()) != null) {
@@ -199,7 +203,4 @@
     searchButtonSlot.add(searchButton);
     treeViewSlot.add(jsonTree);
   }
-
-  private Tree jsonTree = new Tree();
-  private Button searchButton = new Button();
 }
diff --git a/samples/kitchensink/src/com/google/gwt/sample/kitchensink/client/KitchenSink.java b/samples/kitchensink/src/com/google/gwt/sample/kitchensink/client/KitchenSink.java
index b8daab0..bccec47 100644
--- a/samples/kitchensink/src/com/google/gwt/sample/kitchensink/client/KitchenSink.java
+++ b/samples/kitchensink/src/com/google/gwt/sample/kitchensink/client/KitchenSink.java
@@ -30,10 +30,10 @@
  */
 public class KitchenSink implements EntryPoint, HistoryListener {
 
+  protected SinkList list = new SinkList();
   private SinkInfo curInfo;
   private Sink curSink;
   private HTML description = new HTML();
-  protected SinkList list = new SinkList();
   private DockPanel panel = new DockPanel();
   private DockPanel sinkContainer;
 
@@ -112,7 +112,7 @@
     if (affectHistory) {
       History.newItem(info.getName());
     }
-    
+
     // Display the new sink.
     sinkContainer.add(curSink, DockPanel.CENTER);
     sinkContainer.setCellWidth(curSink, "100%");
diff --git a/samples/kitchensink/src/com/google/gwt/sample/kitchensink/client/Lists.java b/samples/kitchensink/src/com/google/gwt/sample/kitchensink/client/Lists.java
index 7080ce4..cffff40 100644
--- a/samples/kitchensink/src/com/google/gwt/sample/kitchensink/client/Lists.java
+++ b/samples/kitchensink/src/com/google/gwt/sample/kitchensink/client/Lists.java
@@ -27,16 +27,16 @@
  */
 public class Lists extends Sink implements ChangeListener {
 
-  private static final String[][] sStrings = new String[][]{
-    new String[]{"foo0", "bar0", "baz0", "toto0", "tintin0"},
-    new String[]{"foo1", "bar1", "baz1", "toto1", "tintin1"},
-    new String[]{"foo2", "bar2", "baz2", "toto2", "tintin2"},
-    new String[]{"foo3", "bar3", "baz3", "toto3", "tintin3"},
-    new String[]{"foo4", "bar4", "baz4", "toto4", "tintin4"},};
+  private static final String[][] sStrings = new String[][] {
+      new String[] {"foo0", "bar0", "baz0", "toto0", "tintin0"},
+      new String[] {"foo1", "bar1", "baz1", "toto1", "tintin1"},
+      new String[] {"foo2", "bar2", "baz2", "toto2", "tintin2"},
+      new String[] {"foo3", "bar3", "baz3", "toto3", "tintin3"},
+      new String[] {"foo4", "bar4", "baz4", "toto4", "tintin4"},};
 
   public static SinkInfo init() {
     return new SinkInfo("Lists",
-      "Here is the ListBox widget in its two major forms.") {
+        "Here is the ListBox widget in its two major forms.") {
       public Sink createInstance() {
         return new Lists();
       }
@@ -87,17 +87,6 @@
   public void onShow() {
   }
 
-  private void fillList(int idx) {
-    // Set the contents of the list box to reflect the combo selection.
-    list.clear();
-    String[] strings = sStrings[idx];
-    for (int i = 0; i < strings.length; ++i) {
-      list.addItem(strings[i]);
-    }
-
-    echoSelection();
-  }
-
   private void echoSelection() {
     // Determine which items are selected, and display them.
     String msg = "Selected items: ";
@@ -108,4 +97,15 @@
     }
     echo.setText(msg);
   }
+
+  private void fillList(int idx) {
+    // Set the contents of the list box to reflect the combo selection.
+    list.clear();
+    String[] strings = sStrings[idx];
+    for (int i = 0; i < strings.length; ++i) {
+      list.addItem(strings[i]);
+    }
+
+    echoSelection();
+  }
 }
diff --git a/samples/mail/src/com/google/gwt/sample/mail/client/Contacts.java b/samples/mail/src/com/google/gwt/sample/mail/client/Contacts.java
index 9e18a4a..1c6e407 100644
--- a/samples/mail/src/com/google/gwt/sample/mail/client/Contacts.java
+++ b/samples/mail/src/com/google/gwt/sample/mail/client/Contacts.java
@@ -60,27 +60,27 @@
       inner.add(nameLabel);
       inner.add(emailLabel);
 
-      HorizontalPanel panel = new HorizontalPanel();
-      panel.setSpacing(4);
-      panel.add(new Image(contact.photo));
-      panel.add(inner);
+      HorizontalPanel hp = new HorizontalPanel();
+      hp.setSpacing(4);
+      hp.add(new Image(contact.photo));
+      hp.add(inner);
 
-      add(panel);
+      add(hp);
       setStyleName("mail-ContactPopup");
       nameLabel.setStyleName("mail-ContactPopupName");
       emailLabel.setStyleName("mail-ContactPopupEmail");
     }
   }
 
-  private Contact[] contacts = new Contact[]{
-    new Contact("Benoit Mandelbrot", "benoit@example.com"),
-    new Contact("Albert Einstein", "albert@example.com"),
-    new Contact("Rene Descartes", "rene@example.com"),
-    new Contact("Bob Saget", "bob@example.com"),
-    new Contact("Ludwig von Beethoven", "ludwig@example.com"),
-    new Contact("Richard Feynman", "richard@example.com"),
-    new Contact("Alan Turing", "alan@example.com"),
-    new Contact("John von Neumann", "john@example.com")};
+  private Contact[] contacts = new Contact[] {
+      new Contact("Benoit Mandelbrot", "benoit@example.com"),
+      new Contact("Albert Einstein", "albert@example.com"),
+      new Contact("Rene Descartes", "rene@example.com"),
+      new Contact("Bob Saget", "bob@example.com"),
+      new Contact("Ludwig von Beethoven", "ludwig@example.com"),
+      new Contact("Richard Feynman", "richard@example.com"),
+      new Contact("Alan Turing", "alan@example.com"),
+      new Contact("John von Neumann", "john@example.com")};
 
   private VerticalPanel panel = new VerticalPanel();
 
@@ -95,7 +95,8 @@
   }
 
   private void addContact(final Contact contact) {
-    final HTML link = new HTML("<a href='javascript:;'>" + contact.name + "</a>");
+    final HTML link = new HTML("<a href='javascript:;'>" + contact.name
+        + "</a>");
     panel.add(link);
 
     // Add a click listener that displays a ContactPopup when it is clicked.
diff --git a/samples/mail/src/com/google/gwt/sample/mail/client/Mail.java b/samples/mail/src/com/google/gwt/sample/mail/client/Mail.java
index 0040de1..0ccf3de 100644
--- a/samples/mail/src/com/google/gwt/sample/mail/client/Mail.java
+++ b/samples/mail/src/com/google/gwt/sample/mail/client/Mail.java
@@ -48,6 +48,15 @@
   private Shortcuts shortcuts = new Shortcuts();
 
   /**
+   * Displays the specified item.
+   * 
+   * @param item
+   */
+  public void displayItem(MailItem item) {
+    mailDetail.setItem(item);
+  }
+
+  /**
    * This method constructs the application user interface by instantiating
    * controls and hooking up event listeners.
    */
@@ -112,13 +121,4 @@
     // Give the mail detail widget a chance to resize itself as well.
     mailDetail.adjustSize(width, height);
   }
-
-  /**
-   * Displays the specified item.
-   * 
-   * @param item
-   */
-  public void displayItem(MailItem item) {
-    mailDetail.setItem(item);
-  }
 }
diff --git a/samples/mail/src/com/google/gwt/sample/mail/client/MailDetail.java b/samples/mail/src/com/google/gwt/sample/mail/client/MailDetail.java
index 128762c..5e11d87 100644
--- a/samples/mail/src/com/google/gwt/sample/mail/client/MailDetail.java
+++ b/samples/mail/src/com/google/gwt/sample/mail/client/MailDetail.java
@@ -61,13 +61,6 @@
     body.setStyleName("mail-DetailBody");
   }
 
-  public void setItem(MailItem item) {
-    subject.setHTML(item.subject);
-    sender.setHTML("<b>From:</b>&nbsp;" + item.sender);
-    recipient.setHTML("<b>To:</b>&nbsp;foo@example.com");
-    body.setHTML(item.body);
-  }
-
   /**
    * Adjusts the widget's size such that it fits within the window's client
    * area.
@@ -85,4 +78,11 @@
 
     scroller.setSize("" + scrollWidth, "" + scrollHeight);
   }
+
+  public void setItem(MailItem item) {
+    subject.setHTML(item.subject);
+    sender.setHTML("<b>From:</b>&nbsp;" + item.sender);
+    recipient.setHTML("<b>To:</b>&nbsp;foo@example.com");
+    body.setHTML(item.body);
+  }
 }
diff --git a/samples/mail/src/com/google/gwt/sample/mail/client/MailItem.java b/samples/mail/src/com/google/gwt/sample/mail/client/MailItem.java
index a458cd9..f67b7df 100644
--- a/samples/mail/src/com/google/gwt/sample/mail/client/MailItem.java
+++ b/samples/mail/src/com/google/gwt/sample/mail/client/MailItem.java
@@ -20,13 +20,6 @@
  */
 public final class MailItem {
 
-  public MailItem(String sender, String email, String subject, String body) {
-    this.sender = sender;
-    this.email = email;
-    this.subject = subject;
-    this.body = body;
-  }
-
   /**
    * The sender's name.
    */
@@ -51,4 +44,11 @@
    * Read flag.
    */
   public boolean read;
+
+  public MailItem(String sender, String email, String subject, String body) {
+    this.sender = sender;
+    this.email = email;
+    this.subject = subject;
+    this.body = body;
+  }
 }
diff --git a/samples/mail/src/com/google/gwt/sample/mail/client/MailItems.java b/samples/mail/src/com/google/gwt/sample/mail/client/MailItems.java
index 2385969..55fa53c 100644
--- a/samples/mail/src/com/google/gwt/sample/mail/client/MailItems.java
+++ b/samples/mail/src/com/google/gwt/sample/mail/client/MailItems.java
@@ -25,191 +25,193 @@
   private static final int NUM_ITEMS = 37;
   private static final int FRAGMENTS_PER_EMAIL = 10;
 
-  private static final String[] senders = new String[]{
-    "markboland05", "Hollie Voss", "boticario", "Emerson Milton",
-    "Healy Colette", "Brigitte Cobb", "Elba Lockhart", "Claudio Engle",
-    "Dena Pacheco", "Brasil s.p", "Parker", "derbvktqsr", "qetlyxxogg",
-    "antenas.sul", "Christina Blake", "Gail Horton", "Orville Daniel",
-    "PostMaster", "Rae Childers", "Buster misjenou", "user31065", "ftsgeolbx",
-    "aqlovikigd", "user18411", "Mildred Starnes", "Candice Carson",
-    "Louise Kelchner", "Emilio Hutchinson", "Geneva Underwood",
-    "Residence Oper?", "fpnztbwag", "tiger", "Heriberto Rush",
-    "bulrush Bouchard", "Abigail Louis", "Chad Andrews", "bjjycpaa",
-    "Terry English", "Bell Snedden", "huang", "hhh", "(unknown sender)",
-    "Kent", "Dirk Newman", "Equipe Virtual Cards", "wishesundmore",
-    "Benito Meeks"};
+  private static final String[] senders = new String[] {
+      "markboland05", "Hollie Voss", "boticario", "Emerson Milton",
+      "Healy Colette", "Brigitte Cobb", "Elba Lockhart", "Claudio Engle",
+      "Dena Pacheco", "Brasil s.p", "Parker", "derbvktqsr", "qetlyxxogg",
+      "antenas.sul", "Christina Blake", "Gail Horton", "Orville Daniel",
+      "PostMaster", "Rae Childers", "Buster misjenou", "user31065",
+      "ftsgeolbx", "aqlovikigd", "user18411", "Mildred Starnes",
+      "Candice Carson", "Louise Kelchner", "Emilio Hutchinson",
+      "Geneva Underwood", "Residence Oper?", "fpnztbwag", "tiger",
+      "Heriberto Rush", "bulrush Bouchard", "Abigail Louis", "Chad Andrews",
+      "bjjycpaa", "Terry English", "Bell Snedden", "huang", "hhh",
+      "(unknown sender)", "Kent", "Dirk Newman", "Equipe Virtual Cards",
+      "wishesundmore", "Benito Meeks"};
 
-  private static final String[] emails = new String[]{
-    "mark@example.com", "hollie@example.com", "boticario@example.com",
-    "emerson@example.com", "healy@example.com", "brigitte@example.com",
-    "elba@example.com", "claudio@example.com", "dena@example.com",
-    "brasilsp@example.com", "parker@example.com", "derbvktqsr@example.com",
-    "qetlyxxogg@example.com", "antenas_sul@example.com", "cblake@example.com",
-    "gailh@example.com", "orville@example.com", "post_master@example.com",
-    "rchilders@example.com", "buster@example.com", "user31065@example.com",
-    "ftsgeolbx@example.com", "aqlovikigd@example.com", "user18411@example.com",
-    "mildred@example.com", "candice@example.com",
-    "louise_kelchner@example.com", "emilio@example.com", "geneva@example.com",
-    "residence_oper@example.com", "fpnztbwag@example.com", "tiger@example.com",
-    "heriberto@example.com", "bulrush@example.com",
-    "abigail_louis@example.com", "chada@example.com", "bjjycpaa@example.com",
-    "terry@example.com", "bell@example.com", "huang@example.com",
-    "hhh@example.com", "kent@example.com", "newman@example.com",
-    "equipe_virtual@example.com", "wishesundmore@example.com",
-    "benito@example.com"};
+  private static final String[] emails = new String[] {
+      "mark@example.com", "hollie@example.com", "boticario@example.com",
+      "emerson@example.com", "healy@example.com", "brigitte@example.com",
+      "elba@example.com", "claudio@example.com", "dena@example.com",
+      "brasilsp@example.com", "parker@example.com", "derbvktqsr@example.com",
+      "qetlyxxogg@example.com", "antenas_sul@example.com",
+      "cblake@example.com", "gailh@example.com", "orville@example.com",
+      "post_master@example.com", "rchilders@example.com", "buster@example.com",
+      "user31065@example.com", "ftsgeolbx@example.com",
+      "aqlovikigd@example.com", "user18411@example.com", "mildred@example.com",
+      "candice@example.com", "louise_kelchner@example.com",
+      "emilio@example.com", "geneva@example.com", "residence_oper@example.com",
+      "fpnztbwag@example.com", "tiger@example.com", "heriberto@example.com",
+      "bulrush@example.com", "abigail_louis@example.com", "chada@example.com",
+      "bjjycpaa@example.com", "terry@example.com", "bell@example.com",
+      "huang@example.com", "hhh@example.com", "kent@example.com",
+      "newman@example.com", "equipe_virtual@example.com",
+      "wishesundmore@example.com", "benito@example.com"};
 
-  private static final String[] subjects = new String[]{
-    "URGENT -[Mon, 24 Apr 2006 02:17:27 +0000]",
-    "URGENT TRANSACTION -[Sun, 23 Apr 2006 13:10:03 +0000]",
-    "fw: Here it comes", "voce ganho um vale presente Boticario",
-    "Read this ASAP", "Hot Stock Talk", "New Breed of Equity Trader",
-    "FWD: TopWeeks the wire special pr news release", "[fwd] Read this ASAP",
-    "Renda Extra R$1.000,00-R$2.000,00/m?s",
-    "re: Make sure your special pr news released",
-    "Forbidden Knowledge Conference", "decodificadores os menores pre?os",
-    "re: Our Pick", "RE: The hottest pick Watcher",
-    "RE: St0kkMarrkett Picks Trade watch special pr news release",
-    "St0kkMarrkett Picks Watch special pr news release news",
-    "You are a Winner oskoxmshco", "Encrypted E-mail System (VIRUS REMOVED)",
-    "Fw: Malcolm", "Secure Message System (VIRUS REMOVED)",
-    "fwd: St0kkMarrkett Picks Watch special pr news releaser",
-    "FWD: Financial Market Traderr special pr news release",
-    "? s? uma dica r?pida !!!!! leia !!!", "re: You have to heard this",
-    "fwd: Watcher TopNews", "VACANZE alle Mauritius", "funny",
-    "re: You need to review this", "[re:] Our Pick",
-    "RE: Before the be11 special pr news release",
-    "[re:] Market TradePicks Trade watch news", "No prescription needed",
-    "Seu novo site", "[fwd] Financial Market Trader Picker",
-    "FWD: Top Financial Market Specialists Trader interest increases",
-    "Os cart?es mais animados da web!!", "We will sale 4 you cebtdbwtcv",
-    "RE: Best Top Financial Market Specialists Trader Picks"};
+  private static final String[] subjects = new String[] {
+      "URGENT -[Mon, 24 Apr 2006 02:17:27 +0000]",
+      "URGENT TRANSACTION -[Sun, 23 Apr 2006 13:10:03 +0000]",
+      "fw: Here it comes", "voce ganho um vale presente Boticario",
+      "Read this ASAP", "Hot Stock Talk", "New Breed of Equity Trader",
+      "FWD: TopWeeks the wire special pr news release", "[fwd] Read this ASAP",
+      "Renda Extra R$1.000,00-R$2.000,00/m?s",
+      "re: Make sure your special pr news released",
+      "Forbidden Knowledge Conference", "decodificadores os menores pre?os",
+      "re: Our Pick", "RE: The hottest pick Watcher",
+      "RE: St0kkMarrkett Picks Trade watch special pr news release",
+      "St0kkMarrkett Picks Watch special pr news release news",
+      "You are a Winner oskoxmshco", "Encrypted E-mail System (VIRUS REMOVED)",
+      "Fw: Malcolm", "Secure Message System (VIRUS REMOVED)",
+      "fwd: St0kkMarrkett Picks Watch special pr news releaser",
+      "FWD: Financial Market Traderr special pr news release",
+      "? s? uma dica r?pida !!!!! leia !!!", "re: You have to heard this",
+      "fwd: Watcher TopNews", "VACANZE alle Mauritius", "funny",
+      "re: You need to review this", "[re:] Our Pick",
+      "RE: Before the be11 special pr news release",
+      "[re:] Market TradePicks Trade watch news", "No prescription needed",
+      "Seu novo site", "[fwd] Financial Market Trader Picker",
+      "FWD: Top Financial Market Specialists Trader interest increases",
+      "Os cart?es mais animados da web!!", "We will sale 4 you cebtdbwtcv",
+      "RE: Best Top Financial Market Specialists Trader Picks"};
 
-  private static final String[] fragments = new String[]{
-    "Dear Friend,<br><br>I am Mr. Mark Boland the Bank Manager of ABN AMRO "
-      + "BANK 101 Moorgate, London, EC2M 6SB.<br><br>",
-    "I have an urgent and very confidential business proposition for you. On "
-      + "July 20, 2001; Mr. Zemenu Gente, a National of France, who used to be a "
-      + "private contractor with the Shell Petroleum Development Company in Saudi "
-      + "Arabia. Mr. Zemenu Gente Made a Numbered time (Fixed deposit) for 36 "
-      + "calendar months, valued at GBP?30, 000,000.00 (Thirty Million Pounds "
-      + "only) in my Branch.",
-    "I have all necessary legal documents that can be used to back up any "
-      + "claim we may make. All I require is your honest Co-operation, "
-      + "Confidentiality and A trust to enable us sees this transaction through. "
-      + "I guarantee you that this will be executed under a legitimate "
-      + "arrangement that will protect you from any breach of the law. Please "
-      + "get in touch with me urgently by E-mail and "
-      + "Provide me with the following;<br>",
-    "The OIL sector is going crazy. This is our weekly gift to you!<br>"
-      + "<br>" + "Get KKPT First Thing, This Is Going To Run!<br>" + "<br>"
-      + "Check out Latest NEWS!<br>" + "<br>"
-      + "KOKO PETROLEUM (KKPT) - This is our #1 pick for next week!<br>"
-      + "Our last pick gained $2.16 in 4 days of trading.<br>",
-    "LAS VEGAS, NEVADA--(MARKET WIRE)--Apr 6, 2006 -- KOKO Petroleum, Inc. "
-      + "(Other OTC:KKPT.PK - News) -<br>KOKO Petroleum, Inc. announced today that "
-      + "its operator for the Corsicana Field, JMT Resources, Ltd. (\"JMT\") "
-      + "will commence a re-work program on its Pecan Gap wells in the next week. "
-      + "The re-work program will consist of drilling six lateral bore production "
-      + "strings from the existing well bore. This process, known as Radial Jet "
-      + "Enhancement, will utilize high pressure fluids to drill the lateral well "
-      + "bores, which will extend out approximately 350\' each.",
-    "JMT has contracted with Well Enhancement Services, LLC (www."
-      + "wellenhancement.com) to perform the rework on its Pierce nos. 14 and 14a. "
-      + "A small sand frac will follow the drilling of the lateral well bores in "
-      + "order to enhance permeability and create larger access to the Pecan Gap "
-      + "reservoir. Total cost of the re-work per well is estimated to be "
-      + "approximately $50,000 USD.",
-    "Parab?ns!<br>Voc? Ganhou Um Vale Presente da Botic?rio no valor de "
-      + "R$50,00<br>Voc? foi contemplado na Promo??o Respeite Minha Natureza - "
-      + "Pulseira Social.<br>Algu?m pode t?-lo inscrito na promo??o! (Amigos(as), "
-      + "Namorado(a) etc.).<br>Para retirar o seu pr?mio em uma das nossas Lojas, "
-      + "fa?a o download do Vale-Presente abaixo.<br>Ap?s o download, com o "
-      + "arquivo previamente salvo, imprima uma folha e salve a c?pia em seu "
-      + "computador para evitar transtornos decorrentes da perda do mesmo. "
-      + "Lembramos que o Vale-Presente ? ?nico e intransfer?vel.",
-    "Large Marketing Campaign running this weekend!<br>" + "<br>"
-      + "Should you get in today before it explodes?<br>" + "<br>"
-      + "This Will Fly Starting Monday!",
-    "PREMIER INFORMATION (PIFR)<br>"
-      + "A U.S. based company offers specialized information management "
-      + "serices to both the Insurance and Healthcare Industries. The services "
-      + "we provide are specific to each industry and designed for quick "
-      + "response and maximum security.<br>" + "<br>" + "STK- PIFR<br>"
-      + "Current Price: .20<br>"
-      + "This one went to $2.80 during the last marketing Campaign!",
-    "These partnerships specifically allow Premier to obtain personal health "
-      + "information, as governed by the Health In-surancee Portability and "
-      + "Accountability Act of 1996 (HIPAA), and other applicable state laws and "
-      + "regulations.<br><br>"
-      + "Global HealthCare Market Undergoing Digital Conversion",
-    ">>   Componentes e decodificadores; confira aqui;<br>"
-      + " http://br.geocities.com/listajohn/index.htm<br>",
-    "THE GOVERNING AWARD<br>" + "NETHERLANDS HEAD OFFICE<br>"
-      + "AC 76892 HAUITSOP<br>" + "AMSTERDAM, THE NETHERLANDS.<br>"
-      + "FROM: THE DESK OF THE PROMOTIONS MANAGER.<br>"
-      + "INTERNATIONAL PROMOTIONS / PRIZE AWARD DEPARTMENT<br>"
-      + "REF NUMBER: 14235/089.<br>" + "BATCH NUMBER: 304/64780/IFY.<br>"
-      + "RE/AWARD NOTIFICATION<br>",
-    "We are pleased to inform you of the announcement today 13th of April "
-      + "2006, you among TWO LUCKY WINNERS WON the GOVERNING AWARD draw held on "
-      + "the 28th of March 2006. The THREE Winning Addresses were randomly "
-      + "selected from a batch of 10,000,000 international email addresses. "
-      + "Your email address emerged alongside TWO others as a category B winner "
-      + "in this year\'s Annual GOVERNING AWARD Draw.<br>",
-    ">> obrigado por me dar esta pequena aten??o !!!<br>"
-      + "CASO GOSTE DE ASSISTIR TV , MAS A SUA ANTENA S? PEGA AQUELES CANAIS "
-      + "LOCAIS  OU O SEU SISTEMA PAGO ? MUITO CARO , SAIBA QUE TENHO CART?ES "
-      + "DE ACESSO PARA SKY DIRECTV , E DECODERS PARA  NET TVA E TECSAT , "
-      + "TUDO GRATIS , SEM ASSINTURA , SEM MENSALIDADE, VC PAGA UMA VEZ S? E "
-      + "ASSISTE A MUITOS CANAIS , FILMES , JOGOS , PORNOS , DESENHOS , "
-      + "DOCUMENT?RIOS ,SHOWS , ETC,<br><br>"
-      + "CART?O SKY E DIRECTV TOTALMENTE HACKEADOS  350,00<br>"
-      + "DECODERS NET TVA DESBLOQUEADOS                       390,00<br>"
-      + "KITS COMPLETOS SKY OU DTV ANTENA DECODER E CART?O  650,00<br>"
-      + "TECSAT FREE   450,00<br>" + "TENHO TB ACESS?RIOS , CABOS, LNB .<br>",
-    "********************************************************************<br>"
-      + " Original filename: mail.zip<br>"
-      + " Virus discovered: JS.Feebs.AC<br>"
-      + "********************************************************************<br>"
-      + " A file that was attached to this email contained a virus.<br>"
-      + " It is very likely that the original message was generated<br>"
-      + " by the virus and not a person - treat this message as you would<br>"
-      + " any other junk mail (spam).<br>"
-      + " For more information on why you received this message please visit:<br>",
-    "Put a few letters after your name. Let us show you how you can do it in "
-      + "just a few days.<br><br>" + "http://thewrongchoiceforyou.info<br><br>"
-      + "kill future mailing by pressing this : see main website",
-    "We possess scores of pharmaceutical products handy<br>"
-      + "All med\'s are made in U.S. laboratories<br>"
-      + "For your wellbeing! Very rapid, protected and secure<br>"
-      + "Ordering, No script required. We have the pain aid you require<br>",
-    "\"Oh, don\'t speak to me of Austria. Perhaps I don\'t understand things, "
-      + "but Austria never has wished, and does not wish, for war. She is "
-      + "betraying us! Russia alone must save Europe. Our gracious sovereign "
-      + "recognizes his high vocation and will be true to it. That is the one "
-      + "thing I have faith in! Our good and wonderful sovereign has to perform "
-      + "the noblest role on earth, and he is so virtuous and noble that God "
-      + "will not forsake him. He will fulfill his vocation and crush the hydra "
-      + "of revolution, which has become more terrible than ever in the person of "
-      + "this murderer and villain! We alone must avenge the blood of the "
-      + "just one.... Whom, I ask you, can we rely on?... England with "
-      + "her commercial spirit will not and cannot understand the Emperor "
-      + "Alexander\'s loftiness of soul. She has refused to evacuate Malta. "
-      + "She wanted to find, and still seeks, some secret motive in our "
-      + "actions. What answer did Novosiltsev get? None. The English have not "
-      + "understood and cannot understand the self-ab!<br>negation of our "
-      + "Emperor who wants nothing for himself, but only desires the good "
-      + "of mankind. And what have they promised? Nothing! And what little "
-      + "they have promised they will not perform! Prussia has always "
-      + "declared that Buonaparte is invincible, and that all Europe is "
-      + "powerless before him.... And I don\'t believe a word that Hardenburg "
-      + "says, or Haugwitz either. This famous Prussian neutrality is just a "
-      + "trap. I have faith only in God and the lofty destiny of our adored "
-      + "monarch. He will save Europe!\"<br>\"Those were extremes, no doubt, "
-      + "but they are not what is most important. What is important are the "
-      + "rights of man, emancipation from prejudices, and equality of "
-      + "citizenship, and all these ideas Napoleon has retained in full "
-      + "force.\""};
+  private static final String[] fragments = new String[] {
+      "Dear Friend,<br><br>I am Mr. Mark Boland the Bank Manager of ABN AMRO "
+          + "BANK 101 Moorgate, London, EC2M 6SB.<br><br>",
+      "I have an urgent and very confidential business proposition for you. On "
+          + "July 20, 2001; Mr. Zemenu Gente, a National of France, who used to be a "
+          + "private contractor with the Shell Petroleum Development Company in Saudi "
+          + "Arabia. Mr. Zemenu Gente Made a Numbered time (Fixed deposit) for 36 "
+          + "calendar months, valued at GBP?30, 000,000.00 (Thirty Million Pounds "
+          + "only) in my Branch.",
+      "I have all necessary legal documents that can be used to back up any "
+          + "claim we may make. All I require is your honest Co-operation, "
+          + "Confidentiality and A trust to enable us sees this transaction through. "
+          + "I guarantee you that this will be executed under a legitimate "
+          + "arrangement that will protect you from any breach of the law. Please "
+          + "get in touch with me urgently by E-mail and "
+          + "Provide me with the following;<br>",
+      "The OIL sector is going crazy. This is our weekly gift to you!<br>"
+          + "<br>" + "Get KKPT First Thing, This Is Going To Run!<br>" + "<br>"
+          + "Check out Latest NEWS!<br>" + "<br>"
+          + "KOKO PETROLEUM (KKPT) - This is our #1 pick for next week!<br>"
+          + "Our last pick gained $2.16 in 4 days of trading.<br>",
+      "LAS VEGAS, NEVADA--(MARKET WIRE)--Apr 6, 2006 -- KOKO Petroleum, Inc. "
+          + "(Other OTC:KKPT.PK - News) -<br>KOKO Petroleum, Inc. announced today that "
+          + "its operator for the Corsicana Field, JMT Resources, Ltd. (\"JMT\") "
+          + "will commence a re-work program on its Pecan Gap wells in the next week. "
+          + "The re-work program will consist of drilling six lateral bore production "
+          + "strings from the existing well bore. This process, known as Radial Jet "
+          + "Enhancement, will utilize high pressure fluids to drill the lateral well "
+          + "bores, which will extend out approximately 350\' each.",
+      "JMT has contracted with Well Enhancement Services, LLC (www."
+          + "wellenhancement.com) to perform the rework on its Pierce nos. 14 and 14a. "
+          + "A small sand frac will follow the drilling of the lateral well bores in "
+          + "order to enhance permeability and create larger access to the Pecan Gap "
+          + "reservoir. Total cost of the re-work per well is estimated to be "
+          + "approximately $50,000 USD.",
+      "Parab?ns!<br>Voc? Ganhou Um Vale Presente da Botic?rio no valor de "
+          + "R$50,00<br>Voc? foi contemplado na Promo??o Respeite Minha Natureza - "
+          + "Pulseira Social.<br>Algu?m pode t?-lo inscrito na promo??o! (Amigos(as), "
+          + "Namorado(a) etc.).<br>Para retirar o seu pr?mio em uma das nossas Lojas, "
+          + "fa?a o download do Vale-Presente abaixo.<br>Ap?s o download, com o "
+          + "arquivo previamente salvo, imprima uma folha e salve a c?pia em seu "
+          + "computador para evitar transtornos decorrentes da perda do mesmo. "
+          + "Lembramos que o Vale-Presente ? ?nico e intransfer?vel.",
+      "Large Marketing Campaign running this weekend!<br>" + "<br>"
+          + "Should you get in today before it explodes?<br>" + "<br>"
+          + "This Will Fly Starting Monday!",
+      "PREMIER INFORMATION (PIFR)<br>"
+          + "A U.S. based company offers specialized information management "
+          + "serices to both the Insurance and Healthcare Industries. The services "
+          + "we provide are specific to each industry and designed for quick "
+          + "response and maximum security.<br>" + "<br>" + "STK- PIFR<br>"
+          + "Current Price: .20<br>"
+          + "This one went to $2.80 during the last marketing Campaign!",
+      "These partnerships specifically allow Premier to obtain personal health "
+          + "information, as governed by the Health In-surancee Portability and "
+          + "Accountability Act of 1996 (HIPAA), and other applicable state laws and "
+          + "regulations.<br><br>"
+          + "Global HealthCare Market Undergoing Digital Conversion",
+      ">>   Componentes e decodificadores; confira aqui;<br>"
+          + " http://br.geocities.com/listajohn/index.htm<br>",
+      "THE GOVERNING AWARD<br>" + "NETHERLANDS HEAD OFFICE<br>"
+          + "AC 76892 HAUITSOP<br>" + "AMSTERDAM, THE NETHERLANDS.<br>"
+          + "FROM: THE DESK OF THE PROMOTIONS MANAGER.<br>"
+          + "INTERNATIONAL PROMOTIONS / PRIZE AWARD DEPARTMENT<br>"
+          + "REF NUMBER: 14235/089.<br>" + "BATCH NUMBER: 304/64780/IFY.<br>"
+          + "RE/AWARD NOTIFICATION<br>",
+      "We are pleased to inform you of the announcement today 13th of April "
+          + "2006, you among TWO LUCKY WINNERS WON the GOVERNING AWARD draw held on "
+          + "the 28th of March 2006. The THREE Winning Addresses were randomly "
+          + "selected from a batch of 10,000,000 international email addresses. "
+          + "Your email address emerged alongside TWO others as a category B winner "
+          + "in this year\'s Annual GOVERNING AWARD Draw.<br>",
+      ">> obrigado por me dar esta pequena aten??o !!!<br>"
+          + "CASO GOSTE DE ASSISTIR TV , MAS A SUA ANTENA S? PEGA AQUELES CANAIS "
+          + "LOCAIS  OU O SEU SISTEMA PAGO ? MUITO CARO , SAIBA QUE TENHO CART?ES "
+          + "DE ACESSO PARA SKY DIRECTV , E DECODERS PARA  NET TVA E TECSAT , "
+          + "TUDO GRATIS , SEM ASSINTURA , SEM MENSALIDADE, VC PAGA UMA VEZ S? E "
+          + "ASSISTE A MUITOS CANAIS , FILMES , JOGOS , PORNOS , DESENHOS , "
+          + "DOCUMENT?RIOS ,SHOWS , ETC,<br><br>"
+          + "CART?O SKY E DIRECTV TOTALMENTE HACKEADOS  350,00<br>"
+          + "DECODERS NET TVA DESBLOQUEADOS                       390,00<br>"
+          + "KITS COMPLETOS SKY OU DTV ANTENA DECODER E CART?O  650,00<br>"
+          + "TECSAT FREE   450,00<br>"
+          + "TENHO TB ACESS?RIOS , CABOS, LNB .<br>",
+      "********************************************************************<br>"
+          + " Original filename: mail.zip<br>"
+          + " Virus discovered: JS.Feebs.AC<br>"
+          + "********************************************************************<br>"
+          + " A file that was attached to this email contained a virus.<br>"
+          + " It is very likely that the original message was generated<br>"
+          + " by the virus and not a person - treat this message as you would<br>"
+          + " any other junk mail (spam).<br>"
+          + " For more information on why you received this message please visit:<br>",
+      "Put a few letters after your name. Let us show you how you can do it in "
+          + "just a few days.<br><br>"
+          + "http://thewrongchoiceforyou.info<br><br>"
+          + "kill future mailing by pressing this : see main website",
+      "We possess scores of pharmaceutical products handy<br>"
+          + "All med\'s are made in U.S. laboratories<br>"
+          + "For your wellbeing! Very rapid, protected and secure<br>"
+          + "Ordering, No script required. We have the pain aid you require<br>",
+      "\"Oh, don\'t speak to me of Austria. Perhaps I don\'t understand things, "
+          + "but Austria never has wished, and does not wish, for war. She is "
+          + "betraying us! Russia alone must save Europe. Our gracious sovereign "
+          + "recognizes his high vocation and will be true to it. That is the one "
+          + "thing I have faith in! Our good and wonderful sovereign has to perform "
+          + "the noblest role on earth, and he is so virtuous and noble that God "
+          + "will not forsake him. He will fulfill his vocation and crush the hydra "
+          + "of revolution, which has become more terrible than ever in the person of "
+          + "this murderer and villain! We alone must avenge the blood of the "
+          + "just one.... Whom, I ask you, can we rely on?... England with "
+          + "her commercial spirit will not and cannot understand the Emperor "
+          + "Alexander\'s loftiness of soul. She has refused to evacuate Malta. "
+          + "She wanted to find, and still seeks, some secret motive in our "
+          + "actions. What answer did Novosiltsev get? None. The English have not "
+          + "understood and cannot understand the self-ab!<br>negation of our "
+          + "Emperor who wants nothing for himself, but only desires the good "
+          + "of mankind. And what have they promised? Nothing! And what little "
+          + "they have promised they will not perform! Prussia has always "
+          + "declared that Buonaparte is invincible, and that all Europe is "
+          + "powerless before him.... And I don\'t believe a word that Hardenburg "
+          + "says, or Haugwitz either. This famous Prussian neutrality is just a "
+          + "trap. I have faith only in God and the lofty destiny of our adored "
+          + "monarch. He will save Europe!\"<br>\"Those were extremes, no doubt, "
+          + "but they are not what is most important. What is important are the "
+          + "rights of man, emancipation from prejudices, and equality of "
+          + "citizenship, and all these ideas Napoleon has retained in full "
+          + "force.\""};
 
   private static int senderIdx = 0, emailIdx = 0, subjectIdx = 0,
       fragmentIdx = 0;
@@ -221,10 +223,6 @@
     }
   }
 
-  public static int getMailItemCount() {
-    return items.size();
-  }
-
   public static MailItem getMailItem(int index) {
     if (index >= items.size()) {
       return null;
@@ -232,6 +230,10 @@
     return (MailItem) items.get(index);
   }
 
+  public static int getMailItemCount() {
+    return items.size();
+  }
+
   private static MailItem createFakeMail() {
     String sender = senders[senderIdx++];
     if (senderIdx == senders.length) {
@@ -247,7 +249,7 @@
     if (subjectIdx == subjects.length) {
       subjectIdx = 0;
     }
-    
+
     String body = "";
     for (int i = 0; i < FRAGMENTS_PER_EMAIL; ++i) {
       body += fragments[fragmentIdx++];
diff --git a/samples/mail/src/com/google/gwt/sample/mail/client/Mailboxes.java b/samples/mail/src/com/google/gwt/sample/mail/client/Mailboxes.java
index 3f3402f..aba1087 100644
--- a/samples/mail/src/com/google/gwt/sample/mail/client/Mailboxes.java
+++ b/samples/mail/src/com/google/gwt/sample/mail/client/Mailboxes.java
@@ -30,7 +30,7 @@
     TreeItem root = new TreeItem(imageItemHTML("home.gif", "foo@example.com"));
     tree.addItem(root);
 
-    TreeItem inboxItem = addImageItem(root, "Inbox");
+    addImageItem(root, "Inbox");
     addImageItem(root, "Drafts");
     addImageItem(root, "Templates");
     addImageItem(root, "Sent");
@@ -62,6 +62,6 @@
    */
   private String imageItemHTML(String imageUrl, String title) {
     return "<span><img style='margin-right:4px' src='" + imageUrl.toLowerCase()
-      + "'>" + title + "</span>";
+        + "'>" + title + "</span>";
   }
 }