Formatted using Eclipse Helios / Windows XP

svn changeset:14496/svn branch:6.4

17 files changed, 80 insertions, 89 deletions

diff --git a/src/com/vaadin/ui/AbstractComponent.java b/src/com/vaadin/ui/AbstractComponent.java
index 0875355c73..78e73845ad 100644
--- a/src/com/vaadin/ui/AbstractComponent.java
+++ b/src/com/vaadin/ui/AbstractComponent.java
@@ -320,7 +320,7 @@ public abstract class AbstractComponent implements Component, MethodEventSource
      * InlineDateField date = new InlineDateField("Datum");
      * 
      * // German language specified with ISO 639-1 language
-     * // code and ISO 3166-1 alpha-2 country code. 
+     * // code and ISO 3166-1 alpha-2 country code.
      * date.setLocale(new Locale("de", "DE"));
      * 
      * date.setResolution(DateField.RESOLUTION_DAY);
@@ -735,8 +735,8 @@ public abstract class AbstractComponent implements Component, MethodEventSource
                 }
 
                 if (eventIdentifiers != null) {
-                    target.addAttribute("eventListeners", eventIdentifiers
-                            .toArray());
+                    target.addAttribute("eventListeners",
+                            eventIdentifiers.toArray());
                 }
 
                 paintContent(target);
diff --git a/src/com/vaadin/ui/AbstractLayout.java b/src/com/vaadin/ui/AbstractLayout.java
index ce4b3e40c7..5cb698e688 100644
--- a/src/com/vaadin/ui/AbstractLayout.java
+++ b/src/com/vaadin/ui/AbstractLayout.java
@@ -59,9 +59,7 @@ public abstract class AbstractLayout extends AbstractComponentContainer
      */
     public void setMargin(boolean topEnabled, boolean rightEnabled,
             boolean bottomEnabled, boolean leftEnabled) {
-        margins
-                .setMargins(topEnabled, rightEnabled, bottomEnabled,
-                        leftEnabled);
+        margins.setMargins(topEnabled, rightEnabled, bottomEnabled, leftEnabled);
         requestRepaint();
     }
 
diff --git a/src/com/vaadin/ui/Component.java b/src/com/vaadin/ui/Component.java
index cfc648d9b0..4dcd81da31 100644
--- a/src/com/vaadin/ui/Component.java
+++ b/src/com/vaadin/ui/Component.java
@@ -473,9 +473,9 @@ public interface Component extends Paintable, VariableOwner, Sizeable,
      * </p>
      * 
      * @param caption
-     *            the new caption for the component. If the caption is {@code
-     *            null}, no caption is shown and it does not normally take any
-     *            space
+     *            the new caption for the component. If the caption is
+     *            {@code null}, no caption is shown and it does not normally
+     *            take any space
      */
     public void setCaption(String caption);
 
@@ -533,10 +533,10 @@ public interface Component extends Paintable, VariableOwner, Sizeable,
      * </p>
      * 
      * <p>
-     * An icon will be rendered inside an HTML element that has the {@code
-     * v-icon} CSS style class. The containing layout may enclose an icon and a
-     * caption inside elements related to the caption, such as {@code v-caption}
-     * .
+     * An icon will be rendered inside an HTML element that has the
+     * {@code v-icon} CSS style class. The containing layout may enclose an icon
+     * and a caption inside elements related to the caption, such as
+     * {@code v-caption} .
      * </p>
      * 
      * This method will trigger a
@@ -1075,7 +1075,7 @@ public interface Component extends Paintable, VariableOwner, Sizeable,
          * 
          * username.setTabIndex(1);
          * password.setTabIndex(2);
-         * remember.setTabIndex(3); // Different than natural place 
+         * remember.setTabIndex(3); // Different than natural place
          * login.setTabIndex(4);
          * </pre>
          * 
