You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by de...@apache.org on 2007/04/23 05:51:50 UTC
svn commit: r531326 - in
/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/ppr:
PPRPanelGroup.java PPRPanelGroupTag.java PPRPhaseListener.java
Author: dennisbyrne
Date: Sun Apr 22 20:51:49 2007
New Revision: 531326
URL: http://svn.apache.org/viewvc?view=rev&rev=531326
Log:
applied MyFaces coding standards
Modified:
myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/ppr/PPRPanelGroup.java
myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/ppr/PPRPanelGroupTag.java
myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/ppr/PPRPhaseListener.java
Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/ppr/PPRPanelGroup.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/ppr/PPRPanelGroup.java?view=diff&rev=531326&r1=531325&r2=531326
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/ppr/PPRPanelGroup.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/ppr/PPRPanelGroup.java Sun Apr 22 20:51:49 2007
@@ -27,133 +27,121 @@
/**
* @author Ernst Fastl
*/
-public class PPRPanelGroup extends HtmlPanelGroup
-{
+public class PPRPanelGroup extends HtmlPanelGroup {
public static final String COMPONENT_TYPE = "org.apache.myfaces.PPRPanelGroup";
+
public static final String COMPONENT_FAMILY = "org.apache.myfaces.PPRPanelGroup";
+
public static final String DEFAULT_RENDERER_TYPE = "org.apache.myfaces.PPRPanelGroup";
private String _partialTriggers;
- private Integer _periodicalUpdate;
- private String _partialTriggerPattern;
-
+ private Integer _periodicalUpdate;
+
+ private String _partialTriggerPattern;
+
private String _inlineLoadingMessage;
- private Boolean _showDebugMessages = new Boolean(false);
- private Boolean _stateUpdate = new Boolean(true);
+ private Boolean _showDebugMessages = new Boolean(false);
+
+ private Boolean _stateUpdate = new Boolean(true);
- public PPRPanelGroup()
- {
+ public PPRPanelGroup() {
setRendererType(DEFAULT_RENDERER_TYPE);
}
- public String getFamily()
- {
+ public String getFamily() {
return COMPONENT_FAMILY;
}
- public String getPartialTriggers()
- {
- if (_partialTriggers != null) return _partialTriggers;
- ValueBinding vb = getValueBinding("partialTriggers");
- return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+ public String getPartialTriggers() {
+ if (_partialTriggers != null)
+ return _partialTriggers;
+ ValueBinding vb = getValueBinding("partialTriggers");
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
- public void setPartialTriggers(String partialTriggers)
- {
+ public void setPartialTriggers(String partialTriggers) {
this._partialTriggers = partialTriggers;
}
- public Integer getPeriodicalUpdate()
- {
- if (_periodicalUpdate != null) return _periodicalUpdate;
- ValueBinding vb = getValueBinding("periodicalUpdate");
- return (vb != null) ? (Integer) vb.getValue(getFacesContext()) : null;
- }
-
- public void setPeriodicalUpdate(Integer periodicalUpdate)
- {
- _periodicalUpdate = periodicalUpdate;
- }
-
- public String getPartialTriggerPattern()
- {
- if (_partialTriggerPattern != null) return _partialTriggerPattern;
- ValueBinding vb = getValueBinding("partialTriggerPattern");
- return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+ public Integer getPeriodicalUpdate() {
+ if (_periodicalUpdate != null)
+ return _periodicalUpdate;
+ ValueBinding vb = getValueBinding("periodicalUpdate");
+ return (vb != null) ? (Integer) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setPeriodicalUpdate(Integer periodicalUpdate) {
+ _periodicalUpdate = periodicalUpdate;
+ }
+
+ public String getPartialTriggerPattern() {
+ if (_partialTriggerPattern != null)
+ return _partialTriggerPattern;
+ ValueBinding vb = getValueBinding("partialTriggerPattern");
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
- public void setPartialTriggerPattern(String partialTriggerPattern)
- {
+ public void setPartialTriggerPattern(String partialTriggerPattern) {
this._partialTriggerPattern = partialTriggerPattern;
}
-
- public String getInlineLoadingMessage()
- {
- if (_inlineLoadingMessage != null) return _inlineLoadingMessage;
- ValueBinding vb = getValueBinding("inlineLoadingMessage");
- return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
+
+ public String getInlineLoadingMessage() {
+ if (_inlineLoadingMessage != null)
+ return _inlineLoadingMessage;
+ ValueBinding vb = getValueBinding("inlineLoadingMessage");
+ return vb != null ? _ComponentUtils.getStringValue(getFacesContext(), vb) : null;
}
- public void setInlineLoadingMessage(String inlineLoadingMessage)
- {
+ public void setInlineLoadingMessage(String inlineLoadingMessage) {
this._inlineLoadingMessage = inlineLoadingMessage;
}
- public Boolean getShowDebugMessages()
- {
- if (_showDebugMessages != null)
- {
- return _showDebugMessages;
- }
- ValueBinding vb = getValueBinding("showDebugMessages");
- return vb != null ? (Boolean) vb.getValue(getFacesContext()) : null;
- }
-
- public void setShowDebugMessages(Boolean showDebugMessages)
- {
- _showDebugMessages = showDebugMessages;
- }
-
-
- public Boolean getStateUpdate()
- {
- if (_stateUpdate != null)
- {
- return _stateUpdate;
- }
- ValueBinding vb = getValueBinding("stateUpdate");
- return vb != null ? (Boolean) vb.getValue(getFacesContext()) : null;
- }
-
- public void setStateUpdate(Boolean stateUpdate)
- {
- _stateUpdate = stateUpdate;
- }
+ public Boolean getShowDebugMessages() {
+ if (_showDebugMessages != null) {
+ return _showDebugMessages;
+ }
+ ValueBinding vb = getValueBinding("showDebugMessages");
+ return vb != null ? (Boolean) vb.getValue(getFacesContext()) : null;
+ }
- public void restoreState(FacesContext context, Object state)
- {
+ public void setShowDebugMessages(Boolean showDebugMessages) {
+ _showDebugMessages = showDebugMessages;
+ }
+
+ public Boolean getStateUpdate() {
+ if (_stateUpdate != null) {
+ return _stateUpdate;
+ }
+ ValueBinding vb = getValueBinding("stateUpdate");
+ return vb != null ? (Boolean) vb.getValue(getFacesContext()) : null;
+ }
+
+ public void setStateUpdate(Boolean stateUpdate) {
+ _stateUpdate = stateUpdate;
+ }
+
+ public void restoreState(FacesContext context, Object state) {
Object[] values = (Object[]) state;
super.restoreState(context, values[0]);
_partialTriggers = (String) values[1];
_partialTriggerPattern = (String) values[2];
- _periodicalUpdate = (Integer) values[3];
- _showDebugMessages = (Boolean) values[4];
- _stateUpdate = (Boolean) values[5];
+ _periodicalUpdate = (Integer) values[3];
+ _showDebugMessages = (Boolean) values[4];
+ _stateUpdate = (Boolean) values[5];
- }
+ }
- public Object saveState(FacesContext context)
- {
+ public Object saveState(FacesContext context) {
Object[] values = new Object[6];
values[0] = super.saveState(context);
values[1] = _partialTriggers;
values[2] = _partialTriggerPattern;
- values[3] = _periodicalUpdate;
- values[4] = _showDebugMessages;
- values[5] = _stateUpdate;
- return values;
+ values[3] = _periodicalUpdate;
+ values[4] = _showDebugMessages;
+ values[5] = _stateUpdate;
+ return values;
}
}
Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/ppr/PPRPanelGroupTag.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/ppr/PPRPanelGroupTag.java?view=diff&rev=531326&r1=531325&r2=531326
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/ppr/PPRPanelGroupTag.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/ppr/PPRPanelGroupTag.java Sun Apr 22 20:51:49 2007
@@ -25,58 +25,51 @@
/**
* @author Ernst Fastl
*/
-public class PPRPanelGroupTag extends HtmlPanelGroupTag
-{
+public class PPRPanelGroupTag extends HtmlPanelGroupTag {
private String _partialTriggers;
-
+
private String _partialTriggerPattern;
-
+
private String _inlineLoadingMessage;
- private String _periodicalUpdate;
+ private String _periodicalUpdate;
- private String _showDebugMessages;
+ private String _showDebugMessages;
- private String _stateUpdate;
+ private String _stateUpdate;
- public String getComponentType()
- {
+ public String getComponentType() {
return PPRPanelGroup.COMPONENT_TYPE;
}
- public String getRendererType()
- {
+ public String getRendererType() {
return PPRPanelGroup.DEFAULT_RENDERER_TYPE;
}
- public void release()
- {
+ public void release() {
super.release();
_partialTriggers = null;
- _periodicalUpdate = null;
- _showDebugMessages = null;
- _stateUpdate = null;
- }
+ _periodicalUpdate = null;
+ _showDebugMessages = null;
+ _stateUpdate = null;
+ }
- protected void setProperties(UIComponent component)
- {
+ protected void setProperties(UIComponent component) {
super.setProperties(component);
setStringProperty(component, "partialTriggers", _partialTriggers);
setStringProperty(component, "partialTriggerPattern", _partialTriggerPattern);
setStringProperty(component, "inlineLoadingMessage", _inlineLoadingMessage);
- setIntegerProperty(component,"periodicalUpdate", _periodicalUpdate);
- setBooleanProperty(component, "showDebugMessages", _showDebugMessages);
- setBooleanProperty(component, "stateUpdate", _stateUpdate);
- }
+ setIntegerProperty(component, "periodicalUpdate", _periodicalUpdate);
+ setBooleanProperty(component, "showDebugMessages", _showDebugMessages);
+ setBooleanProperty(component, "stateUpdate", _stateUpdate);
+ }
- public String getPartialTriggers()
- {
+ public String getPartialTriggers() {
return _partialTriggers;
}
- public void setPartialTriggers(String partialTriggers)
- {
+ public void setPartialTriggers(String partialTriggers) {
this._partialTriggers = partialTriggers;
}
@@ -96,18 +89,15 @@
_inlineLoadingMessage = loadingMessage;
}
- public void setPeriodicalUpdate(String periodicalUpdate)
- {
- _periodicalUpdate = periodicalUpdate;
- }
-
- public void setShowDebugMessages(String showDebugMessages)
- {
- _showDebugMessages = showDebugMessages;
- }
-
- public void setStateUpdate(String stateUpdate)
- {
- _stateUpdate = stateUpdate;
- }
+ public void setPeriodicalUpdate(String periodicalUpdate) {
+ _periodicalUpdate = periodicalUpdate;
+ }
+
+ public void setShowDebugMessages(String showDebugMessages) {
+ _showDebugMessages = showDebugMessages;
+ }
+
+ public void setStateUpdate(String stateUpdate) {
+ _stateUpdate = stateUpdate;
+ }
}
Modified: myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/ppr/PPRPhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/ppr/PPRPhaseListener.java?view=diff&rev=531326&r1=531325&r2=531326
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/ppr/PPRPhaseListener.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core/src/main/java/org/apache/myfaces/custom/ppr/PPRPhaseListener.java Sun Apr 22 20:51:49 2007
@@ -42,121 +42,98 @@
/**
* @author Ernst Fastl
*/
-public class PPRPhaseListener implements PhaseListener
-{
+public class PPRPhaseListener implements PhaseListener {
private static Log log = LogFactory.getLog(PPRPhaseListener.class);
+
private static final String PPR_PARAMETER = "org.apache.myfaces.PPRCtrl.ajaxRequest";
+
private static final String TRIGGERED_COMPONENTS_PARAMETER = "org.apache.myfaces.PPRCtrl.triggeredComponents";
+
private static final String XML_HEADER = "<?xml version=\"1.0\"?>\n";
- public void afterPhase(PhaseEvent phaseEvent)
- {
+ public void afterPhase(PhaseEvent phaseEvent) {
}
- public void beforePhase(PhaseEvent event)
- {
- if (log.isDebugEnabled())
- {
+ public void beforePhase(PhaseEvent event) {
+ if (log.isDebugEnabled()) {
log.debug("In PPRPhaseListener beforePhase");
}
FacesContext context = event.getFacesContext();
Map externalRequestMap = context.getExternalContext().getRequestParameterMap();
- if (externalRequestMap.containsKey(PPR_PARAMETER))
- {
+ if (externalRequestMap.containsKey(PPR_PARAMETER)) {
context.getExternalContext().getRequestMap().put(PPRPanelGroupRenderer.PPR_RESPONSE, Boolean.TRUE);
- ServletResponse response =
- (ServletResponse) context.getExternalContext().getResponse();
- ServletRequest request =
- (ServletRequest) context.getExternalContext().getRequest();
+ ServletResponse response = (ServletResponse) context.getExternalContext().getResponse();
+ ServletRequest request = (ServletRequest) context.getExternalContext().getRequest();
UIViewRoot viewRoot = context.getViewRoot();
- String contentType = getContentType("text/xml",request.getCharacterEncoding());
- response.setContentType(contentType);
+ String contentType = getContentType("text/xml", request.getCharacterEncoding());
+ response.setContentType(contentType);
response.setLocale(viewRoot.getLocale());
String triggeredComponents = (String) externalRequestMap.get(TRIGGERED_COMPONENTS_PARAMETER);
- try
- {
+ try {
PrintWriter out = response.getWriter();
- context.setResponseWriter(new HtmlResponseWriterImpl(out,
- contentType,
- request.getCharacterEncoding()));
+ context.setResponseWriter(new HtmlResponseWriterImpl(out, contentType, request.getCharacterEncoding()));
out.print(XML_HEADER);
out.print("<response>\n");
encodeTriggeredComponents(out, triggeredComponents, viewRoot, context);
out.print("</response>");
out.flush();
- }
- catch (IOException e)
- {
+ } catch (IOException e) {
throw new FacesException(e);
}
context.responseComplete();
- }
+ }
}
- private String getContentType(String contentType, String charset)
- {
- if (charset == null || charset.trim().length() == 0)
- return contentType;
- else
- return contentType + ";charset=" + charset;
- }
+ private String getContentType(String contentType, String charset) {
+ if (charset == null || charset.trim().length() == 0)
+ return contentType;
+ else
+ return contentType + ";charset=" + charset;
+ }
- private void encodeTriggeredComponents(PrintWriter out, String triggeredComponents, UIViewRoot viewRoot, FacesContext context)
- {
+ private void encodeTriggeredComponents(PrintWriter out, String triggeredComponents, UIViewRoot viewRoot,
+ FacesContext context) {
StringTokenizer st = new StringTokenizer(triggeredComponents, ",", false);
String clientId;
UIComponent component;
- while (st.hasMoreTokens())
- {
+ while (st.hasMoreTokens()) {
clientId = st.nextToken();
component = viewRoot.findComponent(clientId);
- if(component!=null) {
- out.print("<component id=\"" +
- component.getClientId(context) +
- "\"><![CDATA[");
- boolean oldValue = HtmlRendererUtils.isAllowedCdataSection(context);
- HtmlRendererUtils.allowCdataSection(context, false);
- try
- {
+ if (component != null) {
+ out.print("<component id=\"" + component.getClientId(context) + "\"><![CDATA[");
+ boolean oldValue = HtmlRendererUtils.isAllowedCdataSection(context);
+ HtmlRendererUtils.allowCdataSection(context, false);
+ try {
RendererUtils.renderChildren(context, component);
- }
- catch (IOException e)
- {
+ } catch (IOException e) {
throw new FacesException(e);
}
- HtmlRendererUtils.allowCdataSection(context, oldValue);
- out.print("]]></component>");
- }
- else
- {
+ HtmlRendererUtils.allowCdataSection(context, oldValue);
+ out.print("]]></component>");
+ } else {
log.debug("PPRPhaseListener component with id" + clientId + "not found!");
}
}
- out.print("<state>");
- FacesContext facesContext = FacesContext.getCurrentInstance();
- StateManager stateManager = facesContext.getApplication().getStateManager();
- StateManager.SerializedView serializedView
- = stateManager.saveSerializedView(facesContext);
- try
- {
- stateManager.writeState(facesContext, serializedView);
- }
- catch (IOException e)
- {
- throw new FacesException(e);
- }
+ out.print("<state>");
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+ StateManager stateManager = facesContext.getApplication().getStateManager();
+ StateManager.SerializedView serializedView = stateManager.saveSerializedView(facesContext);
+ try {
+ stateManager.writeState(facesContext, serializedView);
+ } catch (IOException e) {
+ throw new FacesException(e);
+ }
- out.print("</state>");
+ out.print("</state>");
- }
+ }
- public PhaseId getPhaseId()
- {
+ public PhaseId getPhaseId() {
return PhaseId.RENDER_RESPONSE;
}
}