#2904 ToolkitTunes -> VaadinTunes and one other file rename

svn changeset:7864/svn branch:6.0

2 files changed, 8 insertions, 8 deletions

diff --git a/src/com/vaadin/demo/ToolkitTunesLayout.java b/src/com/vaadin/demo/VaadinTunesLayout.java
index c3615e934c..695c4dc2cf 100644
--- a/src/com/vaadin/demo/ToolkitTunesLayout.java
+++ b/src/com/vaadin/demo/VaadinTunesLayout.java
@@ -24,7 +24,7 @@ import com.vaadin.ui.Window.Notification;
  * 
  */
 @SuppressWarnings("serial")
-public class ToolkitTunesLayout extends Application {
+public class VaadinTunesLayout extends Application {
 
     @Override
     public void init() {
@@ -35,8 +35,8 @@ public class ToolkitTunesLayout extends Application {
          * the UI into different classes and methods.
          */
 
-        // Main (browser) window, needed in all Toolkit applications
-        final Window root = new Window("ToolkitTunes");
+        // Main (browser) window, needed in all Vaadin applications
+        final Window root = new Window("VaadinTunes");
 
         /*
          * We'll attach the window to the browser view already here, so we won't
@@ -195,8 +195,8 @@ public class ToolkitTunesLayout extends Application {
         music.setWidth("100%");
 
         Label store = new Label("Store");
-        Button toolkitTunesStore = new Button("ToolkitTunes Store");
-        toolkitTunesStore.setWidth("100%");
+        Button vaadinTunesStore = new Button("VaadinTunes Store");
+        vaadinTunesStore.setWidth("100%");
         Button purchased = new Button("Purchased");
         purchased.setWidth("100%");
 
@@ -210,7 +210,7 @@ public class ToolkitTunesLayout extends Application {
         selections.addComponent(library);
         selections.addComponent(music);
         selections.addComponent(store);
-        selections.addComponent(toolkitTunesStore);
+        selections.addComponent(vaadinTunesStore);
         selections.addComponent(purchased);
         selections.addComponent(playlists);
         selections.addComponent(genius);
@@ -287,7 +287,7 @@ public class ToolkitTunesLayout extends Application {
         // TODO the footer
 
         // Now what's left to do? Themeing of course.
-        setTheme("toolkittunes");
+        setTheme("vaadintunes");
 
         /*
          * Let's give a namespace to our application window. This way, if
diff --git a/src/com/vaadin/tests/tickets/Ticket2405.java b/src/com/vaadin/tests/tickets/Ticket2405.java
index 0138223db8..174d6e5d6c 100644
--- a/src/com/vaadin/tests/tickets/Ticket2405.java
+++ b/src/com/vaadin/tests/tickets/Ticket2405.java
@@ -19,7 +19,7 @@ public class Ticket2405 extends Application {
     @Override
     public void init() {
 
-        final Window root = new Window("ToolkitTunes");
+        final Window root = new Window("VaadinTunes");
         root.setWidth("90%");
         root.setHeight("90%");
         root.center();