]> source.dussan.org Git - vaadin-framework.git/commitdiff
Updated manual example code. Corrected formatting in window test application.
authorMarko Grönroos <magi@iki.fi>
Fri, 29 Aug 2008 11:09:13 +0000 (11:09 +0000)
committerMarko Grönroos <magi@iki.fi>
Fri, 29 Aug 2008 11:09:13 +0000 (11:09 +0000)
svn changeset:5303/svn branch:trunk

src/com/itmill/toolkit/tests/book/WindowTestApplication.java

index 0458298ce350ae15d72e64ff6f25bea2d0be4d73..0affc7a4f66b12766a445073c822fa723091384d 100644 (file)
@@ -11,8 +11,8 @@ import com.itmill.toolkit.ui.Window;
 import com.itmill.toolkit.ui.Button.ClickEvent;
 
 public class WindowTestApplication extends Application {
-    Window anotherpage = null;
-    HashMap windows = new HashMap();
+    Window  anotherpage = null;
+    HashMap windows     = new HashMap();
 
     public void init() {
         final Window main = new Window("Window Test Application");
@@ -36,39 +36,37 @@ public class WindowTestApplication extends Application {
                 new Button.ClickListener() {
                     public void buttonClick(ClickEvent event) {
                         // Open the window.
-                        main.open(new ExternalResource(mywindow.getURL()),
-                                "_new");
+                        main.open(new ExternalResource(mywindow.getURL()), "_new");
                     }
                 }));
 
         /* Add a link to the second window. */
         Link link = new Link("Click to open second window",
-                new ExternalResource(mywindow.getURL()));
+                             new ExternalResource(mywindow.getURL()));
         link.setTargetName("_new");
         main.addComponent(link);
 
         // Add the link manually inside a Label.
-        main.addComponent(new Label("Second window: <a href='"
-                + mywindow.getURL() + "' target='_new'>click to open</a>",
-                Label.CONTENT_XHTML));
-        main.addComponent(new Label(
-                "The second window can be accessed through URL: "
-                        + mywindow.getURL()));
+        main.addComponent(new Label("Second window: <a href='" + mywindow.getURL()
+                                    + "' target='_new'>click to open</a>",
+                                    Label.CONTENT_XHTML));
+        main.addComponent(new Label("The second window can be accessed through URL: "
+                                    + mywindow.getURL()));
 
         // Add links to windows that do not yet exist, but are created
-        // dynamically
-        // when the URL is called.
+        // dynamically when the URL is called.
         main.addComponent(new Label("URLs to open item windows:"));
         final String[] items = new String[] { "mercury", "venus", "earth",
                 "mars", "jupiter", "saturn", "uranus", "neptune" };
+        
         for (int inx = 0; inx < items.length; inx++) {
             String item = items[inx];
-            // We do not create window objects here, but just links to the
-            // windows
+
+            // We do not create window objects here, but just links to the windows
             String windowUrl = getURL() + "planet-" + item;
-            main.addComponent(new Label("A window about '" + item
-                    + "': <a href='" + windowUrl + "' target='_new'>"
-                    + windowUrl + "</a>", Label.CONTENT_XHTML));
+            main.addComponent(new Label("A window about '" + item + "': <a href='" + 
+                                        windowUrl + "' target='_new'>" + windowUrl + 
+                                        "</a>", Label.CONTENT_XHTML));
         }
     }
 
@@ -78,9 +76,8 @@ public class WindowTestApplication extends Application {
             if (!windows.containsKey(planetName)) {
                 // Create the window object on the fly.
                 Window newWindow = new Window("Yet Another Page");
-                newWindow.addComponent(new Label(
-                        "This window contains details about " + planetName
-                                + "."));
+                newWindow.addComponent(new Label("This window contains details about " +
+                                                 planetName + "."));
                 windows.put(planetName, newWindow);
 
                 // We must add the window to the application, it is not done