Read debug window settings when all entry points have run (#17882)

Change-Id: I09d612d784f978ba483d243b6938697893e1eac4

5 files changed, 190 insertions, 14 deletions

diff --git a/client/src/com/vaadin/client/debug/internal/VDebugWindow.java b/client/src/com/vaadin/client/debug/internal/VDebugWindow.java
index b543c23e4d..fbc838f861 100644
--- a/client/src/com/vaadin/client/debug/internal/VDebugWindow.java
+++ b/client/src/com/vaadin/client/debug/internal/VDebugWindow.java
@@ -19,6 +19,8 @@ import java.util.ArrayList;
 import java.util.Date;
 
 import com.google.gwt.core.client.Duration;
+import com.google.gwt.core.client.Scheduler;
+import com.google.gwt.core.client.Scheduler.ScheduledCommand;
 import com.google.gwt.core.shared.GWT;
 import com.google.gwt.dom.client.Element;
 import com.google.gwt.dom.client.NativeEvent;
@@ -698,22 +700,32 @@ public final class VDebugWindow extends VOverlay {
     public void init() {
 
         show();
-        readStoredState();
 
-        Window.addResizeHandler(new com.google.gwt.event.logical.shared.ResizeHandler() {
+        /*
+         * Finalize initialization when all entry points have had the chance to
+         * e.g. register new sections.
+         */
+        Scheduler.get().scheduleFinally(new ScheduledCommand() {
+            @Override
+            public void execute() {
+                readStoredState();
 
-            Timer t = new Timer() {
-                @Override
-                public void run() {
-                    applyPositionAndSize();
-                }
-            };
+                Window.addResizeHandler(new com.google.gwt.event.logical.shared.ResizeHandler() {
 
-            @Override
-            public void onResize(ResizeEvent event) {
-                t.cancel();
-                // TODO less
-                t.schedule(1000);
+                    Timer t = new Timer() {
+                        @Override
+                        public void run() {
+                            applyPositionAndSize();
+                        }
+                    };
+
+                    @Override
+                    public void onResize(ResizeEvent event) {
+                        t.cancel();
+                        // TODO less
+                        t.schedule(1000);
+                    }
+                });
             }
         });
     }
diff --git a/uitest/src/com/vaadin/tests/debug/PreserveCustomDebugSectionOpen.java b/uitest/src/com/vaadin/tests/debug/PreserveCustomDebugSectionOpen.java
new file mode 100644
index 0000000000..0ac2e87510
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/debug/PreserveCustomDebugSectionOpen.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.tests.debug;
+
+import com.vaadin.annotations.Widgetset;
+import com.vaadin.server.VaadinRequest;
+import com.vaadin.tests.components.AbstractTestUI;
+import com.vaadin.tests.widgetset.TestingWidgetSet;
+import com.vaadin.ui.Label;
+
+@Widgetset(TestingWidgetSet.NAME)
+public class PreserveCustomDebugSectionOpen extends AbstractTestUI {
+
+    @Override
+    protected void setup(VaadinRequest request) {
+        addComponent(new Label(
+                "UI for testing that a custom debug window section remains open after refreshging."));
+    }
+
+}
diff --git a/uitest/src/com/vaadin/tests/debug/PreserveCustomDebugSectionOpenTest.java b/uitest/src/com/vaadin/tests/debug/PreserveCustomDebugSectionOpenTest.java
new file mode 100644
index 0000000000..01b73ded92
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/debug/PreserveCustomDebugSectionOpenTest.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.tests.debug;
+
+import org.junit.Assert;
+import org.junit.Test;
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebElement;
+
+import com.vaadin.tests.tb3.SingleBrowserTest;
+
+public class PreserveCustomDebugSectionOpenTest extends SingleBrowserTest {
+    @Test
+    public void testPreserveSection() {
+        setDebug(true);
+        openTestURL();
+
+        findElement(
+                By.cssSelector(".v-debugwindow-tabs button[title=\"Dummy debug window section\"]"))
+                .click();
+
+        WebElement content = findElement(By
+                .cssSelector(".v-debugwindow-content"));
+
+        // Sanity check
+        Assert.assertEquals("Dummy debug window section", content.getText());
+
+        // Open page again, should still have the same section open
+        openTestURL();
+
+        content = findElement(By.cssSelector(".v-debugwindow-content"));
+        Assert.assertEquals("Dummy debug window section", content.getText());
+    }
+}
diff --git a/uitest/src/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml b/uitest/src/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml
index 8a02d91d2c..3878e85193 100644
--- a/uitest/src/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml
+++ b/uitest/src/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml
@@ -23,5 +23,6 @@
     <generate-with class="com.vaadin.tests.widgetset.rebind.TestWidgetRegistryGenerator">
         <when-type-is class="com.vaadin.tests.widgetset.client.TestWidgetConnector.TestWidgetRegistry" />
     </generate-with>
-
+    
+    <entry-point class="com.vaadin.tests.widgetset.client.TestingWidgetsetEntryPoint" />
 </module>
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/TestingWidgetsetEntryPoint.java b/uitest/src/com/vaadin/tests/widgetset/client/TestingWidgetsetEntryPoint.java
new file mode 100644
index 0000000000..7268d02993
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/widgetset/client/TestingWidgetsetEntryPoint.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2000-2014 Vaadin Ltd.
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License. You may obtain a copy of
+ * the License at
+ * 
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package com.vaadin.tests.widgetset.client;
+
+import com.google.gwt.core.client.EntryPoint;
+import com.google.gwt.user.client.Window.Location;
+import com.google.gwt.user.client.ui.Label;
+import com.google.gwt.user.client.ui.Widget;
+import com.vaadin.client.ApplicationConnection;
+import com.vaadin.client.ValueMap;
+import com.vaadin.client.debug.internal.DebugButton;
+import com.vaadin.client.debug.internal.Icon;
+import com.vaadin.client.debug.internal.Section;
+import com.vaadin.client.debug.internal.VDebugWindow;
+
+public class TestingWidgetsetEntryPoint implements EntryPoint {
+
+    @Override
+    public void onModuleLoad() {
+        if (Location.getPath().contains("PreserveCustomDebugSectionOpen")) {
+            addDummyDebugWindowSection();
+        }
+    }
+
+    private void addDummyDebugWindowSection() {
+        VDebugWindow.get().addSection(new Section() {
+            private final DebugButton tabButton = new DebugButton(Icon.ERROR,
+                    "Dummy debug window section");
+            private final Label controls = new Label("");
+            private final Label contents = new Label(
+                    "Dummy debug window section");
+
+            @Override
+            public DebugButton getTabButton() {
+                return tabButton;
+            }
+
+            @Override
+            public Widget getControls() {
+                return controls;
+            }
+
+            @Override
+            public Widget getContent() {
+                return contents;
+            }
+
+            @Override
+            public void show() {
+                // nop
+            }
+
+            @Override
+            public void hide() {
+                // nop
+            }
+
+            @Override
+            public void meta(ApplicationConnection ac, ValueMap meta) {
+                // nop
+            }
+
+            @Override
+            public void uidl(ApplicationConnection ac, ValueMap uidl) {
+                // nop
+            }
+        });
+    }
+
+}