Author: abelevich Date: 2011-02-03 08:38:41 -0500 (Thu, 03 Feb 2011) New Revision: 21416 Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractProgressBar.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ProgressBarBaseRenderer.java trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ProgressBarStateEncoder.java Log: RF-10409 ProgressBar: using defaults(min and max) breaks component look and feel -type of attribute was changed from int to Object. Modified: trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractProgressBar.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractProgressBar.java 2011-02-03 13:30:51 UTC (rev 21415) +++ trunk/ui/output/ui/src/main/java/org/richfaces/component/AbstractProgressBar.java 2011-02-03 13:38:41 UTC (rev 21416) @@ -127,13 +127,13 @@ public abstract SwitchType getMode(); @Attribute - public abstract int getMaxValue(); + public abstract Object getMaxValue(); @Attribute - public abstract int getMinValue(); + public abstract Object getMinValue(); @Attribute - public abstract int getValue(); + public abstract Object getValue(); @Attribute(hidden = true) public abstract String getResource(); Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ProgressBarBaseRenderer.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ProgressBarBaseRenderer.java 2011-02-03 13:30:51 UTC (rev 21415) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ProgressBarBaseRenderer.java 2011-02-03 13:38:41 UTC (rev 21416) @@ -123,7 +123,7 @@ } else { Number minValue = NumberUtils.getNumber(getMinValueOrDefault(component)); Number maxValue = NumberUtils.getNumber(getMaxValueOrDefault(component)); - Number value = NumberUtils.getNumber(((AbstractProgressBar) component).getValue()); + Number value = NumberUtils.getNumber(getValueOrDefault(component)); if (value.doubleValue() < minValue.doubleValue()) { result = ProgressBarState.initialState; @@ -195,22 +195,30 @@ return isAjaxMode(component) ? PARTIAL_ENCODER : FULL_ENCODER; } - protected int getMaxValueOrDefault(UIComponent component) { - int maxValue = ((AbstractProgressBar) component).getMaxValue(); - if (maxValue == Integer.MIN_VALUE) { + protected Object getMaxValueOrDefault(UIComponent component) { + Object maxValue = ((AbstractProgressBar) component).getMaxValue(); + if (maxValue == null) { maxValue = DEFAULT_MAX_VALUE; } return maxValue; } - protected int getMinValueOrDefault(UIComponent component) { - int maxValue = ((AbstractProgressBar) component).getMinValue(); - if (maxValue == Integer.MIN_VALUE) { + protected Object getMinValueOrDefault(UIComponent component) { + Object maxValue = ((AbstractProgressBar) component).getMinValue(); + if (maxValue == null) { maxValue = DEFAULT_MIN_VALUE; } return maxValue; } + protected Object getValueOrDefault(UIComponent component) { + Object value = ((AbstractProgressBar) component).getValue(); + if (value == null) { + value = Integer.MIN_VALUE; + } + return value; + } + protected SwitchType getModeOrDefault(UIComponent component) { SwitchType mode = ((AbstractProgressBar) component).getMode(); if (mode == null) { Modified: trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ProgressBarStateEncoder.java =================================================================== --- trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ProgressBarStateEncoder.java 2011-02-03 13:30:51 UTC (rev 21415) +++ trunk/ui/output/ui/src/main/java/org/richfaces/renderkit/html/ProgressBarStateEncoder.java 2011-02-03 13:38:41 UTC (rev 21416) @@ -83,7 +83,7 @@ } protected String getWidth(UIComponent component) { - Number value = NumberUtils.getNumber(((AbstractProgressBar) component).getValue()); + Number value = NumberUtils.getNumber(getValueOrDefault(component)); Number minValue = NumberUtils.getNumber(getMinValueOrDefault(component)); Number maxValue = NumberUtils.getNumber(getMaxValueOrDefault(component)); Number percent = calculatePercent(value, minValue, maxValue); @@ -175,19 +175,27 @@ encodeStateFacet(context, component, ProgressBarState.finishState, currentState); } - protected int getMaxValueOrDefault(UIComponent component) { - int maxValue = ((AbstractProgressBar) component).getMaxValue(); - if (maxValue == Integer.MIN_VALUE) { + protected Object getMaxValueOrDefault(UIComponent component) { + Object maxValue = ((AbstractProgressBar) component).getMaxValue(); + if (maxValue == null) { maxValue = DEFAULT_MAX_VALUE; } return maxValue; } - protected int getMinValueOrDefault(UIComponent component) { - int maxValue = ((AbstractProgressBar) component).getMinValue(); - if (maxValue == Integer.MIN_VALUE) { + protected Object getMinValueOrDefault(UIComponent component) { + Object maxValue = ((AbstractProgressBar) component).getMinValue(); + if (maxValue == null) { maxValue = DEFAULT_MIN_VALUE; } return maxValue; } + + protected Object getValueOrDefault(UIComponent component) { + Object value = ((AbstractProgressBar) component).getValue(); + if (value == null) { + value = Integer.MIN_VALUE; + } + return value; + } }