You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sk...@apache.org on 2008/07/03 23:58:25 UTC
svn commit: r673833 [14/18] - in /myfaces/tomahawk/trunk:
core/src/main/java/org/apache/myfaces/component/
core/src/main/java/org/apache/myfaces/component/html/ext/
core/src/main/java/org/apache/myfaces/component/html/util/
core/src/main/java/org/apach...
Modified: myfaces/tomahawk/trunk/sandbox/core12/src/main/java/org/apache/myfaces/custom/conversation/UIStartConversation.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core12/src/main/java/org/apache/myfaces/custom/conversation/UIStartConversation.java?rev=673833&r1=673832&r2=673833&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core12/src/main/java/org/apache/myfaces/custom/conversation/UIStartConversation.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core12/src/main/java/org/apache/myfaces/custom/conversation/UIStartConversation.java Thu Jul 3 14:58:05 2008
@@ -41,166 +41,166 @@
private boolean inited;
private Boolean persistence;
- public static class ConversationStartAction extends AbstractConversationActionListener
- {
- private boolean persistence;
- private List beanToElevate;
-
- public void doConversationAction(AbstractConversationComponent abstractConversationComponent)
- {
- ConversationManager conversationManager = ConversationManager.getInstance();
- conversationManager.startConversation(getConversationName(), isPersistence());
-
- if (beanToElevate != null)
- {
- FacesContext context = FacesContext.getCurrentInstance();
-
- Iterator iterBeans = beanToElevate.iterator();
- while (iterBeans.hasNext())
- {
- String vb = (String) iterBeans.next();
- UIConversation.elevateBean(
- context,
- getConversationName(),
- context.getApplication().createValueBinding(vb));
- }
- }
- }
-
- public boolean isPersistence()
- {
- return persistence;
- }
-
- public void setPersistence(boolean persistence)
- {
- this.persistence = persistence;
- }
-
- public void addBeanToElevate(String beanBinding)
- {
- if (beanToElevate == null)
- {
- beanToElevate = new ArrayList();
- }
- beanToElevate.add(beanBinding);
- }
-
-
- public Object saveState(FacesContext context)
- {
- return new Object[]
- {
- super.saveState(context),
- Boolean.valueOf(persistence),
- beanToElevate
- };
- }
-
- public void restoreState(FacesContext context, Object state)
- {
- Object[] states = (Object[]) state;
- super.restoreState(context, states[0]);
- persistence = ((Boolean) states[1]).booleanValue();
- beanToElevate = (List) states[2];
- }
- }
-
- public void encodeEnd(FacesContext context) throws IOException
- {
- super.encodeEnd(context);
-
- setupConversationSystem(context);
-
- UICommand command = ConversationUtils.findParentCommand(this);
- if (command != null)
- {
- if (!inited)
- {
- ConversationStartAction actionListener = new ConversationStartAction();
- actionListener.setConversationName(getName());
- actionListener.setPersistence(toBoolean(getPersistence()));
- command.addActionListener(actionListener);
-
- Iterator iterChildren = getChildren().iterator();
- while (iterChildren.hasNext())
- {
- Object child = iterChildren.next();
- if (child instanceof UIConversation)
- {
- UIConversation conversation = (UIConversation) child;
- actionListener.addBeanToElevate(conversation.getBeanBinding().getExpressionString());
- }
- }
-
- inited = true;
- }
- }
- else
- {
- ConversationManager conversationManager = ConversationManager.getInstance();
- conversationManager.startConversation(getName(), toBoolean(getPersistence()));
- }
- }
-
- protected boolean toBoolean(Boolean bool)
- {
- if (bool != null)
- {
- return bool.booleanValue();
- }
- return false;
- }
-
- protected void setupConversationSystem(FacesContext context)
- {
- if (Boolean.TRUE.equals(context.getExternalContext().getApplicationMap().get(CONVERSATION_SYSTEM_SETUP)))
- {
- return;
- }
-
- VariableResolver originalVR = context.getApplication().getVariableResolver();
- context.getApplication().setVariableResolver(new ConversationVariableResolver(originalVR));
-
- context.getExternalContext().getApplicationMap().put(CONVERSATION_SYSTEM_SETUP, Boolean.TRUE);
- }
-
- public void restoreState(FacesContext context, Object state)
- {
- Object[] states = (Object[]) state;
- super.restoreState(context, states[0]);
- inited = ((Boolean) states[1]).booleanValue();
- persistence = (Boolean) states[2];
- }
-
- public Object saveState(FacesContext context)
- {
- return new Object[]
- {
- super.saveState(context),
- inited?Boolean.TRUE:Boolean.FALSE,
- persistence
- };
- }
-
- /**
- * true|false - if this conversation requires a persistence manager. Default: false
- *
- * @JSFProperty
- * @return
- */
- public Boolean getPersistence()
- {
+ public static class ConversationStartAction extends AbstractConversationActionListener
+ {
+ private boolean persistence;
+ private List beanToElevate;
+
+ public void doConversationAction(AbstractConversationComponent abstractConversationComponent)
+ {
+ ConversationManager conversationManager = ConversationManager.getInstance();
+ conversationManager.startConversation(getConversationName(), isPersistence());
+
+ if (beanToElevate != null)
+ {
+ FacesContext context = FacesContext.getCurrentInstance();
+
+ Iterator iterBeans = beanToElevate.iterator();
+ while (iterBeans.hasNext())
+ {
+ String vb = (String) iterBeans.next();
+ UIConversation.elevateBean(
+ context,
+ getConversationName(),
+ context.getApplication().createValueBinding(vb));
+ }
+ }
+ }
+
+ public boolean isPersistence()
+ {
+ return persistence;
+ }
+
+ public void setPersistence(boolean persistence)
+ {
+ this.persistence = persistence;
+ }
+
+ public void addBeanToElevate(String beanBinding)
+ {
+ if (beanToElevate == null)
+ {
+ beanToElevate = new ArrayList();
+ }
+ beanToElevate.add(beanBinding);
+ }
+
+
+ public Object saveState(FacesContext context)
+ {
+ return new Object[]
+ {
+ super.saveState(context),
+ Boolean.valueOf(persistence),
+ beanToElevate
+ };
+ }
+
+ public void restoreState(FacesContext context, Object state)
+ {
+ Object[] states = (Object[]) state;
+ super.restoreState(context, states[0]);
+ persistence = ((Boolean) states[1]).booleanValue();
+ beanToElevate = (List) states[2];
+ }
+ }
+
+ public void encodeEnd(FacesContext context) throws IOException
+ {
+ super.encodeEnd(context);
+
+ setupConversationSystem(context);
+
+ UICommand command = ConversationUtils.findParentCommand(this);
+ if (command != null)
+ {
+ if (!inited)
+ {
+ ConversationStartAction actionListener = new ConversationStartAction();
+ actionListener.setConversationName(getName());
+ actionListener.setPersistence(toBoolean(getPersistence()));
+ command.addActionListener(actionListener);
+
+ Iterator iterChildren = getChildren().iterator();
+ while (iterChildren.hasNext())
+ {
+ Object child = iterChildren.next();
+ if (child instanceof UIConversation)
+ {
+ UIConversation conversation = (UIConversation) child;
+ actionListener.addBeanToElevate(conversation.getBeanBinding().getExpressionString());
+ }
+ }
+
+ inited = true;
+ }
+ }
+ else
+ {
+ ConversationManager conversationManager = ConversationManager.getInstance();
+ conversationManager.startConversation(getName(), toBoolean(getPersistence()));
+ }
+ }
+
+ protected boolean toBoolean(Boolean bool)
+ {
+ if (bool != null)
+ {
+ return bool.booleanValue();
+ }
+ return false;
+ }
+
+ protected void setupConversationSystem(FacesContext context)
+ {
+ if (Boolean.TRUE.equals(context.getExternalContext().getApplicationMap().get(CONVERSATION_SYSTEM_SETUP)))
+ {
+ return;
+ }
+
+ VariableResolver originalVR = context.getApplication().getVariableResolver();
+ context.getApplication().setVariableResolver(new ConversationVariableResolver(originalVR));
+
+ context.getExternalContext().getApplicationMap().put(CONVERSATION_SYSTEM_SETUP, Boolean.TRUE);
+ }
+
+ public void restoreState(FacesContext context, Object state)
+ {
+ Object[] states = (Object[]) state;
+ super.restoreState(context, states[0]);
+ inited = ((Boolean) states[1]).booleanValue();
+ persistence = (Boolean) states[2];
+ }
+
+ public Object saveState(FacesContext context)
+ {
+ return new Object[]
+ {
+ super.saveState(context),
+ inited?Boolean.TRUE:Boolean.FALSE,
+ persistence
+ };
+ }
+
+ /**
+ * true|false - if this conversation requires a persistence manager. Default: false
+ *
+ * @JSFProperty
+ * @return
+ */
+ public Boolean getPersistence()
+ {
if (persistence != null)
{
- return persistence;
+ return persistence;
}
ValueBinding vb = getValueBinding("persistence");
return vb != null ? (Boolean) vb.getValue(getFacesContext()) : null;
- }
+ }
- public void setPersistence(Boolean persistence)
- {
- this.persistence = persistence;
- }
+ public void setPersistence(Boolean persistence)
+ {
+ this.persistence = persistence;
+ }
}
\ No newline at end of file
Modified: myfaces/tomahawk/trunk/sandbox/core12/src/main/java/org/apache/myfaces/custom/suggestajax/SuggestAjaxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core12/src/main/java/org/apache/myfaces/custom/suggestajax/SuggestAjaxRenderer.java?rev=673833&r1=673832&r2=673833&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core12/src/main/java/org/apache/myfaces/custom/suggestajax/SuggestAjaxRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core12/src/main/java/org/apache/myfaces/custom/suggestajax/SuggestAjaxRenderer.java Thu Jul 3 14:58:05 2008
@@ -90,7 +90,7 @@
}
protected String addQueryString(String url, String queryString)
- {
- return url + (url.indexOf("?") > 0 ? "&" : "?") + queryString;
+ {
+ return url + (url.indexOf("?") > 0 ? "&" : "?") + queryString;
}
}
Modified: myfaces/tomahawk/trunk/sandbox/core12/src/main/java/org/apache/myfaces/custom/suggestajax/inputsuggestajax/AbstractInputSuggestAjax.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core12/src/main/java/org/apache/myfaces/custom/suggestajax/inputsuggestajax/AbstractInputSuggestAjax.java?rev=673833&r1=673832&r2=673833&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core12/src/main/java/org/apache/myfaces/custom/suggestajax/inputsuggestajax/AbstractInputSuggestAjax.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core12/src/main/java/org/apache/myfaces/custom/suggestajax/inputsuggestajax/AbstractInputSuggestAjax.java Thu Jul 3 14:58:05 2008
@@ -51,10 +51,10 @@
setRendererType(DEFAULT_RENDERER_TYPE);
- // it makes absolutely no sense to have two autocompletes active at the same time
- // ensure to disable the browser one - this has nothing to do with the
- // autocomplete attribute this component provides
- setAutocomplete("off"); // NON-NLS
+ // it makes absolutely no sense to have two autocompletes active at the same time
+ // ensure to disable the browser one - this has nothing to do with the
+ // autocomplete attribute this component provides
+ setAutocomplete("off"); // NON-NLS
}
public void encodeChildren(FacesContext context) throws IOException
Modified: myfaces/tomahawk/trunk/sandbox/core12/src/main/java/org/apache/myfaces/custom/suggestajax/inputsuggestajax/InputSuggestAjaxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core12/src/main/java/org/apache/myfaces/custom/suggestajax/inputsuggestajax/InputSuggestAjaxRenderer.java?rev=673833&r1=673832&r2=673833&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core12/src/main/java/org/apache/myfaces/custom/suggestajax/inputsuggestajax/InputSuggestAjaxRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core12/src/main/java/org/apache/myfaces/custom/suggestajax/inputsuggestajax/InputSuggestAjaxRenderer.java Thu Jul 3 14:58:05 2008
@@ -96,12 +96,12 @@
String mainComponentRenderedValue = null;
- /* check if the user supplied a label method */
- if (inputSuggestAjax.getItemLabelMethod() == null)
- {
- mainComponentRenderedValue = RendererUtils.getStringValue(context, inputSuggestAjax);
+ /* check if the user supplied a label method */
+ if (inputSuggestAjax.getItemLabelMethod() == null)
+ {
+ mainComponentRenderedValue = RendererUtils.getStringValue(context, inputSuggestAjax);
}
- else
+ else
{
MethodExpression labelMethod = inputSuggestAjax.getItemLabelMethod();
@@ -115,7 +115,7 @@
label = (String) labelMethod.invoke(context.getELContext(), new Object[]{valueObject});
- hiddenInputValue = converter.getAsString(context, inputSuggestAjax, valueObject);
+ hiddenInputValue = converter.getAsString(context, inputSuggestAjax, valueObject);
mainComponentRenderedValue = hiddenInputValue;
}
}
@@ -134,36 +134,36 @@
out.endElement(HTML.DIV_ELEM);
String textInputId = inputSuggestAjax.getClientId(context);
- if (label != null)
- {
- // whe have a label method and thus a hidden input field holding the real value
- // now fake the component id to have the rendered input component use another id
- // than the one we render later for the real value
- String oriId = inputSuggestAjax.getId();
- try
- {
- // fake the label
- inputSuggestAjax.setId(oriId + "_fake");
-
- textInputId = inputSuggestAjax.getClientId(context);
-
- // fake a submitted value so we have it rendered
- inputSuggestAjax.setSubmittedValue(label);
-
- super.encodeEnd(context, inputSuggestAjax);
- }
- finally
- {
- inputSuggestAjax.setSubmittedValue(null);
- inputSuggestAjax.setId(oriId);
- }
- }
- else
- {
- super.encodeEnd(context, inputSuggestAjax);
- }
+ if (label != null)
+ {
+ // whe have a label method and thus a hidden input field holding the real value
+ // now fake the component id to have the rendered input component use another id
+ // than the one we render later for the real value
+ String oriId = inputSuggestAjax.getId();
+ try
+ {
+ // fake the label
+ inputSuggestAjax.setId(oriId + "_fake");
+
+ textInputId = inputSuggestAjax.getClientId(context);
- String inputSuggestComponentVar = DojoUtils.calculateWidgetVarName(placeHolderId);
+ // fake a submitted value so we have it rendered
+ inputSuggestAjax.setSubmittedValue(label);
+
+ super.encodeEnd(context, inputSuggestAjax);
+ }
+ finally
+ {
+ inputSuggestAjax.setSubmittedValue(null);
+ inputSuggestAjax.setId(oriId);
+ }
+ }
+ else
+ {
+ super.encodeEnd(context, inputSuggestAjax);
+ }
+
+ String inputSuggestComponentVar = DojoUtils.calculateWidgetVarName(placeHolderId);
Map attributes = new HashedMap();
@@ -222,29 +222,29 @@
}
}
- protected Converter getRequiredConverter(FacesContext context, InputSuggestAjax inputSuggestAjax)
- {
- Converter converter = inputSuggestAjax.getConverter();
- if (converter != null)
- {
- return converter;
- }
-
- Class type = inputSuggestAjax.getValueBinding("value").getType(context);
- if (type != null)
- {
- converter = context.getApplication().createConverter(type);
- if (converter != null)
- {
- return converter;
- }
- }
-
- throw new IllegalStateException("There must be a converter if " +
- "attribute \"labelMethod\" is used");
- }
+ protected Converter getRequiredConverter(FacesContext context, InputSuggestAjax inputSuggestAjax)
+ {
+ Converter converter = inputSuggestAjax.getConverter();
+ if (converter != null)
+ {
+ return converter;
+ }
+
+ Class type = inputSuggestAjax.getValueBinding("value").getType(context);
+ if (type != null)
+ {
+ converter = context.getApplication().createConverter(type);
+ if (converter != null)
+ {
+ return converter;
+ }
+ }
+
+ throw new IllegalStateException("There must be a converter if " +
+ "attribute \"labelMethod\" is used");
+ }
- public void encodeAjax(FacesContext context, UIComponent uiComponent)
+ public void encodeAjax(FacesContext context, UIComponent uiComponent)
throws IOException
{
InputSuggestAjax inputSuggestAjax = (InputSuggestAjax) uiComponent;
@@ -259,7 +259,7 @@
if (labelMethod != null)
{
- Converter converter = getRequiredConverter(context, inputSuggestAjax);
+ Converter converter = getRequiredConverter(context, inputSuggestAjax);
for (Iterator iterator = suggesteds.iterator(); iterator.hasNext();)
{
@@ -303,7 +303,7 @@
private String escapeQuotes(String input)
{
- return input != null ? input.replaceAll("\"", "\\\\\"") : "";
+ return input != null ? input.replaceAll("\"", "\\\\\"") : "";
}
}
Modified: myfaces/tomahawk/trunk/sandbox/core12/src/main/java/org/apache/myfaces/custom/toggle/ToggleLinkRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core12/src/main/java/org/apache/myfaces/custom/toggle/ToggleLinkRenderer.java?rev=673833&r1=673832&r2=673833&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core12/src/main/java/org/apache/myfaces/custom/toggle/ToggleLinkRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core12/src/main/java/org/apache/myfaces/custom/toggle/ToggleLinkRenderer.java Thu Jul 3 14:58:05 2008
@@ -247,7 +247,7 @@
RendererUtils.checkParamValidity(context, component, ToggleLink.class);
if(((ToggleLink) component).isDisabled())
- return;
+ return;
super.encodeEnd(context, component);
}
@@ -257,19 +257,19 @@
ToggleLink toggleLink = (ToggleLink) component;
if(toggleLink.isDisabled())
- return;
+ return;
super.encodeBegin(context, component);
}
private String getToggleJavascriptFunctionName(FacesContext context,ToggleLink toggleLink){
- for(UIComponent component = toggleLink.getParent(); component != null; component = component.getParent())
- if( component instanceof TogglePanel )
- return TogglePanelRenderer.getToggleJavascriptFunctionName( context, (TogglePanel)component );
+ for(UIComponent component = toggleLink.getParent(); component != null; component = component.getParent())
+ if( component instanceof TogglePanel )
+ return TogglePanelRenderer.getToggleJavascriptFunctionName( context, (TogglePanel)component );
- Log log = LogFactory.getLog(ToggleLinkRenderer.class);
+ Log log = LogFactory.getLog(ToggleLinkRenderer.class);
log.error("The ToggleLink component with id " + toggleLink.getClientId( context )+" isn't enclosed in a togglePanel.");
- return null;
+ return null;
}
}
Modified: myfaces/tomahawk/trunk/sandbox/core12/src/main/java/org/apache/myfaces/custom/valueChangeNotifier/ValueChangeNotifierTag.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/core12/src/main/java/org/apache/myfaces/custom/valueChangeNotifier/ValueChangeNotifierTag.java?rev=673833&r1=673832&r2=673833&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/core12/src/main/java/org/apache/myfaces/custom/valueChangeNotifier/ValueChangeNotifierTag.java (original)
+++ myfaces/tomahawk/trunk/sandbox/core12/src/main/java/org/apache/myfaces/custom/valueChangeNotifier/ValueChangeNotifierTag.java Thu Jul 3 14:58:05 2008
@@ -50,74 +50,74 @@
*/
public class ValueChangeNotifierTag extends TagSupport
{
- private ValueExpression method = null;
-
- private static Log log = LogFactory.getLog(ValueChangeNotifierTag.class);
-
- public ValueChangeNotifierTag()
- {
- }
-
- /**
- * The bean.method name of your valueChange method<br />
- * Currently only methods listeners are supported.<br />
- * e.g. myBean.myListenerMethod
- *
- * @JSFJspAttribute
- * required = "true"
- */
- public void setMethod(ValueExpression method)
- {
- this.method = method;
- }
-
- public int doStartTag() throws JspException
- {
- if (method == null)
- {
- throw new JspException("name attribute not set");
- }
-
- // Find parent UIComponentTag
- UIComponentTag componentTag = UIComponentTag
- .getParentUIComponentTag(pageContext);
- if (componentTag == null)
- {
- throw new JspException(
- "ValueChangeListenerTag has no UIComponentTag ancestor");
- }
-
- if (componentTag.getCreated())
- {
- // Component was just created, so we add the Listener
- UIComponent component = componentTag.getComponentInstance();
- if (component instanceof EditableValueHolder)
- {
- setupClassListener(component);
- }
- else
- {
- throw new JspException("Component " + component.getId()
- + " is no EditableValueHolder");
- }
- }
-
- return Tag.SKIP_BODY;
- }
-
- protected void setupClassListener(UIComponent component)
- {
- //UIComponentTag.isValueReference(method)
- if (!method.isLiteralText())
- {
- ((EditableValueHolder) component)
- .addValueChangeListener(new ValueChangeCollector(method.getExpressionString()));
- }
- else
- {
- if(log.isErrorEnabled()){
- log.error("Invalid expression " + method);
- }
- }
- }
+ private ValueExpression method = null;
+
+ private static Log log = LogFactory.getLog(ValueChangeNotifierTag.class);
+
+ public ValueChangeNotifierTag()
+ {
+ }
+
+ /**
+ * The bean.method name of your valueChange method<br />
+ * Currently only methods listeners are supported.<br />
+ * e.g. myBean.myListenerMethod
+ *
+ * @JSFJspAttribute
+ * required = "true"
+ */
+ public void setMethod(ValueExpression method)
+ {
+ this.method = method;
+ }
+
+ public int doStartTag() throws JspException
+ {
+ if (method == null)
+ {
+ throw new JspException("name attribute not set");
+ }
+
+ // Find parent UIComponentTag
+ UIComponentTag componentTag = UIComponentTag
+ .getParentUIComponentTag(pageContext);
+ if (componentTag == null)
+ {
+ throw new JspException(
+ "ValueChangeListenerTag has no UIComponentTag ancestor");
+ }
+
+ if (componentTag.getCreated())
+ {
+ // Component was just created, so we add the Listener
+ UIComponent component = componentTag.getComponentInstance();
+ if (component instanceof EditableValueHolder)
+ {
+ setupClassListener(component);
+ }
+ else
+ {
+ throw new JspException("Component " + component.getId()
+ + " is no EditableValueHolder");
+ }
+ }
+
+ return Tag.SKIP_BODY;
+ }
+
+ protected void setupClassListener(UIComponent component)
+ {
+ //UIComponentTag.isValueReference(method)
+ if (!method.isLiteralText())
+ {
+ ((EditableValueHolder) component)
+ .addValueChangeListener(new ValueChangeCollector(method.getExpressionString()));
+ }
+ else
+ {
+ if(log.isErrorEnabled()){
+ log.error("Invalid expression " + method);
+ }
+ }
+ }
}
Modified: myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/NumberHolder.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/NumberHolder.java?rev=673833&r1=673832&r2=673833&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/NumberHolder.java (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/NumberHolder.java Thu Jul 3 14:58:05 2008
@@ -23,59 +23,59 @@
public class NumberHolder
{
- private short shortNumber;
- private int intNumber;
- private long longNumber;
- private double doubleNumber;
- private BigDecimal bigDecimalNumber;
- private double doubleNumberManual;
-
- public BigDecimal getBigDecimalNumber()
- {
- return bigDecimalNumber;
- }
- public void setBigDecimalNumber(BigDecimal bigDecimalNumber)
- {
- this.bigDecimalNumber = bigDecimalNumber;
- }
- public double getDoubleNumber()
- {
- return doubleNumber;
- }
- public void setDoubleNumber(double doubleNumber)
- {
- this.doubleNumber = doubleNumber;
- }
- public int getIntNumber()
- {
- return intNumber;
- }
- public void setIntNumber(int intNumber)
- {
- this.intNumber = intNumber;
- }
- public long getLongNumber()
- {
- return longNumber;
- }
- public void setLongNumber(long longNumber)
- {
- this.longNumber = longNumber;
- }
- public short getShortNumber()
- {
- return shortNumber;
- }
- public void setShortNumber(short shortNumber)
- {
- this.shortNumber = shortNumber;
- }
- public double getDoubleNumberManual()
- {
- return doubleNumberManual;
- }
- public void setDoubleNumberManual(double doubleNumberManual)
- {
- this.doubleNumberManual = doubleNumberManual;
- }
+ private short shortNumber;
+ private int intNumber;
+ private long longNumber;
+ private double doubleNumber;
+ private BigDecimal bigDecimalNumber;
+ private double doubleNumberManual;
+
+ public BigDecimal getBigDecimalNumber()
+ {
+ return bigDecimalNumber;
+ }
+ public void setBigDecimalNumber(BigDecimal bigDecimalNumber)
+ {
+ this.bigDecimalNumber = bigDecimalNumber;
+ }
+ public double getDoubleNumber()
+ {
+ return doubleNumber;
+ }
+ public void setDoubleNumber(double doubleNumber)
+ {
+ this.doubleNumber = doubleNumber;
+ }
+ public int getIntNumber()
+ {
+ return intNumber;
+ }
+ public void setIntNumber(int intNumber)
+ {
+ this.intNumber = intNumber;
+ }
+ public long getLongNumber()
+ {
+ return longNumber;
+ }
+ public void setLongNumber(long longNumber)
+ {
+ this.longNumber = longNumber;
+ }
+ public short getShortNumber()
+ {
+ return shortNumber;
+ }
+ public void setShortNumber(short shortNumber)
+ {
+ this.shortNumber = shortNumber;
+ }
+ public double getDoubleNumberManual()
+ {
+ return doubleNumberManual;
+ }
+ public void setDoubleNumberManual(double doubleNumberManual)
+ {
+ this.doubleNumberManual = doubleNumberManual;
+ }
}
Modified: myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/RequestTrackerRedirectBean.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/RequestTrackerRedirectBean.java?rev=673833&r1=673832&r2=673833&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/RequestTrackerRedirectBean.java (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/RequestTrackerRedirectBean.java Thu Jul 3 14:58:05 2008
@@ -23,23 +23,23 @@
public class RequestTrackerRedirectBean
{
- private String input;
+ private String input;
- public String getInput()
- {
- return input;
- }
+ public String getInput()
+ {
+ return input;
+ }
- public void setInput(String input)
- {
- this.input = input;
- }
+ public void setInput(String input)
+ {
+ this.input = input;
+ }
- public String redirectAction()
- {
- FacesContext.getCurrentInstance().addMessage(null,
- new FacesMessage(FacesMessage.SEVERITY_INFO, "requestTrackerRedirect message", "this is the message from the previous http request"));
+ public String redirectAction()
+ {
+ FacesContext.getCurrentInstance().addMessage(null,
+ new FacesMessage(FacesMessage.SEVERITY_INFO, "requestTrackerRedirect message", "this is the message from the previous http request"));
- return "requestTrackerRedirect";
- }
+ return "requestTrackerRedirect";
+ }
}
Modified: myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/clientvalidation/Customer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/clientvalidation/Customer.java?rev=673833&r1=673832&r2=673833&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/clientvalidation/Customer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/clientvalidation/Customer.java Thu Jul 3 14:58:05 2008
@@ -26,58 +26,58 @@
*/
public class Customer implements Serializable{
- private Integer _id;
- private String _name;
- private String _surname;
- private Integer _age;
- private String _address;
- private Double _salary;
- private Float _salaryBonus;
-
- public Integer getId() {
- return _id;
- }
- public void setId(Integer _id) {
- this._id = _id;
- }
+ private Integer _id;
+ private String _name;
+ private String _surname;
+ private Integer _age;
+ private String _address;
+ private Double _salary;
+ private Float _salaryBonus;
+
+ public Integer getId() {
+ return _id;
+ }
+ public void setId(Integer _id) {
+ this._id = _id;
+ }
- public String getName() {
- return _name;
- }
- public void setName(String _name) {
- this._name = _name;
- }
-
- public String getSurname() {
- return _surname;
- }
- public void setSurname(String _surname) {
- this._surname = _surname;
- }
-
- public Integer getAge() {
- return _age;
- }
- public void setAge(Integer _age) {
- this._age = _age;
- }
-
- public String getAddress() {
- return _address;
- }
- public void setAddress(String _address) {
- this._address = _address;
- }
- public Double getSalary() {
- return _salary;
- }
- public void setSalary(Double _salary) {
- this._salary = _salary;
- }
- public Float getSalaryBonus() {
- return _salaryBonus;
- }
- public void setSalaryBonus(Float bonus) {
- _salaryBonus = bonus;
- }
+ public String getName() {
+ return _name;
+ }
+ public void setName(String _name) {
+ this._name = _name;
+ }
+
+ public String getSurname() {
+ return _surname;
+ }
+ public void setSurname(String _surname) {
+ this._surname = _surname;
+ }
+
+ public Integer getAge() {
+ return _age;
+ }
+ public void setAge(Integer _age) {
+ this._age = _age;
+ }
+
+ public String getAddress() {
+ return _address;
+ }
+ public void setAddress(String _address) {
+ this._address = _address;
+ }
+ public Double getSalary() {
+ return _salary;
+ }
+ public void setSalary(Double _salary) {
+ this._salary = _salary;
+ }
+ public Float getSalaryBonus() {
+ return _salaryBonus;
+ }
+ public void setSalaryBonus(Float bonus) {
+ _salaryBonus = bonus;
+ }
}
\ No newline at end of file
Modified: myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/clientvalidation/CustomerCreateBean.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/clientvalidation/CustomerCreateBean.java?rev=673833&r1=673832&r2=673833&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/clientvalidation/CustomerCreateBean.java (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/clientvalidation/CustomerCreateBean.java Thu Jul 3 14:58:05 2008
@@ -26,17 +26,17 @@
*/
public class CustomerCreateBean implements Serializable{
- private Customer _customer;
-
- public CustomerCreateBean() {
- _customer = new Customer();
- }
+ private Customer _customer;
+
+ public CustomerCreateBean() {
+ _customer = new Customer();
+ }
- public Customer getCustomer() {
- return _customer;
- }
- public void setCustomer(Customer _customer) {
- this._customer = _customer;
- }
-
+ public Customer getCustomer() {
+ return _customer;
+ }
+ public void setCustomer(Customer _customer) {
+ this._customer = _customer;
+ }
+
}
Modified: myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/conversation/ConvData.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/conversation/ConvData.java?rev=673833&r1=673832&r2=673833&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/conversation/ConvData.java (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/conversation/ConvData.java Thu Jul 3 14:58:05 2008
@@ -20,20 +20,20 @@
public class ConvData
{
- private String input;
+ private String input;
- public String getInput()
- {
- return input;
- }
+ public String getInput()
+ {
+ return input;
+ }
- public void setInput(String input)
- {
- this.input = input;
- }
-
- public String save()
- {
- return "jo-o";
- }
+ public void setInput(String input)
+ {
+ this.input = input;
+ }
+
+ public String save()
+ {
+ return "jo-o";
+ }
}
Modified: myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/conversation/SpringWizardController.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/conversation/SpringWizardController.java?rev=673833&r1=673832&r2=673833&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/conversation/SpringWizardController.java (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/conversation/SpringWizardController.java Thu Jul 3 14:58:05 2008
@@ -24,26 +24,26 @@
public class SpringWizardController
{
- private WizardData wizardData;
+ private WizardData wizardData;
- public WizardData getWizardData()
- {
- return wizardData;
- }
+ public WizardData getWizardData()
+ {
+ return wizardData;
+ }
- public void setWizardData(WizardData wizardData)
- {
- this.wizardData = wizardData;
- }
+ public void setWizardData(WizardData wizardData)
+ {
+ this.wizardData = wizardData;
+ }
- public String ensureConversationAction()
- {
- return "springWizardPage1";
- }
+ public String ensureConversationAction()
+ {
+ return "springWizardPage1";
+ }
- public String save()
- {
- FacesContext.getCurrentInstance().addMessage(null, new FacesMessage("data saved"));
- return "success";
- }
+ public String save()
+ {
+ FacesContext.getCurrentInstance().addMessage(null, new FacesMessage("data saved"));
+ return "success";
+ }
}
Modified: myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/conversation/WizardController.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/conversation/WizardController.java?rev=673833&r1=673832&r2=673833&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/conversation/WizardController.java (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/conversation/WizardController.java Thu Jul 3 14:58:05 2008
@@ -23,14 +23,14 @@
public class WizardController
{
- public String ensureConversationAction()
- {
- return "wizardPage1";
- }
+ public String ensureConversationAction()
+ {
+ return "wizardPage1";
+ }
- public String save()
- {
- FacesContext.getCurrentInstance().addMessage(null, new FacesMessage("data saved"));
- return "success";
- }
+ public String save()
+ {
+ FacesContext.getCurrentInstance().addMessage(null, new FacesMessage("data saved"));
+ return "success";
+ }
}
Modified: myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/conversation/WizardData.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/conversation/WizardData.java?rev=673833&r1=673832&r2=673833&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/conversation/WizardData.java (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/conversation/WizardData.java Thu Jul 3 14:58:05 2008
@@ -20,109 +20,109 @@
public class WizardData
{
- // page 1
- private String salutation;
- private String title;
- private String name;
- private String surename;
-
- // page 2
- private String street;
- private String city;
- private String state;
- private String province;
- private String postal;
- private String country;
-
- // page 3
- private String info;
-
- public String getCity()
- {
- return city;
- }
- public void setCity(String city)
- {
- this.city = city;
- }
- public String getCountry()
- {
- return country;
- }
- public void setCountry(String country)
- {
- this.country = country;
- }
- public String getName()
- {
- return name;
- }
- public void setName(String name)
- {
- this.name = name;
- }
- public String getPostal()
- {
- return postal;
- }
- public void setPostal(String postal)
- {
- this.postal = postal;
- }
- public String getProvince()
- {
- return province;
- }
- public void setProvince(String province)
- {
- this.province = province;
- }
- public String getSalutation()
- {
- return salutation;
- }
- public void setSalutation(String salutation)
- {
- this.salutation = salutation;
- }
- public String getState()
- {
- return state;
- }
- public void setState(String state)
- {
- this.state = state;
- }
- public String getStreet()
- {
- return street;
- }
- public void setStreet(String street)
- {
- this.street = street;
- }
- public String getSurename()
- {
- return surename;
- }
- public void setSurename(String surename)
- {
- this.surename = surename;
- }
- public String getTitle()
- {
- return title;
- }
- public void setTitle(String title)
- {
- this.title = title;
- }
- public String getInfo()
- {
- return info;
- }
- public void setInfo(String info)
- {
- this.info = info;
- }
+ // page 1
+ private String salutation;
+ private String title;
+ private String name;
+ private String surename;
+
+ // page 2
+ private String street;
+ private String city;
+ private String state;
+ private String province;
+ private String postal;
+ private String country;
+
+ // page 3
+ private String info;
+
+ public String getCity()
+ {
+ return city;
+ }
+ public void setCity(String city)
+ {
+ this.city = city;
+ }
+ public String getCountry()
+ {
+ return country;
+ }
+ public void setCountry(String country)
+ {
+ this.country = country;
+ }
+ public String getName()
+ {
+ return name;
+ }
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+ public String getPostal()
+ {
+ return postal;
+ }
+ public void setPostal(String postal)
+ {
+ this.postal = postal;
+ }
+ public String getProvince()
+ {
+ return province;
+ }
+ public void setProvince(String province)
+ {
+ this.province = province;
+ }
+ public String getSalutation()
+ {
+ return salutation;
+ }
+ public void setSalutation(String salutation)
+ {
+ this.salutation = salutation;
+ }
+ public String getState()
+ {
+ return state;
+ }
+ public void setState(String state)
+ {
+ this.state = state;
+ }
+ public String getStreet()
+ {
+ return street;
+ }
+ public void setStreet(String street)
+ {
+ this.street = street;
+ }
+ public String getSurename()
+ {
+ return surename;
+ }
+ public void setSurename(String surename)
+ {
+ this.surename = surename;
+ }
+ public String getTitle()
+ {
+ return title;
+ }
+ public void setTitle(String title)
+ {
+ this.title = title;
+ }
+ public String getInfo()
+ {
+ return info;
+ }
+ public void setInfo(String info)
+ {
+ this.info = info;
+ }
}
Modified: myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/convertStringUtils/ConvertStringUtilsBean.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/convertStringUtils/ConvertStringUtilsBean.java?rev=673833&r1=673832&r2=673833&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/convertStringUtils/ConvertStringUtilsBean.java (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/convertStringUtils/ConvertStringUtilsBean.java Thu Jul 3 14:58:05 2008
@@ -21,14 +21,14 @@
public class ConvertStringUtilsBean {
- private String text;
+ private String text;
- public String getText() {
- return text;
- }
+ public String getText() {
+ return text;
+ }
- public void setText(String text) {
- this.text = text;
- }
-
+ public void setText(String text) {
+ this.text = text;
+ }
+
}
Modified: myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/debug/DebugPhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/debug/DebugPhaseListener.java?rev=673833&r1=673832&r2=673833&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/debug/DebugPhaseListener.java (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/debug/DebugPhaseListener.java Thu Jul 3 14:58:05 2008
@@ -34,26 +34,26 @@
public class DebugPhaseListener implements PhaseListener
{
- private static Log log = LogFactory.getLog(DebugPhaseListener.class);
-
- public void afterPhase(PhaseEvent event)
- {
- if(log.isInfoEnabled())
- {
- log.info("AFTER PHASE " + event.getPhaseId());
- }
- }
+ private static Log log = LogFactory.getLog(DebugPhaseListener.class);
+
+ public void afterPhase(PhaseEvent event)
+ {
+ if(log.isInfoEnabled())
+ {
+ log.info("AFTER PHASE " + event.getPhaseId());
+ }
+ }
- public void beforePhase(PhaseEvent event)
- {
- if(log.isInfoEnabled())
- {
- log.info("BEFORE PHASE " + event.getPhaseId());
- }
-
- }
+ public void beforePhase(PhaseEvent event)
+ {
+ if(log.isInfoEnabled())
+ {
+ log.info("BEFORE PHASE " + event.getPhaseId());
+ }
+
+ }
- public PhaseId getPhaseId() {
- return PhaseId.ANY_PHASE;
- }
+ public PhaseId getPhaseId() {
+ return PhaseId.ANY_PHASE;
+ }
}
\ No newline at end of file
Modified: myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/exporter/ExporterBean.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/exporter/ExporterBean.java?rev=673833&r1=673832&r2=673833&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/exporter/ExporterBean.java (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/exporter/ExporterBean.java Thu Jul 3 14:58:05 2008
@@ -28,28 +28,28 @@
*/
public class ExporterBean implements Serializable {
- private List carsList;
+ private List carsList;
- public List getCarsList() {
- if( carsList == null)
- carsList = createCarsList();
- return carsList;
- }
+ public List getCarsList() {
+ if( carsList == null)
+ carsList = createCarsList();
+ return carsList;
+ }
- public void setCarsList(List carsList) {
- this.carsList = carsList;
- }
-
- private List createCarsList() {
- List list = new ArrayList();
+ public void setCarsList(List carsList) {
+ this.carsList = carsList;
+ }
+
+ private List createCarsList() {
+ List list = new ArrayList();
for(int i = 0; i < 97; i += 5) {
- list.add( new SimpleCar(i, "typeA", "blue"));
- list.add( new SimpleCar(i + 1, "typeB", "red"));
- list.add( new SimpleCar(i + 2, "typeC", "orange"));
- list.add( new SimpleCar(i + 3, "typeD", "gray"));
- list.add( new SimpleCar(i + 4, "typeE", "white"));
+ list.add( new SimpleCar(i, "typeA", "blue"));
+ list.add( new SimpleCar(i + 1, "typeB", "red"));
+ list.add( new SimpleCar(i + 2, "typeC", "orange"));
+ list.add( new SimpleCar(i + 3, "typeD", "gray"));
+ list.add( new SimpleCar(i + 4, "typeE", "white"));
}
- return list;
- }
+ return list;
+ }
}
Modified: myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/fisheye/FishEyeHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/fisheye/FishEyeHandler.java?rev=673833&r1=673832&r2=673833&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/fisheye/FishEyeHandler.java (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/fisheye/FishEyeHandler.java Thu Jul 3 14:58:05 2008
@@ -122,11 +122,11 @@
public boolean containsKey(Object key)
{
- try {
+ try {
return _bundle.getObject(key.toString()) != null;
- } catch (MissingResourceException e) {
- return false;
- }
+ } catch (MissingResourceException e) {
+ return false;
+ }
}
Modified: myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/graphicImageDynamic/GraphicImageDynamicBean.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/graphicImageDynamic/GraphicImageDynamicBean.java?rev=673833&r1=673832&r2=673833&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/graphicImageDynamic/GraphicImageDynamicBean.java (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/graphicImageDynamic/GraphicImageDynamicBean.java Thu Jul 3 14:58:05 2008
@@ -36,12 +36,12 @@
public void setUpImage(UploadedFile upImage)
{
- this._upImage = upImage;
+ this._upImage = upImage;
}
public boolean isUploaded()
{
- return _upImage != null;
+ return _upImage != null;
}
public Class getImageRenderer()
Modified: myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/graphicImageDynamic/GraphicImageDynamicTextBean.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/graphicImageDynamic/GraphicImageDynamicTextBean.java?rev=673833&r1=673832&r2=673833&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/graphicImageDynamic/GraphicImageDynamicTextBean.java (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/graphicImageDynamic/GraphicImageDynamicTextBean.java Thu Jul 3 14:58:05 2008
@@ -40,57 +40,57 @@
*/
public class GraphicImageDynamicTextBean implements ImageRenderer
{
- private String _text;
-
+ private String _text;
+
private byte[] bytes = null;
public String getText() {
- return _text;
- }
+ return _text;
+ }
- public void setText(String text) {
- this._text = text;
- }
+ public void setText(String text) {
+ this._text = text;
+ }
- public void setContext(FacesContext facesContext, ResourceContext resourceContext) throws IOException
+ public void setContext(FacesContext facesContext, ResourceContext resourceContext) throws IOException
{
- ImageContext imageContext = (ImageContext) resourceContext;
- Object text = imageContext.getParamters().get("text");
- if (text == null)
- {
- text = "";
- }
- int width = 300;
- int height = 30;
- Integer widthObj = imageContext.getWidth();
- if (widthObj != null)
- {
- width = widthObj.intValue();
- }
- Integer heightObj = imageContext.getHeight();
- if (heightObj != null)
- {
- height = heightObj.intValue();
- }
- BufferedImage img = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
- Graphics graphics = img.getGraphics();
- try
- {
- graphics.setColor(Color.WHITE);
- graphics.fillRect(0, 0, width, height);
- graphics.setColor(Color.BLUE);
- graphics.drawString(text.toString(), 10, 20);
-
- ByteArrayOutputStream baout = new ByteArrayOutputStream();
- JPEGImageEncoder encoder = JPEGCodec.createJPEGEncoder(baout);
- encoder.encode(img);
- baout.flush();
- bytes = baout.toByteArray();
- }
- finally
- {
- graphics.dispose();
- }
+ ImageContext imageContext = (ImageContext) resourceContext;
+ Object text = imageContext.getParamters().get("text");
+ if (text == null)
+ {
+ text = "";
+ }
+ int width = 300;
+ int height = 30;
+ Integer widthObj = imageContext.getWidth();
+ if (widthObj != null)
+ {
+ width = widthObj.intValue();
+ }
+ Integer heightObj = imageContext.getHeight();
+ if (heightObj != null)
+ {
+ height = heightObj.intValue();
+ }
+ BufferedImage img = new BufferedImage(width, height, BufferedImage.TYPE_INT_RGB);
+ Graphics graphics = img.getGraphics();
+ try
+ {
+ graphics.setColor(Color.WHITE);
+ graphics.fillRect(0, 0, width, height);
+ graphics.setColor(Color.BLUE);
+ graphics.drawString(text.toString(), 10, 20);
+
+ ByteArrayOutputStream baout = new ByteArrayOutputStream();
+ JPEGImageEncoder encoder = JPEGCodec.createJPEGEncoder(baout);
+ encoder.encode(img);
+ baout.flush();
+ bytes = baout.toByteArray();
+ }
+ finally
+ {
+ graphics.dispose();
+ }
}
public Class getImageRenderer()
Modified: myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/graphicImageDynamic/UploadedImageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/graphicImageDynamic/UploadedImageRenderer.java?rev=673833&r1=673832&r2=673833&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/graphicImageDynamic/UploadedImageRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/graphicImageDynamic/UploadedImageRenderer.java Thu Jul 3 14:58:05 2008
@@ -52,8 +52,8 @@
* @see org.apache.myfaces.custom.graphicimagedynamic.ImageRenderer#getContentLength()
*/
public int getContentLength() {
- return _graphicImageDynamicBean.isUploaded() ? (int)_graphicImageDynamicBean.getUpImage().getSize() : -1;
- }
+ return _graphicImageDynamicBean.isUploaded() ? (int)_graphicImageDynamicBean.getUpImage().getSize() : -1;
+ }
/**
* @see org.apache.myfaces.custom.graphicimagedynamic.ImageRenderer#getContentType()
Modified: myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/inputSuggestAjax/InputSuggestAjaxBean.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/inputSuggestAjax/InputSuggestAjaxBean.java?rev=673833&r1=673832&r2=673833&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/inputSuggestAjax/InputSuggestAjaxBean.java (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/inputSuggestAjax/InputSuggestAjaxBean.java Thu Jul 3 14:58:05 2008
@@ -155,13 +155,13 @@
public List getItems(String prefix, Integer maxSize) {
- List li = new ArrayList();
+ List li = new ArrayList();
- for(int i = 0; i < maxSize.intValue(); i++) {
- li.add(prefix+ " " +(i+1));
- }
+ for(int i = 0; i < maxSize.intValue(); i++) {
+ li.add(prefix+ " " +(i+1));
+ }
- return li;
+ return li;
}
public List getAddresses(String prefix)
Modified: myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/outputLinkDynamic/OutputLinkDynamicBean.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/outputLinkDynamic/OutputLinkDynamicBean.java?rev=673833&r1=673832&r2=673833&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/outputLinkDynamic/OutputLinkDynamicBean.java (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/outputLinkDynamic/OutputLinkDynamicBean.java Thu Jul 3 14:58:05 2008
@@ -36,12 +36,12 @@
public void setUpFile(UploadedFile upFile)
{
- this._upFile = upFile;
+ this._upFile = upFile;
}
public boolean isUploaded()
{
- return _upFile != null;
+ return _upFile != null;
}
public Class getResourceRenderer()
Modified: myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/outputLinkDynamic/UploadedFileRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/outputLinkDynamic/UploadedFileRenderer.java?rev=673833&r1=673832&r2=673833&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/outputLinkDynamic/UploadedFileRenderer.java (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/outputLinkDynamic/UploadedFileRenderer.java Thu Jul 3 14:58:05 2008
@@ -52,8 +52,8 @@
* @see org.apache.myfaces.custom.graphicimagedynamic.ImageRenderer#getContentLength()
*/
public int getContentLength() {
- return _outputLinkDynamicBean.isUploaded() ? (int)_outputLinkDynamicBean.getUpFile().getSize() : -1;
- }
+ return _outputLinkDynamicBean.isUploaded() ? (int)_outputLinkDynamicBean.getUpFile().getSize() : -1;
+ }
/**
* @see org.apache.myfaces.custom.graphicimagedynamic.ImageRenderer#getContentType()
Modified: myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/passwordStrength/PasswordStrengthBean.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/passwordStrength/PasswordStrengthBean.java?rev=673833&r1=673832&r2=673833&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/passwordStrength/PasswordStrengthBean.java (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/passwordStrength/PasswordStrengthBean.java Thu Jul 3 14:58:05 2008
@@ -19,13 +19,13 @@
package org.apache.myfaces.examples.passwordStrength;
public class PasswordStrengthBean {
- String password;
+ String password;
- public String getPassword() {
- return password;
- }
+ public String getPassword() {
+ return password;
+ }
- public void setPassword(String password) {
- this.password = password;
- }
+ public void setPassword(String password) {
+ this.password = password;
+ }
}
Modified: myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/ppr/PPRExampleBean.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/ppr/PPRExampleBean.java?rev=673833&r1=673832&r2=673833&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/ppr/PPRExampleBean.java (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/ppr/PPRExampleBean.java Thu Jul 3 14:58:05 2008
@@ -167,9 +167,9 @@
this._textField = textField;
}
- public String testExceptionAction() {
- throw new FacesException("Test PPR Exception Handling");
- }
+ public String testExceptionAction() {
+ throw new FacesException("Test PPR Exception Handling");
+ }
public String searchNames() {
_names = getListMasterData();
Modified: myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/ppr/PPRScrollerExampleBean.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/ppr/PPRScrollerExampleBean.java?rev=673833&r1=673832&r2=673833&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/ppr/PPRScrollerExampleBean.java (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/ppr/PPRScrollerExampleBean.java Thu Jul 3 14:58:05 2008
@@ -27,70 +27,70 @@
* @author Martin Marinschek
*/
public class PPRScrollerExampleBean extends SortableList implements Serializable {
- private List cars = new ArrayList();
+ private List cars = new ArrayList();
- private Map carMap = new HashMap();
+ private Map carMap = new HashMap();
- public PPRScrollerExampleBean()
- {
- super("type");
- for (int i = 100; i < 900; i++)
- {
- Object car = new SimpleCar(i, "Car Type " + i, (i % 2 == 0) ? "blue" : "green");
- cars.add(car);
- carMap.put(new Integer(i), car);
- }
- }
-
- public List getCars()
- {
- sort(getSort(), isAscending());
- return cars;
- }
-
- public void setCars(List cars)
- {
- // update the cars from the provided list
- for (Iterator iter = cars.iterator(); iter.hasNext();)
- {
- SimpleCar car = (SimpleCar) iter.next();
- SimpleCar oldCar = (SimpleCar) carMap.get(new Integer(car.getId()));
- oldCar.setType(car.getType());
- oldCar.setColor(car.getColor());
- }
- }
-
- protected boolean isDefaultAscending(String sortColumn)
- {
- return true;
- }
-
- protected void sort(final String column, final boolean ascending)
- {
- Comparator comparator = new Comparator()
- {
- public int compare(Object o1, Object o2)
- {
- SimpleCar c1 = (SimpleCar) o1;
- SimpleCar c2 = (SimpleCar) o2;
- if (column == null)
- {
- return 0;
- }
- if (column.equals("type"))
- {
- return ascending ? c1.getType().compareTo(c2.getType()) : c2.getType()
- .compareTo(c1.getType());
- }
- else if (column.equals("color"))
- {
- return ascending ? c1.getColor().compareTo(c2.getColor()) : c2.getColor()
- .compareTo(c1.getColor());
- }
- else
- return 0;
- }
- };
- Collections.sort(cars, comparator);
- }
+ public PPRScrollerExampleBean()
+ {
+ super("type");
+ for (int i = 100; i < 900; i++)
+ {
+ Object car = new SimpleCar(i, "Car Type " + i, (i % 2 == 0) ? "blue" : "green");
+ cars.add(car);
+ carMap.put(new Integer(i), car);
+ }
+ }
+
+ public List getCars()
+ {
+ sort(getSort(), isAscending());
+ return cars;
+ }
+
+ public void setCars(List cars)
+ {
+ // update the cars from the provided list
+ for (Iterator iter = cars.iterator(); iter.hasNext();)
+ {
+ SimpleCar car = (SimpleCar) iter.next();
+ SimpleCar oldCar = (SimpleCar) carMap.get(new Integer(car.getId()));
+ oldCar.setType(car.getType());
+ oldCar.setColor(car.getColor());
+ }
+ }
+
+ protected boolean isDefaultAscending(String sortColumn)
+ {
+ return true;
+ }
+
+ protected void sort(final String column, final boolean ascending)
+ {
+ Comparator comparator = new Comparator()
+ {
+ public int compare(Object o1, Object o2)
+ {
+ SimpleCar c1 = (SimpleCar) o1;
+ SimpleCar c2 = (SimpleCar) o2;
+ if (column == null)
+ {
+ return 0;
+ }
+ if (column.equals("type"))
+ {
+ return ascending ? c1.getType().compareTo(c2.getType()) : c2.getType()
+ .compareTo(c1.getType());
+ }
+ else if (column.equals("color"))
+ {
+ return ascending ? c1.getColor().compareTo(c2.getColor()) : c2.getColor()
+ .compareTo(c1.getColor());
+ }
+ else
+ return 0;
+ }
+ };
+ Collections.sort(cars, comparator);
+ }
}
Modified: myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/toggle/ToggleBean.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/toggle/ToggleBean.java?rev=673833&r1=673832&r2=673833&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/toggle/ToggleBean.java (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/toggle/ToggleBean.java Thu Jul 3 14:58:05 2008
@@ -23,34 +23,34 @@
public class ToggleBean implements Serializable
{
- private String testValue = "default";
-
- private String firstName = "firstName";
- private String lastName = "lastName";
-
- public String getTestValue()
- {
- return testValue;
- }
-
- public void setTestValue(String val)
- {
- testValue = val;
- }
+ private String testValue = "default";
+
+ private String firstName = "firstName";
+ private String lastName = "lastName";
+
+ public String getTestValue()
+ {
+ return testValue;
+ }
+
+ public void setTestValue(String val)
+ {
+ testValue = val;
+ }
- public String getFirstName() {
- return firstName;
- }
+ public String getFirstName() {
+ return firstName;
+ }
- public void setFirstName(String firstName) {
- this.firstName = firstName;
- }
+ public void setFirstName(String firstName) {
+ this.firstName = firstName;
+ }
- public String getLastName() {
- return lastName;
- }
+ public String getLastName() {
+ return lastName;
+ }
- public void setLastName(String lastName) {
- this.lastName = lastName;
- }
+ public void setLastName(String lastName) {
+ this.lastName = lastName;
+ }
}
Modified: myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/validate/ValidateForm.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/validate/ValidateForm.java?rev=673833&r1=673832&r2=673833&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/validate/ValidateForm.java (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/validate/ValidateForm.java Thu Jul 3 14:58:05 2008
@@ -24,93 +24,93 @@
*/
public class ValidateForm {
- private String email = null;
- private String email2 = null;
- private String creditCardNumber = null;
- private String url = null;
- private String regExpr = null;
-
- private String equal = null;
- private String equal2 = null;
-
- private String isbn =null;
-
-
- public String getEmail() {
- return email;
- }
-
- public void setEmail(String string) {
- email = string;
- }
-
- public String submit(){
- System.out.println("Action was called.");
- return ("valid");
- }
-
- public String getCreditCardNumber() {
- return creditCardNumber;
- }
- public String getUrl(){
- return url;
- }
- public void setCreditCardNumber(String string) {
- creditCardNumber = string;
- }
- public void setUrl(String string) {
- url = string;
- }
-
- public String getEmail2() {
- return email2;
- }
-
- public void setEmail2(String string) {
- email2 = string;
- }
-
- /**
- * @return
- */
- public String getRegExpr() {
- return regExpr;
- }
-
- /**
- * @param string
- */
- public void setRegExpr(String string) {
- regExpr = string;
- }
-
- /**
- * @return
- */
- public String getEqual2() {
- return equal2;
- }
-
- /**
- * @param string
- */
- public void setEqual2(String string) {
- equal2 = string;
- }
-
- /**
- * @return
- */
- public String getEqual() {
- return equal;
- }
-
- /**
- * @param string
- */
- public void setEqual(String string) {
- equal = string;
- }
+ private String email = null;
+ private String email2 = null;
+ private String creditCardNumber = null;
+ private String url = null;
+ private String regExpr = null;
+
+ private String equal = null;
+ private String equal2 = null;
+
+ private String isbn =null;
+
+
+ public String getEmail() {
+ return email;
+ }
+
+ public void setEmail(String string) {
+ email = string;
+ }
+
+ public String submit(){
+ System.out.println("Action was called.");
+ return ("valid");
+ }
+
+ public String getCreditCardNumber() {
+ return creditCardNumber;
+ }
+ public String getUrl(){
+ return url;
+ }
+ public void setCreditCardNumber(String string) {
+ creditCardNumber = string;
+ }
+ public void setUrl(String string) {
+ url = string;
+ }
+
+ public String getEmail2() {
+ return email2;
+ }
+
+ public void setEmail2(String string) {
+ email2 = string;
+ }
+
+ /**
+ * @return
+ */
+ public String getRegExpr() {
+ return regExpr;
+ }
+
+ /**
+ * @param string
+ */
+ public void setRegExpr(String string) {
+ regExpr = string;
+ }
+
+ /**
+ * @return
+ */
+ public String getEqual2() {
+ return equal2;
+ }
+
+ /**
+ * @param string
+ */
+ public void setEqual2(String string) {
+ equal2 = string;
+ }
+
+ /**
+ * @return
+ */
+ public String getEqual() {
+ return equal;
+ }
+
+ /**
+ * @param string
+ */
+ public void setEqual(String string) {
+ equal = string;
+ }
public String getIsbn() {
return isbn;
Modified: myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/valueChangeNotifier/NotifierBean.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/valueChangeNotifier/NotifierBean.java?rev=673833&r1=673832&r2=673833&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/valueChangeNotifier/NotifierBean.java (original)
+++ myfaces/tomahawk/trunk/sandbox/examples/src/main/java/org/apache/myfaces/examples/valueChangeNotifier/NotifierBean.java Thu Jul 3 14:58:05 2008
@@ -34,147 +34,147 @@
public class NotifierBean
{
- private static Log log = LogFactory.getLog(NotifierBean.class);
+ private static Log log = LogFactory.getLog(NotifierBean.class);
- private String selectedCategory;
- private List categories;
- private List listData;
- private UIData listDataBinding;
-
- public static class EntryList implements Serializable
- {
- private List listData;
-
- public List getListData()
- {
- return listData;
- }
-
- public void setListData(List listData)
- {
- this.listData = listData;
- }
- }
-
- public static class Entry implements Serializable
- {
- private String data;
-
- public Entry()
- {
- }
-
- public String getData()
- {
- return data;
- }
-
- public void setData(String data)
- {
- this.data = data;
- }
-
- public String toString()
- {
- return "Entry=" + data;
- }
- }
-
- public NotifierBean()
- {
- categories = new ArrayList();
- categories.add(new SelectItem("a", "Category A"));
- categories.add(new SelectItem("b", "Category b"));
-
- Entry a1 = new Entry();
- a1.setData("A1");
- Entry b1 = new Entry();
- b1.setData("B1");
- Entry c1 = new Entry();
- c1.setData("C1");
- Entry d1 = new Entry();
- d1.setData("D1");
- List listData1 = Arrays.asList(new Entry[]
- {
- a1,b1,c1,d1
- });
- Entry a2 = new Entry();
- a2.setData("A2");
- Entry b2 = new Entry();
- b2.setData("B2");
- Entry c2 = new Entry();
- c2.setData("C2");
- Entry d2 = new Entry();
- d2.setData("D2");
- List listData2 = Arrays.asList(new Entry[]
- {
- a2,b2,c2,d2
- });
-
- EntryList al1 = new EntryList();
- al1.setListData(listData1);
- EntryList al2 = new EntryList();
- al2.setListData(listData2);
-
- listData = Arrays.asList(new EntryList[]
- {
- al1, al2
- });
- }
-
- public void valueChange(ValueChangeEvent vce)
- throws AbortProcessingException
- {
- if (log.isInfoEnabled())
- {
- log.info("invoked valueChange method with " + vce.getNewValue()
- + " as its new value");
-
- if (listDataBinding != null)
- {
- log.info("current uiData row=" + listDataBinding.getRowIndex());
- if (listDataBinding.getRowIndex() > -1)
- {
- log.info("current uiData rowData=" + listDataBinding.getRowData());
- }
- }
- }
-
- selectedCategory = vce.getNewValue()!=null?vce.getNewValue().toString():"#null?";
- }
-
- public List getListData()
- {
- return listData;
- }
-
- public String getSelectedCategory()
- {
- return selectedCategory;
- }
-
- public void setSelectedCategory(String selectedCategory)
- {
- this.selectedCategory = selectedCategory;
- }
-
- public List getCategories()
- {
- return categories;
- }
-
- public void setCategories(List categories)
- {
- this.categories = categories;
- }
-
- public UIData getListDataBinding()
- {
- return listDataBinding;
- }
-
- public void setListDataBinding(UIData listDataBinding)
- {
- this.listDataBinding = listDataBinding;
- }
+ private String selectedCategory;
+ private List categories;
+ private List listData;
+ private UIData listDataBinding;
+
+ public static class EntryList implements Serializable
+ {
+ private List listData;
+
+ public List getListData()
+ {
+ return listData;
+ }
+
+ public void setListData(List listData)
+ {
+ this.listData = listData;
+ }
+ }
+
+ public static class Entry implements Serializable
+ {
+ private String data;
+
+ public Entry()
+ {
+ }
+
+ public String getData()
+ {
+ return data;
+ }
+
+ public void setData(String data)
+ {
+ this.data = data;
+ }
+
+ public String toString()
+ {
+ return "Entry=" + data;
+ }
+ }
+
+ public NotifierBean()
+ {
+ categories = new ArrayList();
+ categories.add(new SelectItem("a", "Category A"));
+ categories.add(new SelectItem("b", "Category b"));
+
+ Entry a1 = new Entry();
+ a1.setData("A1");
+ Entry b1 = new Entry();
+ b1.setData("B1");
+ Entry c1 = new Entry();
+ c1.setData("C1");
+ Entry d1 = new Entry();
+ d1.setData("D1");
+ List listData1 = Arrays.asList(new Entry[]
+ {
+ a1,b1,c1,d1
+ });
+ Entry a2 = new Entry();
+ a2.setData("A2");
+ Entry b2 = new Entry();
+ b2.setData("B2");
+ Entry c2 = new Entry();
+ c2.setData("C2");
+ Entry d2 = new Entry();
+ d2.setData("D2");
+ List listData2 = Arrays.asList(new Entry[]
+ {
+ a2,b2,c2,d2
+ });
+
+ EntryList al1 = new EntryList();
+ al1.setListData(listData1);
+ EntryList al2 = new EntryList();
+ al2.setListData(listData2);
+
+ listData = Arrays.asList(new EntryList[]
+ {
+ al1, al2
+ });
+ }
+
+ public void valueChange(ValueChangeEvent vce)
+ throws AbortProcessingException
+ {
+ if (log.isInfoEnabled())
+ {
+ log.info("invoked valueChange method with " + vce.getNewValue()
+ + " as its new value");
+
+ if (listDataBinding != null)
+ {
+ log.info("current uiData row=" + listDataBinding.getRowIndex());
+ if (listDataBinding.getRowIndex() > -1)
+ {
+ log.info("current uiData rowData=" + listDataBinding.getRowData());
+ }
+ }
+ }
+
+ selectedCategory = vce.getNewValue()!=null?vce.getNewValue().toString():"#null?";
+ }
+
+ public List getListData()
+ {
+ return listData;
+ }
+
+ public String getSelectedCategory()
+ {
+ return selectedCategory;
+ }
+
+ public void setSelectedCategory(String selectedCategory)
+ {
+ this.selectedCategory = selectedCategory;
+ }
+
+ public List getCategories()
+ {
+ return categories;
+ }
+
+ public void setCategories(List categories)
+ {
+ this.categories = categories;
+ }
+
+ public UIData getListDataBinding()
+ {
+ return listDataBinding;
+ }
+
+ public void setListDataBinding(UIData listDataBinding)
+ {
+ this.listDataBinding = listDataBinding;
+ }
}
Modified: myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/converter/enumeration/EnumConverter.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/converter/enumeration/EnumConverter.java?rev=673833&r1=673832&r2=673833&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/converter/enumeration/EnumConverter.java (original)
+++ myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/converter/enumeration/EnumConverter.java Thu Jul 3 14:58:05 2008
@@ -35,65 +35,65 @@
*/
public class EnumConverter implements Converter
{
- @SuppressWarnings("unchecked")
- public Object getAsObject(FacesContext context, UIComponent component, String value) throws ConverterException
- {
- if (value == null || value.length() < 1)
- {
- return null;
- }
-
- int pos = value.indexOf('@');
- if (pos < 0)
- {
- throw new IllegalArgumentException(value + " do not point to an enum");
- }
-
- String className = value.substring(0, pos);
- Class clazz;
- int ordinal = Integer.parseInt(value.substring(pos+1), 10);
-
- try
- {
- clazz = ClassUtils.classForName(className);
- // if the clazz is not an enum it might be an enum which is inherited. In this case try to find the superclass.
- while (clazz != null && !clazz.isEnum())
- {
- clazz = clazz.getSuperclass();
- }
- if (clazz == null)
- {
- throw new IllegalArgumentException("class " + className + " couldn't be treated as enum");
- }
-
- Enum[] enums = (Enum[]) clazz.getEnumConstants();
- if (enums.length >= ordinal)
- {
- return enums[ordinal];
- }
- }
- catch (ClassNotFoundException e1)
- {
- throw new RuntimeException(e1);
- }
-
- throw new IllegalArgumentException("ordinal " + ordinal + " not found in enum " + clazz);
- }
-
- public String getAsString(FacesContext context, UIComponent component, Object value) throws ConverterException
- {
- if (value == null)
- {
- return "";
- }
-
- Enum e = (Enum) value;
-
- if (component instanceof UIInput || UIInput.COMPONENT_FAMILY.equals(component.getFamily()))
- {
- return e.getClass().getName() + "@" + Integer.toString(e.ordinal(), 10);
- }
+ @SuppressWarnings("unchecked")
+ public Object getAsObject(FacesContext context, UIComponent component, String value) throws ConverterException
+ {
+ if (value == null || value.length() < 1)
+ {
+ return null;
+ }
+
+ int pos = value.indexOf('@');
+ if (pos < 0)
+ {
+ throw new IllegalArgumentException(value + " do not point to an enum");
+ }
+
+ String className = value.substring(0, pos);
+ Class clazz;
+ int ordinal = Integer.parseInt(value.substring(pos+1), 10);
+
+ try
+ {
+ clazz = ClassUtils.classForName(className);
+ // if the clazz is not an enum it might be an enum which is inherited. In this case try to find the superclass.
+ while (clazz != null && !clazz.isEnum())
+ {
+ clazz = clazz.getSuperclass();
+ }
+ if (clazz == null)
+ {
+ throw new IllegalArgumentException("class " + className + " couldn't be treated as enum");
+ }
+
+ Enum[] enums = (Enum[]) clazz.getEnumConstants();
+ if (enums.length >= ordinal)
+ {
+ return enums[ordinal];
+ }
+ }
+ catch (ClassNotFoundException e1)
+ {
+ throw new RuntimeException(e1);
+ }
+
+ throw new IllegalArgumentException("ordinal " + ordinal + " not found in enum " + clazz);
+ }
+
+ public String getAsString(FacesContext context, UIComponent component, Object value) throws ConverterException
+ {
+ if (value == null)
+ {
+ return "";
+ }
+
+ Enum e = (Enum) value;
+
+ if (component instanceof UIInput || UIInput.COMPONENT_FAMILY.equals(component.getFamily()))
+ {
+ return e.getClass().getName() + "@" + Integer.toString(e.ordinal(), 10);
+ }
- return e.toString();
- }
+ return e.toString();
+ }
}
Modified: myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/dynaForm/annot/jsf/Converter.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/dynaForm/annot/jsf/Converter.java?rev=673833&r1=673832&r2=673833&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/dynaForm/annot/jsf/Converter.java (original)
+++ myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/dynaForm/annot/jsf/Converter.java Thu Jul 3 14:58:05 2008
@@ -31,13 +31,13 @@
@Retention(value= RetentionPolicy.RUNTIME)
public @interface Converter
{
- /**
- * attach a converter by its id
- */
- String converterId() default "";
+ /**
+ * attach a converter by its id
+ */
+ String converterId() default "";
- /**
- * attach a converter by its class
- */
- Class converterClass() default Void.class;
+ /**
+ * attach a converter by its class
+ */
+ Class converterClass() default Void.class;
}
Modified: myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/dynaForm/annot/ui/DataProvider.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/dynaForm/annot/ui/DataProvider.java?rev=673833&r1=673832&r2=673833&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/dynaForm/annot/ui/DataProvider.java (original)
+++ myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/dynaForm/annot/ui/DataProvider.java Thu Jul 3 14:58:05 2008
@@ -30,13 +30,13 @@
@Retention(value= RetentionPolicy.RUNTIME)
public @interface DataProvider
{
- /**
- * points to a method returning a list
- */
- public String value();
+ /**
+ * points to a method returning a list
+ */
+ public String value();
- /**
- * the properties to use as description. This can be a JSF value-binding.
- */
- public String description();
+ /**
+ * the properties to use as description. This can be a JSF value-binding.
+ */
+ public String description();
}
\ No newline at end of file
Modified: myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/dynaForm/annot/ui/ReadOnly.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/dynaForm/annot/ui/ReadOnly.java?rev=673833&r1=673832&r2=673833&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/dynaForm/annot/ui/ReadOnly.java (original)
+++ myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/dynaForm/annot/ui/ReadOnly.java Thu Jul 3 14:58:05 2008
@@ -30,8 +30,8 @@
@Retention(value=RetentionPolicy.RUNTIME)
public @interface ReadOnly
{
- /**
- * set to true if you would like to render as disabled control
- */
- boolean disabled() default false;
+ /**
+ * set to true if you would like to render as disabled control
+ */
+ boolean disabled() default false;
}
Modified: myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/dynaForm/annot/ui/Temporal.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/dynaForm/annot/ui/Temporal.java?rev=673833&r1=673832&r2=673833&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/dynaForm/annot/ui/Temporal.java (original)
+++ myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/dynaForm/annot/ui/Temporal.java Thu Jul 3 14:58:05 2008
@@ -32,8 +32,8 @@
@Retention(value=RetentionPolicy.RUNTIME)
public @interface Temporal
{
- /**
- * set to true if you would like to render as disabled control
- */
- TemporalType value() default TemporalType.TIMESTAMP;
+ /**
+ * set to true if you would like to render as disabled control
+ */
+ TemporalType value() default TemporalType.TIMESTAMP;
}
Modified: myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/dynaForm/annot/ui/UIComponent.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/dynaForm/annot/ui/UIComponent.java?rev=673833&r1=673832&r2=673833&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/dynaForm/annot/ui/UIComponent.java (original)
+++ myfaces/tomahawk/trunk/sandbox15/core/src/main/java/org/apache/myfaces/custom/dynaForm/annot/ui/UIComponent.java Thu Jul 3 14:58:05 2008
@@ -32,5 +32,5 @@
@Retention(value=RetentionPolicy.RUNTIME)
public @interface UIComponent
{
- ComponentEnum type() default ComponentEnum.OutputText;
+ ComponentEnum type() default ComponentEnum.OutputText;
}