11:23 a.m.
Author: A.Skokov
Date: 2007-04-12 12:23:41 -0400 (Thu, 12 Apr 2007)
New Revision: 387
Modified:
trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces/event/SimpleToggleEvent.java
trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanelRenderer.java
Log:
checkstyle
Modified:
trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces/event/SimpleToggleEvent.java
===================================================================
---
trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces/event/SimpleToggleEvent.java 2007-04-12
16:11:53 UTC (rev 386)
+++
trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces/event/SimpleToggleEvent.java 2007-04-12
16:23:41 UTC (rev 387)
@@ -33,16 +33,17 @@
*/
public class SimpleToggleEvent extends ActionEvent {
- private static final long serialVersionUID = 5582624805941635421L;
- private boolean _opened;
+ private static final long serialVersionUID = 5582624805941635421L;
+ private boolean _opened;
- /**
- * @param component
- */
- public SimpleToggleEvent(UIComponent source, boolean opened) {
- super(source);
- this._opened = opened;
- }
+ /**
+ * @param source
+ * @param opened
+ */
+ public SimpleToggleEvent(UIComponent source, boolean opened) {
+ super(source);
+ this._opened = opened;
+ }
/* (non-Javadoc)
* @see
javax.faces.event.FacesEvent#isAppropriateListener(javax.faces.event.FacesListener)
@@ -58,17 +59,18 @@
((ISimpleToggleListener) listener).processToggle(this);
}
- /**
- * @return Returns the _state.
- */
- public boolean isIsOpen() {
- return _opened;
- }
+ /**
+ * @return Returns the _state.
+ */
+ public boolean isIsOpen() {
+ return _opened;
+ }
- /**
- * @param _switchToState The _state to set.
- */
- public void setIsOpen(boolean opened) {
- this._opened = opened;
- }
+ /**
+ *
+ * @param opened The state to set
+ */
+ public void setIsOpen(boolean opened) {
+ this._opened = opened;
+ }
}
\ No newline at end of file
Modified:
trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanelRenderer.java
===================================================================
---
trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanelRenderer.java 2007-04-12
16:11:53 UTC (rev 386)
+++
trunk/richfaces/simpleTogglePanel/src/main/java/org/richfaces/renderkit/html/SimpleTogglePanelRenderer.java 2007-04-12
16:23:41 UTC (rev 387)
@@ -25,12 +25,10 @@
package org.richfaces.renderkit.html;
import org.ajax4jsf.framework.renderer.AjaxRendererUtils;
-import org.ajax4jsf.framework.renderer.RendererUtils;
import org.richfaces.component.UISimpleTogglePanel;
import org.richfaces.event.SimpleToggleEvent;
import javax.faces.component.UIComponent;
-import javax.faces.component.UIForm;
import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.faces.event.ActionEvent;
@@ -38,8 +36,8 @@
import java.io.IOException;
import java.util.Map;
-
//public class SimpleTogglePanelRenderer extends AjaxCommandLinkRenderer {
+
public class SimpleTogglePanelRenderer extends
org.ajax4jsf.framework.renderer.HeaderResourcesRendererBase {
//XXXX by nick - denis - seems there is a lot of code common to
org.richfaces.renderkit.html.ToggleControlRenderer. Please commonize!
//private InternetResource[] _scripts = {new PrototypeScript(),
getResource("scripts/simpleTogglePanel.js") };
@@ -54,143 +52,129 @@
//}
- public boolean getRendersChildren() {
- return true;
- }
+ public boolean getRendersChildren() {
+ return true;
+ }
- public void doDecode(FacesContext context, UIComponent component) {
+ public void doDecode(FacesContext context, UIComponent component) {
- super.doDecode(context, component);
+ super.doDecode(context, component);
+ ExternalContext exCtx = context.getExternalContext();
+ Map rqMap = exCtx.getRequestParameterMap();
+ Object clnId = rqMap.get(component.getClientId(context));
+ UISimpleTogglePanel panel = (UISimpleTogglePanel) component;
- ExternalContext exCtx = context.getExternalContext();
+ if (clnId != null) {
+ // enqueue event here for this component or for component with Id
+ // taken fro forId attribute
- Map rqMap = exCtx.getRequestParameterMap();
- Object clnId = rqMap.get(component.getClientId(context));
- UISimpleTogglePanel panel = (UISimpleTogglePanel)component;
+ String switchType = panel.getSwitchType();
+ if (!(UISimpleTogglePanel.CLIENT_SWITCH_TYPE.equals(switchType))) {
- if(clnId!=null) {
- // enqueue event here for this component or for component with Id
- // taken fro forId attribute
+ //xxxx by nick - denis - use constants, please!
+ if ((panel.isOpened() == UISimpleTogglePanel.EXPANDED)) {
+ panel.setOpened(UISimpleTogglePanel.COLLAPSED);
+ } else {
+ //xxxx by nick - denis - use constants, please!
+ panel.setOpened(UISimpleTogglePanel.EXPANDED);
+ }
+ } else {
+ panel.setOpened(new Boolean((String) clnId).booleanValue());
+ }
- String switchType = panel.getSwitchType();
- if(!(UISimpleTogglePanel.CLIENT_SWITCH_TYPE.equals(switchType))){
- //xxxx by nick - denis - use constants, please!
- if ((panel.isOpened()==UISimpleTogglePanel.EXPANDED)){
- panel.setOpened(UISimpleTogglePanel.COLLAPSED);
- }
- else{
- //xxxx by nick - denis - use constants, please!
- panel.setOpened(UISimpleTogglePanel.EXPANDED);
- }
+ SimpleToggleEvent event = new SimpleToggleEvent(panel, (panel.isOpened()));
+ if (panel.isImmediate()) {
+ event.setPhaseId(PhaseId.APPLY_REQUEST_VALUES);
+ } else {
+ event.setPhaseId(PhaseId.INVOKE_APPLICATION);
+ }
+ event.queue();
- }
- else{
- panel.setOpened(new Boolean((String)clnId).booleanValue());
- }
+ //xxx by nick - denis - same as in ToggleControlRenderer
+ if (!UISimpleTogglePanel.AJAX_SWITCH_TYPE.equals(panel.getSwitchType()))
+ {
+ ActionEvent actionEvent = new ActionEvent(component);
+ component.queueEvent(actionEvent);
+ }
+ }
+ }
+ public String getdivdisplay(FacesContext context, UIComponent component) {
+ String Switch = Boolean.toString(((UISimpleTogglePanel) component).isOpened());
+ if (Switch == null ||
Switch.equals(Boolean.toString(UISimpleTogglePanel.EXPANDED)))
+ {
+ //xxxx by nick - denis - do not set "block" explicitly - that can
break some elements, set "" for display. See Element.show() in prototype.js
+ return "";
+ }
+ return "none";
+ }
- SimpleToggleEvent event = new SimpleToggleEvent(panel, (panel.isOpened()));
- if (panel.isImmediate()) {
- event.setPhaseId(PhaseId.APPLY_REQUEST_VALUES);
- } else {
- event.setPhaseId(PhaseId.INVOKE_APPLICATION);
- }
- event.queue();
+ public String getOnClick(FacesContext context, UIComponent component) {
+ UISimpleTogglePanel tgComp = (UISimpleTogglePanel) component;
- //xxx by nick - denis - same as in ToggleControlRenderer
- if(!UISimpleTogglePanel.AJAX_SWITCH_TYPE.equals(panel.getSwitchType())) {
- ActionEvent actionEvent = new ActionEvent(component);
- component.queueEvent(actionEvent);
- }
- }
+ String switchType = tgComp.getSwitchType();
+ StringBuffer onClick = new StringBuffer();
+ //String userOnClick =
(String)component.getAttributes().get("onclick");
+ //if(userOnClick!=null) {
+ // onClick.append(userOnClick);
+ // if(!userOnClick.trim().endsWith(";")) {
+ // onClick.append("; ");
+ // }
+ //}
- }
- public String getdivdisplay(FacesContext context, UIComponent component) {
+ if (UISimpleTogglePanel.CLIENT_SWITCH_TYPE.equals(switchType)) {
+ // Client
+ String panelId = tgComp.getClientId(context);
+ onClick.append("SimpleTogglePanelManager.toggleOnClient('")
+ .append(panelId)
+ .append("');");
+ } else if (UISimpleTogglePanel.AJAX_SWITCH_TYPE.equals(switchType)) {
+ // Ajax
+ //
writer.writeAttribute(HTML.onclick_ATTRIBUTE,AjaxRendererUtils.buildOnClick(tab,context),"ajaxOnclick");
+ onClick.append(AjaxRendererUtils.buildOnClick(component, context));
+ //return super.getOnClick(context, component);
+ } else {
+ // Server
- String Switch = Boolean.toString(((UISimpleTogglePanel)component).isOpened());
- if (Switch == null || Switch.equals(Boolean.toString(UISimpleTogglePanel.EXPANDED))) {
- //xxxx by nick - denis - do not set "block" explicitly - that can break some
elements, set "" for display. See Element.show() in prototype.js
- return "";
- }
- return "none";
- }
- public String getOnClick(FacesContext context, UIComponent component) {
- UISimpleTogglePanel tgComp = (UISimpleTogglePanel)component;
+ onClick.append("SimpleTogglePanelManager.toggleOnServer('")
+ .append(component.getClientId(context))
+ .append("'")
- String switchType = tgComp.getSwitchType();
- StringBuffer onClick = new StringBuffer();
- //String userOnClick = (String)component.getAttributes().get("onclick");
- //if(userOnClick!=null) {
- // onClick.append(userOnClick);
- // if(!userOnClick.trim().endsWith(";")) {
- // onClick.append("; ");
- // }
- //}
+ .append(");");
+ //.append(tgComp.getSwitch()==null?"'0'":"'"
+ tgComp.getSwitch() + "'")
+ //.append("")
+ }
+ return onClick.toString();
+ }
+ private String getDivId(String panelId, String state) {
+ if (state != null) {
+ return panelId + "_" + state;
+ }
+ return null;
+ }
- if(UISimpleTogglePanel.CLIENT_SWITCH_TYPE.equals(switchType)) {
- // Client
- String panelId = tgComp.getClientId(context);
- onClick.append("SimpleTogglePanelManager.toggleOnClient('")
- .append(panelId)
- .append("');");
- } else if(UISimpleTogglePanel.AJAX_SWITCH_TYPE.equals(switchType)) {
- // Ajax
- //
writer.writeAttribute(HTML.onclick_ATTRIBUTE,AjaxRendererUtils.buildOnClick(tab,context),"ajaxOnclick");
- onClick.append(AjaxRendererUtils.buildOnClick(component,context));
- //return super.getOnClick(context, component);
- } else {
- // Server
+ protected String getValueAsString(FacesContext context, UISimpleTogglePanel Panel) {
+ return getUtils().getValueAsString(context, Panel);
+ }
-
- onClick.append("SimpleTogglePanelManager.toggleOnServer('")
- .append(component.getClientId(context))
- .append("'")
-
-
- .append(");");
- //.append(tgComp.getSwitch()==null?"'0'":"'" +
tgComp.getSwitch() + "'")
- //.append("")
- }
- return onClick.toString();
- }
-
- private String getDivId(String panelId, String state) {
- if(state!=null) {
- return panelId + "_" + state;
- }
- return null;
- }
-
-
- protected String getValueAsString(FacesContext context, UISimpleTogglePanel Panel) {
- return getUtils().getValueAsString(context, Panel);
- }
-
-
- public void encodeChildren(FacesContext context, UIComponent component) throws
IOException {
- // TODO Auto-generated method stub
- UISimpleTogglePanel comp=(UISimpleTogglePanel)component;
- //xxxx by nick - denis - use constants, please!
- if(!(((comp.getSwitchType()==null) ||
(comp.getSwitchType().equals(UISimpleTogglePanel.CLIENT_SWITCH_TYPE)!=true)) &&
(comp.isOpened()==UISimpleTogglePanel.COLLAPSED) )){
- super.encodeChildren(context, component);
- }
- }
-
-// private String getFormId(FacesContext context,UIComponent component) {
-// while (component != null && !(component instanceof UIForm)) {
-// component = component.getParent();
-// }
-// return component != null ? component.getClientId(context) : null;
-// }
+ public void encodeChildren(FacesContext context, UIComponent component) throws
IOException {
+ // TODO Auto-generated method stub
+ UISimpleTogglePanel comp = (UISimpleTogglePanel) component;
+ //xxxx by nick - denis - use constants, please!
+ if (!(((comp.getSwitchType() == null) ||
(comp.getSwitchType().equals(UISimpleTogglePanel.CLIENT_SWITCH_TYPE) != true)) &&
(comp.isOpened() == UISimpleTogglePanel.COLLAPSED)))
+ {
+ super.encodeChildren(context, component);
+ }
+ }
}
\ No newline at end of file