diff --git a/src/com/vaadin/ui/CssLayout.java b/src/com/vaadin/ui/CssLayout.java
index 59d13c137f..673003175c 100644
--- a/src/com/vaadin/ui/CssLayout.java
+++ b/src/com/vaadin/ui/CssLayout.java
@@ -33,7 +33,7 @@ import com.vaadin.terminal.gwt.client.ui.VCssLayout;
  * <li>noticeably faster rendering time in some situations as we rely more on
  * the browser's rendering engine.
  * </ul>
- *<p>
+ * <p>
  * With {@link CustomLayout} one can often achieve similar results (good looking
  * layouts with web technologies), but with CustomLayout developer needs to work
  * with fixed templates.
diff --git a/src/com/vaadin/ui/DragAndDropWrapper.java b/src/com/vaadin/ui/DragAndDropWrapper.java
index 2421e43401..87ff571f36 100644
--- a/src/com/vaadin/ui/DragAndDropWrapper.java
+++ b/src/com/vaadin/ui/DragAndDropWrapper.java
@@ -266,8 +266,8 @@ public class DragAndDropWrapper extends CustomComponent implements DropTarget,
             throws UploadException {
         Html5File file = receivers.get(fileId);
         if (file != null && file.receiver != null) {
-            OutputStream receiveUpload = file.receiver.receiveUpload(file
-                    .getFileName(), "TODO");
+            OutputStream receiveUpload = file.receiver.receiveUpload(
+                    file.getFileName(), "TODO");
 
             InputStream stream = upstream.getStream();
             byte[] buf = new byte[AbstractApplicationServlet.MAX_BUFFER_SIZE];
diff --git a/src/com/vaadin/ui/Form.java b/src/com/vaadin/ui/Form.java
index 30cd546b4b..c79b62e539 100644
--- a/src/com/vaadin/ui/Form.java
+++ b/src/com/vaadin/ui/Form.java
@@ -682,8 +682,9 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item,
      * @see com.vaadin.data.Item.Viewer#setItemDataSource(Item)
      */
     public void setItemDataSource(Item newDataSource) {
-        setItemDataSource(newDataSource, newDataSource != null ? newDataSource
-                .getItemPropertyIds() : null);
+        setItemDataSource(newDataSource,
+                newDataSource != null ? newDataSource.getItemPropertyIds()
+                        : null);
     }
 
     /**
@@ -782,8 +783,8 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item,
                 Field f = getField(properties[i]);
                 layout.removeComponent(f);
                 if (newLayout instanceof CustomLayout) {
-                    ((CustomLayout) newLayout).addComponent(f, properties[i]
-                            .toString());
+                    ((CustomLayout) newLayout).addComponent(f,
+                            properties[i].toString());
                 } else {
                     newLayout.addComponent(f);
                 }
@@ -832,8 +833,7 @@ public class Form extends AbstractField implements Item.Editor, Buffered, Item,
                     + propertyId.toString() + "' can not be found.");
         }
         final Object value = oldField.getPropertyDataSource() == null ? oldField
-                .getValue()
-                : oldField.getPropertyDataSource().getValue();
+                .getValue() : oldField.getPropertyDataSource().getValue();
 
         // Checks that the value exists and check if the select should
         // be forced in multiselect mode
diff --git a/src/com/vaadin/ui/FormLayout.java b/src/com/vaadin/ui/FormLayout.java
index 4b42f0d8fb..97b5b0c7fc 100644
--- a/src/com/vaadin/ui/FormLayout.java
+++ b/src/com/vaadin/ui/FormLayout.java
@@ -21,7 +21,7 @@ import com.vaadin.terminal.gwt.client.ui.VFormLayout;
  * bottom are by default on.
  * 
  */
-@SuppressWarnings( { "deprecation", "serial" })
+@SuppressWarnings({ "deprecation", "serial" })
 @ClientWidget(VFormLayout.class)
 public class FormLayout extends OrderedLayout {
 
diff --git a/src/com/vaadin/ui/GridLayout.java b/src/com/vaadin/ui/GridLayout.java
index b7e92402cc..51610912d1 100644
--- a/src/com/vaadin/ui/GridLayout.java
+++ b/src/com/vaadin/ui/GridLayout.java
@@ -18,6 +18,7 @@ import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
 import com.vaadin.terminal.gwt.client.MouseEventDetails;
 import com.vaadin.terminal.gwt.client.ui.VGridLayout;
+import com.vaadin.ui.GridLayout.OverlapsException;
 
 /**
  * <p>
@@ -1074,8 +1075,9 @@ public class GridLayout extends AbstractLayout implements
             addComponent(newComponent);
         } else if (newLocation == null) {
             removeComponent(oldComponent);
-            addComponent(newComponent, oldLocation.getColumn1(), oldLocation
-                    .getRow1(), oldLocation.getColumn2(), oldLocation.getRow2());
+            addComponent(newComponent, oldLocation.getColumn1(),
+                    oldLocation.getRow1(), oldLocation.getColumn2(),
+                    oldLocation.getRow2());
         } else {
             oldLocation.setComponent(newComponent);
             newLocation.setComponent(oldComponent);
diff --git a/src/com/vaadin/ui/Layout.java b/src/com/vaadin/ui/Layout.java
index f735b86023..df4798b0c2 100644
--- a/src/com/vaadin/ui/Layout.java
+++ b/src/com/vaadin/ui/Layout.java
@@ -6,8 +6,8 @@ package com.vaadin.ui;
 
 import java.io.Serializable;
 
-import com.vaadin.terminal.gwt.client.ui.VMarginInfo;
 import com.vaadin.terminal.gwt.client.ui.AlignmentInfo.Bits;
+import com.vaadin.terminal.gwt.client.ui.VMarginInfo;
 
 /**
  * Extension to the {@link ComponentContainer} interface which adds the
diff --git a/src/com/vaadin/ui/Panel.java b/src/com/vaadin/ui/Panel.java
index 3c9ac71645..9a3d24a53d 100644
--- a/src/com/vaadin/ui/Panel.java
+++ b/src/com/vaadin/ui/Panel.java
@@ -8,8 +8,8 @@ import java.util.Iterator;
 import java.util.Map;
 
 import com.vaadin.event.Action;
-import com.vaadin.event.ActionManager;
 import com.vaadin.event.Action.Handler;
+import com.vaadin.event.ActionManager;
 import com.vaadin.event.MouseEvents.ClickEvent;
 import com.vaadin.event.MouseEvents.ClickListener;
 import com.vaadin.terminal.PaintException;
@@ -191,10 +191,8 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
         // detach old content if present
         if (content != null) {
             content.setParent(null);
-            content
-                    .removeListener((ComponentContainer.ComponentAttachListener) this);
-            content
-                    .removeListener((ComponentContainer.ComponentDetachListener) this);
+            content.removeListener((ComponentContainer.ComponentAttachListener) this);
+            content.removeListener((ComponentContainer.ComponentDetachListener) this);
         }
 
         // Sets the panel to be parent for the content
diff --git a/src/com/vaadin/ui/PopupView.java b/src/com/vaadin/ui/PopupView.java
index 93208d84d2..7879b04ee4 100644
--- a/src/com/vaadin/ui/PopupView.java
+++ b/src/com/vaadin/ui/PopupView.java
@@ -47,8 +47,7 @@ public class PopupView extends AbstractComponentContainer {
      * {@link PopupView#getComponentIterator()}.
      */
     private static class SingleComponentIterator implements
-            Iterator<Component>,
-            Serializable {
+            Iterator<Component>, Serializable {
 
         private final Component component;
         private boolean first;
diff --git a/src/com/vaadin/ui/Select.java b/src/com/vaadin/ui/Select.java
index 0f33529714..bd7ec39bdb 100644
--- a/src/com/vaadin/ui/Select.java
+++ b/src/com/vaadin/ui/Select.java
@@ -283,8 +283,7 @@ public class Select extends AbstractSelect implements AbstractSelect.Filtering,
                         int index = options.indexOf(selection);
                         if (index != -1 && (index < first || index >= last)) {
                             int newPage = (index + (needNullSelectOption ? 1
-                                    : 0))
-                                    / pageLength;
+                                    : 0)) / pageLength;
                             currentPage = newPage;
                             return sanitetizeList(options, needNullSelectOption);
                         }
diff --git a/src/com/vaadin/ui/Slider.java b/src/com/vaadin/ui/Slider.java
index 7d06b8075a..55ff48b48a 100644
--- a/src/com/vaadin/ui/Slider.java
+++ b/src/com/vaadin/ui/Slider.java
@@ -41,7 +41,7 @@ import com.vaadin.terminal.gwt.client.ui.VSlider;
  * 			setVolume(d.doubleValue());
  * 		}
  * 	}
- *
+ * 
  * </code>
  * 
  * @author IT Mill Ltd.
@@ -408,8 +408,8 @@ public class Slider extends AbstractField {
         target.addAttribute("resolution", resolution);
 
         if (resolution > 0) {
-            target.addVariable(this, "value", ((Double) getValue())
-                    .doubleValue());
+            target.addVariable(this, "value",
+                    ((Double) getValue()).doubleValue());
         } else {
             target.addVariable(this, "value", ((Double) getValue()).intValue());
         }
diff --git a/src/com/vaadin/ui/TabSheet.java b/src/com/vaadin/ui/TabSheet.java
index db8178ed07..d25e68a7f9 100644
--- a/src/com/vaadin/ui/TabSheet.java
+++ b/src/com/vaadin/ui/TabSheet.java
@@ -21,6 +21,8 @@ import com.vaadin.terminal.PaintTarget;
 import com.vaadin.terminal.Resource;
 import com.vaadin.terminal.gwt.client.ui.VTabsheet;
 import com.vaadin.terminal.gwt.server.CommunicationManager;
+import com.vaadin.ui.TabSheet.CloseHandler;
+import com.vaadin.ui.TabSheet.Tab;
 import com.vaadin.ui.themes.Reindeer;
 import com.vaadin.ui.themes.Runo;
 
diff --git a/src/com/vaadin/ui/Table.java b/src/com/vaadin/ui/Table.java
index 2ee80d7430..1f0200b583 100644
--- a/src/com/vaadin/ui/Table.java
+++ b/src/com/vaadin/ui/Table.java
@@ -24,9 +24,9 @@ import com.vaadin.data.Property;
 import com.vaadin.data.util.ContainerOrderedWrapper;
 import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.event.Action;
+import com.vaadin.event.Action.Handler;
 import com.vaadin.event.DataBoundTransferable;
 import com.vaadin.event.ItemClickEvent;
-import com.vaadin.event.Action.Handler;
 import com.vaadin.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.event.ItemClickEvent.ItemClickSource;
 import com.vaadin.event.MouseEvents.ClickEvent;
@@ -553,8 +553,7 @@ public class Table extends AbstractSelect implements Action.Container,
         this.columnHeaders.clear();
         int i = 0;
         for (final Iterator<Object> it = visibleColumns.iterator(); it
-                .hasNext()
-                && i < columnHeaders.length; i++) {
+                .hasNext() && i < columnHeaders.length; i++) {
             this.columnHeaders.put(it.next(), columnHeaders[i]);
         }
 
@@ -617,8 +616,7 @@ public class Table extends AbstractSelect implements Action.Container,
         this.columnIcons.clear();
         int i = 0;
         for (final Iterator<Object> it = visibleColumns.iterator(); it
-                .hasNext()
-                && i < columnIcons.length; i++) {
+                .hasNext() && i < columnIcons.length; i++) {
             this.columnIcons.put(it.next(), columnIcons[i]);
         }
 
@@ -698,8 +696,7 @@ public class Table extends AbstractSelect implements Action.Container,
         final HashMap<Object, String> newCA = new HashMap<Object, String>();
         int i = 0;
         for (final Iterator<Object> it = visibleColumns.iterator(); it
-                .hasNext()
-                && i < columnAlignments.length; i++) {
+                .hasNext() && i < columnAlignments.length; i++) {
             newCA.put(it.next(), columnAlignments[i]);
         }
         this.columnAlignments = newCA;
@@ -714,7 +711,7 @@ public class Table extends AbstractSelect implements Action.Container,
      * small or very big values. Setting width to -1 (default) means that theme
      * will make decision of width.
      * 
-     *<p>
+     * <p>
      * Column can either have a fixed width or expand ratio. The latter one set
      * is used. See @link {@link #setColumnExpandRatio(Object, float)}.
      * 
@@ -2075,8 +2072,8 @@ public class Table extends AbstractSelect implements Action.Container,
 
         // Actions
         if (variables.containsKey("action")) {
-            final StringTokenizer st = new StringTokenizer((String) variables
-                    .get("action"), ",");
+            final StringTokenizer st = new StringTokenizer(
+                    (String) variables.get("action"), ",");
             if (st.countTokens() == 2) {
                 final Object itemId = itemIdMapper.get(st.nextToken());
                 final Action action = (Action) actionMapper.get(st.nextToken());
@@ -2337,8 +2334,7 @@ public class Table extends AbstractSelect implements Action.Container,
         final boolean[] iscomponent = new boolean[visibleColumns.size()];
         int iscomponentIndex = 0;
         for (final Iterator<Object> it = visibleColumns.iterator(); it
-                .hasNext()
-                && iscomponentIndex < iscomponent.length;) {
+                .hasNext() && iscomponentIndex < iscomponent.length;) {
             final Object columnId = it.next();
             if (columnGenerators.containsKey(columnId)) {
                 iscomponent[iscomponentIndex++] = true;
@@ -2383,8 +2379,8 @@ public class Table extends AbstractSelect implements Action.Container,
 
         // The select variable is only enabled if selectable
         if (selectable) {
-            target.addVariable(this, "selected", selectedKeys
-                    .toArray(new String[selectedKeys.size()]));
+            target.addVariable(this, "selected",
+                    selectedKeys.toArray(new String[selectedKeys.size()]));
         }
 
         // The cursors are only shown on pageable table
@@ -2394,8 +2390,8 @@ public class Table extends AbstractSelect implements Action.Container,
 
         // Sorting
         if (getContainerDataSource() instanceof Container.Sortable) {
-            target.addVariable(this, "sortcolumn", columnIdMap
-                    .key(sortContainerPropertyId));
+            target.addVariable(this, "sortcolumn",
+                    columnIdMap.key(sortContainerPropertyId));
             target.addVariable(this, "sortascending", sortAscending);
         }
 
@@ -2429,8 +2425,7 @@ public class Table extends AbstractSelect implements Action.Container,
             final String[] colorder = new String[visibleColumns.size()];
             int i = 0;
             for (final Iterator<Object> it = visibleColumns.iterator(); it
-                    .hasNext()
-                    && i < colorder.length;) {
+                    .hasNext() && i < colorder.length;) {
                 colorder[i++] = columnIdMap.key(it.next());
             }
             target.addVariable(this, "columnorder", colorder);
@@ -2448,8 +2443,7 @@ public class Table extends AbstractSelect implements Action.Container,
             final String[] collapsedkeys = new String[ccs.size()];
             int nextColumn = 0;
             for (final Iterator<Object> it = visibleColumns.iterator(); it
-                    .hasNext()
-                    && nextColumn < collapsedkeys.length;) {
+                    .hasNext() && nextColumn < collapsedkeys.length;) {
                 final Object columnId = it.next();
                 if (isColumnCollapsed(columnId)) {
                     collapsedkeys[nextColumn++] = columnIdMap.key(columnId);
@@ -2485,8 +2479,8 @@ public class Table extends AbstractSelect implements Action.Container,
                 }
                 if (columnWidths.containsKey(columnId)) {
                     if (getColumnWidth(columnId) > -1) {
-                        target.addAttribute("width", String
-                                .valueOf(getColumnWidth(columnId)));
+                        target.addAttribute("width",
+                                String.valueOf(getColumnWidth(columnId)));
                     } else {
                         target.addAttribute("er",
                                 getColumnExpandRatio(columnId));
@@ -2542,8 +2536,7 @@ public class Table extends AbstractSelect implements Action.Container,
                     c.paint(target);
                 }
             } else {
-                target
-                        .addText((String) cells[CELL_FIRSTCOL + currentColumn][indexInRowbuffer]);
+                target.addText((String) cells[CELL_FIRSTCOL + currentColumn][indexInRowbuffer]);
             }
         }
 
@@ -2557,8 +2550,8 @@ public class Table extends AbstractSelect implements Action.Container,
 
         paintRowIcon(target, cells, indexInRowbuffer);
         paintRowHeader(target, cells, indexInRowbuffer);
-        target.addAttribute("key", Integer
-                .parseInt(cells[CELL_KEY][indexInRowbuffer].toString()));
+        target.addAttribute("key",
+                Integer.parseInt(cells[CELL_KEY][indexInRowbuffer].toString()));
 
         if (isSelected(itemId)) {
             target.addAttribute("selected", true);
@@ -3697,8 +3690,8 @@ public class Table extends AbstractSelect implements Action.Container,
             AbstractSelectTargetDetails dropTargetData = (AbstractSelectTargetDetails) dragEvent
                     .getTargetDetails();
             table = (Table) dragEvent.getTargetDetails().getTarget();
-            ArrayList<Object> visibleItemIds = new ArrayList<Object>(table
-                    .getPageLength());
+            ArrayList<Object> visibleItemIds = new ArrayList<Object>(
+                    table.getPageLength());
             visibleItemIds.size();
             Object id = table.getCurrentPageFirstItemId();
             for (int i = 0; i < table.getPageLength() && id != null; i++) {
diff --git a/src/com/vaadin/ui/Tree.java b/src/com/vaadin/ui/Tree.java
index 4e7fda5d88..505f37a783 100644
--- a/src/com/vaadin/ui/Tree.java
+++ b/src/com/vaadin/ui/Tree.java
@@ -25,9 +25,9 @@ import com.vaadin.data.util.IndexedContainer;
 import com.vaadin.event.Action;
 import com.vaadin.event.DataBoundTransferable;
 import com.vaadin.event.ItemClickEvent;
-import com.vaadin.event.Transferable;
 import com.vaadin.event.ItemClickEvent.ItemClickListener;
 import com.vaadin.event.ItemClickEvent.ItemClickSource;
+import com.vaadin.event.Transferable;
 import com.vaadin.event.dd.DragAndDropEvent;
 import com.vaadin.event.dd.DragSource;
 import com.vaadin.event.dd.DropHandler;
@@ -436,8 +436,8 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
         // Actions
         if (variables.containsKey("action")) {
 
-            final StringTokenizer st = new StringTokenizer((String) variables
-                    .get("action"), ",");
+            final StringTokenizer st = new StringTokenizer(
+                    (String) variables.get("action"), ",");
             if (st.countTokens() == 2) {
                 final Object itemId = itemIdMapper.get(st.nextToken());
                 final Action action = (Action) actionMapper.get(st.nextToken());
@@ -508,8 +508,8 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
                 target.addAttribute("selectmode", (isMultiSelect() ? "multi"
                         : "single"));
                 if (isMultiSelect()) {
-                    target.addAttribute("multiselectmode", multiSelectMode
-                            .ordinal());
+                    target.addAttribute("multiselectmode",
+                            multiSelectMode.ordinal());
                 }
             } else {
                 target.addAttribute("selectmode", "none");
@@ -661,8 +661,8 @@ public class Tree extends AbstractSelect implements Container.Hierarchical,
             partialUpdate = false;
         } else {
             // Selected
-            target.addVariable(this, "selected", selectedKeys
-                    .toArray(new String[selectedKeys.size()]));
+            target.addVariable(this, "selected",
+                    selectedKeys.toArray(new String[selectedKeys.size()]));
 
             // Expand and collapse
             target.addVariable(this, "expand", new String[] {});
diff --git a/src/com/vaadin/ui/Window.java b/src/com/vaadin/ui/Window.java
index b1b26e2807..8e407fe5ad 100644
--- a/src/com/vaadin/ui/Window.java
+++ b/src/com/vaadin/ui/Window.java
@@ -18,9 +18,9 @@ import java.util.Set;
 
 import com.vaadin.Application;
 import com.vaadin.event.ShortcutAction;
-import com.vaadin.event.ShortcutListener;
 import com.vaadin.event.ShortcutAction.KeyCode;
 import com.vaadin.event.ShortcutAction.ModifierKey;
+import com.vaadin.event.ShortcutListener;
 import com.vaadin.terminal.DownloadStream;
 import com.vaadin.terminal.PaintException;
 import com.vaadin.terminal.PaintTarget;
@@ -37,8 +37,8 @@ import com.vaadin.terminal.gwt.client.ui.VWindow;
  * <p>
  * If the window is a application window or a sub window depends on how it is
  * added to the application. Adding a {@code Window} to a {@code Window} using
- * {@link Window#addWindow(Window)} makes it a sub window and adding a {@code
- * Window} to the {@code Application} using
+ * {@link Window#addWindow(Window)} makes it a sub window and adding a
+ * {@code Window} to the {@code Application} using
  * {@link Application#addWindow(Window)} makes it an application window.
  * </p>
  * <p>
@@ -378,8 +378,8 @@ public class Window extends Panel implements URIHandler, ParameterHandler {
      * <b>Application window only</b>. Handles an URI by passing the URI to all
      * URI handlers defined using {@link #addURIHandler(URIHandler)}. All URI
      * handlers are called for each URI but no more than one handler may return
-     * a {@link DownloadStream}. If more than one stream is returned a {@code
-     * RuntimeException} is thrown.
+     * a {@link DownloadStream}. If more than one stream is returned a
+     * {@code RuntimeException} is thrown.
      * 
      * @param context
      *            The URL of the application
@@ -470,8 +470,8 @@ public class Window extends Panel implements URIHandler, ParameterHandler {
     /**
      * <b>Application window only</b>. Handles parameters by passing the
      * parameters to all {@code ParameterHandler}s defined using
-     * {@link #addParameterHandler(ParameterHandler)}. All {@code
-     * ParameterHandler}s are called for each set of parameters.
+     * {@link #addParameterHandler(ParameterHandler)}. All
+     * {@code ParameterHandler}s are called for each set of parameters.
      * 
      * @param parameters
      *            a map containing the parameter names and values
@@ -822,10 +822,10 @@ public class Window extends Panel implements URIHandler, ParameterHandler {
      * name of the window is used to uniquely identify it.
      * <p>
      * The name also determines the URL that can be used for direct access to a
-     * window. All windows can be accessed through {@code
-     * http://host:port/app/win} where {@code http://host:port/app} is the
-     * application URL (as returned by {@link Application#getURL()} and {@code
-     * win} is the window name.
+     * window. All windows can be accessed through
+     * {@code http://host:port/app/win} where {@code http://host:port/app} is
+     * the application URL (as returned by {@link Application#getURL()} and
+     * {@code win} is the window name.
      * </p>
      * <p>
      * Note! Portlets do not support direct window access through URLs.
@@ -908,10 +908,10 @@ public class Window extends Panel implements URIHandler, ParameterHandler {
      * application.
      * <p>
      * The name also determines the URL that can be used for direct access to a
-     * window. All windows can be accessed through {@code
-     * http://host:port/app/win} where {@code http://host:port/app} is the
-     * application URL (as returned by {@link Application#getURL()} and {@code
-     * win} is the window name.
+     * window. All windows can be accessed through
+     * {@code http://host:port/app/win} where {@code http://host:port/app} is
+     * the application URL (as returned by {@link Application#getURL()} and
+     * {@code win} is the window name.
      * </p>
      * <p>
      * This method can only be called before the window is added to an