[richfaces-svn-commits] JBoss Rich Faces SVN: r3904 - in branches/3.1.x/ui/modal-panel/src/main/java/org/richfaces: renderkit and 1 other directory.

Author: abelevich Date: 2007-11-12 06:04:49 -0500 (Mon, 12 Nov 2007) New Revision: 3904 Modified: branches/3.1.x/ui/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java branches/3.1.x/ui/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRendererBase.java Log: RF-1312 Modified: branches/3.1.x/ui/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java =================================================================== --- branches/3.1.x/ui/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java 2007-11-12 08:44:03 UTC (rev 3903) +++ branches/3.1.x/ui/modal-panel/src/main/java/org/richfaces/component/UIModalPanel.java 2007-11-12 11:04:49 UTC (rev 3904) @@ -26,6 +26,7 @@ import javax.faces.component.UIInput; import javax.faces.context.FacesContext; +import javax.faces.el.ValueBinding; import org.richfaces.skin.Skin; import org.richfaces.skin.SkinFactory; @@ -47,6 +48,9 @@ */ private static final int SHADOW_DEPTH = 4; + private boolean resizeable = true; + private boolean resizeableSet = false; + public abstract int getWidth(); public abstract int getHeight(); @@ -59,11 +63,9 @@ public abstract void setMinWidth(int width); public abstract void setMinHeight(int height); - public abstract boolean isResizeable(); public abstract boolean isMoveable(); public abstract boolean isAutosized(); - public abstract void setResizeable(boolean resizeable); public abstract void setMoveable(boolean moveable); public abstract void setAutosized(boolean autosized); @@ -130,4 +132,35 @@ public void setVisualOptions(Map visualOptions) { this.visualOptions = visualOptions; } + + /** + * if "true" there is possibility to change component size + * Setter for resizeable + * @param resizeable - new value + */ + public void setResizeable(boolean __resizeable) { + this.resizeable = __resizeable; + this.resizeableSet = true; + } + + /** + * if "true" there is possibility to change component size + * Getter for resizeable + * @return resizeable value from local variable or value bindings + */ + public boolean isResizeable() { + if (this.resizeableSet) { + return this.resizeable; + } + ValueBinding vb = getValueBinding("resizeable"); + if (vb != null) { + Boolean value = (Boolean) vb.getValue(getFacesContext()); + if (null == value) { + return !isAutosized(); + } + return (value.booleanValue()); + } else { + return !isAutosized(); + } + } } Modified: branches/3.1.x/ui/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRendererBase.java =================================================================== --- branches/3.1.x/ui/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRendererBase.java 2007-11-12 08:44:03 UTC (rev 3903) +++ branches/3.1.x/ui/modal-panel/src/main/java/org/richfaces/renderkit/ModalPanelRendererBase.java 2007-11-12 11:04:49 UTC (rev 3904) @@ -88,7 +88,7 @@ //TODO nick - add messages public void checkOptions(FacesContext context, UIModalPanel panel) { if (panel.isAutosized() && panel.isResizeable()) { - throw new IllegalArgumentException(); + throw new IllegalArgumentException("Autosized modal panel can't be resizeable."); } if (panel.getMinHeight() != -1) { if (panel.getMinHeight() < sizeA) {