From: <an...@us...> - 2009-08-24 13:02:36
|
Revision: 9756 http://wonder.svn.sourceforge.net/wonder/?rev=9756&view=rev Author: anjo Date: 2009-08-24 13:02:21 +0000 (Mon, 24 Aug 2009) Log Message: ----------- cleanup of boolean components Modified Paths: -------------- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WCustomQueryBoolean.wo/ERD2WCustomQueryBoolean.html trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WCustomQueryBoolean.wo/ERD2WCustomQueryBoolean.wod trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayYesNo.wo/ERD2WDisplayYesNo.html trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayYesNo.wo/ERD2WDisplayYesNo.wod trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditAllowRestrict.wo/ERD2WEditAllowRestrict.html trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditAllowRestrict.wo/ERD2WEditAllowRestrict.wod trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditFlag.wo/ERD2WEditFlag.html trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditFlag.wo/ERD2WEditFlag.wod trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditYesNo.wo/ERD2WEditYesNo.html trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditYesNo.wo/ERD2WEditYesNo.wod trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/bool/ERD2WCustomQueryBoolean.java trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/bool/ERD2WDisplayYesNo.java trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/bool/ERD2WEditAllowRestrict.java trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/bool/ERD2WEditFlag.java trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/bool/ERD2WEditYesNo.java Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WCustomQueryBoolean.wo/ERD2WCustomQueryBoolean.html =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WCustomQueryBoolean.wo/ERD2WCustomQueryBoolean.html 2009-08-24 13:01:27 UTC (rev 9755) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WCustomQueryBoolean.wo/ERD2WCustomQueryBoolean.html 2009-08-24 13:02:21 UTC (rev 9756) @@ -1 +1 @@ -<WEBOBJECT NAME=RadioButtonList></WEBOBJECT> \ No newline at end of file +<webobject name = "Selector"></webobject> \ No newline at end of file Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WCustomQueryBoolean.wo/ERD2WCustomQueryBoolean.wod =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WCustomQueryBoolean.wo/ERD2WCustomQueryBoolean.wod 2009-08-24 13:01:27 UTC (rev 9755) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WCustomQueryBoolean.wo/ERD2WCustomQueryBoolean.wod 2009-08-24 13:02:21 UTC (rev 9756) @@ -1,8 +1,8 @@ -RadioButtonList: WORadioButtonList { - displayString = displayString; - index = index; - item = item; - list = queryNumbers; +Selector: ERXBooleanSelector { + yesString = stringForYes; + noString = stringForNo; + noSelectionString = stringForNull; selection = value; - suffix = " "; -} \ No newline at end of file + uiMode = "radio"; +} + Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayYesNo.wo/ERD2WDisplayYesNo.html =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayYesNo.wo/ERD2WDisplayYesNo.html 2009-08-24 13:01:27 UTC (rev 9755) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayYesNo.wo/ERD2WDisplayYesNo.html 2009-08-24 13:02:21 UTC (rev 9756) @@ -1 +1 @@ -<WEBOBJECT NAME=Conditional1><WEBOBJECT NAME=ERXLocalizedString1></WEBOBJECT></WEBOBJECT><WEBOBJECT NAME=Conditional2><WEBOBJECT NAME=ERXLocalizedString2></WEBOBJECT></WEBOBJECT> \ No newline at end of file +<webobject name = "Display"></webobject> \ No newline at end of file Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayYesNo.wo/ERD2WDisplayYesNo.wod =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayYesNo.wo/ERD2WDisplayYesNo.wod 2009-08-24 13:01:27 UTC (rev 9755) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayYesNo.wo/ERD2WDisplayYesNo.wod 2009-08-24 13:02:21 UTC (rev 9756) @@ -1,17 +1,3 @@ -Conditional1: WOConditional { - condition = isYes; -} - -Conditional2: WOConditional { - condition = isYes; - negate = true; -} - -ERXLocalizedString1: ERXLocalizedString { - value = "Yes"; -} - -ERXLocalizedString2: ERXLocalizedString { - value = "No"; -} - +Display: WOString { + value = displayString; +} \ No newline at end of file Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditAllowRestrict.wo/ERD2WEditAllowRestrict.html =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditAllowRestrict.wo/ERD2WEditAllowRestrict.html 2009-08-24 13:01:27 UTC (rev 9755) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditAllowRestrict.wo/ERD2WEditAllowRestrict.html 2009-08-24 13:02:21 UTC (rev 9756) @@ -1 +1 @@ -<TABLE BORDER=0><TR><TD>Allow</TD><TD><WEBOBJECT NAME=RadioButton1></WEBOBJECT></TD><TD>Restrict</TD><TD><WEBOBJECT NAME=RadioButton2></WEBOBJECT></TD></TR></TABLE> \ No newline at end of file +<webobject name = "Selector"/> \ No newline at end of file Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditAllowRestrict.wo/ERD2WEditAllowRestrict.wod =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditAllowRestrict.wo/ERD2WEditAllowRestrict.wod 2009-08-24 13:01:27 UTC (rev 9755) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditAllowRestrict.wo/ERD2WEditAllowRestrict.wod 2009-08-24 13:02:21 UTC (rev 9756) @@ -1,12 +1,5 @@ -RadioButton1: WORadioButton { - value = 1; - selection = yesNoBoolean; - name = radioBoxGroupName; -} - -RadioButton2: WORadioButton { - value = 0; - selection = yesNoBoolean; - name = radioBoxGroupName; -} - +Selector: ERXBooleanSelector { + selection = objectPropertyValue; + yesString = "Allow"; + noString = "Restrict"; +} \ No newline at end of file Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditFlag.wo/ERD2WEditFlag.html =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditFlag.wo/ERD2WEditFlag.html 2009-08-24 13:01:27 UTC (rev 9755) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditFlag.wo/ERD2WEditFlag.html 2009-08-24 13:02:21 UTC (rev 9756) @@ -1 +1 @@ -<TABLE BORDER=0><TR><TD>Yes</TD><TD><WEBOBJECT NAME=RadioButton1></WEBOBJECT></TD><TD> No</TD><TD><WEBOBJECT NAME=RadioButton2></WEBOBJECT></TD></TR></TABLE> \ No newline at end of file +<webobject name = "Selector"></webobject> \ No newline at end of file Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditFlag.wo/ERD2WEditFlag.wod =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditFlag.wo/ERD2WEditFlag.wod 2009-08-24 13:01:27 UTC (rev 9755) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditFlag.wo/ERD2WEditFlag.wod 2009-08-24 13:02:21 UTC (rev 9756) @@ -1,14 +1,5 @@ - -RadioButton1: WORadioButton { - value = "Y"; - selection = yesNoBoolean; - name = radioBoxGroupName; -} - -RadioButton2: WORadioButton { - value = "N"; - selection = yesNoBoolean; - name = radioBoxGroupName; -} - - +Selector: ERXBooleanSelector { + selection = objectPropertyValue; + yesString = "Yes"; + noString = "No"; +} \ No newline at end of file Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditYesNo.wo/ERD2WEditYesNo.html =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditYesNo.wo/ERD2WEditYesNo.html 2009-08-24 13:01:27 UTC (rev 9755) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditYesNo.wo/ERD2WEditYesNo.html 2009-08-24 13:02:21 UTC (rev 9756) @@ -1 +1 @@ -<TABLE BORDER=0><TR><TD><WEBOBJECT NAME=RadioButton1></WEBOBJECT></TD><TD><WEBOBJECT NAME=ERXLocalizedString1></WEBOBJECT></TD><TD><WEBOBJECT NAME=RadioButton2></WEBOBJECT></TD><TD><WEBOBJECT NAME=ERXLocalizedString2></WEBOBJECT></TD></TR></TABLE> \ No newline at end of file +<webobject name = "Selector"></webobject> \ No newline at end of file Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditYesNo.wo/ERD2WEditYesNo.wod =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditYesNo.wo/ERD2WEditYesNo.wod 2009-08-24 13:01:27 UTC (rev 9755) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditYesNo.wo/ERD2WEditYesNo.wod 2009-08-24 13:02:21 UTC (rev 9756) @@ -1,20 +1,5 @@ -ERXLocalizedString1: ERXLocalizedString { - value = "Yes"; -} - -ERXLocalizedString2: ERXLocalizedString { - value = "No"; -} - -RadioButton1: WORadioButton { - value = 1; - selection = yesNoBoolean; - name = radioBoxGroupName; -} - -RadioButton2: WORadioButton { - value = 0; - selection = yesNoBoolean; - name = radioBoxGroupName; -} - +Selector: ERXBooleanSelector { + selection = objectPropertyValue; + yesString = "Yes"; + noString = "No"; +} \ No newline at end of file Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/bool/ERD2WCustomQueryBoolean.java =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/bool/ERD2WCustomQueryBoolean.java 2009-08-24 13:01:27 UTC (rev 9755) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/bool/ERD2WCustomQueryBoolean.java 2009-08-24 13:02:21 UTC (rev 9756) @@ -14,7 +14,6 @@ * Also keeps the selected value. * * @author ak on Mon Dec 22 2003 - * @project ERDirectToWeb */ public class ERD2WCustomQueryBoolean extends D2WQueryBoolean { Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/bool/ERD2WDisplayYesNo.java =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/bool/ERD2WDisplayYesNo.java 2009-08-24 13:01:27 UTC (rev 9755) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/bool/ERD2WDisplayYesNo.java 2009-08-24 13:02:21 UTC (rev 9756) @@ -1,26 +1,22 @@ -/* - * Copyright (C) NetStruxr, Inc. All rights reserved. - * - * This software is published under the terms of the NetStruxr - * Public Software License version 0.5, a copy of which has been - * included with this distribution in the LICENSE.NPL file. */ package er.directtoweb.components.bool; import com.webobjects.appserver.WOContext; -import com.webobjects.directtoweb.D2WDisplayBoolean; +import com.webobjects.foundation.NSArray; -import er.extensions.foundation.ERXValueUtilities; - /** - * Displays a boolean as Yes or No.<br /> - * + * Displays a boolean localized as Yes or No.<br /> + * You should use ERD2WCustomDisplayBoolean with the choicesNames d2w key instead. */ +@Deprecated +public class ERD2WDisplayYesNo extends ERD2WCustomDisplayBoolean { -public class ERD2WDisplayYesNo extends D2WDisplayBoolean { - - public ERD2WDisplayYesNo(WOContext context) { super(context); } - - public boolean isYes() { - return ERXValueUtilities.booleanValue(objectPropertyValue()); + private NSArray<String> choicesNames = new NSArray(new String[] {"Yes" , "No"}); + + public ERD2WDisplayYesNo(WOContext context) { + super(context); } + + public NSArray<String> choicesNames() { + return choicesNames; + } } Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/bool/ERD2WEditAllowRestrict.java =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/bool/ERD2WEditAllowRestrict.java 2009-08-24 13:01:27 UTC (rev 9755) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/bool/ERD2WEditAllowRestrict.java 2009-08-24 13:02:21 UTC (rev 9756) @@ -1,21 +1,16 @@ -/* - * Copyright (C) NetStruxr, Inc. All rights reserved. - * - * This software is published under the terms of the NetStruxr - * Public Software License version 0.5, a copy of which has been - * included with this distribution in the LICENSE.NPL file. */ package er.directtoweb.components.bool; import com.webobjects.appserver.WOContext; - -// FIXME: This can be replaced by D2WCustomEditBoolean /** - * Edits a boolean with the string Allow/Restrict. Should use ERD2WCustomEditBoolean instead.<br /> + * Edits a boolean with the string Allow/Restrict. <br /> + * You should use ERD2WCustomEditBoolean with the choicesNames d2w key instead. * */ - +@Deprecated public class ERD2WEditAllowRestrict extends ERD2WEditYesNo { - public ERD2WEditAllowRestrict(WOContext context) { super(context); } + public ERD2WEditAllowRestrict(WOContext context) { + super(context); + } } Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/bool/ERD2WEditFlag.java =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/bool/ERD2WEditFlag.java 2009-08-24 13:01:27 UTC (rev 9755) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/bool/ERD2WEditFlag.java 2009-08-24 13:02:21 UTC (rev 9756) @@ -1,9 +1,3 @@ -// -// FRD2WEditYesNo.java: Class file for WO Component 'FRD2WEditYesNo' -// Project FRAdmin -// -// Created by bposokho on Fri Aug 02 2002 -// package er.directtoweb.components.bool; import com.webobjects.appserver.WOContext; @@ -11,32 +5,15 @@ import com.webobjects.directtoweb.D2WEditString; import com.webobjects.foundation.NSValidation; -public class ERD2WEditFlag extends D2WEditString { +/** + * Edits a boolean with radio buttons and Yes/No<br /> + * You should use ERD2WCustomEditBoolean with the choicesNames d2w key instead. + */ +@Deprecated +public class ERD2WEditFlag extends ERD2WCustomEditBoolean { + public ERD2WEditFlag(WOContext context) { super(context); } - - public String yesNoBoolean() { - return (String)object().valueForKey(propertyKey()); - } - public void setYesNoBoolean(String newYesNoBoolean) { - object().validateTakeValueForKeyPath(newYesNoBoolean, propertyKey()); - } - public String radioBoxGroupName(){ - return ("YesNoGroup_"+d2wContext().propertyKey()); - } - - public void validationFailedWithException(Throwable theException,Object theValue, String theKeyPath) { - parent().validationFailedWithException(theException, theValue, theKeyPath); - } - - public void takeValuesFromRequest(WORequest r, WOContext c) { - super.takeValuesFromRequest(r,c); - try { - object().validateTakeValueForKeyPath(objectPropertyValue(), propertyKey()); - } catch (NSValidation.ValidationException e) { - validationFailedWithException(e, objectPropertyValue(), propertyKey()); - } - } } Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/bool/ERD2WEditYesNo.java =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/bool/ERD2WEditYesNo.java 2009-08-24 13:01:27 UTC (rev 9755) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/bool/ERD2WEditYesNo.java 2009-08-24 13:02:21 UTC (rev 9756) @@ -17,46 +17,15 @@ /** * Edits a boolean with radio buttons and Yes/No<br /> - * + * You should use ERD2WCustomEditBoolean with the choicesNames d2w key instead. */ -public class ERD2WEditYesNo extends D2WEditBoolean { +@Deprecated +public class ERD2WEditYesNo extends ERD2WCustomEditBoolean { + public static Logger log = Logger.getLogger(ERD2WEditYesNo.class); - private String _groupName; - public ERD2WEditYesNo(WOContext context) { super(context); } - - public Integer yesNoBoolean() { - Object bool = object().valueForKeyPath(propertyKey()); - bool = new Integer(ERXValueUtilities.booleanValue(bool) ? 1 : 0); - return (Integer)bool; + public ERD2WEditYesNo(WOContext context) { + super(context); } - - public void awake() { - _groupName = "YesNoGroup_"+context().elementID(); - } - public void sleep() { - _groupName = null; - } - - public void setYesNoBoolean(Integer newYesNoBoolean) { - object().validateTakeValueForKeyPath(newYesNoBoolean, propertyKey()); - } - - public String radioBoxGroupName() { - return _groupName; - } - - public void validationFailedWithException(Throwable theException,Object theValue, String theKeyPath) { - parent().validationFailedWithException(theException, theValue, theKeyPath); - } - - public void takeValuesFromRequest(WORequest r, WOContext c) { - super.takeValuesFromRequest(r,c); - try { - object().validateTakeValueForKeyPath(objectPropertyValue(), propertyKey()); - } catch (NSValidation.ValidationException e) { - validationFailedWithException(e, objectPropertyValue(), propertyKey()); - } - } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |