Fixed references to default theme.

svn changeset:7900/svn branch:6.0

3 files changed, 6 insertions, 8 deletions

diff --git a/src/com/vaadin/demo/sampler/FeatureView.java b/src/com/vaadin/demo/sampler/FeatureView.java
index 02ff91117b..2d326dec51 100644
--- a/src/com/vaadin/demo/sampler/FeatureView.java
+++ b/src/com/vaadin/demo/sampler/FeatureView.java
@@ -179,9 +179,7 @@ public class FeatureView extends HorizontalLayout {
                 res.setMargin(false, false, true, false);
                 for (NamedExternalResource r : resources) {
                     final Link l = new Link(r.getName(), r);
-                    l
-                            .setIcon(new ThemeResource(
-                                    "../default/icons/16/note.png"));
+                    l.setIcon(new ThemeResource("../runo/icons/16/note.png"));
                     res.addComponent(l);
                 }
                 right.addComponent(res);
@@ -199,7 +197,7 @@ public class FeatureView extends HorizontalLayout {
                 for (APIResource r : apis) {
                     final Link l = new Link(r.getName(), r);
                     l.setIcon(new ThemeResource(
-                            "../default/icons/16/document-txt.png"));
+                            "../runo/icons/16/document-txt.png"));
                     api.addComponent(l);
                 }
                 right.addComponent(api);
diff --git a/src/com/vaadin/tests/tickets/Ticket1710.java b/src/com/vaadin/tests/tickets/Ticket1710.java
index 359af103d3..f65fd0c8e4 100644
--- a/src/com/vaadin/tests/tickets/Ticket1710.java
+++ b/src/com/vaadin/tests/tickets/Ticket1710.java
@@ -219,14 +219,14 @@ public class Ticket1710 extends com.vaadin.Application {
         t7.setValue("With icon and required and icon");

         t7.setComponentError(new SystemError("Error"));

         t7.setRequired(true);

-        t7.setIcon(new ThemeResource("../default/icons/16/ok.png"));

+        t7.setIcon(new ThemeResource("../runo/icons/16/ok.png"));

         lo.addComponent(t7);

 

         DateField d1 = new DateField(

                 "Datefield with caption and icon, next one without caption");

         d1.setComponentError(new SystemError("Error"));

         d1.setRequired(true);

-        d1.setIcon(new ThemeResource("../default/icons/16/ok.png"));

+        d1.setIcon(new ThemeResource("../runo/icons/16/ok.png"));

         lo.addComponent(d1);

 

         DateField d2 = new DateField();

diff --git a/src/com/vaadin/tests/tickets/Ticket736.java b/src/com/vaadin/tests/tickets/Ticket736.java
index bc31c5b75d..45d46866a5 100644
--- a/src/com/vaadin/tests/tickets/Ticket736.java
+++ b/src/com/vaadin/tests/tickets/Ticket736.java
@@ -31,7 +31,7 @@ public class Ticket736 extends Application {
         f.setItemDataSource(new BeanItem(address, new String[] { "name",
                 "street", "zip", "city", "state", "country" }));
         f.setCaption("Office address");
-        f.setIcon(new ThemeResource("../default/icons/16/document.png"));
+        f.setIcon(new ThemeResource("../runo/icons/16/document.png"));
         f.setDescription("Jep jpe, this is form description.");
         mainWin.addComponent(f);
 
@@ -52,7 +52,7 @@ public class Ticket736 extends Application {
         f.getField("zip").addValidator(new IsInteger());
         f.getField("zip").setDescription("Jepjep");
         ((AbstractComponent) f.getField("zip")).setIcon(new ThemeResource(
-                "../default/icons/16/folder.png"));
+                "../runo/icons/16/folder.png"));
         f.getField("state").addValidator(new IsValidState());
         f.getField("name").setRequired(true);
         f.getField("street").setRequired(true);