svn changeset:10500/svn branch:6.2

diff --git a/src/com/vaadin/ui/GridLayout.java b/src/com/vaadin/ui/GridLayout.java
index f1195e9ef40df6b830011437c39d372b877b4fb0..19abe8d14213ee9b2c7f2930aecb3bf498be990b 100644 (file)
--- a/src/com/vaadin/ui/GridLayout.java
+++ b/src/com/vaadin/ui/GridLayout.java
@@ -830,8 +830,9 @@ public class GridLayout extends AbstractLayout implements
     }
 
     /**
-     * An <code>Exception</code> object which is thrown when two Items occupy
-     * the same space on a grid.
+     * Gridlayout does not support laying components on top of each other. An
+     * <code>OverlapsException</code> is thrown when a component already exists
+     * (even partly) at the same space on a grid with the new component.
      * 
      * @author IT Mill Ltd.
      * @version
@@ -851,6 +852,32 @@ public class GridLayout extends AbstractLayout implements
             this.existingArea = existingArea;
         }
 
+        @Override
+        public String getMessage() {
+            StringBuilder sb = new StringBuilder();
+            Component component = existingArea.getComponent();
+            sb.append(component);
+            sb.append("( type = ");
+            sb.append(component.getClass().getName());
+            if (component.getCaption() != null) {
+                sb.append(", caption = \"");
+                sb.append(component.getCaption());
+                sb.append("\"");
+            }
+            sb.append(")");
+            sb.append(" is already added to ");
+            sb.append(existingArea.column1);
+            sb.append(",");
+            sb.append(existingArea.column1);
+            sb.append(",");
+            sb.append(existingArea.row1);
+            sb.append(",");
+            sb.append(existingArea.row2);
+            sb.append("(column1, column2, row1, row2).");
+
+            return sb.toString();
+        }
+
         /**
          * Gets the area .
          *