From: <tc...@us...> - 2008-12-13 01:59:45
|
Revision: 8755 http://wonder.svn.sourceforge.net/wonder/?rev=8755&view=rev Author: tcripps Date: 2008-12-13 01:38:48 +0000 (Sat, 13 Dec 2008) Log Message: ----------- Just a bunch of very minor corrections to grammar or spelling or weird formatting. I've been saving these up for a while... Modified Paths: -------------- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Resources/English.lproj/Localizable.strings trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/ERD2WDirectAction.java trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/ERDirectToWeb.java trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDInstanceCreationAssignment.java trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDTabConfigurationAssignment.java trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultModelAssignment.java Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Resources/English.lproj/Localizable.strings =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Resources/English.lproj/Localizable.strings 2008-12-13 01:37:24 UTC (rev 8754) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Resources/English.lproj/Localizable.strings 2008-12-13 01:38:48 UTC (rev 8755) @@ -83,7 +83,7 @@ "ERDEditDatePopupOrNull.or" = "- or -"; "ERDEditFile.deleteButton" = "Delete File"; "ERDEditFile.selectButton" = "Select File"; - "ERDEditFile.selectMessage" = "Select a file on you local disk:"; + "ERDEditFile.selectMessage" = "Select a file on your local disk:"; "ERDEditFile.uploadButton" = "Upload File"; "ERDEditFile.uploadMessage" = "Upload the file to the server:"; "ERDEditList.saveLabel" = "Save @@pluralCount@@ @@pluralString@@?"; Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/ERD2WDirectAction.java =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/ERD2WDirectAction.java 2008-12-13 01:37:24 UTC (rev 8754) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/ERD2WDirectAction.java 2008-12-13 01:38:48 UTC (rev 8755) @@ -70,7 +70,7 @@ * <ul> * <li><code>http://localhost/cgi-bin/WebObjects/MyApp.woa/wa/QueryAll</code><br > * will create an query page all entities. -* <li><code>http://localhost/cgi-bin/WebObjects/MyApp.woa/wa/QueryArticle</code><br > + * <li><code>http://localhost/cgi-bin/WebObjects/MyApp.woa/wa/QueryArticle</code><br > * will create an query page for articles. * * <li><code>http://localhost/cgi-bin/WebObjects/MyApp.woa/wa/QueryArticle?__fs=findNewArticles</code><br > Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/ERDirectToWeb.java =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/ERDirectToWeb.java 2008-12-13 01:37:24 UTC (rev 8754) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/ERDirectToWeb.java 2008-12-13 01:38:48 UTC (rev 8755) @@ -319,7 +319,7 @@ } /** - * Subclass of NSForwardException that can hold a d2wContext. Usefull when the exception + * Subclass of NSForwardException that can hold a d2wContext. Useful when the exception * occurs while evaluating embedded components. The page's d2wContext will not show you the error. * * @author ak @@ -446,7 +446,7 @@ } } - // This is the actual method that turns trace rule firign on and off. + // This is the actual method that turns trace rule firing on and off. public static void configureTraceRuleFiring() { //AK: we can trace firing much more fine-grained than the default engine // and also enabling the debug level NSLog spews out a ton of ridiculous Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDInstanceCreationAssignment.java =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDInstanceCreationAssignment.java 2008-12-13 01:37:24 UTC (rev 8754) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDInstanceCreationAssignment.java 2008-12-13 01:38:48 UTC (rev 8755) @@ -16,7 +16,7 @@ import er.directtoweb.assignments.delayed.ERDDelayedObjectCreationAssignment; /** - * Assignment used to create objects on the fly. You suse this by + * Assignment used to create objects on the fly. You use this by * specifing the class name as a string, ie "foo.bar.MyClass". This * will create an instance of the MyClass object. * @deprecated use ERDDelayedObjectCreationAssignment instead. Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDTabConfigurationAssignment.java =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDTabConfigurationAssignment.java 2008-12-13 01:37:24 UTC (rev 8754) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/ERDTabConfigurationAssignment.java 2008-12-13 01:38:48 UTC (rev 8755) @@ -14,7 +14,7 @@ // MOVEME: ERDConfigurationAssignment /** - * Generated pageConfigurations that will use the tab inspect tempaltes.<br /> + * Generated pageConfigurations that will use the tab inspect templates.<br /> * @deprecated use ERDDefaultConfigurationNameAssignment with key inspectTabConfigurationName */ Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultModelAssignment.java =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultModelAssignment.java 2008-12-13 01:37:24 UTC (rev 8754) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultModelAssignment.java 2008-12-13 01:38:48 UTC (rev 8755) @@ -307,6 +307,7 @@ EOEntity destinationEntity = (EOEntity)c.valueForKeyPath("smartRelationship.destinationEntity"); return destinationEntity; } + /** * Called when firing this assignment with the key-path: * <b>sortKeyForList</b>. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tc...@us...> - 2009-01-26 22:45:38
|
Revision: 8850 http://wonder.svn.sourceforge.net/wonder/?rev=8850&view=rev Author: tcripps Date: 2009-01-26 22:04:57 +0000 (Mon, 26 Jan 2009) Log Message: ----------- Target of the hyperlink is now configurable. Modified Paths: -------------- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayURL.wo/ERD2WDisplayURL.html trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayURL.wo/ERD2WDisplayURL.wod trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERD2WDisplayURL.java Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayURL.wo/ERD2WDisplayURL.html =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayURL.wo/ERD2WDisplayURL.html 2009-01-26 22:01:23 UTC (rev 8849) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayURL.wo/ERD2WDisplayURL.html 2009-01-26 22:04:57 UTC (rev 8850) @@ -1 +1 @@ -<webObject name=Link></webObject> \ No newline at end of file +<webobject name="Link"></webobject> \ No newline at end of file Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayURL.wo/ERD2WDisplayURL.wod =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayURL.wo/ERD2WDisplayURL.wod 2009-01-26 22:01:23 UTC (rev 8849) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayURL.wo/ERD2WDisplayURL.wod 2009-01-26 22:04:57 UTC (rev 8850) @@ -1,5 +1,5 @@ Link: WOHyperlink { -target="_blank"; - href= href; + href = href; string = objectPropertyValue; + target = target; } \ No newline at end of file Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERD2WDisplayURL.java =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERD2WDisplayURL.java 2009-01-26 22:01:23 UTC (rev 8849) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERD2WDisplayURL.java 2009-01-26 22:04:57 UTC (rev 8850) @@ -10,14 +10,17 @@ import com.webobjects.directtoweb.D2WDisplayString; /** - * Displays the url in a hyperlink with target set to "_new"<br /> - * + * Displays the URL in a hyperlink with target set to "_blank". The target value may be overridden using the + * D2W key <code>urlTarget</code>. */ - public class ERD2WDisplayURL extends D2WDisplayString { public ERD2WDisplayURL(WOContext context) { super(context); } + /** + * Gets the href property for the displayed hyperlink. + * @return the href of the hyperlink + */ public String href() { String href = objectPropertyValue() != null ? objectPropertyValue().toString() : null; if(href != null && href.indexOf("://") < 0) { @@ -25,4 +28,14 @@ } return href; } + + /** + * Gets the target for the displayed hyperlink. The target defaults to "_blank", but can be overridden + * using the D2W key <code>urlTarget</code>. + * @return the target of the hyperlink + */ + public String target() { + String target = (String)d2wContext().valueForKey("urlTarget"); + return target != null ? target : "_blank"; + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rm...@us...> - 2009-04-30 10:22:09
|
Revision: 9303 http://wonder.svn.sourceforge.net/wonder/?rev=9303&view=rev Author: rmendis Date: 2009-04-30 08:25:17 +0000 (Thu, 30 Apr 2009) Log Message: ----------- Add functionality for a displayString - based on ERD2WDisplayConstant Modified Paths: -------------- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayURL.wo/ERD2WDisplayURL.wod trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERD2WDisplayURL.java Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayURL.wo/ERD2WDisplayURL.wod =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayURL.wo/ERD2WDisplayURL.wod 2009-04-30 07:57:18 UTC (rev 9302) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayURL.wo/ERD2WDisplayURL.wod 2009-04-30 08:25:17 UTC (rev 9303) @@ -1,5 +1,5 @@ Link: WOHyperlink { href = href; - string = objectPropertyValue; + string = string; target = target; } \ No newline at end of file Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERD2WDisplayURL.java =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERD2WDisplayURL.java 2009-04-30 07:57:18 UTC (rev 9302) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERD2WDisplayURL.java 2009-04-30 08:25:17 UTC (rev 9303) @@ -28,6 +28,16 @@ } return href; } + + /** + * Gets the string from the + * D2W key <propertyKey> + * @return the display string of the hyperlink + */ + public String string() { + String string = (String) d2wContext().valueForKey(propertyKey()); + return string != null ? string : (String) objectPropertyValue(); + } /** * Gets the target for the displayed hyperlink. The target defaults to "_blank", but can be overridden This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tc...@us...> - 2009-05-23 00:10:00
|
Revision: 9374 http://wonder.svn.sourceforge.net/wonder/?rev=9374&view=rev Author: tcripps Date: 2009-05-23 00:09:52 +0000 (Sat, 23 May 2009) Log Message: ----------- Allow overriding when the debug flags should show. Modified Paths: -------------- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/ERD2WDebugFlags.api trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDebugFlags.wo/ERD2WDebugFlags.html trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDebugFlags.wo/ERD2WDebugFlags.wod trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERD2WDebugFlags.java Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/ERD2WDebugFlags.api =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/ERD2WDebugFlags.api 2009-05-23 00:06:36 UTC (rev 9373) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/ERD2WDebugFlags.api 2009-05-23 00:09:52 UTC (rev 9374) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <wodefinitions> <wo class="ERD2WDebugFlags" wocomponentcontent="false"> - <binding name="linkClass"/> + <binding name="shouldShow"/> </wo> </wodefinitions> \ No newline at end of file Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDebugFlags.wo/ERD2WDebugFlags.html =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDebugFlags.wo/ERD2WDebugFlags.html 2009-05-23 00:06:36 UTC (rev 9373) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDebugFlags.wo/ERD2WDebugFlags.html 2009-05-23 00:09:52 UTC (rev 9374) @@ -1,4 +1,4 @@ -<WEBOBJECT NAME=Show> +<WEBOBJECT NAME="Show"> <script> function ERD2WDebugFlags_cssDebug() { var newSS; @@ -10,22 +10,22 @@ newSS=document.createElement('link'); newSS.rel='stylesheet'; newSS.type='text/css'; - newSS.href='<webobject name=CSSUrl></webobject>'; + newSS.href='<webobject name="CSSUrl"></webobject>'; newSS.id='debug-stylesheet'; document.documentElement.childNodes[0].appendChild(newSS); } } </script> <ul class="DebugFlags"> - <li><WEBOBJECT NAME=Log4J>Log4J</WEBOBJECT></li> - <li><WEBOBJECT NAME=D2W>D2W</WEBOBJECT> </li> - <li><WEBOBJECT NAME=CSS>CSS</WEBOBJECT> </li> - <li><WEBOBJECT NAME=SQL>Toggle SQL</WEBOBJECT></li> - <li><WEBOBJECT NAME=Clear>Clear D2W Cache</WEBOBJECT></li> - <li><WEBOBJECT NAME=Dump>Created keys</WEBOBJECT></li> - <li><WEBOBJECT NAME=Localization>Localization</WEBOBJECT></li> - <li><WEBOBJECT NAME=WOStats>WOStats</WEBOBJECT></li> - <li><WEBOBJECT NAME=Test>Run Test</WEBOBJECT></li> + <li><WEBOBJECT NAME="Log4J">Log4J</WEBOBJECT></li> + <li><WEBOBJECT NAME="D2W">D2W</WEBOBJECT> </li> + <li><WEBOBJECT NAME="CSS">CSS</WEBOBJECT> </li> + <li><WEBOBJECT NAME="SQL">Toggle SQL</WEBOBJECT></li> + <li><WEBOBJECT NAME="Clear">Clear D2W Cache</WEBOBJECT></li> + <li><WEBOBJECT NAME="Dump">Created keys</WEBOBJECT></li> + <li><WEBOBJECT NAME="Localization">Localization</WEBOBJECT></li> + <li><WEBOBJECT NAME="WOStats">WOStats</WEBOBJECT></li> + <li><WEBOBJECT NAME="Test">Run Test</WEBOBJECT></li> </ul> </WEBOBJECT> Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDebugFlags.wo/ERD2WDebugFlags.wod =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDebugFlags.wo/ERD2WDebugFlags.wod 2009-05-23 00:06:36 UTC (rev 9373) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDebugFlags.wo/ERD2WDebugFlags.wod 2009-05-23 00:09:52 UTC (rev 9374) @@ -1,5 +1,5 @@ Show: WOConditional { - condition = application.isDevelopmentMode; + condition = shouldShow; } Log4J: WOHyperlink { @@ -40,15 +40,18 @@ directActionName = "dumpCreatedKeys"; class = ^linkClass; } + WOStats: WOHyperlink { action = statisticsPage; class = ^linkClass; } + Localization: WOHyperlink { actionClass = "ERXDirectAction"; directActionName = "editLocalizedFiles"; class = ^linkClass; } + Test: WOHyperlink { actionClass = "er.selenium.SeleniumStartTesting"; class = ^linkClass; Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERD2WDebugFlags.java =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERD2WDebugFlags.java 2009-05-23 00:06:36 UTC (rev 9373) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/ERD2WDebugFlags.java 2009-05-23 00:09:52 UTC (rev 9374) @@ -15,6 +15,8 @@ import er.directtoweb.ERD2WModel; import er.directtoweb.ERDirectToWeb; import er.extensions.ERXExtensions; +import er.extensions.appserver.ERXApplication; +import er.extensions.components.ERXComponentUtilities; import er.extensions.foundation.ERXProperties; /////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -57,4 +59,14 @@ ERD2WModel.erDefaultModel().clearD2WRuleCache(); return null; } + + /** + * Allow users to override when the debug flags show. Defaults to showing when the application is running in + * {@link ERXApplication#isDevelopmentMode development mode}, i.e. is not deployed to production. + * @return true when the debug flags should be displayed + */ + public boolean shouldShow() { + return ERXComponentUtilities.booleanValueForBinding(this, "shouldShow", ERXApplication.erxApplication().isDevelopmentMode()); + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <an...@us...> - 2009-08-24 12:24:18
|
Revision: 9754 http://wonder.svn.sourceforge.net/wonder/?rev=9754&view=rev Author: anjo Date: 2009-08-24 12:24:08 +0000 (Mon, 24 Aug 2009) Log Message: ----------- using ERXBooleanSelector instead of custom code Modified Paths: -------------- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WCustomEditBoolean.wo/ERD2WCustomEditBoolean.html trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WCustomEditBoolean.wo/ERD2WCustomEditBoolean.wod trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/bool/ERD2WCustomEditBoolean.java Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WCustomEditBoolean.wo/ERD2WCustomEditBoolean.html =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WCustomEditBoolean.wo/ERD2WCustomEditBoolean.html 2009-08-24 12:23:13 UTC (rev 9753) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WCustomEditBoolean.wo/ERD2WCustomEditBoolean.html 2009-08-24 12:24:08 UTC (rev 9754) @@ -1,22 +1 @@ -<webobject name="UseRadio"> -<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> - <webobject name=AllowsNull> - <td><webobject name=RadioButton3></webobject></td> - <td> <webobject name=ERXLocalizedString3></webobject></td> - </webobject> - </tr> -</table> -</webobject> -<webobject name="UseCheckBox"> -<table border=0> - <tr> - <td><webobject name=Checkbox></webobject></td> - <td><webobject name=ERXLocalizedString1></webobject></td> - </tr> -</table> -</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/ERD2WCustomEditBoolean.wo/ERD2WCustomEditBoolean.wod =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WCustomEditBoolean.wo/ERD2WCustomEditBoolean.wod 2009-08-24 12:23:13 UTC (rev 9753) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WCustomEditBoolean.wo/ERD2WCustomEditBoolean.wod 2009-08-24 12:24:08 UTC (rev 9754) @@ -1,50 +1,8 @@ -AllowsNull: WOConditional { - condition = allowsNull; +Selector: ERXBooleanSelector { + yesString = stringForYes; + noString = stringForNo; + noSelectionString = stringForNull; + selection = objectPropertyValue; + uiMode = uiMode; } -ERXLocalizedString1: ERXLocalizedString { - value = trueValue.name; - escapeHTML = false; -} - -ERXLocalizedString2: ERXLocalizedString { - value = falseValue.name; - escapeHTML = false; -} - -ERXLocalizedString3: ERXLocalizedString { - value = nullValue.name; - escapeHTML = false; -} - -RadioButton1: WORadioButton { - value = trueValue; - selection = yesNoBoolean; - name = radioBoxGroupName; -} - -RadioButton2: WORadioButton { - value = falseValue; - selection = yesNoBoolean; - name = radioBoxGroupName; -} - -RadioButton3: WORadioButton { - value = nullValue; - selection = yesNoBoolean; - name = radioBoxGroupName; -} - -UseRadio : WOConditional { - condition = useCheckbox; - negate = true; -} - -UseCheckBox : WOConditional { - condition = useCheckbox; -} - -Checkbox :WOCheckBox { - value = trueValue; - selection = yesNoBoolean; -} Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/bool/ERD2WCustomEditBoolean.java =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/bool/ERD2WCustomEditBoolean.java 2009-08-24 12:23:13 UTC (rev 9753) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/bool/ERD2WCustomEditBoolean.java 2009-08-24 12:24:08 UTC (rev 9754) @@ -10,6 +10,7 @@ import com.webobjects.appserver.WORequest; import com.webobjects.directtoweb.D2WEditBoolean; import com.webobjects.foundation.NSArray; +import com.webobjects.foundation.NSMutableArray; import com.webobjects.foundation.NSValidation; import er.extensions.foundation.ERXValueUtilities; @@ -24,103 +25,42 @@ public ERD2WCustomEditBoolean(WOContext context) { super(context); } - - public static class BooleanProxy { - private String _name; - private Boolean _value; - - BooleanProxy(String name, Boolean value) { - _name = name; - _value = value; - } - - public String name() { - return _name; - } - - public Boolean value() { - return _value; - } - - public boolean equals(Object other) { - return other == _value || (other != null && _value != null && ERXValueUtilities.booleanValue(other) == _value); - } - } + + protected NSArray<String> _choicesNames; - public BooleanProxy trueValue; - public BooleanProxy falseValue; - public BooleanProxy nullValue; - - protected NSArray _choicesNames; - protected String _radioBoxGroupName; - public void reset(){ super.reset(); _choicesNames = null; - _radioBoxGroupName = null; } - public Object yesNoBoolean() { - Object value = object().valueForKeyPath(propertyKey()); - if(trueValue.equals(value)) return trueValue; - if(falseValue.equals(value)) return falseValue; - return nullValue; - } - - public void setYesNoBoolean(Object newYesNoBoolean) { - BooleanProxy proxy = (BooleanProxy)newYesNoBoolean; - Object o = object().validateTakeValueForKeyPath(proxy.value(), propertyKey()); - object().takeValueForKeyPath(o, propertyKey()); - } - public String radioBoxGroupName(){ - if (_radioBoxGroupName == null) { - _radioBoxGroupName = "YesNoGroup_"+ context().elementID().replace('.','_'); - } - return _radioBoxGroupName; - } - - public NSArray choicesNames(){ + public NSArray<String> choicesNames() { if(_choicesNames == null) { _choicesNames = (NSArray)d2wContext().valueForKey("choicesNames"); - trueValue = new BooleanProxy((String) choicesNames().objectAtIndex(0), Boolean.TRUE); - falseValue = new BooleanProxy((String) choicesNames().objectAtIndex(1), Boolean.FALSE); - if(choicesNames().count() > 2) { - nullValue = new BooleanProxy((String) choicesNames().objectAtIndex(2), null); - } } return _choicesNames; } - public boolean useCheckbox() { - return choicesNames().count() == 1; + public String stringForYes() { + return choicesNames().objectAtIndex(0); } - public void validationFailedWithException(Throwable theException,Object object, String theKeyPath) { - if(object instanceof BooleanProxy) { - BooleanProxy proxy = (BooleanProxy)object; - object = proxy.value(); - } - parent().validationFailedWithException(theException, object, theKeyPath); + public String stringForNo() { + return choicesNames().objectAtIndex(1); } + + public String stringForNull() { + if(allowsNull()) { + return choicesNames().objectAtIndex(2); + } + return null; + } - public Object validateTakeValueForKeyPath(Object object, String string) { - if(useCheckbox() && object == null) { - object = Boolean.FALSE; - } - if(object instanceof BooleanProxy) { - BooleanProxy proxy = (BooleanProxy)object; - object = proxy.value(); - } - return super.validateTakeValueForKeyPath(object, string); + public String uiMode() { + return useCheckbox() ? "checkbox" : "radio"; } - public void takeValuesFromRequest(WORequest r, WOContext c) { - super.takeValuesFromRequest(r,c); - try { - object().validateTakeValueForKeyPath(objectPropertyValue(), propertyKey()); - } catch (NSValidation.ValidationException e) { - validationFailedWithException(e, objectPropertyValue(), propertyKey()); - } + public boolean useCheckbox() { + return choicesNames().count() == 1; } public boolean allowsNull() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
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. |
From: <san...@us...> - 2009-08-26 18:37:51
|
Revision: 9773 http://wonder.svn.sourceforge.net/wonder/?rev=9773&view=rev Author: santoash Date: 2009-08-26 18:37:35 +0000 (Wed, 26 Aug 2009) Log Message: ----------- <rdar://problem/6544508> Make email addresses linkable to Mail changed the 'email' key binding to accept just a string or array of strings. If its array of strings the href will look like this: mailto:as...@ma..., sd...@ma..., df...@ma... the displayString key binding was not used in the wod file. I fixed it. Modified Paths: -------------- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDDisplayMailTo.wo/ERDDisplayMailTo.html trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDDisplayMailTo.wo/ERDDisplayMailTo.wod trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDDisplayMailTo.java Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDDisplayMailTo.wo/ERDDisplayMailTo.html =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDDisplayMailTo.wo/ERDDisplayMailTo.html 2009-08-26 17:22:51 UTC (rev 9772) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDDisplayMailTo.wo/ERDDisplayMailTo.html 2009-08-26 18:37:35 UTC (rev 9773) @@ -1 +1,4 @@ -<WEBOBJECT NAME=Conditional1><</WEBOBJECT><webObject name=MailHyperlink></webObject><WEBOBJECT NAME=Conditional2>></WEBOBJECT> \ No newline at end of file +<webobject name = "Conditional1"><</webobject> +<webObject name = "MailHyperlink" /> +<webobject name = "Conditional2">></webobject> + Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDDisplayMailTo.wo/ERDDisplayMailTo.wod =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDDisplayMailTo.wo/ERDDisplayMailTo.wod 2009-08-26 17:22:51 UTC (rev 9772) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDDisplayMailTo.wo/ERDDisplayMailTo.wod 2009-08-26 18:37:35 UTC (rev 9773) @@ -7,6 +7,6 @@ } MailHyperlink: WOHyperlink { - href=mailToHref; - string = email; -} \ No newline at end of file + href=mailToHref; + string = displayString; +} Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDDisplayMailTo.java =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDDisplayMailTo.java 2009-08-26 17:22:51 UTC (rev 9772) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDDisplayMailTo.java 2009-08-26 18:37:35 UTC (rev 9773) @@ -10,8 +10,13 @@ import er.directtoweb.components.ERDCustomEditComponent; +import com.webobjects.foundation.NSArray; + +import er.extensions.foundation.ERXArrayUtilities; + ///////////////////////////////////////////////////////////////////////////////// // Important D2W Keys: +// displayString - String that will be used to display the hyperlink // displayKey - key that specifies the key path off of the object that will be used // for displaying in the hyperlink. Not required. // showBrackets - Boolean, specifies if the <> should be displayed around the mailto link. @@ -56,14 +61,26 @@ public String email() { if (_email == null) { - _email = (String)(hasBinding("email") ? valueForBinding("email") : objectKeyPathValue()); + Object emailObj = (hasBinding("email") ? valueForBinding("email") : objectKeyPathValue()); + if(emailObj != null && emailObj instanceof NSArray) { + _email = ERXArrayUtilities.removeNullValues(((NSArray)emailObj)).componentsJoinedByString(","); + } + else if(emailObj != null && emailObj instanceof String) { + _email = (String) emailObj; + } } return _email; } public String displayString() { if (_displayString == null) { - _displayString = (String)(hasBinding("displayKey") ? object().valueForKeyPath((String)valueForBinding("displayKey")) : email()); + //first look for displayString binding + _displayString = (String)(hasBinding("displayString")? valueForBinding("displayString") : null); + + //if displayString binding is not available, then settle for just email + if (_displayString == null) { + _displayString = email(); + } } return _displayString; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rm...@us...> - 2009-10-20 02:40:31
|
Revision: 10101 http://wonder.svn.sourceforge.net/wonder/?rev=10101&view=rev Author: rmendis Date: 2009-10-20 02:40:24 +0000 (Tue, 20 Oct 2009) Log Message: ----------- Adding non-ajax ERDSearchDisplayGroup Added Paths: ----------- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDSearchDisplayGroup.wo/ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDSearchDisplayGroup.wo/ERDSearchDisplayGroup.html trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDSearchDisplayGroup.wo/ERDSearchDisplayGroup.wod trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDSearchDisplayGroup.wo/ERDSearchDisplayGroup.woo trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDSearchDisplayGroup.java Added: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDSearchDisplayGroup.wo/ERDSearchDisplayGroup.html =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDSearchDisplayGroup.wo/ERDSearchDisplayGroup.html (rev 0) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDSearchDisplayGroup.wo/ERDSearchDisplayGroup.html 2009-10-20 02:40:24 UTC (rev 10101) @@ -0,0 +1,4 @@ +<ul class="ERDSearchDisplayGroup"> + <li><webobject name = "Submit">Search</webobject></li> + <li><label for="quick_search_field"><webobject name = "Key" /></label><webobject name = "SearchField" /></li> +</ul> \ No newline at end of file Property changes on: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDSearchDisplayGroup.wo/ERDSearchDisplayGroup.html ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDSearchDisplayGroup.wo/ERDSearchDisplayGroup.wod =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDSearchDisplayGroup.wo/ERDSearchDisplayGroup.wod (rev 0) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDSearchDisplayGroup.wo/ERDSearchDisplayGroup.wod 2009-10-20 02:40:24 UTC (rev 10101) @@ -0,0 +1,16 @@ +SearchField: WOTextField { + value = value; + class = "quick_serach_field"; + id = "quick_search_field"; +} + +Key: WOString { + value = displayNameForSearchKey; +} + +Submit: WOSubmitButton { + action = search; + value = "Search"; + name = "quick_search_submit"; + id = "quick_search_submit"; +} Property changes on: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDSearchDisplayGroup.wo/ERDSearchDisplayGroup.wod ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDSearchDisplayGroup.wo/ERDSearchDisplayGroup.woo =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDSearchDisplayGroup.wo/ERDSearchDisplayGroup.woo (rev 0) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDSearchDisplayGroup.wo/ERDSearchDisplayGroup.woo 2009-10-20 02:40:24 UTC (rev 10101) @@ -0,0 +1,4 @@ +{ + "WebObjects Release" = "WebObjects 5.0"; + encoding = "UTF-8"; +} Property changes on: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDSearchDisplayGroup.wo/ERDSearchDisplayGroup.woo ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDSearchDisplayGroup.java =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDSearchDisplayGroup.java (rev 0) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDSearchDisplayGroup.java 2009-10-20 02:40:24 UTC (rev 10101) @@ -0,0 +1,62 @@ +package er.directtoweb.components.misc; + +import com.webobjects.appserver.WOActionResults; +import com.webobjects.appserver.WOContext; +import com.webobjects.eoaccess.EODatabaseDataSource; +import com.webobjects.eocontrol.EODataSource; +import com.webobjects.eocontrol.EOKeyValueQualifier; +import com.webobjects.eocontrol.EOQualifier; +import com.webobjects.foundation.NSSelector; + +import er.directtoweb.components.ERDCustomQueryComponent; + +/** + * QuickSerch or 'filter' feature + * For nesting inside list page nav bar + * + * @author mendis + * + */ +public class ERDSearchDisplayGroup extends ERDCustomQueryComponent { + public String value; + + public ERDSearchDisplayGroup(WOContext context) { + super(context); + } + + @Override + public boolean synchronizesVariablesWithBindings() { + return false; + } + public static final NSSelector selector = EOQualifier.QualifierOperatorCaseInsensitiveLike; // FIXME: turn into property + + // accessors + public String searchKey() { + String searchKey = (String) d2wContext().valueForKey("searchKey"); + EODataSource dataSource = displayGroup().dataSource(); + + if (searchKey == null && dataSource instanceof EODatabaseDataSource) { + searchKey = (String) ((EODatabaseDataSource) dataSource).entity().classPropertyNames().objectAtIndex(0); + } + return searchKey; + } + + public String displayNameForSearchKey() { + String displayNameForSearchKey = (String) d2wContext().valueForKey("displayNameForSearchKey"); + return (displayNameForSearchKey != null && !displayNameForSearchKey.equals("")) ? displayNameForSearchKey : searchKey(); + } + + // actions + public WOActionResults search() { + EODataSource dataSource = displayGroup().dataSource(); + + if (value != null && dataSource instanceof EODatabaseDataSource) { + EOQualifier _qualifier = new EOKeyValueQualifier(searchKey(), selector, "*" + value + "*"); + ((EODatabaseDataSource) dataSource).setAuxiliaryQualifier(_qualifier); + } else ((EODatabaseDataSource) dataSource).setAuxiliaryQualifier(null); + + displayGroup().fetch(); + + return context().page(); + } +} \ No newline at end of file Property changes on: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDSearchDisplayGroup.java ___________________________________________________________________ Added: svn:mime-type + text/plain This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rm...@us...> - 2009-10-21 02:57:08
|
Revision: 10106 http://wonder.svn.sourceforge.net/wonder/?rev=10106&view=rev Author: rmendis Date: 2009-10-21 02:56:58 +0000 (Wed, 21 Oct 2009) Log Message: ----------- Adding semantic-rich markup toMany D2W display component (i.e for XHTML/HTML4) Added Paths: ----------- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayToManyUnorderedList.wo/ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayToManyUnorderedList.wo/ERD2WDisplayToManyUnorderedList.html trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayToManyUnorderedList.wo/ERD2WDisplayToManyUnorderedList.wod trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayToManyUnorderedList.wo/ERD2WDisplayToManyUnorderedList.woo trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WDisplayToManyUnorderedList.java Added: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayToManyUnorderedList.wo/ERD2WDisplayToManyUnorderedList.html =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayToManyUnorderedList.wo/ERD2WDisplayToManyUnorderedList.html (rev 0) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayToManyUnorderedList.wo/ERD2WDisplayToManyUnorderedList.html 2009-10-21 02:56:58 UTC (rev 10106) @@ -0,0 +1,8 @@ +<webobject name="HasItems"> +<ul> +<webobject name="ItemRepetition"> + <li><webobject name="Inspect"/></li> +</webobject> +</ul> +</webobject> +<webobject name="HasNoItems"><br /></webobject> \ No newline at end of file Property changes on: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayToManyUnorderedList.wo/ERD2WDisplayToManyUnorderedList.html ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayToManyUnorderedList.wo/ERD2WDisplayToManyUnorderedList.wod =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayToManyUnorderedList.wo/ERD2WDisplayToManyUnorderedList.wod (rev 0) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayToManyUnorderedList.wo/ERD2WDisplayToManyUnorderedList.wod 2009-10-21 02:56:58 UTC (rev 10106) @@ -0,0 +1,19 @@ +Inspect: WOHyperlink { + action = inspectAction; + disabled = d2wContext.disabled; + string = stringForItem; +} + +ItemRepetition: WORepetition { + list = list; + item = item; +} + +HasItems: WOConditional { + condition = hasItems; +} + +HasNoItems: WOConditional { + condition = hasItems; + negate = true; +} Property changes on: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayToManyUnorderedList.wo/ERD2WDisplayToManyUnorderedList.wod ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayToManyUnorderedList.wo/ERD2WDisplayToManyUnorderedList.woo =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayToManyUnorderedList.wo/ERD2WDisplayToManyUnorderedList.woo (rev 0) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayToManyUnorderedList.wo/ERD2WDisplayToManyUnorderedList.woo 2009-10-21 02:56:58 UTC (rev 10106) @@ -0,0 +1,4 @@ +{ + "WebObjects Release" = "WebObjects 5.0"; + encoding = "UTF-8"; +} Property changes on: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayToManyUnorderedList.wo/ERD2WDisplayToManyUnorderedList.woo ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WDisplayToManyUnorderedList.java =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WDisplayToManyUnorderedList.java (rev 0) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WDisplayToManyUnorderedList.java 2009-10-21 02:56:58 UTC (rev 10106) @@ -0,0 +1,21 @@ +package er.directtoweb.components.relationships; + +import com.webobjects.appserver.WOContext; +import com.webobjects.directtoweb.D2WDisplayToManyTable; + +/** + * Display toMany relationship in <ul></ul> + * + * @author mendis + * + */ +public class ERD2WDisplayToManyUnorderedList extends D2WDisplayToManyTable { + public ERD2WDisplayToManyUnorderedList(WOContext aContext) { + super(aContext); + } + + // accessors + public boolean hasItems() { + return (list()!= null && list().count() > 0); + } +} Property changes on: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WDisplayToManyUnorderedList.java ___________________________________________________________________ Added: svn:mime-type + text/plain This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tho...@us...> - 2009-11-05 08:48:18
|
Revision: 10195 http://wonder.svn.sourceforge.net/wonder/?rev=10195&view=rev Author: thoepfner Date: 2009-11-05 08:48:08 +0000 (Thu, 05 Nov 2009) Log Message: ----------- -removing Ajax framework from classpath -Using WOSwitchComponent in ERD2W*Attachment.wod to prevent dependency on ERAttachment framework Relates to WONDER-388 Modified Paths: -------------- trunk/Wonder/Frameworks/Core/ERDirectToWeb/.classpath trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayAttachment.wo/ERD2WDisplayAttachment.wod trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditAttachment.wo/ERD2WEditAttachment.wod Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/.classpath =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/.classpath 2009-11-05 03:52:51 UTC (rev 10194) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/.classpath 2009-11-05 08:48:08 UTC (rev 10195) @@ -4,7 +4,6 @@ <classpathentry exported="true" kind="con" path="WOFramework/ERExtensions"/> <classpathentry exported="true" kind="con" path="WOFramework/ERJars"/> <classpathentry exported="true" kind="con" path="WOFramework/JavaWOExtensions"/> - <classpathentry exported="true" kind="con" path="WOFramework/Ajax"/> <classpathentry exported="true" kind="con" path="WOFramework/JavaDirectToWeb"/> <classpathentry exported="true" kind="con" path="WOFramework/JavaDTWGeneration"/> <classpathentry exported="true" kind="con" path="WOFramework/JavaEOAccess"/> Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayAttachment.wo/ERD2WDisplayAttachment.wod =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayAttachment.wo/ERD2WDisplayAttachment.wod 2009-11-05 03:52:51 UTC (rev 10194) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayAttachment.wo/ERD2WDisplayAttachment.wod 2009-11-05 08:48:08 UTC (rev 10195) @@ -7,7 +7,9 @@ negate = true; } -DisplayAttachmentDownloadLink: ERAttachmentLink { +DisplayAttachmentDownloadLink: WOSwitchComponent { + // Using WOSwitchComponent to prevent dependency on ERAttachment framework + WOComponentName = "ERAttachmentLink"; attachment = objectPropertyValue; class = "ERD2WDisplayAttachment download"; } @@ -16,7 +18,9 @@ value = objectPropertyValue.originalFileName;//VALID } -Icon: ERAttachmentIcon { +Icon: WOSwitchComponent { + // Using WOSwitchComponent to prevent dependency on ERAttachment framework + WOComponentName = "ERAttachmentIcon"; attachment = objectPropertyValue; size = d2wContext.size; } Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditAttachment.wo/ERD2WEditAttachment.wod =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditAttachment.wo/ERD2WEditAttachment.wod 2009-11-05 03:52:51 UTC (rev 10194) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditAttachment.wo/ERD2WEditAttachment.wod 2009-11-05 08:48:08 UTC (rev 10195) @@ -7,23 +7,29 @@ negate = true; } -FileUpload : ERAttachmentUpload { +FileUpload : WOSwitchComponent { + // Using WOSwitchComponent to prevent dependency on ERAttachment framework + WOComponentName = "ERAttachmentUpload"; attachment = objectPropertyValue; editingContext = object.editingContext; configurationName = configurationName; ajax = ^ajax; } -DisplayAttachmentDownloadLink: ERAttachmentLink { +DisplayAttachmentDownloadLink: WOSwitchComponent { + // Using WOSwitchComponent to prevent dependency on ERAttachment framework + WOComponentName = "ERAttachmentLink"; attachment = objectPropertyValue; class = "ERD2WDisplayAttachment download"; } FileName: WOString { - value = objectPropertyValue.originalFileName; + value = objectPropertyValue.originalFileName //VALID; } -Icon: ERAttachmentIcon { +Icon: WOSwitchComponent { + // Using WOSwitchComponent to prevent dependency on ERAttachment framework + WOComponentName = "ERAttachmentIcon"; attachment = objectPropertyValue; size = d2wContext.size; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <rm...@us...> - 2009-11-26 04:09:45
|
Revision: 10337 http://wonder.svn.sourceforge.net/wonder/?rev=10337&view=rev Author: rmendis Date: 2009-11-26 04:09:35 +0000 (Thu, 26 Nov 2009) Log Message: ----------- Adding the alternative edit toMany fault list D2W component Added Paths: ----------- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditToManyFaultList.wo/ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditToManyFaultList.wo/ERD2WEditToManyFaultList.html trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditToManyFaultList.wo/ERD2WEditToManyFaultList.wod trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditToManyFaultList.wo/ERD2WEditToManyFaultList.woo trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WEditToManyFaultList.java Added: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditToManyFaultList.wo/ERD2WEditToManyFaultList.html =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditToManyFaultList.wo/ERD2WEditToManyFaultList.html (rev 0) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditToManyFaultList.wo/ERD2WEditToManyFaultList.html 2009-11-26 04:09:35 UTC (rev 10337) @@ -0,0 +1,8 @@ +<webobject name="HasBrowserItems"> +<ul> +<webobject name="ItemRepetition"> + <webobject name="RemoveBox"><webobject name="ToOneLink" /><webobject name="DeleteButton">Remove</webobject></webobject> +</webobject> +</ul> +</webobject> +<webobject name="AddBox"><webobject name="AddButton">Add...</webobject></webobject> \ No newline at end of file Property changes on: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditToManyFaultList.wo/ERD2WEditToManyFaultList.html ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditToManyFaultList.wo/ERD2WEditToManyFaultList.wod =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditToManyFaultList.wo/ERD2WEditToManyFaultList.wod (rev 0) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditToManyFaultList.wo/ERD2WEditToManyFaultList.wod 2009-11-26 04:09:35 UTC (rev 10337) @@ -0,0 +1,37 @@ +HasBrowserItems : WOConditional { + condition = browserList.count; +} + +ItemRepetition: WORepetition { + list = browserList; + item = browserItem; +} + +AddButton: WOSubmitButton { + action = editValues; + class = "D2WAjaxEditToManyFault_Add"; + value = "Add..."; +} + +AddBox: WOGenericContainer { + elementName = "div"; + id = addBoxID; +} + +RemoveBox: WOGenericContainer { + elementName = "li"; + id = removeBoxID; + class = "D2WAjaxEditToManyFault"; +} + +ToOneLink: WOHyperlink { + action = toOneAction; + disabled = d2wContext.disabled; + string = toOneDescription; +} + +DeleteButton: WOSubmitButton { + action = removeFromToManyRelationshipAction; + value = "Remove"; + class = "D2WAjaxEditToManyFault_Delete"; +} Property changes on: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditToManyFaultList.wo/ERD2WEditToManyFaultList.wod ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditToManyFaultList.wo/ERD2WEditToManyFaultList.woo =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditToManyFaultList.wo/ERD2WEditToManyFaultList.woo (rev 0) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditToManyFaultList.wo/ERD2WEditToManyFaultList.woo 2009-11-26 04:09:35 UTC (rev 10337) @@ -0,0 +1,4 @@ +{ + "WebObjects Release" = "WebObjects 5.0"; + encoding = "UTF-8"; +} Property changes on: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WEditToManyFaultList.wo/ERD2WEditToManyFaultList.woo ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WEditToManyFaultList.java =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WEditToManyFaultList.java (rev 0) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WEditToManyFaultList.java 2009-11-26 04:09:35 UTC (rev 10337) @@ -0,0 +1,83 @@ +package er.directtoweb.components.relationships; + +import org.apache.log4j.Logger; + +import com.webobjects.appserver.WOComponent; +import com.webobjects.appserver.WOContext; +import com.webobjects.directtoweb.D2W; +import com.webobjects.directtoweb.D2WEditToManyFault; +import com.webobjects.directtoweb.EditRelationshipPageInterface; +import com.webobjects.directtoweb.InspectPageInterface; +import com.webobjects.eocontrol.EOEnterpriseObject; + +import er.extensions.eof.ERXEOControlUtilities; +import er.extensions.foundation.ERXStringUtilities; + +/** + * An alternative/simplified edit to many fault component for D2W + * displaying the the toMany relationship in a <ul></ul> with add/remove functionality + * + * @author mendis + */ +public class ERD2WEditToManyFaultList extends D2WEditToManyFault { + + public ERD2WEditToManyFaultList(WOContext arg0) { + super(arg0); + } + + public static Logger log = Logger.getLogger(ERD2WEditToManyFaultList.class); + + // accessors + public String addBoxID() { + return id() + "_add"; + } + + public String removeBoxID() { + String primaryKeyString = ERXEOControlUtilities.primaryKeyStringForObject(browserItem); + return ERXStringUtilities.safeIdentifierName(browserItem.entityName() + primaryKeyString); + } + + public Object toOneDescription() { + EOEnterpriseObject anEO = browserItem; + if(anEO != null) { + String keyWhenRelationship = keyWhenRelationship(); + if(keyWhenRelationship == null || keyWhenRelationship.equals("userPresentableDescription")) + return anEO.userPresentableDescription(); + else + return anEO.valueForKeyPath(keyWhenRelationship); + } else { + return null; + } + } + + public String id() { + return (String) d2wContext().valueForKey("id"); + } + + // actions + public WOComponent toOneAction() { + EOEnterpriseObject anEO = browserItem; + if(anEO == null) { + return null; + } else { + InspectPageInterface inspectPage = (InspectPageInterface) D2W.factory().pageForConfigurationNamed("Inspect" + anEO.entityName(), session()); + inspectPage.setObject(anEO); + inspectPage.setNextPage(context().page()); + return (WOComponent)inspectPage; + } + } + + public void removeFromToManyRelationshipAction() { + EOEnterpriseObject anEO = browserItem; + object().removeObjectFromBothSidesOfRelationshipWithKey(anEO, propertyKey()); + } + + @Override + public WOComponent editValues() { + String targetEntityName = relationship().destinationEntity().name(); + EditRelationshipPageInterface editPage = (EditRelationshipPageInterface) D2W.factory().editRelationshipPageForEntityNamed(targetEntityName, session()); + editPage.setMasterObjectAndRelationshipKey(object(), propertyKey()); + editPage.setNextPage(context().page()); + return (WOComponent)editPage; + } +} Property changes on: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERD2WEditToManyFaultList.java ___________________________________________________________________ Added: svn:mime-type + text/plain This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <an...@us...> - 2009-12-03 10:41:02
|
Revision: 10369 http://wonder.svn.sourceforge.net/wonder/?rev=10369&view=rev Author: anjo Date: 2009-12-03 10:40:48 +0000 (Thu, 03 Dec 2009) Log Message: ----------- added GraphViz support Modified Paths: -------------- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Resources/d2w.d2wmodel trunk/Wonder/Frameworks/Core/ERDirectToWeb/Resources/d2w.d2wmodel.txt Added Paths: ----------- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/ERD2WGraphVizPage.api trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WGraphVizPage.wo/ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WGraphVizPage.wo/ERD2WGraphVizPage.html trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WGraphVizPage.wo/ERD2WGraphVizPage.wod trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WGraphVizPage.wo/ERD2WGraphVizPage.woo trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WGraphVizPage.java Added: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/ERD2WGraphVizPage.api =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/ERD2WGraphVizPage.api (rev 0) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/ERD2WGraphVizPage.api 2009-12-03 10:40:48 UTC (rev 10369) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<wodefinitions> + <wo wocomponentcontent="false" class="ERD2WGraphVizPage.java"> + + </wo> +</wodefinitions> \ No newline at end of file Added: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WGraphVizPage.wo/ERD2WGraphVizPage.html =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WGraphVizPage.wo/ERD2WGraphVizPage.html (rev 0) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WGraphVizPage.wo/ERD2WGraphVizPage.html 2009-12-03 10:40:48 UTC (rev 10369) @@ -0,0 +1,27 @@ +digraph g { +graph [ + rankdir = "LR" +]; +node [ + fontsize = "16" + shape = "record" +]; +edge [ + +]; + +<webobject name=Entities>"<webobject name=EntityName></webobject>" [ + label = "<webobject name=EntityName></webobject>|<webobject name=Attributes><webobject name=AttributeName></webobject>|</webobject><webobject name=ToOneRelationships><webobject name=RelationshipName></webobject>|<webobject name=RelationshipName></webobject></webobject>|<webobject name=ToManyRelationships><webobject name=RelationshipName></webobject>|<webobject name=RelationshipName></webobject></webobject>" +]; +</webobject> +<webobject name=Entities> +<webobject name=ToOneRelationships> +"<webobject name=EntityName></webobject>":<webobject name=RelationshipName></webobject> <webobject name=NodeType></webobject> "<webobject name=DestinationEntityName></webobject>": <webobject name=DestinationRelationshipName></webobject> [ + id = <webobject name=NodeID></webobject> +];</webobject> +<webobject name=ToManyRelationships> +"<webobject name=EntityName></webobject>":<webobject name=RelationshipName></webobject> <webobject name=NodeType></webobject> "<webobject name=DestinationEntityName></webobject>": <webobject name=DestinationRelationshipName></webobject> [ + id = <webobject name=NodeID></webobject> +];</webobject> +</webobject> +} \ No newline at end of file Added: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WGraphVizPage.wo/ERD2WGraphVizPage.wod =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WGraphVizPage.wo/ERD2WGraphVizPage.wod (rev 0) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WGraphVizPage.wo/ERD2WGraphVizPage.wod 2009-12-03 10:40:48 UTC (rev 10369) @@ -0,0 +1,48 @@ +Entities : WORepetition { + list = d2wContext.visibleEntityNames; + item = entityName; +} + +EntityName : WOString { + value = d2wContext.entity.name; +} + +NodeType : WOString { + value = nodeType; + escapeHTML = false; +} + +NodeID : WOString { + value = nodeID; +} + +DestinationEntityName : WOString { + value = d2wContext.smartRelationship.destinationEntity.name; +} + +DestinationRelationshipName : WOString { + value = d2wContext.smartRelationship.anyInverseRelationship.name; +} + +Attributes : WORepetition { + list = attributes; + item = d2wContext.propertyKey; +} + +AttributeName : WOString { + value = d2wContext.propertyKey; +} + +ToOneRelationships : WORepetition { + list = toOneRelationships; + item = d2wContext.propertyKey; +} + +ToManyRelationships : WORepetition { + list = toManyRelationships; + item = d2wContext.propertyKey; +} + +RelationshipName : WOString { + value = d2wContext.propertyKey; +} Added: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WGraphVizPage.wo/ERD2WGraphVizPage.woo =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WGraphVizPage.wo/ERD2WGraphVizPage.woo (rev 0) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WGraphVizPage.wo/ERD2WGraphVizPage.woo 2009-12-03 10:40:48 UTC (rev 10369) @@ -0,0 +1,4 @@ +{ + "WebObjects Release" = "WebObjects 5.0"; + encoding = "UTF-8"; +} \ No newline at end of file Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Resources/d2w.d2wmodel =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Resources/d2w.d2wmodel 2009-12-03 07:23:54 UTC (rev 10368) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Resources/d2w.d2wmodel 2009-12-03 10:40:48 UTC (rev 10369) @@ -379,6 +379,9 @@ {"author" = "70"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOAndQualifier"; "qualifiers" = ({"class" = "com.webobjects.eocontrol.EOOrQualifier"; "qualifiers" = ({"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo"; "value" = "inspect"; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo"; "value" = "edit"; }); }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "subTask"; "selectorName" = "isEqualTo"; "value" = "printerFriendly"; }); }; "rhs" = {"class" = "er.directtoweb.ERDKeyValueAssignment"; "keyPath" = "pageName"; "value" = "templateNameForPrinterFriendlyInspectPage"; }; }, {"author" = "70"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOAndQualifier"; "qualifiers" = ({"class" = "com.webobjects.eocontrol.EOOrQualifier"; "qualifiers" = ({"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo"; "value" = "list"; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo"; "value" = "select"; }); }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "subTask"; "selectorName" = "isEqualTo"; "value" = "printerFriendly"; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "existingSubTask"; "selectorName" = "isEqualTo"; "value" = "group"; }); }; "rhs" = {"class" = "er.directtoweb.ERDKeyValueAssignment"; "keyPath" = "pageName"; "value" = "templateNameForGroupingPrinterFriendlyListPage"; }; }, {"author" = "70"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOAndQualifier"; "qualifiers" = ({"class" = "com.webobjects.eocontrol.EOOrQualifier"; "qualifiers" = ({"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo"; "value" = "inspect"; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo"; "value" = "edit"; }); }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "subTask"; "selectorName" = "isEqualTo"; "value" = "printerFriendly"; }, {"class" = "com.webobjects.eocontrol.EOOrQualifier"; "qualifiers" = ({"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "existingPageName"; "selectorName" = "isLike"; "value" = "ERD2WTabInspectPageTemplate*"; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "existingPageName"; "selectorName" = "isLike"; "value" = "ERD2WWizardCreationPageTemplate*"; }); }); }; "rhs" = {"class" = "er.directtoweb.ERDKeyValueAssignment"; "keyPath" = "pageName"; "value" = "templateNameForPrinterFriendlyInspectPage"; }; }, + {"author" = "100"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "pageConfiguration"; "selectorName" = "isLike"; "value" = "GraphViz*"; }; "rhs" = {"class" = "com.webobjects.directtoweb.Assignment"; "keyPath" = "task"; "value" = "showAll"; }; }, + {"author" = "100"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "pageConfiguration"; "selectorName" = "isLike"; "value" = "GraphViz*"; }; "rhs" = {"class" = "er.directtoweb.ERDDefaultModelAssignment"; "keyPath" = "entity"; "value" = "*all*"; }; }, + {"author" = "100"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "pageConfiguration"; "selectorName" = "isLike"; "value" = "GraphViz*"; }; "rhs" = {"class" = "com.webobjects.directtoweb.Assignment"; "keyPath" = "pageName"; "value" = "ERD2WGraphVizPage"; }; }, {"author" = "100"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo"; "value" = "editRelationship"; }; "rhs" = {"class" = "er.directtoweb.ERDKeyValueAssignment"; "keyPath" = "pageName"; "value" = "templateNameForEditRelationshipPage"; }; }, {"author" = "100"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOAndQualifier"; "qualifiers" = ({"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo"; "value" = "list"; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "subTask"; "selectorName" = "isEqualTo"; "value" = "calendar"; }); }; "rhs" = {"class" = "er.directtoweb.ERDKeyValueAssignment"; "keyPath" = "pageName"; "value" = "templateNameForListCalendarPage"; }; }, {"author" = "100"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOAndQualifier"; "qualifiers" = ({"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo"; "value" = "list"; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "subTask"; "selectorName" = "isEqualTo"; "value" = "group"; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "targetOutput"; "selectorName" = "isEqualTo"; "value" = "xml"; }); }; "rhs" = {"class" = "er.directtoweb.ERDKeyValueAssignment"; "keyPath" = "pageName"; "value" = "templateNameForGroupingListXMLPage"; }; }, Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Resources/d2w.d2wmodel.txt =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Resources/d2w.d2wmodel.txt 2009-12-03 07:23:54 UTC (rev 10368) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Resources/d2w.d2wmodel.txt 2009-12-03 10:40:48 UTC (rev 10369) @@ -387,6 +387,9 @@ 70 : ((task = 'inspect' or task = 'edit') and subTask = 'printerFriendly') => pageName = templateNameForPrinterFriendlyInspectPage [er.directtoweb.ERDKeyValueAssignment], 70 : ((task = 'list' or task = 'select') and subTask = 'printerFriendly' and existingSubTask = 'group') => pageName = templateNameForGroupingPrinterFriendlyListPage [er.directtoweb.ERDKeyValueAssignment], 70 : ((task = 'inspect' or task = 'edit') and subTask = 'printerFriendly' and (existingPageName like 'ERD2WTabInspectPageTemplate*' or existingPageName like 'ERD2WWizardCreationPageTemplate*')) => pageName = templateNameForPrinterFriendlyInspectPage [er.directtoweb.ERDKeyValueAssignment], + 100 : pageConfiguration like 'GraphViz*' => task = showAll [com.webobjects.directtoweb.Assignment], + 100 : pageConfiguration like 'GraphViz*' => entity = *all* [er.directtoweb.ERDDefaultModelAssignment], + 100 : pageConfiguration like 'GraphViz*' => pageName = ERD2WGraphVizPage [com.webobjects.directtoweb.Assignment], 100 : task = 'editRelationship' => pageName = templateNameForEditRelationshipPage [er.directtoweb.ERDKeyValueAssignment], 100 : (task = 'list' and subTask = 'calendar') => pageName = templateNameForListCalendarPage [er.directtoweb.ERDKeyValueAssignment], 100 : (task = 'list' and subTask = 'group' and targetOutput = 'xml') => pageName = templateNameForGroupingListXMLPage [er.directtoweb.ERDKeyValueAssignment], Added: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WGraphVizPage.java =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WGraphVizPage.java (rev 0) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WGraphVizPage.java 2009-12-03 10:40:48 UTC (rev 10369) @@ -0,0 +1,74 @@ +package er.directtoweb.pages; + +import com.webobjects.appserver.WOContext; +import com.webobjects.appserver.WOResponse; +import com.webobjects.eoaccess.EOEntity; +import com.webobjects.foundation.NSArray; +import com.webobjects.foundation.NSMutableArray; + +import er.extensions.appserver.ERXApplication; + + +/** + * Creates a GrahpViz page for those that needs such trivial tools. + * @author ak + * + */ +public class ERD2WGraphVizPage extends ERD2WPage { + + private int _nodeID = 0; + + public ERD2WGraphVizPage(WOContext context) { + super(context); + } + + public int nodeID() { + return _nodeID ++; + } + + public NSArray<String> attributes() { + NSMutableArray<String> result = new NSMutableArray<String>(); + EOEntity entity = entity(); + for (String key : (NSArray<String>)displayPropertyKeys()) { + if(entity.classDescriptionForInstances().attributeKeys().containsObject(key) && entity.classPropertyNames().containsObject(key)) { + result.addObject(key); + } + } + return result; + } + + public NSArray<String> toOneRelationships() { + NSMutableArray<String> result = new NSMutableArray<String>(); + EOEntity entity = entity(); + for (String key : (NSArray<String>)displayPropertyKeys()) { + if(entity.classDescriptionForInstances().toOneRelationshipKeys().containsObject(key) && entity.classPropertyNames().containsObject(key)) { + result.addObject(key); + } + } + return result; + } + + public String nodeType() { + return "->"; + } + + public NSArray<String> toManyRelationships() { + NSMutableArray<String> result = new NSMutableArray<String>(); + EOEntity entity = entity(); + for (String key : (NSArray<String>)displayPropertyKeys()) { + if(entity.classDescriptionForInstances().toManyRelationshipKeys().containsObject(key) && entity.classPropertyNames().containsObject(key)) { + result.addObject(key); + } + } + return result; + } + + @Override + public void appendToResponse(WOResponse response, WOContext context) { + // we do NOT want to expose our model to just everyone... + if (ERXApplication.isDevelopmentModeSafe()) { + super.appendToResponse(response, context); + } + response.setHeader("text/plain", "content-type"); + } +} \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <an...@us...> - 2009-12-03 10:48:37
|
Revision: 10370 http://wonder.svn.sourceforge.net/wonder/?rev=10370&view=rev Author: anjo Date: 2009-12-03 10:48:31 +0000 (Thu, 03 Dec 2009) Log Message: ----------- added GraphViz support Modified Paths: -------------- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WGraphVizPage.wo/ERD2WGraphVizPage.html trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WGraphVizPage.wo/ERD2WGraphVizPage.wod trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WGraphVizPage.java Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WGraphVizPage.wo/ERD2WGraphVizPage.html =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WGraphVizPage.wo/ERD2WGraphVizPage.html 2009-12-03 10:40:48 UTC (rev 10369) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WGraphVizPage.wo/ERD2WGraphVizPage.html 2009-12-03 10:48:31 UTC (rev 10370) @@ -11,7 +11,7 @@ ]; <webobject name=Entities>"<webobject name=EntityName></webobject>" [ - label = "<webobject name=EntityName></webobject>|<webobject name=Attributes><webobject name=AttributeName></webobject>|</webobject><webobject name=ToOneRelationships><webobject name=RelationshipName></webobject>|<webobject name=RelationshipName></webobject></webobject>|<webobject name=ToManyRelationships><webobject name=RelationshipName></webobject>|<webobject name=RelationshipName></webobject></webobject>" + label = "<webobject name=EntityName></webobject>|<webobject name=Attributes><webobject name=AttributeName></webobject>|</webobject><webobject name=ToOneRelationships><webobject name=RelationshipTag></webobject><webobject name=RelationshipName></webobject>|</webobject>|<webobject name=ToManyRelationships><webobject name=RelationshipTag></webobject><webobject name=RelationshipName></webobject>|</webobject>" ]; </webobject> <webobject name=Entities> Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WGraphVizPage.wo/ERD2WGraphVizPage.wod =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WGraphVizPage.wo/ERD2WGraphVizPage.wod 2009-12-03 10:40:48 UTC (rev 10369) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WGraphVizPage.wo/ERD2WGraphVizPage.wod 2009-12-03 10:48:31 UTC (rev 10370) @@ -43,6 +43,11 @@ item = d2wContext.propertyKey; } +RelationshipTag : WOString { + value = tag; + escapeHTML = false; +} + RelationshipName : WOString { value = d2wContext.propertyKey; } Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WGraphVizPage.java =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WGraphVizPage.java 2009-12-03 10:40:48 UTC (rev 10369) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WGraphVizPage.java 2009-12-03 10:48:31 UTC (rev 10370) @@ -48,6 +48,10 @@ return result; } + public String tag() { + return "<" + propertyKey() + ">"; + } + public String nodeType() { return "->"; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ms...@us...> - 2010-09-01 07:53:48
|
Revision: 11185 http://wonder.svn.sourceforge.net/wonder/?rev=11185&view=rev Author: mschrag Date: 2010-09-01 07:53:41 +0000 (Wed, 01 Sep 2010) Log Message: ----------- Merge Wonder 2.0 11055: created a component called ERDZoomableImage which can be used to display a image which onClick will open a window with zoomedImage. ERD2WDisplayImageWithUrl component uses ERDZoomableImage component by default zoomEnabledForImage is set to false. Modified Paths: -------------- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayImageWithUrl.wo/ERD2WDisplayImageWithUrl.wod trunk/Wonder/Frameworks/Core/ERDirectToWeb/Resources/d2w.d2wmodel trunk/Wonder/Frameworks/Core/ERDirectToWeb/Resources/d2w.d2wmodel.txt Added Paths: ----------- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDZoomableImage.wo/ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDZoomableImage.wo/ERDZoomableImage.html trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDZoomableImage.wo/ERDZoomableImage.wod trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDZoomableImage.java Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayImageWithUrl.wo/ERD2WDisplayImageWithUrl.wod =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayImageWithUrl.wo/ERD2WDisplayImageWithUrl.wod 2010-09-01 07:37:57 UTC (rev 11184) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERD2WDisplayImageWithUrl.wo/ERD2WDisplayImageWithUrl.wod 2010-09-01 07:53:41 UTC (rev 11185) @@ -1,5 +1,7 @@ -Image: WOImage { +Image: ERDZoomableImage { src=objectPropertyValue; width = d2wContext.imageWidth; height = d2wContext.imageHeight; + zoomWidth = localContext.zoomWidth; + zoomHeight = 777; } \ No newline at end of file Added: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDZoomableImage.wo/ERDZoomableImage.html =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDZoomableImage.wo/ERDZoomableImage.html (rev 0) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDZoomableImage.wo/ERDZoomableImage.html 2010-09-01 07:53:41 UTC (rev 11185) @@ -0,0 +1,54 @@ +<webobject name="Once"> +<script> + var ZoomableImage = { + openImageFromURL: function(url, height, width) + { + var myWidth = (screen.availWidth > 800) ? (screen.availWidth - 100) : screen.availWidth; // if 800x600 or less, take up + var myHeight = (screen.availHeight > 600) ? (screen.availHeight - 100) : (screen.availHeight - 70); // the whole screen. + var myLeft = Math.round((screen.availWidth - myWidth) / 2); + var myTop = Math.round((screen.availHeight - myHeight) / 2)-25; + + + if (myTop < 0) { myTop = 0; } // bugfix for Opera + if (screen.availHeight < 600) { myTop-=20; } + var horizontalScrollbar = true; + var verticalScrollbar = true; + + if(width > 0 && width < myWidth) { + myWidth = width; + //horizontalScrollbar = false; + } + + if(height > 0 && height < myHeight) { + myHeight = height; + //verticalScrollbar = false; + } + + var scrollbars = "yes"; + //if(!horizontalScrollbar && !verticalScrollbar) scrollbars = "no"; + console.info("myheight:" + myHeight); + console.info("mywidth:" + myWidth); + console.info("screen.width:" + screen.availWidth); + var openCurrentImageWindow = window.open(url, 'FullSizeImage', 'scrollbars='+scrollbars+',titlebar=no,location=no,status=no,toolbar=no,resizable=yes,width='+ myWidth +',height='+ myHeight +',top='+myTop+',left='+myLeft); + openCurrentImageWindow.focus(); + return false; + } + }; +</script> + +</webobject> +<webobject name = "ValidThumbnailSrcExist"> + <!-- zoom case --> + <webobject name = "EnableZoom"> + <webobject name="ZoomImageLink"> + <webobject name="Thumbnail"></webobject> + </webobject> + </webobject> + <!-- no zoom case --> + <webobject name = "DisableZoom"> + <webobject name="Thumbnail"></webobject> + </webobject> +</webobject> + +<!-- no image case --> +<webobject name = "ValidThumbnailSrcDoesntExist"><webobject name="NoImageString"></webobject></webobject> Property changes on: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDZoomableImage.wo/ERDZoomableImage.html ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDZoomableImage.wo/ERDZoomableImage.wod =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDZoomableImage.wo/ERDZoomableImage.wod (rev 0) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDZoomableImage.wo/ERDZoomableImage.wod 2010-09-01 07:53:41 UTC (rev 11185) @@ -0,0 +1,37 @@ +Thumbnail : WOImage { + src = thumnailSrc; + height = ^height; + width = ^width; + title = ^title; +} + +ZoomImageLink : WOHyperlink { + href = "javascript:void(0)"; + onClick = jsToZoomImage; +} + +ValidThumbnailSrcExist : WOConditional { + condition = thumbnailSrcNullOrEmpty; + negate = true; +} + +ValidThumbnailSrcDoesntExist : WOConditional { + condition = thumbnailSrcNullOrEmpty; +} + +Once : ERXOncePerRequestConditional { + keyName = "ERDZoomableImage"; +} + +NoImageString : WOString { + value = noImageString; +} + +EnableZoom : WOConditional { + condition = enableZoom; +} + +DisableZoom : WOConditional { + condition = enableZoom; + negate = true; +} \ No newline at end of file Property changes on: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDZoomableImage.wo/ERDZoomableImage.wod ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Resources/d2w.d2wmodel =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Resources/d2w.d2wmodel 2010-09-01 07:37:57 UTC (rev 11184) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Resources/d2w.d2wmodel 2010-09-01 07:53:41 UTC (rev 11185) @@ -26,6 +26,7 @@ {"author" = "0"; "class" = "com.webobjects.directtoweb.Rule"; "rhs" = {"class" = "com.webobjects.directtoweb.BooleanAssignment"; "keyPath" = "isEntityEditable"; "value" = "false"; }; }, {"author" = "0"; "class" = "com.webobjects.directtoweb.Rule"; "rhs" = {"class" = "com.webobjects.directtoweb.Assignment"; "keyPath" = "indefiniteArticleForProperty"; "value" = "a"; }; }, {"author" = "0"; "class" = "com.webobjects.directtoweb.Rule"; "rhs" = {"class" = "com.webobjects.directtoweb.Assignment"; "keyPath" = "controllerButtonUIStyle"; "value" = "flyOver"; }; }, + {"author" = "0"; "class" = "com.webobjects.directtoweb.Rule"; "rhs" = {"class" = "com.webobjects.directtoweb.BooleanAssignment"; "keyPath" = "enableZoomForImage"; "value" = "false"; }; }, {"author" = "0"; "class" = "com.webobjects.directtoweb.Rule"; "rhs" = {"class" = "com.webobjects.directtoweb.BooleanAssignment"; "keyPath" = "flushPropertyValue"; "value" = "false"; }; }, {"author" = "0"; "class" = "com.webobjects.directtoweb.Rule"; "rhs" = {"class" = "com.webobjects.directtoweb.BooleanAssignment"; "keyPath" = "isEntityInspectable"; "value" = "true"; }; }, {"author" = "0"; "class" = "com.webobjects.directtoweb.Rule"; "rhs" = {"class" = "com.webobjects.directtoweb.BooleanAssignment"; "keyPath" = "propertyIsSortable"; "value" = "false"; }; }, Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Resources/d2w.d2wmodel.txt =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Resources/d2w.d2wmodel.txt 2010-09-01 07:37:57 UTC (rev 11184) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Resources/d2w.d2wmodel.txt 2010-09-01 07:53:41 UTC (rev 11185) @@ -26,6 +26,7 @@ 0 : *true* => isEntityEditable = false [com.webobjects.directtoweb.BooleanAssignment], 0 : *true* => indefiniteArticleForProperty = a [com.webobjects.directtoweb.Assignment], 0 : *true* => controllerButtonUIStyle = flyOver [com.webobjects.directtoweb.Assignment], + 0 : *true* => enableZoomForImage = false [com.webobjects.directtoweb.BooleanAssignment], 0 : *true* => flushPropertyValue = false [com.webobjects.directtoweb.BooleanAssignment], 0 : *true* => isEntityInspectable = true [com.webobjects.directtoweb.BooleanAssignment], 0 : *true* => propertyIsSortable = false [com.webobjects.directtoweb.BooleanAssignment], @@ -322,11 +323,9 @@ 25 : (smartAttribute.userInfo.erPrototype = 'BooleanYesNo' and (smartAttribute.className = 'java.math.BigDecimal' or smartAttribute.className = 'java.lang.Number')) => justification = center [com.webobjects.directtoweb.Assignment], 25 : (smartAttribute.userInfo.erPrototype = 'BooleanYesNo' and (smartAttribute.className = 'java.math.BigDecimal' or smartAttribute.className = 'java.lang.Number')) => componentName = ERD2WDisplayYesNo [com.webobjects.directtoweb.Assignment], 25 : (task = 'edit' and not (smartAttribute.userInfo.unit = null) and (smartAttribute.className = 'java.lang.Number' or smartAttribute.className = 'java.math.BigDecimal')) => componentName = ERD2WEditNumberWithUnit [com.webobjects.directtoweb.Assignment], - 25 : (task = 'edit' and smartAttribute.userInfo.erPrototype = 'BooleanYesNo' and (smartAttribute.className = 'java.math.BigDecimal' or smartAttribute.className = 'java.lang.Number')) => componentName = ERD2WEditYesNo [com.webobjects.directtoweb.Assignment], 25 : (not (task = 'edit') and not (task = 'query') and not (smartAttribute.userInfo.unit = null) and (smartAttribute.className = 'java.math.BigDecimal' or smartAttribute.className = 'java.lang.Number')) => componentName = ERD2WDisplayNumberWithUnit [com.webobjects.directtoweb.Assignment], 25 : (task = 'edit' and (smartAttribute.className = 'java.lang.Boolean' or (smartAttribute.userInfo.erPrototype = 'Boolean' and (smartAttribute.className = 'java.math.BigDecimal' or smartAttribute.className = 'java.lang.Number')))) => componentName = D2WEditBoolean [com.webobjects.directtoweb.Assignment], 25 : ((not (task = 'edit') and not (task = 'query')) and (smartAttribute.className = 'java.lang.Boolean' or (smartAttribute.userInfo.erPrototype = 'Boolean' and (smartAttribute.className = 'java.math.BigDecimal' or smartAttribute.className = 'java.lang.Number')))) => componentName = D2WDisplayBoolean [com.webobjects.directtoweb.Assignment], - 25 : (task = 'query' and (smartAttribute.className = 'java.lang.Boolean' or ((smartAttribute.userInfo.erPrototype = 'Boolean' or smartAttribute.userInfo.erPrototype = 'BooleanYesNo') and (smartAttribute.className = 'java.math.BigDecimal' or smartAttribute.className = 'java.lang.Number')))) => componentName = D2WQueryBoolean [com.webobjects.directtoweb.Assignment], 30 : smartAttribute.userInfo.unit = '%' => length = 5 [com.webobjects.directtoweb.Assignment], 30 : smartAttribute.userInfo.unit = 'ft' => length = 6 [com.webobjects.directtoweb.Assignment], 30 : smartAttribute.userInfo.unit = '%' => minValue = 0 [com.webobjects.directtoweb.Assignment], @@ -348,7 +347,9 @@ 30 : (smartAttribute.userInfo.unit = '%' and smartAttribute.className = 'java.math.BigDecimal') => formatter = ##.###;0;-##.### [com.webobjects.directtoweb.Assignment], 30 : (smartAttribute.userInfo.unit = 'USD in Mills' or smartAttribute.userInfo.unit = 'USD in Millions.') => formatter = ###,###.##;0;-###,###.## [com.webobjects.directtoweb.Assignment], 30 : (smartAttribute.userInfo.unit like 'usf' or smartAttribute.userInfo.unit like 'rsf' or smartAttribute.userInfo.unit like 'feet') => minValue = 0 [com.webobjects.directtoweb.Assignment], + 30 : (task = 'edit' and smartAttribute.userInfo.erPrototype = 'BooleanYesNo' and (smartAttribute.className = 'java.math.BigDecimal' or smartAttribute.className = 'java.lang.Number')) => componentName = ERD2WEditYesNo [com.webobjects.directtoweb.Assignment], 30 : (smartAttribute.userInfo.unit = 'USD/SF/Yr.' or smartAttribute.userInfo.unit = 'USD' or smartAttribute.userInfo.unit = 'USD / Month' or smartAttribute.userInfo.unit = 'USD/SF' or smartAttribute.userInfo.unit = 'USD/RSF/Year' or smartAttribute.userInfo.unit = 'USD / RSF') => minValue = 0 [com.webobjects.directtoweb.Assignment], + 30 : (task = 'query' and (smartAttribute.className = 'java.lang.Boolean' or ((smartAttribute.userInfo.erPrototype = 'Boolean' or smartAttribute.userInfo.erPrototype = 'BooleanYesNo') and (smartAttribute.className = 'java.math.BigDecimal' or smartAttribute.className = 'java.lang.Number')))) => componentName = D2WQueryBoolean [com.webobjects.directtoweb.Assignment], 50 : *true* => defaultBatchSize = 10 [com.webobjects.directtoweb.Assignment], 50 : *true* => richTextMode = simpleRichTextMode [er.directtoweb.ERDKeyValueAssignment], 50 : *true* => backgroundColorForTable = #ebebeb [com.webobjects.directtoweb.Assignment], Added: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDZoomableImage.java =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDZoomableImage.java (rev 0) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDZoomableImage.java 2010-09-01 07:53:41 UTC (rev 11185) @@ -0,0 +1,136 @@ +package er.directtoweb.components.misc; + +import java.awt.image.BufferedImage; +import java.io.IOException; +import java.net.URL; + +import javax.imageio.ImageIO; + +import org.apache.log4j.Logger; + +import com.webobjects.appserver.WOContext; +import com.webobjects.appserver.WOComponent; +import com.webobjects.appserver.WOResponse; +import com.webobjects.foundation.NSDictionary; +import com.webobjects.foundation.NSKeyValueCoding; +import com.webobjects.foundation.NSMutableDictionary; + +import er.directtoweb.components.ERDCustomEditComponent; +import er.extensions.appserver.ERXResponseRewriter; +import er.extensions.components.ERXStatelessComponent; +import er.extensions.foundation.ERXPatcher.DynamicElementsPatches.Image; +import er.extensions.foundation.ERXProperties; +import er.extensions.foundation.ERXStringUtilities; +import er.extensions.foundation.ERXValueUtilities; + +/** + * This stateless component: <p> + * - displays an image with a given src, width & height <br/> + * - allows to zoom to a given height and width. + * + * <p> + * @binding src - source url for the image to be displaed. mandatory for this component to work properly. + * @binding height - height of the image to be displayed in the page. + * @binding width- width of the image to be displayed in the page. + * @binding zoomWidth - width of the zoomed image. defaults to 200. + * @binding zoomHeight - height of the zoomed image. defaults to 200. + * @binding thumbnailSrc - source url for the thumbnail. if null, src binding with height and width is used. + * @binding title - title for the image. used as tooltip in thumbnail mode [optional] + * @binding enableZoomForImage - true/false. if true, clicking on thumbnail will popup the full size image. If false, clicking is not allowed. + * + * @author rajaram + * + */ +public class ERDZoomableImage extends ERXStatelessComponent { + public static final Logger log = Logger.getLogger(ERDZoomableImage.class); + + public ERDZoomableImage(WOContext context) { + super(context); + } + + @Override + public boolean synchronizesVariablesWithBindings() { + return Boolean.FALSE; + } + + /** + * @return {@link String} - source of the zoomable image. + */ + public String imageSrc() { + return (String) valueForBinding("src"); + } + + /** + * @return {@link Integer} width to zoom to (defaults to 200) + */ + public Integer zoomWidth() { + return ERXValueUtilities.intValueWithDefault(valueForBinding("zoomWidth"), 200); + } + + /** + * + * @return {@link Integer} height to zoom to (defaults to 200) + */ + public Integer zoomHeight() { + return ERXValueUtilities.intValueWithDefault(valueForBinding("zoomHeight"), 200); + } + + /** + * @return {@link String} - src for the thumbnail to be displayed in the page. defaults to imageSrc, if null. + */ + public String thumnailSrc() { + String result = (String)valueForBinding("thumbnailSrc"); + if(ERXStringUtilities.stringIsNullOrEmpty(result)) { + result = imageSrc(); + } + + return result; + } + + /** + * @return {@link Boolean} true, if {@link ERDZoomableImage#thumnailSrc()} returns an empty or null string + * false, otherwise + */ + public boolean isThumbnailSrcNullOrEmpty() { + return ERXStringUtilities.stringIsNullOrEmpty(thumnailSrc()); + } + + /** + * controlled by key: enableZoomForImage + * and if either thumbnailSrc or height or width is present (there is no point zooming without these properties passed in) + * @return {@link Boolean} - true, if zooming is allowed. false, otherwise. + */ + public Boolean enableZoom() { + String thumbnailSrc = thumbnailSrcNoFallBack(); + boolean isThumbnailSrcOrHeightOrWidthPresent = (thumbnailSrc != null && thumbnailSrc.length() >0) || valueForBinding("height") != null || valueForBinding("width") != null; + return ERXValueUtilities.booleanValue(valueForBinding("enableZoomForImage")) && isThumbnailSrcOrHeightOrWidthPresent; + } + + String thumbnailSrcNoFallBack() { + return (String) valueForBinding("thumbnailSrc"); + } + + public Boolean disableZoom() { + return !enableZoom(); + } + + public String jsToZoomImage() { + StringBuffer sb = new StringBuffer(); + if(enableZoom()) { + sb.append ("ZoomableImage.openImageFromURL('"); + sb.append(imageSrc()); + sb.append("',"); + sb.append(zoomHeight() + "," + zoomWidth()); + sb.append(");"); + } + + return sb.toString(); + } + + /** + * @return String to use when imageSrc() turns out to be null + */ + public String noImageString() { + return (String) valueForBinding("noImageString"); + } +} Property changes on: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/misc/ERDZoomableImage.java ___________________________________________________________________ Added: svn:mime-type + text/plain This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <nul...@us...> - 2010-10-30 17:51:37
|
Revision: 11653 http://wonder.svn.sourceforge.net/wonder/?rev=11653&view=rev Author: nullterminated Date: 2010-10-30 17:51:30 +0000 (Sat, 30 Oct 2010) Log Message: ----------- Adding David LeBer's embedded edit relationship components into ERDirectToWeb. They aren't enabled in the rules by default since the existing edit relationship pages will need to be updated to use them properly. Modified Paths: -------------- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Resources/d2w.d2wmodel trunk/Wonder/Frameworks/Core/ERDirectToWeb/Resources/d2w.d2wmodel.txt trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultConfigurationNameAssignment.java Added Paths: ----------- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/ERDEditRelationship.api trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/ERXD2WEditRelationship.api trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDEditRelationship.wo/ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDEditRelationship.wo/ERDEditRelationship.html trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDEditRelationship.wo/ERDEditRelationship.wod trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDEditRelationship.wo/ERDEditRelationship.woo trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERXD2WEditRelationship.wo/ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERXD2WEditRelationship.wo/ERXD2WEditRelationship.html trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERXD2WEditRelationship.wo/ERXD2WEditRelationship.wod trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERXD2WEditRelationship.wo/ERXD2WEditRelationship.woo trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERDEditRelationship.java trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/embed/ERXD2WEditRelationship.java Added: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/ERDEditRelationship.api =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/ERDEditRelationship.api (rev 0) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/ERDEditRelationship.api 2010-10-30 17:51:30 UTC (rev 11653) @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<wodefinitions> + <wo wocomponentcontent="false" class="ERDEditRelationship.java"> + + </wo> +</wodefinitions> \ No newline at end of file Added: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/ERXD2WEditRelationship.api =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/ERXD2WEditRelationship.api (rev 0) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/ERXD2WEditRelationship.api 2010-10-30 17:51:30 UTC (rev 11653) @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wodefinitions> + <wo class="ERDEditRelationship.java" wocomponentcontent="false"> + + <binding name="datasource"/> + <binding name="displayKeys"/> + <binding name="entityName"/> + <binding name="list"/> + <binding name="masterObject"/> + <binding name="nextPage"/> + <binding name="nextPageDelegate"/> + <binding name="pageConfiguration"/> + <binding name="relationshipKey"/> + <binding name="settings"/> + </wo> +</wodefinitions> Added: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDEditRelationship.wo/ERDEditRelationship.html =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDEditRelationship.wo/ERDEditRelationship.html (rev 0) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDEditRelationship.wo/ERDEditRelationship.html 2010-10-30 17:51:30 UTC (rev 11653) @@ -0,0 +1 @@ +<webobject name = "EmbeddedEditRelationship"/> \ No newline at end of file Added: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDEditRelationship.wo/ERDEditRelationship.wod =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDEditRelationship.wo/ERDEditRelationship.wod (rev 0) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDEditRelationship.wo/ERDEditRelationship.wod 2010-10-30 17:51:30 UTC (rev 11653) @@ -0,0 +1,7 @@ +EmbeddedEditRelationship: ERXD2WEditRelationship { + pageConfiguration = ^editRelationshipEmbeddedConfigurationName; + entityName = destinationEntityName; + settings = settings; + masterObject = object; + relationshipKey = key; +} \ No newline at end of file Added: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDEditRelationship.wo/ERDEditRelationship.woo =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDEditRelationship.wo/ERDEditRelationship.woo (rev 0) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERDEditRelationship.wo/ERDEditRelationship.woo 2010-10-30 17:51:30 UTC (rev 11653) @@ -0,0 +1,4 @@ +{ + "WebObjects Release" = "WebObjects 5.0"; + encoding = "UTF-8"; +} \ No newline at end of file Added: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERXD2WEditRelationship.wo/ERXD2WEditRelationship.html =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERXD2WEditRelationship.wo/ERXD2WEditRelationship.html (rev 0) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERXD2WEditRelationship.wo/ERXD2WEditRelationship.html 2010-10-30 17:51:30 UTC (rev 11653) @@ -0,0 +1 @@ +<webobject name = "SwitchComponent"><webObject name = "Content" /></webobject> \ No newline at end of file Added: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERXD2WEditRelationship.wo/ERXD2WEditRelationship.wod =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERXD2WEditRelationship.wo/ERXD2WEditRelationship.wod (rev 0) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERXD2WEditRelationship.wo/ERXD2WEditRelationship.wod 2010-10-30 17:51:30 UTC (rev 11653) @@ -0,0 +1,13 @@ +Content: WOComponentContent {} + +SwitchComponent: ERD2WSwitchComponent { + _dynamicPage = ^pageConfiguration; + _entityName = ^entityName; + _settings = ^settings; + _task = "editRelationship"; + _unroll = true; + displayKeys = ^displayKeys; + nextPage = ^nextPage; + nextPageDelegate = actionPageDelegate; + masterObjectAndRelationshipKey = masterObjectAndRelationshipKey; +} \ No newline at end of file Added: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERXD2WEditRelationship.wo/ERXD2WEditRelationship.woo =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERXD2WEditRelationship.wo/ERXD2WEditRelationship.woo (rev 0) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Components/Nonlocalized.lproj/ERXD2WEditRelationship.wo/ERXD2WEditRelationship.woo 2010-10-30 17:51:30 UTC (rev 11653) @@ -0,0 +1,4 @@ +{ + "WebObjects Release" = "WebObjects 5.0"; + encoding = "UTF-8"; +} \ No newline at end of file Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Resources/d2w.d2wmodel =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Resources/d2w.d2wmodel 2010-10-30 03:34:50 UTC (rev 11652) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Resources/d2w.d2wmodel 2010-10-30 17:51:30 UTC (rev 11653) @@ -243,6 +243,7 @@ {"author" = "10"; "class" = "com.webobjects.directtoweb.Rule"; "rhs" = {"class" = "er.directtoweb.ERDDefaultConfigurationNameAssignment"; "keyPath" = "editRelationshipConfigurationName"; "value" = "<ERDDefaultConfigurationNameAssignment>"; }; }, {"author" = "10"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOAndQualifier"; "qualifiers" = ({"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "propertyType"; "selectorName" = "isEqualTo"; "value" = "r"; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "propertyKey"; "selectorName" = "isNotEqualTo"; "value" = {"class" = "com.webobjects.foundation.NSKeyValueCoding$Null"; }; }); }; "rhs" = {"class" = "er.directtoweb.ERDKeyValueAssignment"; "keyPath" = "listConfigurationName"; "value" = "listEmbeddedConfigurationName"; }; }, {"author" = "10"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOAndQualifier"; "qualifiers" = ({"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo"; "value" = "edit"; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "propertyKey"; "selectorName" = "isEqualTo"; "value" = "passwordConfirmation"; }); }; "rhs" = {"class" = "com.webobjects.directtoweb.Assignment"; "keyPath" = "componentName"; "value" = "ERDEditPasswordConfirmation"; }; }, + {"author" = "10"; "class" = "com.webobjects.directtoweb.Rule"; "rhs" = {"class" = "er.directtoweb.ERDDefaultConfigurationNameAssignment"; "keyPath" = "editRelationshipEmbeddedConfigurationName"; "value" = "<ERDDefaultConfigurationNameAssignment>"; }; }, {"author" = "10"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOAndQualifier"; "qualifiers" = ({"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo"; "value" = "query"; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "smartAttribute.className"; "selectorName" = "isEqualTo"; "value" = "java.lang.String"; }); }; "rhs" = {"class" = "com.webobjects.directtoweb.Assignment"; "keyPath" = "componentName"; "value" = "ERD2WQueryStringOperator"; }; }, {"author" = "10"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOAndQualifier"; "qualifiers" = ({"class" = "com.webobjects.eocontrol.EOOrQualifier"; "qualifiers" = ({"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo"; "value" = "list"; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo"; "value" = "select"; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo"; "value" = "inspect"; }); }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "smartRelationship"; "selectorName" = "isNotEqualTo"; "value" = {"class" = "com.webobjects.foundation.NSKeyValueCoding$Null"; }; }); }; "rhs" = {"class" = "com.webobjects.directtoweb.BooleanAssignment"; "keyPath" = "disabled"; "value" = "true"; }; }, {"author" = "10"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOAndQualifier"; "qualifiers" = ({"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "propertyType"; "selectorName" = "isEqualTo"; "value" = "r"; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "propertyKey"; "selectorName" = "isNotEqualTo"; "value" = {"class" = "com.webobjects.foundation.NSKeyValueCoding$Null"; }; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo"; "value" = "edit"; }); }; "rhs" = {"class" = "er.directtoweb.ERDKeyValueAssignment"; "keyPath" = "inspectConfigurationName"; "value" = "editEmbeddedConfigurationName"; }; }, Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Resources/d2w.d2wmodel.txt =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Resources/d2w.d2wmodel.txt 2010-10-30 03:34:50 UTC (rev 11652) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Resources/d2w.d2wmodel.txt 2010-10-30 17:51:30 UTC (rev 11653) @@ -247,6 +247,7 @@ 10 : *true* => editRelationshipConfigurationName = <ERDDefaultConfigurationNameAssignment> [er.directtoweb.ERDDefaultConfigurationNameAssignment], 10 : (propertyType = 'r' and propertyKey != null) => listConfigurationName = listEmbeddedConfigurationName [er.directtoweb.ERDKeyValueAssignment], 10 : (task = 'edit' and propertyKey = 'passwordConfirmation') => componentName = ERDEditPasswordConfirmation [com.webobjects.directtoweb.Assignment], + 10 : *true* => editRelationshipEmbeddedConfigurationName = <ERDDefaultConfigurationNameAssignment> [er.directtoweb.ERDDefaultConfigurationNameAssignment], 10 : (task = 'query' and smartAttribute.className = 'java.lang.String') => componentName = ERD2WQueryStringOperator [com.webobjects.directtoweb.Assignment], 10 : ((task = 'list' or task = 'select' or task = 'inspect') and smartRelationship != null) => disabled = true [com.webobjects.directtoweb.BooleanAssignment], 10 : (propertyType = 'r' and propertyKey != null and task = 'edit') => inspectConfigurationName = editEmbeddedConfigurationName [er.directtoweb.ERDKeyValueAssignment], Modified: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultConfigurationNameAssignment.java =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultConfigurationNameAssignment.java 2010-10-30 03:34:50 UTC (rev 11652) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/assignments/defaults/ERDDefaultConfigurationNameAssignment.java 2010-10-30 17:51:30 UTC (rev 11653) @@ -141,13 +141,24 @@ /** * Generates a default embedded edit page configuration * based on the current entity name. Default format - * is 'Edit' + entity name. + * is 'EditEmbedded' + entity name. * @param c current D2W context - * @return default edit page configuration name + * @return default embedded edit page configuration name */ public Object editEmbeddedConfigurationName(D2WContext c) { return "EditEmbedded" + entityNameForContext(c); } + + /** + * Generates a default embedded edit relationship page + * configuration based on the current entity name. Default + * format is 'EditRelationshipEmbedded' + entity.name. + * @param c current D2W context + * @return default embedded edit relationship page configuration name + */ + public Object editRelationshipEmbeddedConfigurationName(D2WContext c) { + return "EditRelationshipEmbedded" + entityNameForContext(c); + } /** * Generates a default inspect page configuration Added: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERDEditRelationship.java =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERDEditRelationship.java (rev 0) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/components/relationships/ERDEditRelationship.java 2010-10-30 17:51:30 UTC (rev 11653) @@ -0,0 +1,33 @@ +package er.directtoweb.components.relationships; + +import com.webobjects.appserver.WOContext; +import com.webobjects.eocontrol.EOClassDescription; +import com.webobjects.foundation.NSDictionary; + +import er.directtoweb.components.ERDCustomEditComponent; + +public class ERDEditRelationship extends ERDCustomEditComponent { + public static final String parentPageConfiguration = "parentPageConfiguration"; + + public ERDEditRelationship(WOContext context) { + super(context); + } + + public boolean synchronizesVariablesWithBindings() { + return false; + } + + public String destinationEntityName() { + EOClassDescription destinationClassDescription = object().classDescriptionForDestinationKey(key()); + String destinationEntityName = destinationClassDescription.entityName(); + return destinationEntityName; + } + + public NSDictionary<String, Object> settings() { + String pageConfiguration = d2wContext().dynamicPage(); + if(pageConfiguration != null) { + new NSDictionary<String,Object>(pageConfiguration, parentPageConfiguration); + } + return null; + } +} \ No newline at end of file Added: trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/embed/ERXD2WEditRelationship.java =================================================================== --- trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/embed/ERXD2WEditRelationship.java (rev 0) +++ trunk/Wonder/Frameworks/Core/ERDirectToWeb/Sources/er/directtoweb/embed/ERXD2WEditRelationship.java 2010-10-30 17:51:30 UTC (rev 11653) @@ -0,0 +1,29 @@ +package er.directtoweb.embed; + +import com.webobjects.appserver.WOContext; +import com.webobjects.directtoweb.D2WEmbeddedComponent; +import com.webobjects.eocontrol.EOEnterpriseObject; +import com.webobjects.foundation.NSArray; + +/** + * A clone of David LeBer's ERMD2WEditRelationship component. + */ +public class ERXD2WEditRelationship extends D2WEmbeddedComponent { + public ERXD2WEditRelationship(WOContext context) { + super(context); + } + + public NSArray<Object> masterObjectAndRelationshipKey() { + return new NSArray<Object>(masterObject(), relationshipKey()); + } + + public EOEnterpriseObject masterObject() { + EOEnterpriseObject obj = (EOEnterpriseObject) valueForBinding("masterObject"); + return obj; + } + + public String relationshipKey() { + String obj = (String) valueForBinding("relationshipKey"); + return obj; + } +} \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |