Extracted icon locations to constants

Fixed broken icon in tabsheets

svn changeset:15110/svn branch:6.4

diff --git a/tests/src/com/vaadin/tests/layouts/layouttester/AbstractLayoutTests.java b/tests/src/com/vaadin/tests/layouts/layouttester/AbstractLayoutTests.java
index 765a2ac0bde392519713bbf41e7f18150d38722c..9bfbebc43901a8965e0d9008d441b0fa71fb42aa 100644 (file)
--- a/tests/src/com/vaadin/tests/layouts/layouttester/AbstractLayoutTests.java
+++ b/tests/src/com/vaadin/tests/layouts/layouttester/AbstractLayoutTests.java
@@ -4,6 +4,11 @@ import com.vaadin.ui.Layout;
 \r
 public abstract class AbstractLayoutTests {\r
 \r
+    protected static final String FOLDER_16_PNG = "../icons/runo/16/folder.png";\r
+    protected static final String CALENDAR_32_PNG = "../runo/icons/32/calendar.png";\r
+    protected static final String LOCK_16_PNG = "../runo/icons/16/lock.png";\r
+    protected static final String GLOBE_16_PNG = "../runo/icons/16/globe.png";\r
+\r
     abstract protected Layout getCaptionsTests();\r
 \r
     abstract protected Layout getIconsTests();\r

diff --git a/tests/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java b/tests/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java
index 10bdd0aff2f3b683b13f8218b07a657de8ffa3d2..12b2ccc38d525e5d7ff598e119e70cf9f60d69cd 100644 (file)
--- a/tests/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java
+++ b/tests/src/com/vaadin/tests/layouts/layouttester/GridLayoutTests.java
@@ -39,6 +39,7 @@ public class GridLayoutTests extends AbstractLayoutTests {
         this.application = application;\r
     }\r
 \r
+    @Override\r
     protected Layout getAlignmentTests() {\r
         HorizontalLayout hlo = new HorizontalLayout();\r
         hlo.setSpacing(true);\r
@@ -75,6 +76,7 @@ public class GridLayoutTests extends AbstractLayoutTests {
         return hlo;\r
     }\r
 \r
+    @Override\r
     protected Layout getCaptionsTests() {\r
         GridLayout glo = getTestGrid();\r
         glo.setWidth("600px");\r
@@ -89,7 +91,7 @@ public class GridLayoutTests extends AbstractLayoutTests {
         col1.setCaption(captions[0]);\r
         col2.setCaption(captions[1]);\r
         col3.setCaption(captions[2]);\r
-        col3.setIcon(new ThemeResource("../runo/icons/16/lock.png"));\r
+        col3.setIcon(new ThemeResource(LOCK_16_PNG));\r
 \r
         glo.replaceComponent(row1, row1 = new Label());\r
         glo.replaceComponent(row2, row2 = new Label());\r
@@ -109,6 +111,7 @@ public class GridLayoutTests extends AbstractLayoutTests {
         return glo;\r
     }\r
 \r
+    @Override\r
     protected Layout getComponentAddReplaceMoveTests() {\r
         final GridLayout glo = getTestGrid();\r
         glo.setHeight("350px");\r
@@ -202,6 +205,7 @@ public class GridLayoutTests extends AbstractLayoutTests {
         return baseLayout;\r
     }\r
 \r
+    @Override\r
     protected Layout getComponentSizingTests() {\r
         final GridLayout glo = getTestGrid();\r
         glo.setHeight("350px");\r
@@ -264,6 +268,7 @@ public class GridLayoutTests extends AbstractLayoutTests {
         return baseLayout;\r
     }\r
 \r
+    @Override\r
     protected Layout getExpandRatiosTests() {\r
         final GridLayout glo = getTestGrid();\r
         Layout baseLayout = getBaseLayout();\r
@@ -326,12 +331,12 @@ public class GridLayoutTests extends AbstractLayoutTests {
         return baseLayout;\r
     }\r
 \r
+    @Override\r
     protected Layout getIconsTests() {\r
         GridLayout glo = getTestGrid();\r
         glo.setWidth("600px");\r
-        Resource[] icons = new Resource[] {\r
-                new ThemeResource("../runo/icons/32/calendar.png"),\r
-                new ThemeResource("../runo/icons/16/lock.png") };\r
+        Resource[] icons = new Resource[] { new ThemeResource(CALENDAR_32_PNG),\r
+                new ThemeResource(LOCK_16_PNG) };\r
 \r
         glo.replaceComponent(col1, col1 = new TextField("TEXTFIELD"));\r
         glo.replaceComponent(col2, col2 = new Label("LABEL"));\r
@@ -354,7 +359,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 ThemeResource("../runo/icons/32/calendar.png"));\r
+        x22.setIcon(new ThemeResource(CALENDAR_32_PNG));\r
 \r
         x3.setIcon(icons[0]);\r
         x22.setIcon(icons[1]);\r
@@ -362,6 +367,7 @@ public class GridLayoutTests extends AbstractLayoutTests {
         return glo;\r
     }\r
 \r
+    @Override\r
     protected Layout getLayoutSizingTests() {\r
         final GridLayout glo = getTestGrid();\r
         Layout baseLayout = getBaseLayout();\r
@@ -426,6 +432,7 @@ public class GridLayoutTests extends AbstractLayoutTests {
         return baseLayout;\r
     }\r
 \r
+    @Override\r
     protected Layout getMarginSpacingTests() {\r
         final GridLayout glo = getTestGrid();\r
         Layout baseLayout = getBaseLayout();\r
@@ -486,12 +493,12 @@ public class GridLayoutTests extends AbstractLayoutTests {
         return baseLayout;\r
     }\r
 \r
+    @Override\r
     protected Layout getRequiredErrorIndicatorsTests() {\r
         GridLayout glo = getTestGrid();\r
         glo.setWidth("600px");\r
-        Resource[] icons = new Resource[] {\r
-                new ThemeResource("../runo/icons/32/calendar.png"),\r
-                new ThemeResource("../runo/icons/16/lock.png") };\r
+        Resource[] icons = new Resource[] { new ThemeResource(CALENDAR_32_PNG),\r
+                new ThemeResource(LOCK_16_PNG) };\r
 \r
         glo.replaceComponent(col1, col1 = new TextField("TEXTFIELD"));\r
         glo.replaceComponent(col2, col2 = new Label("LABEL"));\r
@@ -571,7 +578,7 @@ public class GridLayoutTests extends AbstractLayoutTests {
         TabSheet tabsheet = new TabSheet();\r
         tabsheet.setSizeUndefined();\r
         tabsheet.addTab(new Label("TAB1"), "TAB1", new ClassResource(\r
-                "alert.png", application));\r
+                GLOBE_16_PNG, application));\r
         tabsheet.addTab(new Label("TAB2"), "TAB2", null);\r
         return tabsheet;\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 c4332d5b867c093f7f29ce6ac0c6f6727e939c99..3acf10c53169841c108790a9c48f0218782e3317 100644 (file)
--- a/tests/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java
+++ b/tests/src/com/vaadin/tests/layouts/layouttester/HorizontalLayoutTests.java
@@ -93,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 ThemeResource("../runo/icons/16/lock.png"));\r
+            component.setIcon(new ThemeResource(LOCK_16_PNG));\r
             vlo.addComponent(component);\r
         }\r
         baseLayout.addComponent(vlo);\r
@@ -372,9 +372,8 @@ public class HorizontalLayoutTests extends AbstractLayoutTests {
         HorizontalLayout vlo = getTestLaytout();\r
         AbstractComponent[] components = new AbstractComponent[2];\r
         Layout baseLayout = getBaseLayout();\r
-        Resource[] icons = new Resource[] {\r
-                new ThemeResource("../runo/icons/32/calendar.png"),\r
-                new ThemeResource("../runo/icons/16/lock.png") };\r
+        Resource[] icons = new Resource[] { new ThemeResource(CALENDAR_32_PNG),\r
+                new ThemeResource(LOCK_16_PNG) };\r
 \r
         for (int i = 0; i < components.length; i++) {\r
             components[i] = new TextField();\r
@@ -493,7 +492,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests {
         components[1] = new Button("BUTTON");\r
         components[2] = getTestTable();\r
         components[3] = getTestTabsheet();\r
-        components[3].setIcon(new ThemeResource("../runo/icons/16/lock.png"));\r
+        components[3].setIcon(new ThemeResource(LOCK_16_PNG));\r
 \r
         AbstractField[] fields = new AbstractField[6];\r
         fields[0] = new TextField();\r
@@ -523,7 +522,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 ThemeResource("../runo/icons/32/calendar.png"));\r
+        fields[5].setIcon(new ThemeResource(CALENDAR_32_PNG));\r
 \r
         for (int i = 0; i < components.length; i++) {\r
             components[i].setComponentError(new UserError(\r
@@ -556,7 +555,7 @@ public class HorizontalLayoutTests extends AbstractLayoutTests {
         TabSheet tabsheet = new TabSheet();\r
         tabsheet.setSizeUndefined();\r
         tabsheet.addTab(new Label("TAB1"), "TAB1", new ClassResource(\r
-                "alert.png", application));\r
+                GLOBE_16_PNG, application));\r
         tabsheet.addTab(new Label("TAB2"), "TAB2", null);\r
         return tabsheet;\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 f2a5c659d1ea1ce7443b03fb45cbdbbbda5fcbfb..46407abc5da102a4a8cc2fa54583e0cbc10e0665 100644 (file)
--- a/tests/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
+++ b/tests/src/com/vaadin/tests/layouts/layouttester/VerticalLayoutTests.java
@@ -93,7 +93,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 ThemeResource("../runo/icons/16/lock.png"));\r
+            component.setIcon(new ThemeResource(LOCK_16_PNG));\r
             vlo.addComponent(component);\r
         }\r
         for (int i = 0; i < captions.length; i++) {\r
@@ -384,9 +384,8 @@ public class VerticalLayoutTests extends AbstractLayoutTests {
         VerticalLayout vlo = getTestLaytout();\r
         AbstractComponent[] components = new AbstractComponent[2];\r
 \r
-        Resource[] icons = new Resource[] {\r
-                new ThemeResource("../runo/icons/32/calendar.png"),\r
-                new ThemeResource("../runo/icons/16/lock.png") };\r
+        Resource[] icons = new Resource[] { new ThemeResource(CALENDAR_32_PNG),\r
+                new ThemeResource(LOCK_16_PNG) };\r
 \r
         for (int i = 0; i < components.length; i++) {\r
             components[i] = new TextField();\r
@@ -513,7 +512,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests {
         components[1] = new Button("BUTTON");\r
         components[2] = getTestTable();\r
         components[3] = getTestTabsheet();\r
-        components[3].setIcon(new ThemeResource("../runo/icons/16/lock.png"));\r
+        components[3].setIcon(new ThemeResource(LOCK_16_PNG));\r
 \r
         AbstractField[] fields = new AbstractField[6];\r
         fields[0] = new TextField();\r
@@ -543,7 +542,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 ThemeResource("../runo/icons/32/calendar.png"));\r
+        fields[5].setIcon(new ThemeResource(CALENDAR_32_PNG));\r
 \r
         for (int i = 0; i < components.length; i++) {\r
             components[i].setComponentError(new UserError(\r
@@ -577,7 +576,7 @@ public class VerticalLayoutTests extends AbstractLayoutTests {
         TabSheet tabsheet = new TabSheet();\r
         tabsheet.setSizeUndefined();\r
         tabsheet.addTab(new Label("TAB1"), "TAB1", new ClassResource(\r
-                "alert.png", application));\r
+                GLOBE_16_PNG, application));\r
         tabsheet.addTab(new Label("TAB2"), "TAB2", null);\r
         return tabsheet;\r
     }\r