From: <bob...@us...> - 2010-07-08 17:56:04
|
Revision: 11002 http://wonder.svn.sourceforge.net/wonder/?rev=11002&view=rev Author: bob_schwarzmann Date: 2010-07-08 17:55:56 +0000 (Thu, 08 Jul 2010) Log Message: ----------- Merged revisions 10993-10995,10998 via svnmerge from https://wonder.svn.sourceforge.net/svnroot/wonder/branches/Wonder_2_0_0_Branch/Wonder ........ r10993 | tcripps | 2010-07-07 18:24:58 -0700 (Wed, 07 Jul 2010) | 1 line Separating the CSS info. for property name and property key container elements. ........ r10994 | tcripps | 2010-07-07 19:04:27 -0700 (Wed, 07 Jul 2010) | 1 line Binding changes to finish separating the property name and property key CSS hooks. ........ r10995 | tcripps | 2010-07-07 19:21:04 -0700 (Wed, 07 Jul 2010) | 5 lines <rdar://problem/8169403> er.extensions.foundation.ERXFileUtilities.linkFiles is not cross platform Changing the -h flag (which doesn't exist on non-Mac platforms) to -n, which is supported across Mac, Linux, and Solaris. ........ r10998 | tcripps | 2010-07-07 20:06:00 -0700 (Wed, 07 Jul 2010) | 1 line Fixed missing Javadoc param for _cssClassForTemplateForCurrentPropertyKey ........ Modified Paths: -------------- branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WPage.java branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/foundation/ERXFileUtilities.java branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUGroupingListPage.wo/ERNEUGroupingListPage.wod branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUInspectPage.wo/ERNEUInspectPage.wod branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUListPage.wo/ERNEUListPage.wod branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUMessagePage.wo/ERNEUMessagePage.wod branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUPickListPage.wo/ERNEUPickListPage.wod branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUQueryPage.wo/ERNEUQueryPage.wod branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUTabInspectPage.wo/ERNEUTabInspectPage.wod branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUWizardCreationPage.wo/ERNEUWizardCreationPage.wod Property Changed: ---------------- branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/ branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/D2W/ Property changes on: branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder ___________________________________________________________________ Modified: svnmerge-integrated - /branches/Wonder_2_0_0_Branch/Wonder:1-9727,9729-10057,10059-10539,10541-10546,10548-10989 + /branches/Wonder_2_0_0_Branch/Wonder:1-9727,9729-10057,10059-10539,10541-10546,10548-11001 Modified: svn:mergeinfo - /branches/Wonder_2_0_0_Branch/Wonder:9653,9672-9702,9707,9730-9802,9876-9930,9937-9939,9959-10054,10060-10075,10112-10220,10307-10490,10495,10505,10514-10526,10546,10560-10562,10569,10578-10693,10702-10703,10709-10710,10734-10741,10743-10771,10780,10782-10785,10788-10808,10813-10817,10820,10824,10830-10837,10844-10869,10871,10881-10897,10901,10903-10912,10921-10946,10948,10954-10968,10986-10987 + /branches/Wonder_2_0_0_Branch/Wonder:9653,9672-9702,9707,9730-9802,9876-9930,9937-9939,9959-10054,10060-10075,10112-10220,10307-10490,10495,10505,10514-10526,10546,10560-10562,10569,10578-10693,10702-10703,10709-10710,10734-10741,10743-10771,10780,10782-10785,10788-10808,10813-10817,10820,10824,10830-10837,10844-10869,10871,10881-10897,10901,10903-10912,10921-10946,10948,10954-10968,10986-10987,10993-10998 Property changes on: branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/D2W ___________________________________________________________________ Modified: svn:mergeinfo - /branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/D2W:9653,9672-9702,9707,9730-9802,9876-9930,9937-9939,9959-10054,10060-10075,10112-10220,10307-10490,10495,10505,10514-10526,10546,10560-10562,10569,10578-10693,10702-10703,10709-10710,10734-10741,10743-10771,10780,10782-10785,10788-10808,10813-10817,10820,10824,10830-10837,10844-10869,10871,10881-10897,10901,10903-10912,10921-10946,10948,10954-10968,10986-10987 /trunk/Wonder/Frameworks/D2W:10824-10953 + /branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/D2W:9653,9672-9702,9707,9730-9802,9876-9930,9937-9939,9959-10054,10060-10075,10112-10220,10307-10490,10495,10505,10514-10526,10546,10560-10562,10569,10578-10693,10702-10703,10709-10710,10734-10741,10743-10771,10780,10782-10785,10788-10808,10813-10817,10820,10824,10830-10837,10844-10869,10871,10881-10897,10901,10903-10912,10921-10946,10948,10954-10968,10986-10987,10993-10998 /trunk/Wonder/Frameworks/D2W:10824-10953 Modified: branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WPage.java =================================================================== --- branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WPage.java 2010-07-08 15:10:00 UTC (rev 11001) +++ branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERDirectToWeb/Sources/er/directtoweb/pages/ERD2WPage.java 2010-07-08 17:55:56 UTC (rev 11002) @@ -1259,10 +1259,27 @@ } /** + * Gets the CSS class(es) that should be applied to the current property name container element. + * @return the css classes + */ + public String cssClassForPropertyName() { + return _cssClassForTemplateForCurrentPropertyKey("cssClassForPropertyName"); + } + + /** * Gets the CSS class(es) that should be applied to the current property key container element. * @return the css classes */ public String cssClassForPropertyKey() { + return _cssClassForTemplateForCurrentPropertyKey("cssClass"); + } + + /** + * Gets the CSS class(es) that should be applied to the current container element. + * @param cssKey from the d2wContext that defines the CSS for this element + * @return the css classes + */ + private String _cssClassForTemplateForCurrentPropertyKey(String cssKey) { NSMutableArray classes = new NSMutableArray(); D2WContext d2wContext = d2wContext(); String propertyKey = d2wContext.propertyKey(); @@ -1280,7 +1297,7 @@ } // Explicitly defined class(es). - NSArray explicitClasses = ERXValueUtilities.arrayValueWithDefault(d2wContext.valueForKey("cssClass"), NSArray.EmptyArray); + NSArray explicitClasses = ERXValueUtilities.arrayValueWithDefault(d2wContext.valueForKey(cssKey), NSArray.EmptyArray); if (explicitClasses.count() > 0) { classes.addObjectsFromArray(explicitClasses); } @@ -1289,6 +1306,14 @@ } /** + * Gets any inline style declarations for the current property name container element. + * @return the inline style declarations + */ + public String inlineStyleDeclarationForPropertyName() { + return (String)d2wContext().valueForKey("inlineStyleForPropertyName"); + } + + /** * Gets any inline style declarations for the current property key container element. * @return the inline style declarations */ Modified: branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/foundation/ERXFileUtilities.java =================================================================== --- branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/foundation/ERXFileUtilities.java 2010-07-08 15:10:00 UTC (rev 11001) +++ branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERExtensions/Sources/er/extensions/foundation/ERXFileUtilities.java 2010-07-08 17:55:56 UTC (rev 11002) @@ -863,7 +863,7 @@ } /** - * Creates a symlink for a given file. Note this only works on + * Creates a symlink for a given file. Note this only works on * civilized OSs which support symbolic linking. * @param source to create the link to * @param destination file to create the link to @@ -883,7 +883,7 @@ cmd[i++] = "ln"; if (allowUnlink ) cmd[i++] = "-f"; if (symbolic ) cmd[i++] = "-s"; - if (!followSymbolicLinks) cmd[i++] = "-h"; + if (!followSymbolicLinks) cmd[i++] = "-n"; cmd[i++] = source.getPath(); cmd[i++] = destination.getPath(); Modified: branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUGroupingListPage.wo/ERNEUGroupingListPage.wod =================================================================== --- branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUGroupingListPage.wo/ERNEUGroupingListPage.wod 2010-07-08 15:10:00 UTC (rev 11001) +++ branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUGroupingListPage.wo/ERNEUGroupingListPage.wod 2010-07-08 17:55:56 UTC (rev 11002) @@ -267,10 +267,10 @@ } PropertyNameComponentGenericContainer: WOGenericContainer { - class = cssClassForPropertyKey; + class = cssClassForPropertyName; elementName = "th"; nowrap = "nowrap"; - style = inlineStyleDeclarationForPropertyKey; + style = inlineStyleDeclarationForPropertyName; valign = "bottom"; } Modified: branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUInspectPage.wo/ERNEUInspectPage.wod =================================================================== --- branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUInspectPage.wo/ERNEUInspectPage.wod 2010-07-08 15:10:00 UTC (rev 11001) +++ branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUInspectPage.wo/ERNEUInspectPage.wod 2010-07-08 17:55:56 UTC (rev 11002) @@ -209,10 +209,10 @@ PropertyNameComponentGenericContainer: WOGenericContainer { align = "right"; - class = cssClassForPropertyKey; + class = cssClassForPropertyName; elementName = "th"; scope = "row"; - style = inlineStyleDeclarationForPropertyKey; + style = inlineStyleDeclarationForPropertyName; } PropertyNameSwitchComponent: WOSwitchComponent { Modified: branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUListPage.wo/ERNEUListPage.wod =================================================================== --- branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUListPage.wo/ERNEUListPage.wod 2010-07-08 15:10:00 UTC (rev 11001) +++ branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUListPage.wo/ERNEUListPage.wod 2010-07-08 17:55:56 UTC (rev 11002) @@ -260,10 +260,10 @@ } PropertyNameComponentGenericContainer: WOGenericContainer { - class = cssClassForPropertyKey; + class = cssClassForPropertyName; elementName = "th"; nowrap = "nowrap"; - style = inlineStyleDeclarationForPropertyKey; + style = inlineStyleDeclarationForPropertyName; valign = "bottom"; } Modified: branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUMessagePage.wo/ERNEUMessagePage.wod =================================================================== --- branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUMessagePage.wo/ERNEUMessagePage.wod 2010-07-08 15:10:00 UTC (rev 11001) +++ branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUMessagePage.wo/ERNEUMessagePage.wod 2010-07-08 17:55:56 UTC (rev 11002) @@ -100,9 +100,9 @@ PropertyNameComponentGenericContainer: WOGenericContainer { align = "right"; - class = cssClassForPropertyKey; + class = cssClassForPropertyName; elementName = "th"; - style = inlineStyleDeclarationForPropertyKey; + style = inlineStyleDeclarationForPropertyName; } PropertyNameSwitchComponent: WOSwitchComponent { Modified: branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUPickListPage.wo/ERNEUPickListPage.wod =================================================================== --- branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUPickListPage.wo/ERNEUPickListPage.wod 2010-07-08 15:10:00 UTC (rev 11001) +++ branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUPickListPage.wo/ERNEUPickListPage.wod 2010-07-08 17:55:56 UTC (rev 11002) @@ -254,10 +254,10 @@ } PropertyNameComponentGenericContainer: WOGenericContainer { - class = cssClassForPropertyKey; + class = cssClassForPropertyName; elementName = "th"; nowrap = "nowrap"; - style = inlineStyleDeclarationForPropertyKey; + style = inlineStyleDeclarationForPropertyName; valign = "bottom"; } Modified: branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUQueryPage.wo/ERNEUQueryPage.wod =================================================================== --- branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUQueryPage.wo/ERNEUQueryPage.wod 2010-07-08 15:10:00 UTC (rev 11001) +++ branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUQueryPage.wo/ERNEUQueryPage.wod 2010-07-08 17:55:56 UTC (rev 11002) @@ -177,9 +177,9 @@ PropertyNameComponentGenericContainer: WOGenericContainer { align = "right"; - class = cssClassForPropertyKey; + class = cssClassForPropertyName; elementName = "th"; - style = inlineStyleDeclarationForPropertyKey; + style = inlineStyleDeclarationForPropertyName; valign = "middle"; } Modified: branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUTabInspectPage.wo/ERNEUTabInspectPage.wod =================================================================== --- branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUTabInspectPage.wo/ERNEUTabInspectPage.wod 2010-07-08 15:10:00 UTC (rev 11001) +++ branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUTabInspectPage.wo/ERNEUTabInspectPage.wod 2010-07-08 17:55:56 UTC (rev 11002) @@ -320,10 +320,10 @@ PropertyNameComponentGenericContainer: WOGenericContainer { align = "right"; - class = cssClassForPropertyKey; + class = cssClassForPropertyName; elementName = "th"; otherTagString = otherTagStringsForPropertyKeyComponentCell; - style = inlineStyleDeclarationForPropertyKey; + style = inlineStyleDeclarationForPropertyName; } PropertyNameSwitchComponent: WOSwitchComponent { Modified: branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUWizardCreationPage.wo/ERNEUWizardCreationPage.wod =================================================================== --- branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUWizardCreationPage.wo/ERNEUWizardCreationPage.wod 2010-07-08 15:10:00 UTC (rev 11001) +++ branches/Wonder_2_0_0_WebObjects_5_4_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUWizardCreationPage.wo/ERNEUWizardCreationPage.wod 2010-07-08 17:55:56 UTC (rev 11002) @@ -198,9 +198,9 @@ PropertyNameComponentGenericContainer: WOGenericContainer { align = "right"; - class = cssClassForPropertyKey; + class = cssClassForPropertyName; elementName = "th"; - style = inlineStyleDeclarationForPropertyKey; + style = inlineStyleDeclarationForPropertyName; } PropertyNameSwitchComponent: WOSwitchComponent { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |