From 2a63a6ea83d272f3eb1aa03da44a57c5dad388e5 Mon Sep 17 00:00:00 2001 From: Henri Sara Date: Mon, 18 May 2009 13:44:37 +0000 Subject: [PATCH] #2904 ToolkitTunes -> VaadinTunes and one other file rename svn changeset:7864/svn branch:6.0 --- .../images/album-cover.jpg | Bin .../images/coverflow-view.png | Bin .../images/grid-view.png | Bin .../images/icon-music.png | Bin .../images/jump-to.png | Bin .../{toolkittunes => vaadintunes}/images/max.png | Bin .../{toolkittunes => vaadintunes}/images/mute.png | Bin .../{toolkittunes => vaadintunes}/images/next.png | Bin .../{toolkittunes => vaadintunes}/images/play.png | Bin .../{toolkittunes => vaadintunes}/images/prev.png | Bin .../images/progress-knob.png | Bin .../images/selected-bg.png | Bin .../images/status-bg.png | Bin .../images/table-header-bg.png | Bin .../images/table-view.png | Bin .../images/toggle-visualization.png | Bin .../images/top-bg.png | Bin .../images/volume-bar.png | Bin .../images/volume-knob.png | Bin .../{toolkittunes => vaadintunes}/styles.css | 2 +- .../{itmill-object.xml => vaadin-object.xml} | 0 WebContent/WEB-INF/web.xml | 8 ++++---- WebContent/index.html | 2 +- .../PortletConfigurationGenerator.java | 2 +- build/package/WebContent/WEB-INF/web.xml | 10 +++++----- ...kitTunesLayout.java => VaadinTunesLayout.java} | 14 +++++++------- src/com/vaadin/tests/tickets/Ticket2405.java | 2 +- 27 files changed, 20 insertions(+), 20 deletions(-) rename WebContent/VAADIN/themes/{toolkittunes => vaadintunes}/images/album-cover.jpg (100%) rename WebContent/VAADIN/themes/{toolkittunes => vaadintunes}/images/coverflow-view.png (100%) rename WebContent/VAADIN/themes/{toolkittunes => vaadintunes}/images/grid-view.png (100%) rename WebContent/VAADIN/themes/{toolkittunes => vaadintunes}/images/icon-music.png (100%) rename WebContent/VAADIN/themes/{toolkittunes => vaadintunes}/images/jump-to.png (100%) rename WebContent/VAADIN/themes/{toolkittunes => vaadintunes}/images/max.png (100%) rename WebContent/VAADIN/themes/{toolkittunes => vaadintunes}/images/mute.png (100%) rename WebContent/VAADIN/themes/{toolkittunes => vaadintunes}/images/next.png (100%) rename WebContent/VAADIN/themes/{toolkittunes => vaadintunes}/images/play.png (100%) rename WebContent/VAADIN/themes/{toolkittunes => vaadintunes}/images/prev.png (100%) rename WebContent/VAADIN/themes/{toolkittunes => vaadintunes}/images/progress-knob.png (100%) rename WebContent/VAADIN/themes/{toolkittunes => vaadintunes}/images/selected-bg.png (100%) rename WebContent/VAADIN/themes/{toolkittunes => vaadintunes}/images/status-bg.png (100%) rename WebContent/VAADIN/themes/{toolkittunes => vaadintunes}/images/table-header-bg.png (100%) rename WebContent/VAADIN/themes/{toolkittunes => vaadintunes}/images/table-view.png (100%) rename WebContent/VAADIN/themes/{toolkittunes => vaadintunes}/images/toggle-visualization.png (100%) rename WebContent/VAADIN/themes/{toolkittunes => vaadintunes}/images/top-bg.png (100%) rename WebContent/VAADIN/themes/{toolkittunes => vaadintunes}/images/volume-bar.png (100%) rename WebContent/VAADIN/themes/{toolkittunes => vaadintunes}/images/volume-knob.png (100%) rename WebContent/VAADIN/themes/{toolkittunes => vaadintunes}/styles.css (99%) rename WebContent/WEB-INF/{itmill-object.xml => vaadin-object.xml} (100%) rename src/com/vaadin/demo/{ToolkitTunesLayout.java => VaadinTunesLayout.java} (97%) diff --git a/WebContent/VAADIN/themes/toolkittunes/images/album-cover.jpg b/WebContent/VAADIN/themes/vaadintunes/images/album-cover.jpg similarity index 100% rename from WebContent/VAADIN/themes/toolkittunes/images/album-cover.jpg rename to WebContent/VAADIN/themes/vaadintunes/images/album-cover.jpg diff --git a/WebContent/VAADIN/themes/toolkittunes/images/coverflow-view.png b/WebContent/VAADIN/themes/vaadintunes/images/coverflow-view.png similarity index 100% rename from WebContent/VAADIN/themes/toolkittunes/images/coverflow-view.png rename to WebContent/VAADIN/themes/vaadintunes/images/coverflow-view.png diff --git a/WebContent/VAADIN/themes/toolkittunes/images/grid-view.png b/WebContent/VAADIN/themes/vaadintunes/images/grid-view.png similarity index 100% rename from WebContent/VAADIN/themes/toolkittunes/images/grid-view.png rename to WebContent/VAADIN/themes/vaadintunes/images/grid-view.png diff --git a/WebContent/VAADIN/themes/toolkittunes/images/icon-music.png b/WebContent/VAADIN/themes/vaadintunes/images/icon-music.png similarity index 100% rename from WebContent/VAADIN/themes/toolkittunes/images/icon-music.png rename to WebContent/VAADIN/themes/vaadintunes/images/icon-music.png diff --git a/WebContent/VAADIN/themes/toolkittunes/images/jump-to.png b/WebContent/VAADIN/themes/vaadintunes/images/jump-to.png similarity index 100% rename from WebContent/VAADIN/themes/toolkittunes/images/jump-to.png rename to WebContent/VAADIN/themes/vaadintunes/images/jump-to.png diff --git a/WebContent/VAADIN/themes/toolkittunes/images/max.png b/WebContent/VAADIN/themes/vaadintunes/images/max.png similarity index 100% rename from WebContent/VAADIN/themes/toolkittunes/images/max.png rename to WebContent/VAADIN/themes/vaadintunes/images/max.png diff --git a/WebContent/VAADIN/themes/toolkittunes/images/mute.png b/WebContent/VAADIN/themes/vaadintunes/images/mute.png similarity index 100% rename from WebContent/VAADIN/themes/toolkittunes/images/mute.png rename to WebContent/VAADIN/themes/vaadintunes/images/mute.png diff --git a/WebContent/VAADIN/themes/toolkittunes/images/next.png b/WebContent/VAADIN/themes/vaadintunes/images/next.png similarity index 100% rename from WebContent/VAADIN/themes/toolkittunes/images/next.png rename to WebContent/VAADIN/themes/vaadintunes/images/next.png diff --git a/WebContent/VAADIN/themes/toolkittunes/images/play.png b/WebContent/VAADIN/themes/vaadintunes/images/play.png similarity index 100% rename from WebContent/VAADIN/themes/toolkittunes/images/play.png rename to WebContent/VAADIN/themes/vaadintunes/images/play.png diff --git a/WebContent/VAADIN/themes/toolkittunes/images/prev.png b/WebContent/VAADIN/themes/vaadintunes/images/prev.png similarity index 100% rename from WebContent/VAADIN/themes/toolkittunes/images/prev.png rename to WebContent/VAADIN/themes/vaadintunes/images/prev.png diff --git a/WebContent/VAADIN/themes/toolkittunes/images/progress-knob.png b/WebContent/VAADIN/themes/vaadintunes/images/progress-knob.png similarity index 100% rename from WebContent/VAADIN/themes/toolkittunes/images/progress-knob.png rename to WebContent/VAADIN/themes/vaadintunes/images/progress-knob.png diff --git a/WebContent/VAADIN/themes/toolkittunes/images/selected-bg.png b/WebContent/VAADIN/themes/vaadintunes/images/selected-bg.png similarity index 100% rename from WebContent/VAADIN/themes/toolkittunes/images/selected-bg.png rename to WebContent/VAADIN/themes/vaadintunes/images/selected-bg.png diff --git a/WebContent/VAADIN/themes/toolkittunes/images/status-bg.png b/WebContent/VAADIN/themes/vaadintunes/images/status-bg.png similarity index 100% rename from WebContent/VAADIN/themes/toolkittunes/images/status-bg.png rename to WebContent/VAADIN/themes/vaadintunes/images/status-bg.png diff --git a/WebContent/VAADIN/themes/toolkittunes/images/table-header-bg.png b/WebContent/VAADIN/themes/vaadintunes/images/table-header-bg.png similarity index 100% rename from WebContent/VAADIN/themes/toolkittunes/images/table-header-bg.png rename to WebContent/VAADIN/themes/vaadintunes/images/table-header-bg.png diff --git a/WebContent/VAADIN/themes/toolkittunes/images/table-view.png b/WebContent/VAADIN/themes/vaadintunes/images/table-view.png similarity index 100% rename from WebContent/VAADIN/themes/toolkittunes/images/table-view.png rename to WebContent/VAADIN/themes/vaadintunes/images/table-view.png diff --git a/WebContent/VAADIN/themes/toolkittunes/images/toggle-visualization.png b/WebContent/VAADIN/themes/vaadintunes/images/toggle-visualization.png similarity index 100% rename from WebContent/VAADIN/themes/toolkittunes/images/toggle-visualization.png rename to WebContent/VAADIN/themes/vaadintunes/images/toggle-visualization.png diff --git a/WebContent/VAADIN/themes/toolkittunes/images/top-bg.png b/WebContent/VAADIN/themes/vaadintunes/images/top-bg.png similarity index 100% rename from WebContent/VAADIN/themes/toolkittunes/images/top-bg.png rename to WebContent/VAADIN/themes/vaadintunes/images/top-bg.png diff --git a/WebContent/VAADIN/themes/toolkittunes/images/volume-bar.png b/WebContent/VAADIN/themes/vaadintunes/images/volume-bar.png similarity index 100% rename from WebContent/VAADIN/themes/toolkittunes/images/volume-bar.png rename to WebContent/VAADIN/themes/vaadintunes/images/volume-bar.png diff --git a/WebContent/VAADIN/themes/toolkittunes/images/volume-knob.png b/WebContent/VAADIN/themes/vaadintunes/images/volume-knob.png similarity index 100% rename from WebContent/VAADIN/themes/toolkittunes/images/volume-knob.png rename to WebContent/VAADIN/themes/vaadintunes/images/volume-knob.png diff --git a/WebContent/VAADIN/themes/toolkittunes/styles.css b/WebContent/VAADIN/themes/vaadintunes/styles.css similarity index 99% rename from WebContent/VAADIN/themes/toolkittunes/styles.css rename to WebContent/VAADIN/themes/vaadintunes/styles.css index b762db49be..1a1a9a378b 100644 --- a/WebContent/VAADIN/themes/toolkittunes/styles.css +++ b/WebContent/VAADIN/themes/vaadintunes/styles.css @@ -2,7 +2,7 @@ /****************************************************************************** - * For ToolkitTunesLayout.java + * For VaadinTunesLayout.java ******************************************************************************/ .tTunes, .tTunes select, .tTunes button { diff --git a/WebContent/WEB-INF/itmill-object.xml b/WebContent/WEB-INF/vaadin-object.xml similarity index 100% rename from WebContent/WEB-INF/itmill-object.xml rename to WebContent/WEB-INF/vaadin-object.xml diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index 087705c646..1737dd9e58 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -183,11 +183,11 @@ - ToolkitTunesLayout + VaadinTunesLayout com.vaadin.terminal.gwt.server.ApplicationServlet application - com.vaadin.demo.ToolkitTunesLayout + com.vaadin.demo.VaadinTunesLayout @@ -409,8 +409,8 @@ - ToolkitTunesLayout - /ToolkitTunesLayout/* + VaadinTunesLayout + /VaadinTunesLayout/* diff --git a/WebContent/index.html b/WebContent/index.html index 22d9f0c123..88c2bee11a 100644 --- a/WebContent/index.html +++ b/WebContent/index.html @@ -99,7 +99,7 @@

Additional demos

diff --git a/build/buildhelpers/com/vaadin/buildhelpers/PortletConfigurationGenerator.java b/build/buildhelpers/com/vaadin/buildhelpers/PortletConfigurationGenerator.java index 5c3f96b473..24cb6e5a76 100644 --- a/build/buildhelpers/com/vaadin/buildhelpers/PortletConfigurationGenerator.java +++ b/build/buildhelpers/com/vaadin/buildhelpers/PortletConfigurationGenerator.java @@ -31,7 +31,7 @@ public class PortletConfigurationGenerator { private static final String PORTLET_XML_FILE = "portlet.xml"; private static final String LIFERAY_PORTLET_XML_FILE = "liferay-portlet.xml"; private static final String LIFERAY_DISPLAY_XML_FILE = "liferay-display.xml"; - private static final String JBOSS_OBJECT_FILE = "itmill-object.xml"; + private static final String JBOSS_OBJECT_FILE = "vaadin-object.xml"; private static final String JBOSS_INSTANCE_FILE = "portlet-instances.xml"; // "templates" follow; diff --git a/build/package/WebContent/WEB-INF/web.xml b/build/package/WebContent/WEB-INF/web.xml index 0189a83071..cce9340dbc 100644 --- a/build/package/WebContent/WEB-INF/web.xml +++ b/build/package/WebContent/WEB-INF/web.xml @@ -177,13 +177,13 @@ - + - ToolkitTunesLayout + VaadinTunesLayout com.vaadin.terminal.gwt.server.ApplicationServlet application - com.vaadin.demo.ToolkitTunesLayout + com.vaadin.demo.VaadinTunesLayout @@ -255,8 +255,8 @@ /colorpicker/* - ToolkitTunesLayout - /ToolkitTunesLayout/* + VaadinTunesLayout + /VaadinTunesLayout/* Coverflow diff --git a/src/com/vaadin/demo/ToolkitTunesLayout.java b/src/com/vaadin/demo/VaadinTunesLayout.java similarity index 97% rename from src/com/vaadin/demo/ToolkitTunesLayout.java rename to 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(); -- 2.39.5