Synchronized 6.8 branch between svn and git.

4 files changed, 23 insertions, 47 deletions

diff --git a/WebContent/release-notes.html b/WebContent/release-notes.html
index a7d3f467a8..59e50a21f9 100644
--- a/WebContent/release-notes.html
+++ b/WebContent/release-notes.html
@@ -230,19 +230,23 @@
 		</p>
 		<h2 id="fixes">Fixes in Vaadin @version@</h2>
 		
-<ul>
-  <li><a href="http://dev.vaadin.com/ticket/6638">#6638</a>: AbstractValidator.validate should use getErrorMessage</li>
-  <li><a href="http://dev.vaadin.com/ticket/6870">#6870</a>: Table/TreeTable header not visible on zoom out (FF3,FF4,IE8)</li>
-  <li><a href="http://dev.vaadin.com/ticket/6970">#6970</a>: "Table causes ""Out of sync"" on IE9, IE8, IE7"</li>
-  <li><a href="http://dev.vaadin.com/ticket/7567">#7567</a>: Button: setClickShortcut NOT WORKING PROPERLY</li>
-  <li><a href="http://dev.vaadin.com/ticket/7976">#7976</a>: Erratic scrolling in portlet deployment</li>
-  <li><a href="http://dev.vaadin.com/ticket/7978">#7978</a>: Buttons in a HorizontalLayout broken with Chameleon theme in IE7</li>
-  <li><a href="http://dev.vaadin.com/ticket/8040">#8040</a>: Infinite request loop with Table scrolling</li>
-  <li><a href="http://dev.vaadin.com/ticket/8090">#8090</a>: Evicted old Paintable can lose reference to new paintable with same debugId when replacing components during window handleParameters call</li>
-  <li><a href="http://dev.vaadin.com/ticket/8143">#8143</a>: Enable using a completely different implementation for VConsole</li>
-  <li><a href="http://dev.vaadin.com/ticket/8145">#8145</a>: TextChangeListener: textChange(TextChangeEvent) is not triggered when the text is equal to the value of the field.</li>
-  <li><a href="http://dev.vaadin.com/ticket/8170">#8170</a>: Attach is not called for sub windows when a window is attached to the application</li>
-</ul>
+	<p>
+    #7788   Field.setProperyDatasource() does not reflect value for 6.7.0<br/>
+    #7479   Vaadin apps cannot current be deployed on IBM WebSphere v8<br/>
+    #7724   TextField with PropertyFormatter did not repaint in 6.7.0 (event with requestRepaint() call)<br/>
+    #7731   Javascript error when adding an item to an empty Table when setColumnWidth is used<br/>
+    #7776   AbstractField don't respect value change events from property during commit<br/>
+    #7778   Table rendering problem<br/>
+    #6588   Repainting in TextChangeListener will send wrong value to client.<br/>
+    #7720   TreeTable doesn't get refreshed if all entries are removed<br/>
+    #7738   Slashes or backslahes in ApplicationResources URLs should not be encoded<br/>
+    #7753   TreeTable gets into a state that causes internal error when getChildren throws an exception.<br/>
+    #3710   Width is miscalculated for the footer layouts in forms of undefined size<br/>
+    #7548   TestBench pressSpecialKey (arrows) doesn't work on Tree in IE6<br/>
+    #7708   DragAndDropWrapper.setDescription("foo") does not work<br/>
+    #7736   Logging level of SqlContainer is too high<br/>
+    #7755   Debug window "highlight component" does not work with sub windows<br/>
+    	</p>
 		<p>
 			The <a href="http://dev.vaadin.com/query?status=closed&type=defect&milestone=Vaadin%20@version@">full
 				details of the defects</a> can be found at dev.vaadin.com.
diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
index 5782a0b822..a60fb808a1 100644
--- a/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
+++ b/src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java
@@ -450,12 +450,8 @@ public class ApplicationConfiguration implements EntryPoint {
         // Prepare VConsole for debugging
         if (isDebugMode()) {
             Console console = GWT.create(Console.class);
-            if (console instanceof VDebugConsole) {
-                // Methods from VDebugConsole not present in Console
-                VDebugConsole vDebugConsole = (VDebugConsole) console;
-                vDebugConsole.setQuietMode(isQuietDebugMode());
-                vDebugConsole.init();
-            }
+            console.setQuietMode(isQuietDebugMode());
+            console.init();
             VConsole.setImplementation(console);
         } else {
             VConsole.setImplementation((Console) GWT.create(NullConsole.class));
diff --git a/src/com/vaadin/ui/AbstractOrderedLayout.java b/src/com/vaadin/ui/AbstractOrderedLayout.java
index 8bba9fc46d..fc3ef5056d 100644
--- a/src/com/vaadin/ui/AbstractOrderedLayout.java
+++ b/src/com/vaadin/ui/AbstractOrderedLayout.java
@@ -54,7 +54,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements
     @Override
     public void addComponent(Component c) {
         // Add to components before calling super.addComponent
-        // so that it is available to AttachListeners
+        // so that it is available to AttachListeners 
         components.add(c);
         try {
             super.addComponent(c);
@@ -75,7 +75,7 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements
     public void addComponentAsFirst(Component c) {
         // If c is already in this, we must remove it before proceeding
         // see ticket #7668
-        if (c.getParent() == this) {
+        if(c.getParent() == this) {
             removeComponent(c);
         }
         components.addFirst(c);
@@ -100,9 +100,9 @@ public abstract class AbstractOrderedLayout extends AbstractLayout implements
     public void addComponent(Component c, int index) {
         // If c is already in this, we must remove it before proceeding
         // see ticket #7668
-        if (c.getParent() == this) {
+        if(c.getParent() == this) {
             // When c is removed, all components after it are shifted down
-            if (index > getComponentIndex(c)) {
+            if(index > getComponentIndex(c)) {
                 index--;
             }
             removeComponent(c);
diff --git a/src/com/vaadin/ui/Window.java b/src/com/vaadin/ui/Window.java
index 7e33f91d31..5f6c29f182 100644
--- a/src/com/vaadin/ui/Window.java
+++ b/src/com/vaadin/ui/Window.java
@@ -2380,28 +2380,4 @@ public class Window extends Panel implements URIHandler, ParameterHandler,
         }
     }
 
-    /**
-     * Notifies the child components and subwindows that the window is attached
-     * to the application.
-     */
-    @Override
-    public void attach() {
-        super.attach();
-        for (Window w : subwindows) {
-            w.attach();
-        }
-    }
-
-    /**
-     * Notifies the child components and subwindows that the window is detached
-     * from the application.
-     */
-    @Override
-    public void detach() {
-        super.detach();
-        for (Window w : subwindows) {
-            w.detach();
-        }
-    }
-
 }