Index: icefaces/core/src/main/java/org/icefaces/impl/context/DOMResponseWriter.java
===================================================================
--- icefaces/core/src/main/java/org/icefaces/impl/context/DOMResponseWriter.java	(revision 36381)
+++ icefaces/core/src/main/java/org/icefaces/impl/context/DOMResponseWriter.java	(revision )
@@ -624,9 +624,10 @@
         public void write(String str) throws IOException {
             if (EnvUtils.getStateMarker().equals(str) ) {
                 FacesContext fc = FacesContext.getCurrentInstance();
-                out.write("<input id=\"javax.faces.ViewState\" type=\"hidden\" autocomplete=\"off\" value=\"");
-                out.write(fc.getApplication().getStateManager().getViewState(fc));
-                out.write("\" name=\"javax.faces.ViewState\"/>");
+                out.write(
+                    "<input id=\"javax.faces.ViewState\" type=\"hidden\" autocomplete=\"off\" value=\"" +
+                    fc.getApplication().getStateManager().getViewState(fc) +
+                    "\" name=\"javax.faces.ViewState\"/>");
             } else {
                 out.write(str);
             }
Index: icefaces/compat/core/src/main/java/com/icesoft/faces/application/ExtrasSetup.java
===================================================================
--- icefaces/compat/core/src/main/java/com/icesoft/faces/application/ExtrasSetup.java	(revision 33085)
+++ icefaces/compat/core/src/main/java/com/icesoft/faces/application/ExtrasSetup.java	(revision )
@@ -114,39 +114,40 @@
                     writer.writeAttribute("id", getClientId(context), null);
                     writer.startElement("script", this);
                     writer.writeAttribute("type", "text/javascript", null);
-                    writer.write("ice.includeScrollOffsets=" + includeScrollOffsets + ";");
-                    writer.write("ice.DefaultIndicators({");
-                    writer.write("fastBusyIndicator: ");
-                    writer.write(Boolean.toString(fastBusyIndicator));
-                    writer.write(",");
-                    writer.write("connectionLostRedirectURI: ");
-                    writer.write(connectionLostRedirectURI);
-                    writer.write(",");
-                    writer.write("sessionExpiredRedirectURI: ");
-                    writer.write(sessionExpiredRedirectURI);
-                    writer.write(",");
-                    writer.write("connection: { context: '");
-                    writer.write(contextPath);
-                    writer.write("'},");
-                    writer.write("messages: {");
-                    writer.write("sessionExpired: '");
-                    writer.write(localizedBundle.getString("session-expired"));
-                    writer.write("',");
-                    writer.write("connectionLost: '");
-                    writer.write(localizedBundle.getString("connection-lost"));
-                    writer.write("',");
-                    writer.write("serverError: '");
-                    writer.write(localizedBundle.getString("server-error"));
-                    writer.write("',");
-                    writer.write("description: '");
-                    writer.write(localizedBundle.getString("description"));
-                    writer.write("',");
-                    writer.write("buttonText: '");
-                    writer.write(localizedBundle.getString("button-text"));
-                    writer.write("'");
-                    writer.write("}},'");
-                    writer.write(getClientId(context));
-                    writer.write("');");
+                    writer.write(
+                        "ice.includeScrollOffsets=" + includeScrollOffsets + ";" +
+                        "ice.DefaultIndicators({" +
+                        "fastBusyIndicator: " +
+                        Boolean.toString(fastBusyIndicator) +
+                        "," +
+                        "connectionLostRedirectURI: " +
+                        connectionLostRedirectURI +
+                        "," +
+                        "sessionExpiredRedirectURI: " +
+                        sessionExpiredRedirectURI +
+                        "," +
+                        "connection: { context: '" +
+                        contextPath +
+                        "'}," +
+                        "messages: {" +
+                        "sessionExpired: '" +
+                        localizedBundle.getString("session-expired") +
+                        "'," +
+                        "connectionLost: '" +
+                        localizedBundle.getString("connection-lost") +
+                        "'," +
+                        "serverError: '" +
+                        localizedBundle.getString("server-error") +
+                        "'," +
+                        "description: '" +
+                        localizedBundle.getString("description") +
+                        "'," +
+                        "buttonText: '" +
+                        localizedBundle.getString("button-text") +
+                        "'" +
+                        "}},'" +
+                        getClientId(context) +
+                        "');");
                     writer.endElement("script");
                     writer.endElement("span");
                 }
