From fbd4d8617b759ba7c35992c09a43a220ac151d29 Mon Sep 17 00:00:00 2001 From: Build Agent Date: Tue, 31 Jan 2012 18:34:28 +0200 Subject: [PATCH] Synchronized 6.8 branch between svn and git. --- WebContent/release-notes.html | 30 +++++++++++-------- .../gwt/client/ApplicationConfiguration.java | 8 ++--- src/com/vaadin/ui/AbstractOrderedLayout.java | 8 ++--- src/com/vaadin/ui/Window.java | 24 --------------- 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 @@

Fixes in Vaadin @version@

- +

+ #7788 Field.setProperyDatasource() does not reflect value for 6.7.0
+ #7479 Vaadin apps cannot current be deployed on IBM WebSphere v8
+ #7724 TextField with PropertyFormatter did not repaint in 6.7.0 (event with requestRepaint() call)
+ #7731 Javascript error when adding an item to an empty Table when setColumnWidth is used
+ #7776 AbstractField don't respect value change events from property during commit
+ #7778 Table rendering problem
+ #6588 Repainting in TextChangeListener will send wrong value to client.
+ #7720 TreeTable doesn't get refreshed if all entries are removed
+ #7738 Slashes or backslahes in ApplicationResources URLs should not be encoded
+ #7753 TreeTable gets into a state that causes internal error when getChildren throws an exception.
+ #3710 Width is miscalculated for the footer layouts in forms of undefined size
+ #7548 TestBench pressSpecialKey (arrows) doesn't work on Tree in IE6
+ #7708 DragAndDropWrapper.setDescription("foo") does not work
+ #7736 Logging level of SqlContainer is too high
+ #7755 Debug window "highlight component" does not work with sub windows
+

The full details of the defects 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(); - } - } - } -- 2.39.5