You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2008/04/27 18:51:19 UTC
svn commit: r651982 - in /myfaces/tobago/trunk:
core/src/main/java/org/apache/myfaces/tobago/ajax/api/
core/src/main/java/org/apache/myfaces/tobago/lifecycle/
theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/
Author: bommel
Date: Sun Apr 27 09:51:04 2008
New Revision: 651982
URL: http://svn.apache.org/viewvc?rev=651982&view=rev
Log:
apply some minor optimizations
and remove some comments
Modified:
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxResponse.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxResponseRenderer.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/ApplyRequestValuesExecutor.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/ProcessValidationsExecutor.java
myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/UpdateModelValuesExecutor.java
myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/CommandRendererHelper.java
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxResponse.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxResponse.java?rev=651982&r1=651981&r2=651982&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxResponse.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxResponse.java Sun Apr 27 09:51:04 2008
@@ -21,6 +21,8 @@
import java.util.regex.Pattern;
import java.util.regex.Matcher;
+import java.io.Writer;
+import java.io.IOException;
public class AjaxResponse {
@@ -73,6 +75,24 @@
public String getAjaxId() {
return ajaxId;
+ }
+
+ public void writeJson(Writer writer) throws IOException {
+ writer.write("{\n ajaxId: \"");
+ writer.write(ajaxId);
+ writer.write("\",\n");
+
+ writer.write(" responseCode: ");
+ writer.write(Integer.toString(responseCode));
+ writer.write(",\n");
+
+ writer.write(" html: \"");
+ writer.write(encodeJavascriptString(html));
+ writer.write("\",\n");
+
+ writer.write(" script: function() {\n");
+ writer.write(javaScript);
+ writer.write("\n }\n }");
}
public String toJson() {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxResponseRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxResponseRenderer.java?rev=651982&r1=651981&r2=651982&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxResponseRenderer.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxResponseRenderer.java Sun Apr 27 09:51:04 2008
@@ -204,43 +204,37 @@
}
}
- StringBuilder buffer = new StringBuilder();
-
- buffer.append("{\n tobagoAjaxResponse: true,\n");
- buffer.append(" responseCode: ");
- buffer.append(reloadRequired ? CODE_RELOAD_REQUIRED : CODE_SUCCESS);
- buffer.append(",\n");
- buffer.append(" jsfState: \"");
- buffer.append(AjaxUtils.encodeJavascriptString(jsfState));
- buffer.append("\"");
+ PrintWriter writer = getPrintWriter(externalContext);
+ writer.write("{\n tobagoAjaxResponse: true,\n");
+ writer.write(" responseCode: ");
+ writer.write(reloadRequired ? Integer.toString(CODE_RELOAD_REQUIRED) : Integer.toString(CODE_SUCCESS));
+ writer.write(",\n");
+ writer.write(" jsfState: \"");
+ writer.write(AjaxUtils.encodeJavascriptString(jsfState));
+ writer.write("\"");
int i = 0;
// add parts to response
for (AjaxResponse part : responseParts) {
- buffer.append(",\n");
- buffer.append(" ajaxPart_").append(i++);
- buffer.append(": ");
- buffer.append(part.toJson());
- }
-
-
- buffer.append("\n}\n");
-
- if (LOG.isTraceEnabled()) {
- LOG.trace("\nresponse follows # #############################################################\n"
- + buffer
- + "\nend response ##############################################################");
+ writer.write(",\n");
+ writer.write(" ajaxPart_");
+ writer.write(Integer.toString(i++));
+ writer.write(": ");
+ part.writeJson(writer);
}
+ writer.write("\n}\n");
+ writer.flush();
+ writer.close();
+ }
+ private PrintWriter getPrintWriter(ExternalContext externalContext) throws IOException {
//TODO: fix this to work in PortletRequest as well
if (externalContext.getResponse() instanceof HttpServletResponse) {
final HttpServletResponse httpServletResponse
= (HttpServletResponse) externalContext.getResponse();
- PrintWriter responseWriter = httpServletResponse.getWriter();
- responseWriter.print(buffer.toString());
- responseWriter.flush();
- responseWriter.close();
+ return httpServletResponse.getWriter();
}
+ throw new IOException("No ResponseWriter found for ExternalContext " + externalContext);
}
}
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/ApplyRequestValuesExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/ApplyRequestValuesExecutor.java?rev=651982&r1=651981&r2=651982&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/ApplyRequestValuesExecutor.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/ApplyRequestValuesExecutor.java Sun Apr 27 09:51:04 2008
@@ -68,10 +68,7 @@
// and all ajax components
for (Map.Entry<String, UIComponent> entry : ajaxComponents.entrySet()) {
- UIComponent ajaxComponent = entry.getValue();
- // TODO: invokeOnComponent()
FacesUtils.invokeOnComponent(facesContext, facesContext.getViewRoot(), entry.getKey(), contextCallback);
- //ComponentUtil.invokeOnComponent(facesContext, entry.getKey(), ajaxComponent, contextCallback);
}
UIViewRoot viewRoot = ((UIViewRoot) facesContext.getViewRoot());
@@ -102,10 +99,7 @@
component = component.getParent();
}
}
- // TODO: invokeOnComponent()
FacesUtils.invokeOnComponent(facesContext, facesContext.getViewRoot(), actionId, contextCallback);
-
- //ComponentUtil.invokeOnComponent(facesContext, actionId, actionComponent, contextCallback);
}
public PhaseId getPhase() {
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/ProcessValidationsExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/ProcessValidationsExecutor.java?rev=651982&r1=651981&r2=651982&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/ProcessValidationsExecutor.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/ProcessValidationsExecutor.java Sun Apr 27 09:51:04 2008
@@ -47,12 +47,7 @@
Map<String, UIComponent> ajaxComponents = AjaxUtils.getAjaxComponents(facesContext);
if (ajaxComponents != null) {
for (Map.Entry<String, UIComponent> entry : ajaxComponents.entrySet()) {
- UIComponent ajaxComponent = entry.getValue();
- // TODO: invokeOnComponent()
FacesUtils.invokeOnComponent(facesContext, facesContext.getViewRoot(), entry.getKey(), contextCallback);
-
-// ComponentUtil.invokeOnComponent(facesContext, entry.getKey(), ajaxComponent, contextCallback);
-// ajaxComponent.processValidators(facesContext);
}
UIViewRoot viewRoot = ((UIViewRoot) facesContext.getViewRoot());
viewRoot.broadcastEventsForPhase(facesContext, PROCESS_VALIDATIONS);
Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/UpdateModelValuesExecutor.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/UpdateModelValuesExecutor.java?rev=651982&r1=651981&r2=651982&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/UpdateModelValuesExecutor.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/lifecycle/UpdateModelValuesExecutor.java Sun Apr 27 09:51:04 2008
@@ -48,11 +48,7 @@
Map<String, UIComponent> ajaxComponents = AjaxUtils.getAjaxComponents(facesContext);
if (ajaxComponents != null) {
for (Map.Entry<String, UIComponent> entry : ajaxComponents.entrySet()) {
- UIComponent ajaxComponent = entry.getValue();
- // TODO: invokeOnComponent()
FacesUtils.invokeOnComponent(facesContext, facesContext.getViewRoot(), entry.getKey(), contextCallback);
- //ComponentUtil.invokeOnComponent(facesContext, entry.getKey(), ajaxComponent, contextCallback);
-// ajaxComponent.processUpdates(facesContext);
}
UIViewRoot viewRoot = ((UIViewRoot) facesContext.getViewRoot());
viewRoot.broadcastEventsForPhase(facesContext, UPDATE_MODEL_VALUES);
Modified: myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/CommandRendererHelper.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/CommandRendererHelper.java?rev=651982&r1=651981&r2=651982&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/CommandRendererHelper.java (original)
+++ myfaces/tobago/trunk/theme/standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/util/CommandRendererHelper.java Sun Apr 27 09:51:04 2008
@@ -84,6 +84,7 @@
href = url;
target = ComponentUtil.getStringAttribute(command, ATTR_TARGET);
} else {
+ // TODO target
onclick = "Tobago.navigateToUrl('" + url + "');";
}
} else if (command.getAttributes().get(ATTR_ACTION_ONCLICK) != null) {
@@ -153,8 +154,7 @@
private String appendConfirmationScript(String onclick, UIComponent component) {
ValueHolder confirmation = (ValueHolder) component.getFacet(FACET_CONFIRMATION);
if (confirmation != null) {
- StringBuilder script = new StringBuilder();
- script.append("return confirm('");
+ StringBuilder script = new StringBuilder("return confirm('");
script.append(confirmation.getValue());
script.append("')");
if (onclick != null) {