From 6bfb8a6adc241205725987d4bbda16de4ba2dd76 Mon Sep 17 00:00:00 2001 From: Matti Tahvonen Date: Thu, 7 Jun 2007 12:00:45 +0000 Subject: [PATCH] servlet now makes index pages. atm works only with trailing slashes ( tk/HelloWorld/ ) svn changeset:1635/svn branch:trunk --- .../terminal/web/ApplicationServlet.java | 141 +++++++++--------- 1 file changed, 71 insertions(+), 70 deletions(-) diff --git a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java index fb7d7399b3..b8748a0331 100644 --- a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java +++ b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java @@ -881,57 +881,14 @@ public class ApplicationServlet extends HttpServlet implements .write("\n"); - page - .write("\n" + window.getCaption() - + "\n"); - Theme t = theme; - Vector themes = new Vector(); - themes.add(t); - while (t.getParent() != null) { - String parentName = t.getParent(); - t = themeSource.getThemeByName(parentName); - themes.add(t); - } - for (int k = themes.size() - 1; k >= 0; k--) { - t = (Theme) themes.get(k); - Collection files = t.getFileNames(terminalType, Theme.MODE_AJAX); - for (Iterator i = files.iterator(); i.hasNext();) { - String file = (String) i.next(); - if (file.endsWith(".css")) - page.write("\n"); - else if (file.endsWith(".js")) { - page.write("\n"); - } - } - - } - - page.write("\n"); - - page.write("\n"); - page.write("
Loading...
\n"); - - page.write("
\n"); - - page.write("\n" + + "\n\n" + + " \n" + + "
" + + "
\n" + + "
console
\n" + + "
IT Mill Toolkit 5 Prototype
\n" + + " \n" + + "\n"); + + + +// Theme t = theme; +// Vector themes = new Vector(); +// themes.add(t); +// while (t.getParent() != null) { +// String parentName = t.getParent(); +// t = themeSource.getThemeByName(parentName); +// themes.add(t); +// } +// for (int k = themes.size() - 1; k >= 0; k--) { +// t = (Theme) themes.get(k); +// Collection files = t.getFileNames(terminalType, Theme.MODE_AJAX); +// for (Iterator i = files.iterator(); i.hasNext();) { +// String file = (String) i.next(); +// if (file.endsWith(".css")) +// page.write("\n"); +// else if (file.endsWith(".js")) { +// page.write("\n"); +// } +// } +// +// } + + +// page.write("itmill.tmp = new itmill.Client(" +// + "document.getElementById('ajax-window')," + "\"" + appUrl +// + "/UIDL/" + "\",\"" + resourcePath +// + ((Theme) themes.get(themes.size() - 1)).getName() + "/" +// +// + "client/\",document.getElementById('ajax-wait'));\n"); // TODO Only current theme is registered to the client // for (int k = themes.size() - 1; k >= 0; k--) { // t = (Theme) themes.get(k); - t = theme; - String themeObjName = "itmill.themes." - + t.getName().substring(0, 1).toUpperCase() - + t.getName().substring(1); - page.write(" (new " + themeObjName + "(\"" + resourcePath + t.getName() - + "/\")).registerTo(itmill.tmp);\n"); +// t = theme; +// String themeObjName = "itmill.themes." +// + t.getName().substring(0, 1).toUpperCase() +// + t.getName().substring(1); +// page.write(" (new " + themeObjName + "(\"" + resourcePath + t.getName() +// + "/\")).registerTo(itmill.tmp);\n"); // } - if (isDebugMode(unhandledParameters)) - page.write("itmill.tmp.debugEnabled =true;\n"); - page.write("itmill.tmp.start();\n"); - page.write("delete itmill.tmp;\n"); - - page.write("\n"); - - page.write("\n"); page.close(); } -- 2.39.5