#2904: more Toolkit -> Vaadin renaming

svn changeset:7860/svn branch:6.0

14 files changed, 21 insertions, 30 deletions

diff --git a/WebContent/VAADIN/themes/base/table/table.css b/WebContent/VAADIN/themes/base/table/table.css
index afb436e33f..9f2ad755a7 100644
--- a/WebContent/VAADIN/themes/base/table/table.css
+++ b/WebContent/VAADIN/themes/base/table/table.css
@@ -1,6 +1,6 @@
 /* Table theme building instructions
  * 
- * Toolkit scroll table is very complex widget with dozens of features. These 
+ * Vaadin scroll table is very complex widget with dozens of features. These 
  * features set some limitations for theme builder. To keep things working, it
  * is safest to try to just override values used in default theme and comfort to
  * these instructions.
diff --git a/WebContent/VAADIN/themes/example/layouts/mainLayout.html b/WebContent/VAADIN/themes/example/layouts/mainLayout.html
index 5679ecbc62..80eec49b7f 100644
--- a/WebContent/VAADIN/themes/example/layouts/mainLayout.html
+++ b/WebContent/VAADIN/themes/example/layouts/mainLayout.html
@@ -1,5 +1,5 @@
 
-<!-- Toolkit components are placed with divs that have matching
+<!-- Vaadin components are placed with divs that have matching
 location tag -->
 
 <table>
diff --git a/build/buildhelpers/com/vaadin/buildhelpers/PortletConfigurationGenerator.java b/build/buildhelpers/com/vaadin/buildhelpers/PortletConfigurationGenerator.java
index 638e85b304..5c3f96b473 100644
--- a/build/buildhelpers/com/vaadin/buildhelpers/PortletConfigurationGenerator.java
+++ b/build/buildhelpers/com/vaadin/buildhelpers/PortletConfigurationGenerator.java
@@ -42,7 +42,7 @@ public class PortletConfigurationGenerator {
             + "        xsi:schemaLocation=\"http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd\">\n";

     private static final String PORTLET_XML_SECTION = "        <portlet>\n"

             + "                <portlet-name>%PORTLETNAME%</portlet-name>\n"

-            + "                <display-name>IT Mill Toolkit %NAME%</display-name>\n"

+            + "                <display-name>Vaadin %NAME%</display-name>\n"

             + "                <portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet</portlet-class>\n"

             + "                <init-param>\n"

             + "                        <name>application</name>\n"

@@ -100,7 +100,7 @@ public class PortletConfigurationGenerator {
             + "<!DOCTYPE display PUBLIC \"-//Liferay//DTD Display 4.0.0//EN\" \"http://www.liferay.com/dtd/liferay-display_4_0_0.dtd\">\n"

             + "\n"

             + "<display>\n"

-            + "        <category name=\"IT Mill Toolkit\">\n" + "";

+            + "        <category name=\"Vaadin\">\n" + "";

     private static final String LIFERAY_DISPLAY_XML_SECTION = "                <portlet id=\"%PORTLETNAME%\" />\n";

     private static final String LIFERAY_DISPLAY_XML_FOOT = "\n"

             + "        </category>\n" + "</display>";

diff --git a/build/package/WebContent/WEB-INF/web.xml b/build/package/WebContent/WEB-INF/web.xml
index 914e5d5e5d..0189a83071 100644
--- a/build/package/WebContent/WEB-INF/web.xml
+++ b/build/package/WebContent/WEB-INF/web.xml
@@ -4,8 +4,8 @@
     PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
     "http://java.sun.com/dtd/web-app_2_3.dtd">
 <web-app>
-	<display-name>IT Mill Toolkit</display-name>
-	<description> IT Mill Toolkit examples </description>
+	<display-name>Vaadin</display-name>
+	<description> Vaadin examples </description>
 
 	<!--
 		Turn off productionMode (off by default). Setting productionMode=true
@@ -16,7 +16,7 @@
 	<context-param>
 		<param-name>productionMode</param-name>
 		<param-value>false</param-value>
-		<description>IT Mill Toolkit production mode</description>
+		<description>Vaadin production mode</description>
 	</context-param>
 
 	<!--
diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
index 9159704fa1..04003a0651 100755
--- a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
@@ -1467,20 +1467,12 @@ public class ApplicationConnection {
         if (contextMenu == null) {
             contextMenu = new VContextMenu();
             DOM.setElementProperty(contextMenu.getElement(), "id",
-                    "PID_TOOLKIT_CM");
+                    "PID_VAADIN_CM");
         }
         return contextMenu;
     }
 
     /**
-     * @deprecated Use {@link #translateVaadinUri(String)} instead.
-     */
-    @Deprecated
-    public String translateToolkitUri(String vaadinUri) {
-        return translateVaadinUri(vaadinUri);
-    }
-
-    /**
      * Translates custom protocols in UIDL URI's to be recognizable by browser.
      * All uri's from UIDL should be routed via this method before giving them
      * to browser due URI's in UIDL may contain custom protocols like theme://.
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
index 7c9e4dadd1..8161688513 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
@@ -87,8 +87,8 @@ public class VFilterSelect extends Composite implements Paintable, Field,
         }
     }
 
-    public class SuggestionPopup extends VOverlay implements
-            PositionCallback, PopupListener {
+    public class SuggestionPopup extends VOverlay implements PositionCallback,
+            PopupListener {
 
         private static final String Z_INDEX = "30000";
 
@@ -133,7 +133,7 @@ public class VFilterSelect extends Composite implements Paintable, Field,
 
             // Add TT anchor point
             DOM.setElementProperty(getElement(), "id",
-                    "TOOLKIT_COMBOBOX_OPTIONLIST");
+                    "VAADIN_COMBOBOX_OPTIONLIST");
 
             menu.setSuggestions(currentSuggestions);
             final int x = VFilterSelect.this.getAbsoluteLeft();
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java
index ef70cae606..a085ceb9ff 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java
@@ -118,7 +118,7 @@ public class VMenuBar extends Widget implements Paintable, PopupListener {
 
             if (moreItemUIDL.hasAttribute("icon")) {
                 itemHTML.append("<img src=\""
-                        + client.translateToolkitUri(moreItemUIDL
+                        + client.translateVaadinUri(moreItemUIDL
                                 .getStringAttribute("icon"))
                         + "\" align=\"left\" />");
             }
@@ -147,7 +147,7 @@ public class VMenuBar extends Widget implements Paintable, PopupListener {
 
             if (item.hasAttribute("icon")) {
                 itemHTML.append("<img src=\""
-                        + client.translateToolkitUri(item
+                        + client.translateVaadinUri(item
                                 .getStringAttribute("icon"))
                         + "\" align=\"left\" />");
             }
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java b/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
index c0c032d276..ea18b5824a 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
@@ -43,7 +43,7 @@ public class VPopupCalendar extends VTextualDate implements Paintable, Field,
         popup.addPopupListener(this);

 

         DOM.setElementProperty(calendar.getElement(), "id",

-                "PID_TOOLKIT_POPUPCAL");

+                "PID_VAADIN_POPUPCAL");

 

     }

 

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VWindow.java b/src/com/vaadin/terminal/gwt/client/ui/VWindow.java
index 57ce65f378..2225eb94ce 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VWindow.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VWindow.java
@@ -35,8 +35,7 @@ import com.vaadin.terminal.gwt.client.Util;
  * 
  * @author IT Mill Ltd
  */