Index: icefaces/ace/component/src/org/icefaces/ace/component/selectmenu/SelectMenuRenderer.java
===================================================================
--- icefaces/ace/component/src/org/icefaces/ace/component/selectmenu/SelectMenuRenderer.java	(revision 34592)
+++ icefaces/ace/component/src/org/icefaces/ace/component/selectmenu/SelectMenuRenderer.java	(revision )
@@ -224,10 +224,11 @@
         writer.writeAttribute("id", clientId + "_fieldupdate", null);
         writer.startElement("script", null);
         writer.writeAttribute("type", "text/javascript", null);
-        writer.writeText("(function() {", null);
-        writer.writeText("var instance = ice.ace.SelectMenus[\"" + clientId + "\"];", null);
-        writer.writeText("instance.updateValue('" + escapeJavascriptString(value.toString()) + "');", null);
-        writer.writeText("})();", null);
+        writer.writeText(
+            "(function() {" +
+            "var instance = ice.ace.SelectMenus[\"" + clientId + "\"];" +
+            "instance.updateValue('" + escapeJavascriptString(value.toString()) + "');" +
+            "})();", null);
         writer.endElement("script");
         writer.endElement("span");
     }
Index: icefaces/compat/core/src/main/java/com/icesoft/faces/context/CompatDOMPartialViewContext.java
===================================================================
--- icefaces/compat/core/src/main/java/com/icesoft/faces/context/CompatDOMPartialViewContext.java	(revision 33085)
+++ icefaces/compat/core/src/main/java/com/icesoft/faces/context/CompatDOMPartialViewContext.java	(revision )
@@ -61,9 +61,10 @@
 
         public void write(String str) throws IOException {
             if (EnvUtils.getStateMarker().equals(str)) {
-                out.write("<input id=\"javax.faces.ViewState\" type=\"hidden\" autocomplete=\"off\" value=\"");
-                out.write(facesContext.getApplication().getStateManager().getViewState(facesContext));
-                out.write("\" name=\"javax.faces.ViewState\"/>");
+                out.write(
+                    "<input id=\"javax.faces.ViewState\" type=\"hidden\" autocomplete=\"off\" value=\"" +
+                    facesContext.getApplication().getStateManager().getViewState(facesContext) +
+                    "\" name=\"javax.faces.ViewState\"/>");
             } else {
                 out.write(str);
             }
Index: icefaces/ace/component/src/org/icefaces/ace/component/combobox/ComboBoxRenderer.java
===================================================================
--- icefaces/ace/component/src/org/icefaces/ace/component/combobox/ComboBoxRenderer.java	(revision 34592)
+++ icefaces/ace/component/src/org/icefaces/ace/component/combobox/ComboBoxRenderer.java	(revision )
@@ -239,10 +239,11 @@
 		writer.writeAttribute("id", clientId + "_fieldupdate", null);
 		writer.startElement("script", null);
 		writer.writeAttribute("type", "text/javascript", null);
-		writer.writeText("(function() {", null);
-		writer.writeText("var instance = ice.ace.ComboBoxes[\"" + clientId + "\"];", null);
-		writer.writeText("instance.updateValue('" + escapeJavascriptString(value.toString()) + "');", null);
-		writer.writeText("})();", null);
+		writer.writeText(
+            "(function() {" +
+		    "var instance = ice.ace.ComboBoxes[\"" + clientId + "\"];" +
+		    "instance.updateValue('" + escapeJavascriptString(value.toString()) + "');" +
+		    "})();", null);
 		writer.endElement("script");
 		writer.endElement("span");
 	}
Index: icefaces/core/src/main/java/org/icefaces/impl/component/NavigationNotifier.java
===================================================================
--- icefaces/core/src/main/java/org/icefaces/impl/component/NavigationNotifier.java	(revision 33244)
+++ icefaces/core/src/main/java/org/icefaces/impl/component/NavigationNotifier.java	(revision )
@@ -71,14 +71,15 @@
 
         writer.startElement("script", this);
         writer.writeAttribute("type", "text/javascript", null);
-        writer.write("window.dhtmlHistory.create();\n");
-        writer.write("var init = function(newLocation, historyData) {\n");
-        writer.write("dhtmlHistory.initialize();\n");
-        writer.write("dhtmlHistory.addListener(function(newLocation, historyData) {\n");
-        writer.write("ice.se(null, '" + id + "');\n");
-        writer.write("});\n");
-        writer.write("};\n");
-        writer.write("if (window.addEventListener) { window.addEventListener('load', init, false) } else { window.attachEvent('onload', init); }");
+        writer.write(
+            "window.dhtmlHistory.create();\n" +
+            "var init = function(newLocation, historyData) {\n" +
+            "dhtmlHistory.initialize();\n" +
+            "dhtmlHistory.addListener(function(newLocation, historyData) {\n" +
+            "ice.se(null, '" + id + "');\n" +
+            "});\n" +
+            "};\n" +
+            "if (window.addEventListener) { window.addEventListener('load', init, false) } else { window.attachEvent('onload', init); }");
         writer.endElement("script");
 
         writer.endElement("span");
