#5334 using theme icons instead of class resource icons

svn changeset:14347/svn branch:6.4

diff --git a/tests/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java b/tests/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java
index 078fc7a8bce779020bb7e36a9957a05791694995..e81736d8a3c3638d4ad129b2c90df3f0ab355510 100644 (file)
--- a/tests/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java
+++ b/tests/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java
@@ -4,6 +4,7 @@ import com.vaadin.Application;
 import com.vaadin.terminal.ClassResource;\r
 import com.vaadin.terminal.Resource;\r
 import com.vaadin.terminal.SystemError;\r
+import com.vaadin.terminal.ThemeResource;\r
 import com.vaadin.terminal.UserError;\r
 import com.vaadin.ui.AbstractComponent;\r
 import com.vaadin.ui.AbstractField;\r
@@ -86,7 +87,7 @@ public class GridLayoutTests extends AbstractLayoutTests {
         col1.setCaption(captions[0]);\r
         col2.setCaption(captions[1]);\r
         col3.setCaption(captions[2]);\r
-        col3.setIcon(new ClassResource("help.png", application));\r
+        col3.setIcon(new ThemeResource("../runo/icons/16/lock.png"));\r
 \r
         glo.replaceComponent(row1, row1 = new Label());\r
         glo.replaceComponent(row2, row2 = new Label());\r
@@ -334,8 +335,8 @@ public class GridLayoutTests extends AbstractLayoutTests {
         GridLayout glo = getTestGrid();\r
         glo.setWidth("600px");\r
         Resource[] icons = new Resource[] {\r
-                new ClassResource("alert.png", application),\r
-                new ClassResource("help.png", application) };\r
+                new ThemeResource("../runo/icons/32/calendar.png"),\r
+                new ThemeResource("../runo/icons/16/lock.png") };\r
 \r
         glo.replaceComponent(col1, col1 = new TextField("TEXTFIELD"));\r
         glo.replaceComponent(col2, col2 = new Label("LABEL"));\r
@@ -359,7 +360,7 @@ public class GridLayoutTests extends AbstractLayoutTests {
 \r
         glo.replaceComponent(x3, x3 = new CheckBox("CHECKBOX"));\r
         glo.replaceComponent(x22, x22 = new Panel("PANEL"));\r
-        x22.setIcon(new ClassResource("alert.png", application));\r
+        x22.setIcon(new ThemeResource("../runo/icons/32/calendar.png"));\r
 \r
         x3.setIcon(icons[0]);\r
         x22.setIcon(icons[1]);\r
@@ -506,8 +507,8 @@ public class GridLayoutTests extends AbstractLayoutTests {
         GridLayout glo = getTestGrid();\r
         glo.setWidth("600px");\r
         Resource[] icons = new Resource[] {\r
-                new ClassResource("alert.png", application),\r
-                new ClassResource("help.png", application) };\r
+                new ThemeResource("../runo/icons/32/calendar.png"),\r
+                new ThemeResource("../runo/icons/16/lock.png") };\r
 \r
         glo.replaceComponent(col1, col1 = new TextField("TEXTFIELD"));\r
         glo.replaceComponent(col2, col2 = new Label("LABEL"));\r
@@ -599,7 +600,7 @@ public class GridLayoutTests extends AbstractLayoutTests {
         t.setSizeUndefined();\r
         t.setPageLength(5);\r
         t.addContainerProperty("test", String.class, null);\r
-        t.addItem(new Object[] { "qwertyuiop asdfghjklöä zxccvbnm,m,." }, 1);\r
+        t.addItem(new Object[] { "qwertyuiop asdfghjklzxccvbnm,m,." }, 1);\r
         t.addItem(new Object[] { "YGVYTCTCTRXRXRXRX" }, 2);\r
         return t;\r
     }\r

diff --git a/tests/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java b/tests/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java
index dfb32a3fa24f087d8a29bc73a01b4dd8f61f514b..831f5e3a196e217e3889f86da84dedf4c0b00784 100644 (file)
--- a/tests/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java
+++ b/tests/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java
@@ -4,6 +4,7 @@ import com.vaadin.Application;
 import com.vaadin.terminal.ClassResource;\r
 import com.vaadin.terminal.Resource;\r
 import com.vaadin.terminal.SystemError;\r
+import com.vaadin.terminal.ThemeResource;\r
 import com.vaadin.terminal.UserError;\r
 import com.vaadin.ui.AbstractComponent;\r
 import com.vaadin.ui.AbstractField;\r
@@ -92,7 +93,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests {
         for (int i = 0; i < captions.length; i++) {\r
             component = new Select();\r
             component.setCaption(captions[i]);\r
-            component.setIcon(new ClassResource("help.png", application));\r
+            component.setIcon(new ThemeResource("../runo/icons/16/lock.png"));\r
             vlo.addComponent(component);\r
         }\r
         baseLayout.addComponent(vlo);\r
@@ -386,8 +387,8 @@ public class HorizontalLayoutTests extends AbstractLayoutTests {
         AbstractComponent[] components = new AbstractComponent[2];\r
         Layout baseLayout = getBaseLayout();\r
         Resource[] icons = new Resource[] {\r
-                new ClassResource("alert.png", application),\r
-                new ClassResource("help.png", application) };\r
+                new ThemeResource("../runo/icons/32/calendar.png"),\r
+                new ThemeResource("../runo/icons/16/lock.png") };\r
 \r
         for (int i = 0; i < components.length; i++) {\r
             components[i] = new TextField();\r
@@ -510,7 +511,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests {
         components[1] = new Button("BUTTON");\r
         components[2] = getTestTable();\r
         components[3] = getTestTabsheet();\r
-        components[3].setIcon(new ClassResource("help.png", application));\r
+        components[3].setIcon(new ThemeResource("../runo/icons/16/lock.png"));\r
 \r
         AbstractField[] fields = new AbstractField[6];\r
         fields[0] = new TextField();\r
@@ -540,7 +541,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests {
         fields[5].setRequiredError("required error");\r
         fields[5]\r
                 .setComponentError(new UserError("component error, user error"));\r
-        fields[5].setIcon(new ClassResource("alert.png", application));\r
+        fields[5].setIcon(new ThemeResource("../runo/icons/32/calendar.png"));\r
 \r
         for (int i = 0; i < components.length; i++) {\r
             components[i].setComponentError(new UserError(\r
@@ -583,7 +584,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests {
         t.setSizeUndefined();\r
         t.setPageLength(5);\r
         t.addContainerProperty("test", String.class, null);\r
-        t.addItem(new Object[] { "qwertyuiop asdfghjklöä zxccvbnm,m,." }, 1);\r
+        t.addItem(new Object[] { "qwertyuiop asdfghjkl zxccvbnm,m,." }, 1);\r
         t.addItem(new Object[] { "YGVYTCTCTRXRXRXRX" }, 2);\r
         return t;\r
     }\r

diff --git a/tests/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java b/tests/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
index 5b32aa1a6ddc4c22b19a487fba6d0d00e821bb6e..ba77440f867ccc6fca5df2fa4524b6697d4d1d29 100644 (file)
--- a/tests/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
+++ b/tests/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
@@ -4,6 +4,7 @@ import com.vaadin.Application;
 import com.vaadin.terminal.ClassResource;\r
 import com.vaadin.terminal.Resource;\r
 import com.vaadin.terminal.SystemError;\r
+import com.vaadin.terminal.ThemeResource;\r
 import com.vaadin.terminal.UserError;\r
 import com.vaadin.ui.AbstractComponent;\r
 import com.vaadin.ui.AbstractField;\r
@@ -90,7 +91,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests {
         for (int i = 0; i < captions.length; i++) {\r
             component = new Select();\r
             component.setCaption(captions[i]);\r
-            component.setIcon(new ClassResource("help.png", application));\r
+            component.setIcon(new ThemeResource("../runo/icons/16/lock.png"));\r
             vlo.addComponent(component);\r
         }\r
         for (int i = 0; i < captions.length; i++) {\r
@@ -377,8 +378,8 @@ public class VerticalLayoutTests extends AbstractLayoutTests {
         AbstractComponent[] components = new AbstractComponent[2];\r
 \r
         Resource[] icons = new Resource[] {\r
-                new ClassResource("alert.png", application),\r
-                new ClassResource("help.png", application) };\r
+                new ThemeResource("../runo/icons/32/calendar.png"),\r
+                new ThemeResource("../runo/icons/16/lock.png") };\r
 \r
         for (int i = 0; i < components.length; i++) {\r
             components[i] = new TextField();\r
@@ -503,7 +504,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests {
         components[1] = new Button("BUTTON");\r
         components[2] = getTestTable();\r
         components[3] = getTestTabsheet();\r
-        components[3].setIcon(new ClassResource("help.png", application));\r
+        components[3].setIcon(new ThemeResource("../runo/icons/16/lock.png"));\r
 \r
         AbstractField[] fields = new AbstractField[6];\r
         fields[0] = new TextField();\r
@@ -533,7 +534,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests {
         fields[5].setRequiredError("required error");\r
         fields[5]\r
                 .setComponentError(new UserError("component error, user error"));\r
-        fields[5].setIcon(new ClassResource("alert.png", application));\r
+        fields[5].setIcon(new ThemeResource("../runo/icons/32/calendar.png"));\r
 \r
         for (int i = 0; i < components.length; i++) {\r
             components[i].setComponentError(new UserError(\r
@@ -577,7 +578,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests {
         t.setSizeUndefined();\r
         t.setPageLength(5);\r
         t.addContainerProperty("test", String.class, null);\r
-        t.addItem(new Object[] { "qwertyuiop asdfghjklöä zxccvbnm,m,." }, 1);\r
+        t.addItem(new Object[] { "qwertyuiop asdfghjköäxccvbnm,m,." }, 1);\r
         t.addItem(new Object[] { "YGVYTCTCTRXRXRXRX" }, 2);\r
         return t;\r
     }\r

diff --git a/tests/src/com/vaadin/tests/layouts/layouttester/alert.png b/tests/src/com/vaadin/tests/layouts/layouttester/alert.png
deleted file mode 100644 (file)
index 3d9d980..0000000
Binary files a/tests/src/com/vaadin/tests/layouts/layouttester/alert.png and /dev/null differ

diff --git a/tests/src/com/vaadin/tests/layouts/layouttester/help.png b/tests/src/com/vaadin/tests/layouts/layouttester/help.png
deleted file mode 100644 (file)
index 54dab47..0000000
Binary files a/tests/src/com/vaadin/tests/layouts/layouttester/help.png and /dev/null differ