#8311 Additional CRLF->LF fixes

svn changeset:22799/svn branch:6.8

3 files changed, 89 insertions, 89 deletions

diff --git a/tests/server-side/com/vaadin/tests/server/component/abstractorderedlayout/AddComponentsTest.java b/tests/server-side/com/vaadin/tests/server/component/abstractorderedlayout/AddComponentsTest.java
index bd67841f33..1971fb6d0e 100644
--- a/tests/server-side/com/vaadin/tests/server/component/abstractorderedlayout/AddComponentsTest.java
+++ b/tests/server-side/com/vaadin/tests/server/component/abstractorderedlayout/AddComponentsTest.java
@@ -1,14 +1,14 @@
 package com.vaadin.tests.server.component.abstractorderedlayout;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.fail;
-
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
 import org.junit.Test;
 
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.fail;
+
 import com.vaadin.ui.AbstractOrderedLayout;
 import com.vaadin.ui.Component;
 import com.vaadin.ui.HorizontalLayout;
diff --git a/tests/server-side/com/vaadin/tests/server/component/csslayout/AddComponentsTest.java b/tests/server-side/com/vaadin/tests/server/component/csslayout/AddComponentsTest.java
index d4a0592768..c0d739b597 100644
--- a/tests/server-side/com/vaadin/tests/server/component/csslayout/AddComponentsTest.java
+++ b/tests/server-side/com/vaadin/tests/server/component/csslayout/AddComponentsTest.java
@@ -5,8 +5,8 @@ import java.util.NoSuchElementException;
 
 import org.junit.Test;
 
-import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.fail;
 
 import com.vaadin.ui.Component;
diff --git a/tests/server-side/com/vaadin/tests/server/componentcontainer/AbstractIndexedLayoutTest.java b/tests/server-side/com/vaadin/tests/server/componentcontainer/AbstractIndexedLayoutTest.java
index 9271e9f1b3..e3e743d02a 100644
--- a/tests/server-side/com/vaadin/tests/server/componentcontainer/AbstractIndexedLayoutTest.java
+++ b/tests/server-side/com/vaadin/tests/server/componentcontainer/AbstractIndexedLayoutTest.java
@@ -1,84 +1,84 @@
-package com.vaadin.tests.server.componentcontainer;

-

-import junit.framework.TestCase;

-

-import com.vaadin.ui.Component;

-import com.vaadin.ui.Label;

-import com.vaadin.ui.Layout;

-

-public abstract class AbstractIndexedLayoutTest extends TestCase {

-

-    private Layout layout;

-

-    protected abstract Layout createLayout();

-

-    @Override

-    protected void setUp() throws Exception {

-        layout = createLayout();

-    }

-

-    public Layout getLayout() {

-        return layout;

-    }

-

-    public void testAddRemoveComponent() {

-        Label c1 = new Label();

-        Label c2 = new Label();

-

-        layout.addComponent(c1);

-

-        assertEquals(c1, getComponent(0));

-        assertEquals(1, getComponentCount());

-        layout.addComponent(c2);

-        assertEquals(c1, getComponent(0));

-        assertEquals(c2, getComponent(1));

-        assertEquals(2, getComponentCount());

-        layout.removeComponent(c1);

-        assertEquals(c2, getComponent(0));

-        assertEquals(1, getComponentCount());

-        layout.removeComponent(c2);

-        assertEquals(0, getComponentCount());

-    }

-

-    protected abstract int getComponentCount();

-

-    protected abstract Component getComponent(int index);

-

-    protected abstract int getComponentIndex(Component c);

-

-    public void testGetComponentIndex() {

-        Label c1 = new Label();

-        Label c2 = new Label();

-

-        layout.addComponent(c1);

-        assertEquals(0, getComponentIndex(c1));

-        layout.addComponent(c2);

-        assertEquals(0, getComponentIndex(c1));

-        assertEquals(1, getComponentIndex(c2));

-        layout.removeComponent(c1);

-        assertEquals(0, getComponentIndex(c2));

-        layout.removeComponent(c2);

-        assertEquals(-1, getComponentIndex(c2));

-        assertEquals(-1, getComponentIndex(c1));

-    }

-

-    public void testGetComponent() {

-        Label c1 = new Label();

-        Label c2 = new Label();

-

-        layout.addComponent(c1);

-        assertEquals(c1, getComponent(0));

-        layout.addComponent(c2);

-        assertEquals(c1, getComponent(0));

-        assertEquals(c2, getComponent(1));

-        layout.removeComponent(c1);

-        assertEquals(c2, getComponent(0));

-        layout.removeComponent(c2);

-        try {

-            getComponent(0);

-            fail();

-        } catch (IndexOutOfBoundsException e) {

-            // Expected

-        }

-    }

-}

+package com.vaadin.tests.server.componentcontainer;
+
+import junit.framework.TestCase;
+
+import com.vaadin.ui.Component;
+import com.vaadin.ui.Label;
+import com.vaadin.ui.Layout;
+
+public abstract class AbstractIndexedLayoutTest extends TestCase {
+
+    private Layout layout;
+
+    protected abstract Layout createLayout();
+
+    @Override
+    protected void setUp() throws Exception {
+        layout = createLayout();
+    }
+
+    public Layout getLayout() {
+        return layout;
+    }
+
+    public void testAddRemoveComponent() {
+        Label c1 = new Label();
+        Label c2 = new Label();
+
+        layout.addComponent(c1);
+
+        assertEquals(c1, getComponent(0));
+        assertEquals(1, getComponentCount());
+        layout.addComponent(c2);
+        assertEquals(c1, getComponent(0));
+        assertEquals(c2, getComponent(1));
+        assertEquals(2, getComponentCount());
+        layout.removeComponent(c1);
+        assertEquals(c2, getComponent(0));
+        assertEquals(1, getComponentCount());
+        layout.removeComponent(c2);
+        assertEquals(0, getComponentCount());
+    }
+
+    protected abstract int getComponentCount();
+
+    protected abstract Component getComponent(int index);
+
+    protected abstract int getComponentIndex(Component c);
+
+    public void testGetComponentIndex() {
+        Label c1 = new Label();
+        Label c2 = new Label();
+
+        layout.addComponent(c1);
+        assertEquals(0, getComponentIndex(c1));
+        layout.addComponent(c2);
+        assertEquals(0, getComponentIndex(c1));
+        assertEquals(1, getComponentIndex(c2));
+        layout.removeComponent(c1);
+        assertEquals(0, getComponentIndex(c2));
+        layout.removeComponent(c2);
+        assertEquals(-1, getComponentIndex(c2));
+        assertEquals(-1, getComponentIndex(c1));
+    }
+
+    public void testGetComponent() {
+        Label c1 = new Label();
+        Label c2 = new Label();
+
+        layout.addComponent(c1);
+        assertEquals(c1, getComponent(0));
+        layout.addComponent(c2);
+        assertEquals(c1, getComponent(0));
+        assertEquals(c2, getComponent(1));
+        layout.removeComponent(c1);
+        assertEquals(c2, getComponent(0));
+        layout.removeComponent(c2);
+        try {
+            getComponent(0);
+            fail();
+        } catch (IndexOutOfBoundsException e) {
+            // Expected
+        }
+    }
+}