Fixes #183

svn changeset:260/svn branch:toolkit

diff --git a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
index de7b2dcb8b6f6c24140e2897035f6a5c9f92e0e5..225410d556da3c67bd14b7b52e197d310d27080b 100644 (file)
--- a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
+++ b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java
@@ -647,21 +647,21 @@ public class ApplicationServlet extends HttpServlet implements
                                                throw new ServletException("Theme (named '"
                                                                + themeName + "') can not be found");
 
-                                       // If UIDL rendering mode is preferred, a page for it is
+                                       // If ajax rendering mode is preferred, a page for it is
                                        // rendered
                                        String renderingMode = theme.getPreferredMode(terminalType,
                                                        themeSource);
                                        if (unhandledParameters.get("renderingMode") != null)
                                                renderingMode = (String) ((Object[]) unhandledParameters
                                                                .get("renderingMode"))[0];
-                                       if (Theme.MODE_UIDL.equals(renderingMode)
+                                       if (Theme.MODE_AJAX.equals(renderingMode)
                                                        && !(window instanceof DebugWindow)) {
                                                writeAjaxPage(request, response, out, unhandledParameters, window, terminalType, theme);
                                                return;
                                        }
 
-                                       // If other than XSLT or UIDL mode is requested
-                                       if (!Theme.MODE_XSLT.equals(renderingMode)
+                                       // If other than html or ajax mode is requested
+                                       if (!Theme.MODE_HTML.equals(renderingMode)
                                                        && !(window instanceof DebugWindow)) {
                                                // TODO More informal message should be given is browser
                                                // is not supported
@@ -820,7 +820,7 @@ public class ApplicationServlet extends HttpServlet implements
                for (int k = themes.size() - 1; k >= 0; k--) {
                        t = (Theme) themes.get(k);
                        Collection files = t.getFileNames(terminalType,
-                                       Theme.MODE_UIDL);
+                                       Theme.MODE_AJAX);
                        for (Iterator i = files.iterator(); i.hasNext();) {
                                String file = (String) i.next();
                                if (file.endsWith(".css"))

diff --git a/src/com/itmill/toolkit/terminal/web/DirectoryThemeSource.java b/src/com/itmill/toolkit/terminal/web/DirectoryThemeSource.java
index 1b2e93519bcf13fb1d4525902c7b03cbfe28ae15..eeff3f1c866b1155399e927be33b88e3acdc652b 100644 (file)
--- a/src/com/itmill/toolkit/terminal/web/DirectoryThemeSource.java
+++ b/src/com/itmill/toolkit/terminal/web/DirectoryThemeSource.java
@@ -134,7 +134,7 @@ public class DirectoryThemeSource implements ThemeSource {
                                }
                        }
 
-                       Collection fileNames = theme.getFileNames(type, Theme.MODE_XSLT);
+                       Collection fileNames = theme.getFileNames(type, Theme.MODE_HTML);
 
                        // Add all XSL file streams
                        for (Iterator i = fileNames.iterator(); i.hasNext();) {

diff --git a/src/com/itmill/toolkit/terminal/web/JarThemeSource.java b/src/com/itmill/toolkit/terminal/web/JarThemeSource.java
index 2d06b85f59adfbe8a0581a94b879fc7d29c87dd0..0851b2a7cbab90c5a7029ceec6548ba26df84ed6 100644 (file)
--- a/src/com/itmill/toolkit/terminal/web/JarThemeSource.java
+++ b/src/com/itmill/toolkit/terminal/web/JarThemeSource.java
@@ -168,7 +168,7 @@ public class JarThemeSource implements ThemeSource {
                                }
                        }
 
-                       Collection fileNames = theme.getFileNames(type, Theme.MODE_XSLT);
+                       Collection fileNames = theme.getFileNames(type, Theme.MODE_HTML);
                        // Add all XSL file streams
                        for (Iterator i = fileNames.iterator(); i.hasNext();) {
                                entry = jar.getJarEntry(this.path + (String) i.next());

diff --git a/src/com/itmill/toolkit/terminal/web/ServletThemeSource.java b/src/com/itmill/toolkit/terminal/web/ServletThemeSource.java
index 92177a2e35e5f34e6c52a6c5af987550e5e908ea..ed8e3b04062158059253a392bfc1a2646662c0f7 100644 (file)
--- a/src/com/itmill/toolkit/terminal/web/ServletThemeSource.java
+++ b/src/com/itmill/toolkit/terminal/web/ServletThemeSource.java
@@ -159,7 +159,7 @@ public class ServletThemeSource implements ThemeSource {
                                        }
                        }
 
-                       Collection fileNames = theme.getFileNames(type, Theme.MODE_XSLT);
+                       Collection fileNames = theme.getFileNames(type, Theme.MODE_HTML);
                        // Add all XSL file streams
                        for (Iterator i = fileNames.iterator(); i.hasNext();) {
                                String entryName = (String) i.next();

diff --git a/src/com/itmill/toolkit/terminal/web/Theme.java b/src/com/itmill/toolkit/terminal/web/Theme.java
index 6989a4a67c72a00716ace14a76a992746cd915b8..3b6237825b4e6819384ee5271e9cb0b3bb0977bd 100644 (file)
--- a/src/com/itmill/toolkit/terminal/web/Theme.java
+++ b/src/com/itmill/toolkit/terminal/web/Theme.java
@@ -130,11 +130,11 @@ public class Theme extends DefaultHandler {
 
        private static final String ATTR_MARKUP = "markup";
 
-       public static final String MODE_UIDL = "uidl";
+       public static final String MODE_AJAX = "ajax";
 
-       public static final String MODE_XSLT = "xslt";
+       public static final String MODE_HTML = "html";
 
-       public static final String MODE_FALLBACK = MODE_XSLT;
+       public static final String MODE_FALLBACK = MODE_HTML;
 
        /** Name of the theme. */
        private String name;
@@ -321,11 +321,11 @@ public class Theme extends DefaultHandler {
                        String mode = atts.getValue(ATTR_MODE);
                        if (mode != null && mode.length() == 0)
                                mode = null;
-                       if (mode != null && !mode.equals(MODE_UIDL)
-                                       && !mode.equals(MODE_XSLT))
+                       if (mode != null && !mode.equals(MODE_AJAX)
+                                       && !mode.equals(MODE_HTML))
                                throw new IllegalStateException("Given mode '" + mode
                                                + "' is not supported. (This version only supports '"
-                                               + MODE_XSLT + "' and '" + MODE_UIDL + "')");
+                                               + MODE_HTML + "' and '" + MODE_AJAX + "')");
                        fs = new Fileset(mode);
 
                        // Use the first fileset as root fileset

diff --git a/src/com/itmill/toolkit/terminal/web/ThemeFunctionLibrary.java b/src/com/itmill/toolkit/terminal/web/ThemeFunctionLibrary.java
index 30efdc2df91004ca9b7555b15a8039b99152c8b8..4096671216f2e2f4fa0e2bd2b13d983ac28ed83a 100644 (file)
--- a/src/com/itmill/toolkit/terminal/web/ThemeFunctionLibrary.java
+++ b/src/com/itmill/toolkit/terminal/web/ThemeFunctionLibrary.java
@@ -440,7 +440,7 @@ public class ThemeFunctionLibrary {
        static public String getCssLinksForHead() {
                ApplicationServlet as = (ApplicationServlet) ((Object[]) state.get())[WEBADAPTERSERVLET];
                Theme t = as.getThemeSource().getThemeByName(theme());
-               Collection allFiles = t.getFileNames(browser(), Theme.MODE_XSLT);
+               Collection allFiles = t.getFileNames(browser(), Theme.MODE_HTML);
                StringBuffer links = new StringBuffer();
                for (Iterator i = allFiles.iterator(); i.hasNext();) {
                        String file = (String) i.next();
@@ -457,7 +457,7 @@ public class ThemeFunctionLibrary {
        static public String getJavaScriptLinksForHead() {
                ApplicationServlet as = (ApplicationServlet) ((Object[]) state.get())[WEBADAPTERSERVLET];
                Theme t = as.getThemeSource().getThemeByName(theme());
-               Collection allFiles = t.getFileNames(browser(), Theme.MODE_XSLT);
+               Collection allFiles = t.getFileNames(browser(), Theme.MODE_HTML);
                StringBuffer links = new StringBuffer();
                for (Iterator i = allFiles.iterator(); i.hasNext();) {
                        String file = (String) i.next();