Mini tutorial code update

6 files changed, 109 insertions, 15 deletions

diff --git a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateConnector.java b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateConnector.java
index 93b12dbc68..a4b816e47e 100644
--- a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateConnector.java
+++ b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateConnector.java
@@ -27,10 +27,10 @@ public class ResourceInStateConnector extends AbstractComponentConnector {
     @Override
     public void onStateChanged(StateChangeEvent stateChangeEvent) {
         super.onStateChanged(stateChangeEvent);
-        String icon = getResourceUrl(ResourceInStateState.MY_ICON_RESOURCE);
+        String iconUrl = getResourceUrl("myIcon");
 
-        if (icon != null) {
-            getWidget().setUrl(icon);
+        if (iconUrl != null) {
+            getWidget().setUrl(iconUrl);
         } else {
             getWidget().setUrl("");
         }
@@ -38,11 +38,6 @@ public class ResourceInStateConnector extends AbstractComponentConnector {
     }
 
     @Override
-    public ResourceInStateState getState() {
-        return (ResourceInStateState) super.getState();
-    }
-
-    @Override
     public Image getWidget() {
         return (Image) super.getWidget();
     }
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateState.java b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateState.java
deleted file mode 100644
index 728f0ba5e1..0000000000
--- a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a2/ResourceInStateState.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.vaadin.tests.widgetset.client.minitutorials.v7a2;
-
-import com.vaadin.shared.ComponentState;
-
-public class ResourceInStateState extends ComponentState {
-    public static final String MY_ICON_RESOURCE = "myIcon";
-}
\ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a3/ClientSideModule.java b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a3/ClientSideModule.java
new file mode 100644
index 0000000000..48bd8a76fb
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a3/ClientSideModule.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2012 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.minitutorials.v7a3;
+
+import com.google.gwt.core.client.EntryPoint;
+import com.google.gwt.event.dom.client.ClickEvent;
+import com.google.gwt.event.dom.client.ClickHandler;
+import com.google.gwt.user.client.Window;
+import com.google.gwt.user.client.ui.Button;
+import com.google.gwt.user.client.ui.RootPanel;
+import com.google.gwt.user.client.ui.TextBox;
+import com.google.gwt.user.client.ui.VerticalPanel;
+
+public class ClientSideModule implements EntryPoint {
+
+    @Override
+    public void onModuleLoad() {
+        final TextBox nameField = new TextBox();
+        nameField.setText("GWT User");
+        final Button button = new Button("Check");
+
+        VerticalPanel vp = new VerticalPanel();
+        vp.add(nameField);
+        vp.add(button);
+        RootPanel.get().add(vp);
+
+        button.addClickHandler(new ClickHandler() {
+            @Override
+            public void onClick(ClickEvent event) {
+                if ("GWT User".equals(nameField.getText())) {
+                    Window.alert("User OK");
+                } else {
+                    Window.alert("Unauthorized user");
+                }
+            }
+        });
+    }
+}
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a3/RefresherConnector.java b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a3/RefresherConnector.java
new file mode 100644
index 0000000000..26fa22a667
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a3/RefresherConnector.java
@@ -0,0 +1,40 @@
+package com.vaadin.tests.widgetset.client.minitutorials.v7a3;
+
+import com.google.gwt.user.client.Timer;
+import com.vaadin.client.communication.RpcProxy;
+import com.vaadin.client.communication.StateChangeEvent;
+import com.vaadin.client.extensions.AbstractExtensionConnector;
+import com.vaadin.shared.ui.Connect;
+import com.vaadin.tests.minitutorials.v7a3.Refresher;
+
+@Connect(Refresher.class)
+public class RefresherConnector extends AbstractExtensionConnector {
+
+    private RefresherRpc rpc = RpcProxy.create(RefresherRpc.class, this);
+
+    private Timer timer = new Timer() {
+        @Override
+        public void run() {
+            rpc.refresh();
+        }
+    };
+
+    @Override
+    public void onStateChanged(StateChangeEvent event) {
+        super.onStateChanged(event);
+        timer.cancel();
+        if (isEnabled()) {
+            timer.scheduleRepeating(getState().interval);
+        }
+    }
+
+    @Override
+    public void onUnregister() {
+        timer.cancel();
+    }
+
+    @Override
+    public RefresherState getState() {
+        return (RefresherState) super.getState();
+    }
+}
\ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a3/RefresherRpc.java b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a3/RefresherRpc.java
new file mode 100644
index 0000000000..df9c9733f7
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a3/RefresherRpc.java
@@ -0,0 +1,7 @@
+package com.vaadin.tests.widgetset.client.minitutorials.v7a3;
+
+import com.vaadin.shared.communication.ServerRpc;
+
+public interface RefresherRpc extends ServerRpc {
+    public void refresh();
+}
\ No newline at end of file
diff --git a/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a3/RefresherState.java b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a3/RefresherState.java
new file mode 100644
index 0000000000..769f6330a9
--- /dev/null
+++ b/uitest/src/com/vaadin/tests/widgetset/client/minitutorials/v7a3/RefresherState.java
@@ -0,0 +1,7 @@
+package com.vaadin.tests.widgetset.client.minitutorials.v7a3;
+
+import com.vaadin.shared.communication.SharedState;
+
+public class RefresherState extends SharedState {
+    public int interval = 1000;
+}
\ No newline at end of file