]> source.dussan.org Git - vaadin-framework.git/commitdiff
#2904: more Toolkit -> Vaadin renaming
authorHenri Sara <henri.sara@itmill.com>
Mon, 18 May 2009 12:35:19 +0000 (12:35 +0000)
committerHenri Sara <henri.sara@itmill.com>
Mon, 18 May 2009 12:35:19 +0000 (12:35 +0000)
svn changeset:7860/svn branch:6.0

16 files changed:
WebContent/VAADIN/themes/base/table/table.css
WebContent/VAADIN/themes/example/layouts/mainLayout.html
build/buildhelpers/com/vaadin/buildhelpers/PortletConfigurationGenerator.java
build/package/WebContent/WEB-INF/web.xml
src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
src/com/vaadin/terminal/gwt/client/ui/VFilterSelect.java
src/com/vaadin/terminal/gwt/client/ui/VMenuBar.java
src/com/vaadin/terminal/gwt/client/ui/VPopupCalendar.java
src/com/vaadin/terminal/gwt/client/ui/VWindow.java
src/com/vaadin/tests/TestComponentsAndLayouts.java
src/com/vaadin/tests/featurebrowser/Feature.java
src/com/vaadin/tests/featurebrowser/FeatureEmbedded.java
src/com/vaadin/tests/featurebrowser/itmill_spin.swf [deleted file]
src/com/vaadin/tests/featurebrowser/vaadin_spin.swf [new file with mode: 0644]
src/com/vaadin/tests/itmill_spin.swf [deleted file]
src/com/vaadin/tests/vaadin_spin.swf [new file with mode: 0644]

index afb436e33fe40872334c6a72b9a203baf5f58d01..9f2ad755a7e48e71b79a9b5af112aeedf54b1419 100644 (file)
@@ -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.
index 5679ecbc62dd222f78d4b723291eaec919e21a69..80eec49b7f79f6057734d63d0288da33a8409bef 100644 (file)
@@ -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>
index 638e85b304f95c2b54ef7325ba74b9ac0282ce07..5c3f96b47352de6c7c7fa54d1960e2e80e5a1c93 100644 (file)
@@ -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";\r
     private static final String PORTLET_XML_SECTION = "        <portlet>\n"\r
             + "                <portlet-name>%PORTLETNAME%</portlet-name>\n"\r
-            + "                <display-name>IT Mill Toolkit %NAME%</display-name>\n"\r
+            + "                <display-name>Vaadin %NAME%</display-name>\n"\r
             + "                <portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet</portlet-class>\n"\r
             + "                <init-param>\n"\r
             + "                        <name>application</name>\n"\r
@@ -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"\r
             + "\n"\r
             + "<display>\n"\r
-            + "        <category name=\"IT Mill Toolkit\">\n" + "";\r
+            + "        <category name=\"Vaadin\">\n" + "";\r
     private static final String LIFERAY_DISPLAY_XML_SECTION = "                <portlet id=\"%PORTLETNAME%\" />\n";\r
     private static final String LIFERAY_DISPLAY_XML_FOOT = "\n"\r
             + "        </category>\n" + "</display>";\r
index 914e5d5e5d753a2133279d23f8e4efda6f3dd044..0189a830710027bf79d045439d9e10b2aa881031 100644 (file)
@@ -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>
 
        <!--
index 9159704fa12d6541b6caee42baffcc8605a8c1e4..04003a065157d0619b7db3932a0b81b16b76961c 100755 (executable)
@@ -1467,19 +1467,11 @@ 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
index 7c9e4dadd11f229221de4967bf2831bb4037b577..816168851313f76cce332551b2c95c82a73da4eb 100644 (file)
@@ -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();
index ef70cae60693f610925a52d173809a6fad5d5d42..a085ceb9ff7d30a7273cc2f898caef2002e280a5 100644 (file)
@@ -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\" />");
             }
index c0c032d276b0a900b730e0aad273ef7c14e6b175..ea18b5824a749f36e75f7bcd5f1f790ea20ff4ed 100644 (file)
@@ -43,7 +43,7 @@ public class VPopupCalendar extends VTextualDate implements Paintable, Field,
         popup.addPopupListener(this);\r
 \r
         DOM.setElementProperty(calendar.getElement(), "id",\r
-                "PID_TOOLKIT_POPUPCAL");\r
+                "PID_VAADIN_POPUPCAL");\r
 \r
     }\r
 \r
index 57ce65f378002c39e6c388689fb796caa2d7c1fe..2225eb94cef446329e9ae5560dd2c0ec7092d387 100644 (file)
@@ -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 + "\" />";
                         }
index 9d3f3901a38f9fd8021f81a0bd0833fd06778ca8..5187f8f8e6bb023afc10b7fd5c7818f6f622e275 100644 (file)
@@ -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");
index 4ec1444d29c429da9952580a053a59e45b50d104..f3335f8e2405f0a4b27fa38f2daa86cd02bb5bab 100644 (file)
@@ -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>");
     }
 
index 834cf1183305ed1d2356b7392574c2a96f1249eb..65453a8ecc936bab69a6ba0af75546f30b3c4d3f 100644 (file)
@@ -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/itmill_spin.swf
deleted file mode 100644 (file)
index 9e58ce2..0000000
Binary files a/src/com/vaadin/tests/featurebrowser/itmill_spin.swf and /dev/null differ
diff --git a/src/com/vaadin/tests/featurebrowser/vaadin_spin.swf b/src/com/vaadin/tests/featurebrowser/vaadin_spin.swf
new file mode 100644 (file)
index 0000000..9e58ce2
Binary files /dev/null and b/src/com/vaadin/tests/featurebrowser/vaadin_spin.swf differ
diff --git a/src/com/vaadin/tests/itmill_spin.swf b/src/com/vaadin/tests/itmill_spin.swf
deleted file mode 100644 (file)
index 9e58ce2..0000000
Binary files a/src/com/vaadin/tests/itmill_spin.swf and /dev/null differ
diff --git a/src/com/vaadin/tests/vaadin_spin.swf b/src/com/vaadin/tests/vaadin_spin.swf
new file mode 100644 (file)
index 0000000..9e58ce2
Binary files /dev/null and b/src/com/vaadin/tests/vaadin_spin.swf differ