" - + window.getCaption() + "

From 76c0d9b8a02945f918bd3bb0bebaeb69d64b4c7e Mon Sep 17 00:00:00 2001 From: Joonas Lehtinen Date: Fri, 12 Jan 2007 12:33:46 +0000 Subject: [PATCH] refactoring... svn changeset:243/svn branch:toolkit --- .../terminal/web/ApplicationServlet.java | 185 +++++++++--------- 1 file changed, 94 insertions(+), 91 deletions(-) diff --git a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java index 914e748a9d..83e503519b 100644 --- a/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java +++ b/src/com/itmill/toolkit/terminal/web/ApplicationServlet.java @@ -656,97 +656,7 @@ public class ApplicationServlet extends HttpServlet implements .get("renderingMode"))[0]; if (Theme.MODE_UIDL.equals(renderingMode) && !(window instanceof DebugWindow)) { - response.setContentType("text/html"); - BufferedWriter page = new BufferedWriter( - new OutputStreamWriter(out)); - - page - .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_UIDL); - 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("

\n"); - - page.write("\n"); - - page.write("\n"); - page.close(); - + writeAjaxPage(request, response, out, unhandledParameters, window, terminalType, theme); return; } @@ -887,6 +797,99 @@ public class ApplicationServlet extends HttpServlet implements } } + private void writeAjaxPage(HttpServletRequest request, HttpServletResponse response, OutputStream out, Map unhandledParameters, Window window, WebBrowser terminalType, Theme theme) throws IOException, MalformedURLException { + response.setContentType("text/html"); + BufferedWriter page = new BufferedWriter( + new OutputStreamWriter(out)); + + page + .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_UIDL); + 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("

\n"); + + page.write("\n"); + + page.write("\n"); + page.close(); + } + /** * Handle the requested URI. An application can add handlers to do special * processing, when a certain URI is requested. The handlers are invoked -- 2.39.5