-public class VWindow extends VOverlay implements Container,
-        ScrollListener {
+public class VWindow extends VOverlay implements Container, ScrollListener {
 
     private static final int MIN_HEIGHT = 100;
 
@@ -373,7 +372,7 @@ public class VWindow extends VOverlay implements Container,
                         String html = "";
                         if (notification.hasAttribute("icon")) {
                             final String parsedUri = client
-                                    .translateToolkitUri(notification
+                                    .translateVaadinUri(notification
                                             .getStringAttribute("icon"));
                             html += "<img src=\"" + parsedUri + "\" />";
                         }
diff --git a/src/com/vaadin/tests/TestComponentsAndLayouts.java b/src/com/vaadin/tests/TestComponentsAndLayouts.java
index 9d3f3901a3..5187f8f8e6 100644
--- a/src/com/vaadin/tests/TestComponentsAndLayouts.java
+++ b/src/com/vaadin/tests/TestComponentsAndLayouts.java
@@ -274,7 +274,7 @@ public class TestComponentsAndLayouts extends Application implements Listener,
         test(layout, cb);
 
         final ClassResource flashResource = new ClassResource(
-                "itmill_spin.swf", this);
+                "vaadin_spin.swf", this);
         final Embedded emb = new Embedded("Embedded " + count++, flashResource);
         emb.setType(Embedded.TYPE_OBJECT);
         emb.setMimeType("application/x-shockwave-flash");
diff --git a/src/com/vaadin/tests/featurebrowser/Feature.java b/src/com/vaadin/tests/featurebrowser/Feature.java
index 4ec1444d29..f3335f8e24 100644
--- a/src/com/vaadin/tests/featurebrowser/Feature.java
+++ b/src/com/vaadin/tests/featurebrowser/Feature.java
@@ -43,13 +43,13 @@ public abstract class Feature extends CustomComponent {
     }
 
     /**
-     * Actual URL consists of "/doc/api/com/itmill/toolkit/"+url
+     * Actual URL consists of "http://www.vaadin.com/api/com/vaadin/"+url
      * 
      * @param url
      */
     public void setJavadocURL(String url) {
         javadoc
-                .setValue("<iframe width=\"100%\" src=\"../doc/api/com/itmill/toolkit/"
+                .setValue("<iframe width=\"100%\" src=\"http://www.vaadin.com/api/com/vaadin/"
                         + url + "\"></iframe>");
     }
 
diff --git a/src/com/vaadin/tests/featurebrowser/FeatureEmbedded.java b/src/com/vaadin/tests/featurebrowser/FeatureEmbedded.java
index 834cf11833..65453a8ecc 100644
--- a/src/com/vaadin/tests/featurebrowser/FeatureEmbedded.java
+++ b/src/com/vaadin/tests/featurebrowser/FeatureEmbedded.java
@@ -22,7 +22,7 @@ public class FeatureEmbedded extends Feature {
         final OrderedLayout l = new OrderedLayout();
 
         final ClassResource flashResource = new ClassResource(
-                "itmill_spin.swf", getApplication());
+                "vaadin_spin.swf", getApplication());
         final Embedded emb = new Embedded("Embedded Caption", flashResource);
         emb.setType(Embedded.TYPE_OBJECT);
         emb.setMimeType("application/x-shockwave-flash");
@@ -49,7 +49,7 @@ public class FeatureEmbedded extends Feature {
         ap.replaceWithSelect("heightUnits", units, symbols);
         ap.replaceWithSelect("widthUnits", units, symbols);
         ap.replaceWithSelect("source", new Object[] { flashResource },
-                new Object[] { "itmill_spin.swf" });
+                new Object[] { "vaadin_spin.swf" });
         propertyPanel.addProperties("Embedded Properties", ap);
         propertyPanel.getField("standby").setDescription(
                 "The text to display while loading the object.");
diff --git a/src/com/vaadin/tests/featurebrowser/itmill_spin.swf b/src/com/vaadin/tests/featurebrowser/vaadin_spin.swf
index 9e58ce29c6..9e58ce29c6 100644
--- a/src/com/vaadin/tests/featurebrowser/itmill_spin.swf
+++ b/src/com/vaadin/tests/featurebrowser/vaadin_spin.swf
diff --git a/src/com/vaadin/tests/itmill_spin.swf b/src/com/vaadin/tests/vaadin_spin.swf
index 9e58ce29c6..9e58ce29c6 100644
--- a/src/com/vaadin/tests/itmill_spin.swf
+++ b/src/com/vaadin/tests/vaadin_spin.swf