Index: icefaces/core/src/main/java/org/icefaces/impl/renderkit/DOMRenderKit.java
===================================================================
--- icefaces/core/src/main/java/org/icefaces/impl/renderkit/DOMRenderKit.java	(revision 36239)
+++ icefaces/core/src/main/java/org/icefaces/impl/renderkit/DOMRenderKit.java	(revision )
@@ -219,9 +219,10 @@
                 if (deltaSubmit) {
                     writer.startElement("script", component);
                     writer.writeAttribute("type", "text/javascript", null);
-                    writer.writeText("ice.calculateInitialParameters('", null);
-                    writer.writeText(component.getClientId(context), null);
-                    writer.writeText("');", null);
+                    writer.writeText(new StringBuilder().
+                        append("ice.calculateInitialParameters('").
+                        append(component.getClientId(context)).
+                        append("');").toString(), null);
                     writer.endElement("script");
                 }
 
Index: icefaces/ace/component/src/org/icefaces/ace/component/autocompleteentry/AutoCompleteEntryRenderer.java
===================================================================
--- icefaces/ace/component/src/org/icefaces/ace/component/autocompleteentry/AutoCompleteEntryRenderer.java	(revision 35682)
+++ icefaces/ace/component/src/org/icefaces/ace/component/autocompleteentry/AutoCompleteEntryRenderer.java	(revision )
@@ -291,10 +291,11 @@
         writer.writeAttribute("id", clientId + "_fieldupdate", null);
         writer.startElement("script", null);
         writer.writeAttribute("type", "text/javascript", null);
-        writer.writeText("(function() {", null);
-        writer.writeText("var instance = ice.ace.Autocompleters[\"" + clientId + "\"];", null);
-        writer.writeText("instance.updateField('" + escapeJavascriptString(renderedValue) + "', " + focus + ");", null);
-        writer.writeText("})();", null);
+        writer.writeText(
+            "(function() {" +
+            "var instance = ice.ace.Autocompleters[\"" + clientId + "\"];" +
+            "instance.updateField('" + escapeJavascriptString(renderedValue) + "', " + focus + ");" +
+            "})();", null);
         writer.endElement("script");
         writer.endElement("span");
 		
Index: icefaces/core/src/main/java/org/icefaces/impl/event/BridgeSetup.java
===================================================================
--- icefaces/core/src/main/java/org/icefaces/impl/event/BridgeSetup.java	(revision 35669)
+++ icefaces/core/src/main/java/org/icefaces/impl/event/BridgeSetup.java	(revision )
@@ -157,37 +157,38 @@
                     writer.writeAttribute("id", clientID, null);
                     writer.startElement("script", this);
                     //define bridge configuration
