From: Joonas Lehtinen <joonas.lehtinen@itmill.com>
Date: Thu, 3 Jul 2008 14:00:31 +0000 (+0000)
Subject: Removed JDK 1.5 dependency from Book example
X-Git-Tag: 6.7.0.beta1~4488
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f227c79de579f9481dc03b5fa84348bf207e5df0;p=vaadin-framework.git

Removed JDK 1.5 dependency from Book example

svn changeset:5035/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/tests/book/WindowTestApplication.java b/src/com/itmill/toolkit/tests/book/WindowTestApplication.java
index baa149f79d..0458298ce3 100644
--- a/src/com/itmill/toolkit/tests/book/WindowTestApplication.java
+++ b/src/com/itmill/toolkit/tests/book/WindowTestApplication.java
@@ -3,25 +3,28 @@ package com.itmill.toolkit.tests.book;
 import java.util.HashMap;
 
 import com.itmill.toolkit.Application;
-import com.itmill.toolkit.ui.*;
+import com.itmill.toolkit.terminal.ExternalResource;
+import com.itmill.toolkit.ui.Button;
+import com.itmill.toolkit.ui.Label;
+import com.itmill.toolkit.ui.Link;
+import com.itmill.toolkit.ui.Window;
 import com.itmill.toolkit.ui.Button.ClickEvent;
-import com.itmill.toolkit.terminal.*;
 
 public class WindowTestApplication extends Application {
     Window anotherpage = null;
-    HashMap<String, Window> windows = new HashMap<String, Window>();
+    HashMap windows = new HashMap();
 
     public void init() {
-        final Window main = new Window ("Window Test Application");
+        final Window main = new Window("Window Test Application");
         setMainWindow(main);
         setTheme("tests-book");
-        
+
         /* Create a new window. */
         final Window mywindow = new Window("Second Window");
-        
+
         /* Manually set the name of the window. */
         mywindow.setName("mywindow");
-        
+
         /* Add some content to the window. */
         mywindow.addComponent(new Label("This is a second window."));
 
@@ -30,56 +33,63 @@ public class WindowTestApplication extends Application {
 
         /* Add a button to open a new window. */
         main.addComponent(new Button("Click to open new window",
-                          new Button.ClickListener() { 
-            public void buttonClick(ClickEvent event) {
-                // Open the window.
-                main.open(new ExternalResource(mywindow.getURL()), "_new");
-            }      
-        }));        
-        
+                new Button.ClickListener() {
+                    public void buttonClick(ClickEvent event) {
+                        // Open the window.
+                        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()));
+                + 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
+        // Add links to windows that do not yet exist, but are created
+        // 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 (String item : items) {
-            // We do not create window objects here, but just links to the 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
             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));
         }
     }
-    
+
     public Window getWindow(String name) {
         if (name.startsWith("planet-")) {
             String planetName = name.substring("planet-".length());
-            if (! windows.containsKey(planetName)) {
+            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
                 // automatically
                 addWindow(newWindow);
             }
-            return windows.get(planetName);
+            return (Window) windows.get(planetName);
         }
-        
+
         return super.getWindow(name);
     }
 }