aboutsummaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorBuild Agent <noreply@vaadin.com>2012-01-31 18:34:28 +0200
committerBuild Agent <noreply@vaadin.com>2012-01-31 18:34:28 +0200
commitfbd4d8617b759ba7c35992c09a43a220ac151d29 (patch)
tree9f5f1563c37aa61d14fe0a2bd93683170c5bb9b0 /src/com
parente5b55ab465af9687524d5ba26a52df5a94600648 (diff)
downloadvaadin-framework-fbd4d8617b759ba7c35992c09a43a220ac151d29.tar.gz
vaadin-framework-fbd4d8617b759ba7c35992c09a43a220ac151d29.zip
Synchronized 6.8 branch between svn and git.
Diffstat (limited to 'src/com')
-rw-r--r--src/com/vaadin/terminal/gwt/client/ApplicationConfiguration.java8
-rw-r--r--src/com/vaadin/ui/AbstractOrderedLayout.java8
-rw-r--r--src/com/vaadin/ui/Window.java24
3 files changed, 6 insertions, 34 deletions
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();
- }
- }
-
}