-                    writer.write("ice.setupBridge('");
-                    writer.write(clientID);
-                    writer.write("', '");
-                    writer.write(viewID);
-                    writer.write("', '");
-                    writer.write(windowID);
-                    writer.write("', {");
-                    writer.write("reloadOnUpdateFailure: ");
-                    writer.write(Boolean.toString(reloadOnUpdateFailure));
-                    writer.write(",");
-                    writer.write("deltaSubmit: ");
-                    writer.write(Boolean.toString(deltaSubmit));
-                    writer.write(",");
-                    writer.write("focusManaged: ");
-                    writer.write(Boolean.toString(focusManaged));
-                    writer.write(",");
-                    writer.write("disableDefaultErrorPopups: ");
-                    writer.write(Boolean.toString(EnvUtils.disableDefaultErrorPopups(context)));
-                    writer.write(",");
-                    writer.write("standardFormSerialization: ");
-                    writer.write(Boolean.toString(standardFormSerialization));
-                    writer.write(",");
-                    writer.write("sendDisposeWindow: ");
-                    writer.write(Boolean.toString(sendDisposeWindow));
-                    writer.write(",");
-                    writer.write("blockUIOnSubmit: ");
-                    writer.write(Boolean.toString(EnvUtils.isBlockUIOnSubmit(context)));
-                    writer.write(",");
-                    writer.write("clientSideElementUpdateDetermination: ");
-                    writer.write(Boolean.toString(EnvUtils.isClientSideElementUpdateDetermination(context)));
-                    writer.write("});");
+                    writer.write(
+                        "ice.setupBridge('" +
+                        clientID +
+                        "', '" +
+                        viewID +
+                        "', '" +
+                        windowID +
+                        "', {" +
+                        "reloadOnUpdateFailure: " +
+                        Boolean.toString(reloadOnUpdateFailure) +
+                        "," +
+                        "deltaSubmit: " +
+                        Boolean.toString(deltaSubmit) +
+                        "," +
+                        "focusManaged: " +
+                        Boolean.toString(focusManaged) +
+                        "," +
+                        "disableDefaultErrorPopups: " +
+                        Boolean.toString(EnvUtils.disableDefaultErrorPopups(context)) +
+                        "," +
+                        "standardFormSerialization: " +
+                        Boolean.toString(standardFormSerialization) +
+                        "," +
+                        "sendDisposeWindow: " +
+                        Boolean.toString(sendDisposeWindow) +
+                        "," +
+                        "blockUIOnSubmit: " +
+                        Boolean.toString(EnvUtils.isBlockUIOnSubmit(context)) +
+                        "," +
+                        "clientSideElementUpdateDetermination: " +
+                        Boolean.toString(EnvUtils.isClientSideElementUpdateDetermination(context)) +
+                        "});");
                     writer.endElement("script");
                     writer.endElement("span");
                 }
@@ -320,20 +321,22 @@
         public void encode(ResponseWriter writer, FacesContext context) throws IOException {
             writer.startElement("style", this);
             writer.writeAttribute("type", "text/css", null);
-            writer.writeText(".ice-blockui-overlay {", null);
-            writer.writeText("position: absolute;", null);
-            writer.writeText("background-color: white;", null);
-            writer.writeText("z-index: 28000;", null);
-            writer.writeText("opacity: 0.22;", null);
-            writer.writeText("filter: alpha(opacity = 22);", null);
-            writer.writeText("}", null);
-            writer.writeText(".ice-status-indicator-overlay {", null);
-            writer.writeText("position: absolute;", null);
-            writer.writeText("background-color: white;", null);
-            writer.writeText("z-index: 28000;", null);
-            writer.writeText("opacity: 0.22;", null);
-            writer.writeText("filter: alpha(opacity = 22);", null);
-            writer.writeText("}", null);
+            writer.writeText(
+                    ".ice-blockui-overlay {" +
+                    "position: absolute;" +
+                    "background-color: white;" +
+                    "z-index: 28000;" +
+                    "opacity: 0.22;" +
+                    "filter: alpha(opacity = 22);" +
+                    "}" +
+                    ".ice-status-indicator-overlay {" +
+                    "position: absolute;" +
+                    "background-color: white;" +
+                    "z-index: 28000;" +
+                    "opacity: 0.22;" +
+                    "filter: alpha(opacity = 22);" +
+                    "}"
+                , null);
             writer.endElement("style");
         }
     }
Index: icefaces/core/src/main/java/org/icefaces/impl/facelets/tag/icefaces/core/RefreshHandler.java
===================================================================
--- icefaces/core/src/main/java/org/icefaces/impl/facelets/tag/icefaces/core/RefreshHandler.java	(revision 35657)
+++ icefaces/core/src/main/java/org/icefaces/impl/facelets/tag/icefaces/core/RefreshHandler.java	(revision )
@@ -97,15 +97,16 @@
             CoreUtils.enableOnElementUpdateNotify(writer, clientId);
             writer.startElement("script", this);
             writer.writeAttribute("type", "text/javascript", null);
-            writer.writeText("ice.setupRefresh('", null);
-            writer.writeText(BridgeSetup.getViewID(context.getExternalContext()), null);
-            writer.writeText("', ", null);
-            writer.writeText(interval, null);
-            writer.writeText(", ", null);
-            writer.writeText(duration, null);
-            writer.writeText(", '", null);
-            writer.writeText(clientId, null);
-            writer.writeText("');", null);
+            writer.writeText(new StringBuilder().
+                append("ice.setupRefresh('").
+                append(BridgeSetup.getViewID(context.getExternalContext())).
+                append("', ").
+                append(interval).
+                append(", ").
+                append(duration).
+                append(", '").
+                append(clientId).
+                append("');").toString(), null);
             writer.endElement("script");
             writer.endElement("span");
         }