Split the Log class to a separate file

svn changeset:10737/svn branch:6.2

diff --git a/tests/src/com/vaadin/tests/components/textfield/TextFieldFocusAndBlurListeners.java b/tests/src/com/vaadin/tests/components/textfield/TextFieldFocusAndBlurListeners.java
index 77cc5879154a7a0e3e29bb189480d53f231ba667..98f3e546f5124a77be5efa54ac142b9284890965 100644 (file)
--- a/tests/src/com/vaadin/tests/components/textfield/TextFieldFocusAndBlurListeners.java
+++ b/tests/src/com/vaadin/tests/components/textfield/TextFieldFocusAndBlurListeners.java
@@ -7,7 +7,7 @@ import com.vaadin.event.FieldEvents.BlurListener;
 import com.vaadin.event.FieldEvents.FocusEvent;
 import com.vaadin.event.FieldEvents.FocusListener;
 import com.vaadin.tests.components.TestBase;
-import com.vaadin.tests.layouts.TestLayoutClickListeners.Log;
+import com.vaadin.tests.util.Log;
 import com.vaadin.ui.TextField;
 
 public class TextFieldFocusAndBlurListeners extends TestBase implements

diff --git a/tests/src/com/vaadin/tests/layouts/TestLayoutClickListeners.java b/tests/src/com/vaadin/tests/layouts/TestLayoutClickListeners.java
index 9a7dca7e30ef30f96e37d78888bae1a9693a1c07..386608f01fbb4c3fd3a2c1d65ffcfab8a9e7a948 100644 (file)
--- a/tests/src/com/vaadin/tests/layouts/TestLayoutClickListeners.java
+++ b/tests/src/com/vaadin/tests/layouts/TestLayoutClickListeners.java
@@ -1,11 +1,9 @@
 package com.vaadin.tests.layouts;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import com.vaadin.event.LayoutEvents.LayoutClickEvent;
 import com.vaadin.event.LayoutEvents.LayoutClickListener;
 import com.vaadin.tests.components.AbstractTestCase;
+import com.vaadin.tests.util.Log;
 import com.vaadin.ui.AbsoluteLayout;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Component;
@@ -22,41 +20,6 @@ public class TestLayoutClickListeners extends AbstractTestCase {
 
     private Log log = new Log(5);
 
-    public static class Log extends VerticalLayout {
-        List<Label> eventLabels = new ArrayList<Label>();
-
-        public Log(int nr) {
-            for (int i = 0; i < nr; i++) {
-                Label l = createEventLabel();
-                eventLabels.add(l);
-                addComponent(l);
-            }
-
-            setCaption("Events:");
-        }
-
-        public void clear() {
-            for (Label l : eventLabels) {
-                l.setValue("");
-            }
-        }
-
-        public void log(String event) {
-            int nr = eventLabels.size();
-            for (int i = nr - 1; i > 0; i--) {
-                eventLabels.get(i).setValue(eventLabels.get(i - 1).getValue());
-            }
-            eventLabels.get(0).setValue(event);
-        }
-
-        private Label createEventLabel() {
-            Label l = new Label("&nbsp;", Label.CONTENT_XHTML);
-            l.setWidth(null);
-            return l;
-        }
-
-    }
-
     @Override
     public void init() {
         Window w = new Window("main window");

diff --git a/tests/src/com/vaadin/tests/util/Log.java b/tests/src/com/vaadin/tests/util/Log.java
new file mode 100644 (file)
index 0000000..75ac5d2
--- /dev/null
+++ b/tests/src/com/vaadin/tests/util/Log.java
@@ -0,0 +1,43 @@
+package com.vaadin.tests.util;\r
+\r
+import java.util.ArrayList;\r
+import java.util.List;\r
+\r
+import com.vaadin.ui.Label;\r
+import com.vaadin.ui.VerticalLayout;\r
+\r
+public class Log extends VerticalLayout {\r
+    List<Label> eventLabels = new ArrayList<Label>();\r
+\r
+    public Log(int nr) {\r
+        for (int i = 0; i < nr; i++) {\r
+            Label l = createEventLabel();\r
+            eventLabels.add(l);\r
+            addComponent(l);\r
+        }\r
+\r
+        setCaption("Events:");\r
+    }\r
+\r
+    public void clear() {\r
+        for (Label l : eventLabels) {\r
+            l.setValue("");\r
+        }\r
+    }\r
+\r
+    public void log(String event) {\r
+        int nr = eventLabels.size();\r
+        for (int i = nr - 1; i > 0; i--) {\r
+            eventLabels.get(i).setValue(eventLabels.get(i - 1).getValue());\r
+        }\r
+        eventLabels.get(0).setValue(event);\r
+        System.out.println(event);\r
+    }\r
+\r
+    private Label createEventLabel() {\r
+        Label l = new Label("&nbsp;", Label.CONTENT_XHTML);\r
+        l.setWidth(null);\r
+        return l;\r
+    }\r
+\r
+}\r