diff options
Diffstat (limited to 'src/com/vaadin/automatedtests')
6 files changed, 19 insertions, 22 deletions
diff --git a/src/com/vaadin/automatedtests/featurebrowser/ButtonExample.java b/src/com/vaadin/automatedtests/featurebrowser/ButtonExample.java index 0cd5ea05ec..aabfe41b20 100644 --- a/src/com/vaadin/automatedtests/featurebrowser/ButtonExample.java +++ b/src/com/vaadin/automatedtests/featurebrowser/ButtonExample.java @@ -104,21 +104,21 @@ public class ButtonExample extends CustomComponent implements + " server-initiated window opening.");
desc.setContentMode(Label.CONTENT_XHTML);
links.addComponent(desc);
- Link l = new Link("IT Mill home", new ExternalResource(
- "http://www.itmill.com"));
+ Link l = new Link("Vaadin home", new ExternalResource(
+ "http://www.vaadin.com"));
l.setDebugId("Link1");
l.setDescription("Link without target name, opens in this window");
links.addComponent(l);
- l = new Link("IT Mill home (new window)", new ExternalResource(
- "http://www.itmill.com"));
+ l = new Link("Vaadin home (new window)", new ExternalResource(
+ "http://www.vaadin.com"));
l.setDebugId("Link2");
l.setTargetName("_blank");
l.setDescription("Link with target name, opens in new window");
links.addComponent(l);
- l = new Link("IT Mill home (new window, less decor)",
- new ExternalResource("http://www.itmill.com"));
+ l = new Link("Vaadin home (new window, less decor)",
+ new ExternalResource("http://www.vaadin.com"));
l.setDebugId("Link3");
l.setTargetName("_blank");
l.setTargetBorder(Link.TARGET_BORDER_MINIMAL);
@@ -127,8 +127,8 @@ public class ButtonExample extends CustomComponent implements .setDescription("Link with target name and BORDER_MINIMAL, opens in new window with less decor");
links.addComponent(l);
- l = new Link("IT Mill home (new 200x200 window, no decor, icon)",
- new ExternalResource("http://www.itmill.com"), "_blank", 200,
+ l = new Link("Vaadin home (new 200x200 window, no decor, icon)",
+ new ExternalResource("http://www.vaadin.com"), "_blank", 200,
200, Link.TARGET_BORDER_NONE);
l.setDebugId("Link4");
l.setTargetName("_blank");
diff --git a/src/com/vaadin/automatedtests/featurebrowser/EmbeddedBrowserExample.java b/src/com/vaadin/automatedtests/featurebrowser/EmbeddedBrowserExample.java index a62e120f46..2ecf60ecdb 100644 --- a/src/com/vaadin/automatedtests/featurebrowser/EmbeddedBrowserExample.java +++ b/src/com/vaadin/automatedtests/featurebrowser/EmbeddedBrowserExample.java @@ -26,16 +26,14 @@ public class EmbeddedBrowserExample extends VerticalLayout implements Select.ValueChangeListener { // Default URL to open. - private static final String DEFAULT_URL = "http://www.itmill.com/index_itmill_toolkit.htm"; + private static final String DEFAULT_URL = "http://www.vaadin.com/"; // The embedded page Embedded emb = new Embedded(); public EmbeddedBrowserExample() { - this(new String[] { DEFAULT_URL, - "http://www.itmill.com/index_developers.htm", - "http://toolkit.itmill.com/demo/doc/api/", - "http://www.itmill.com/manual/index.html" }); + this(new String[] { DEFAULT_URL, "http://www.vaadin.com/learn", + "http://www.vaadin.com/api", "http://www.vaadin.com/book" }); } public EmbeddedBrowserExample(String[] urls) { @@ -81,7 +79,7 @@ public class EmbeddedBrowserExample extends VerticalLayout implements } catch (MalformedURLException e) { getWindow().showNotification("Invalid address", - e.getMessage() + " (example: http://www.itmill.com)", + e.getMessage() + " (example: http://www.vaadin.com)", Notification.TYPE_WARNING_MESSAGE); } diff --git a/src/com/vaadin/automatedtests/featurebrowser/FeatureBrowser.java b/src/com/vaadin/automatedtests/featurebrowser/FeatureBrowser.java index bc3983aea2..275d42efb6 100644 --- a/src/com/vaadin/automatedtests/featurebrowser/FeatureBrowser.java +++ b/src/com/vaadin/automatedtests/featurebrowser/FeatureBrowser.java @@ -109,8 +109,7 @@ public class FeatureBrowser extends com.vaadin.Application implements // Windowing { "Misc", "Windowing", "About windowing", WindowingExample.class }, // JavaScript API - { "Misc", "JavaScript API", - "JavaScript to IT Mill Toolkit communication", + { "Misc", "JavaScript API", "JavaScript to Vaadin communication", JavaScriptAPIExample.class }, // END }; @@ -122,7 +121,7 @@ public class FeatureBrowser extends com.vaadin.Application implements setTheme("example"); // Create new window for the application and give the window a visible. - final Window main = new Window("IT Mill Toolkit 5"); + final Window main = new Window("Vaadin 6"); main.setDebugId("mainWindow"); // set as main window setMainWindow(main); @@ -273,8 +272,8 @@ public class FeatureBrowser extends com.vaadin.Application implements exp.setExpandRatio(ts, 1); final Label status = new Label( - "<a href=\"http://www.itmill.com/developers/\">Developer Area</a>" - + " | <a href=\"http://www.itmill.com/documentation/\">Documentation</a>"); + "<a href=\"http://www.vaadin.com/learn\">30 Seconds to Vaadin</a>" + + " | <a href=\"http://www.vaadin.com/book\">Book of Vaadin</a>"); status.setContentMode(Label.CONTENT_XHTML); exp.addComponent(status); exp.setComponentAlignment(status, Alignment.MIDDLE_RIGHT); diff --git a/src/com/vaadin/automatedtests/featurebrowser/JavaScriptAPIExample.java b/src/com/vaadin/automatedtests/featurebrowser/JavaScriptAPIExample.java index 5956db9853..21e49ce320 100644 --- a/src/com/vaadin/automatedtests/featurebrowser/JavaScriptAPIExample.java +++ b/src/com/vaadin/automatedtests/featurebrowser/JavaScriptAPIExample.java @@ -22,7 +22,7 @@ import com.vaadin.ui.Button.ClickEvent; */
public class JavaScriptAPIExample extends CustomComponent {
- public static final String txt = "<p>For advanced client side programmers Toolkit offers a simple method which can be used to force sync client with server. This may be needed for example if another part of a mashup changes things on server.</p> (more examples will be added here as the APIs are made public)<br/><br/><A href=\"javascript:vaadin.forceSync();\">javascript:itmill.forceSync();</A>";
+ public static final String txt = "<p>For advanced client side programmers Vaadin offers a simple method which can be used to force sync client with server. This may be needed for example if another part of a mashup changes things on server.</p> (more examples will be added here as the APIs are made public)<br/><br/><A href=\"javascript:vaadin.forceSync();\">javascript:vaadin.forceSync();</A>";
private final VerticalLayout main;
private final Label l;
diff --git a/src/com/vaadin/automatedtests/featurebrowser/RichTextExample.java b/src/com/vaadin/automatedtests/featurebrowser/RichTextExample.java index 0fb21b2200..84c16e3a26 100644 --- a/src/com/vaadin/automatedtests/featurebrowser/RichTextExample.java +++ b/src/com/vaadin/automatedtests/featurebrowser/RichTextExample.java @@ -21,7 +21,7 @@ public class RichTextExample extends CustomComponent { public static final String txt = "<h1>RichText editor example</h1>"
+ "To edit this text, press the <b>Edit</b> button below."
+ "<br/>"
- + "See the <A href=\"http://www.itmill.com/documentation/itmill-toolkit-5-reference-manual/\">manual</a> "
+ + "See the <A href=\"http://www.vaadin.com/book\">Book of Vaadin</a> "
+ "for more information.";
private final VerticalLayout main;
diff --git a/src/com/vaadin/automatedtests/util/RandomComponents.java b/src/com/vaadin/automatedtests/util/RandomComponents.java index 8ddafaf62b..46446d8f3b 100644 --- a/src/com/vaadin/automatedtests/util/RandomComponents.java +++ b/src/com/vaadin/automatedtests/util/RandomComponents.java @@ -165,7 +165,7 @@ public class RandomComponents implements Serializable { break; case 4: // Link - result = new Link("", new ExternalResource("http://www.itmill.com")); + result = new Link("", new ExternalResource("http://www.vaadin.com")); result.setCaption("Link component " + caption); break; case 5: |