Menu
▾
▴
[Wonder-cvs] SF.net SVN: wonder:[9732] branches/Wonder_2_0_0_Branch/Wonder/Common/ Frameworks
|
From: <tc...@us...> - 2009-08-22 00:55:26
|
Revision: 9732
http://wonder.svn.sourceforge.net/wonder/?rev=9732&view=rev
Author: tcripps
Date: 2009-08-22 00:55:05 +0000 (Sat, 22 Aug 2009)
Log Message:
-----------
Added support for 'displayVariant' D2W key as another option for controlling property component rendering.
Modified Paths:
--------------
branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERDirectToWeb/Resources/d2w.d2wmodel
branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERDirectToWeb/Sources/er/directtoweb/ERD2WPage.java
branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUGroupingListPage.wo/ERNEUGroupingListPage.html
branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUGroupingListPage.wo/ERNEUGroupingListPage.wod
branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUInspectPage.wo/ERNEUInspectPage.html
branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUInspectPage.wo/ERNEUInspectPage.wod
branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUListPage.wo/ERNEUListPage.html
branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUListPage.wo/ERNEUListPage.wod
branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUPickListPage.wo/ERNEUPickListPage.html
branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUPickListPage.wo/ERNEUPickListPage.wod
branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUQueryPage.wo/ERNEUQueryPage.html
branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUQueryPage.wo/ERNEUQueryPage.wod
branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUTabInspectPage.wo/ERNEUTabInspectPage.html
branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUTabInspectPage.wo/ERNEUTabInspectPage.wod
branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUWizardCreationPage.wo/ERNEUWizardCreationPage.html
branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUWizardCreationPage.wo/ERNEUWizardCreationPage.wod
branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Sources/er/neutral/ERNEUListPage.java
branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Sources/er/neutral/ERNEUPickListPage.java
Modified: branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERDirectToWeb/Resources/d2w.d2wmodel
===================================================================
--- branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERDirectToWeb/Resources/d2w.d2wmodel 2009-08-21 18:45:05 UTC (rev 9731)
+++ branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERDirectToWeb/Resources/d2w.d2wmodel 2009-08-22 00:55:05 UTC (rev 9732)
@@ -22,6 +22,7 @@
{"author" = "10"; "class" = "com.webobjects.directtoweb.Rule"; "rhs" = {"class" = "er.directtoweb.ERDDelayedLocalizedAssignment"; "keyPath" = "clearButtonLabel"; "value" = "ERD2W.clearButtonLabel"; }; },
{"author" = "250"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "EOAndQualifier"; "qualifiers" = ({"class" = "EOOrQualifier"; "qualifiers" = ({"class" = "EOKeyValueQualifier"; "key" = "relationship.isToMany"; "selectorName" = "isEqualTo:"; "value" = {"class" = "NSNumber"; "value" = "1"; }; }, {"class" = "EOKeyValueQualifier"; "key" = "smartRelationship.isToMany"; "selectorName" = "isEqualTo:"; "value" = {"class" = "NSNumber"; "value" = "1"; }; }); }, {"class" = "EOKeyValueQualifier"; "key" = "targetOutput"; "selectorName" = "isEqualTo:"; "value" = "xml"; }, {"class" = "EOKeyValueQualifier"; "key" = "pageConfiguration"; "selectorName" = "isLike:"; "value" = "*"; }); }; "rhs" = {"class" = "com.webobjects.directtoweb.Assignment"; "keyPath" = "componentName"; "value" = "ERD2WXMLDisplayToMany"; }; },
{"author" = "250"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "EOAndQualifier"; "qualifiers" = ({"class" = "EOKeyValueQualifier"; "key" = "targetOutput"; "selectorName" = "isEqualTo:"; "value" = "xml"; }, {"class" = "EOKeyValueQualifier"; "key" = "smartAttribute.userInfo.erPrototype"; "selectorName" = "isEqualTo:"; "value" = "Boolean"; }, {"class" = "EOKeyValueQualifier"; "key" = "pageConfiguration"; "selectorName" = "isLike:"; "value" = "*"; }); }; "rhs" = {"class" = "com.webobjects.directtoweb.Assignment"; "keyPath" = "componentName"; "value" = "ERD2WCustomDisplayBoolean"; }; },
+ {"author" = "250"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "EOKeyValueQualifier"; "key" = "displayVariant"; "selectorName" = "isEqualTo:"; "value" = "blank"; }; "rhs" = {"class" = "com.webobjects.directtoweb.Assignment"; "keyPath" = "componentName"; "value" = "ERXEmptyComponent"; }; },
{"author" = "220"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "EOAndQualifier"; "qualifiers" = ({"class" = "EOOrQualifier"; "qualifiers" = ({"class" = "EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo:"; "value" = "list"; }, {"class" = "EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo:"; "value" = "select"; }, {"class" = "EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo:"; "value" = "inspect"; }); }, {"class" = "EOKeyValueQualifier"; "key" = "targetOutput"; "selectorName" = "isEqualTo:"; "value" = "xml"; }, {"class" = "EOOrQualifier"; "qualifiers" = ({"class" = "EOKeyValueQualifier"; "key" = "smartAttribute.className"; "selectorName" = "isEqualTo:"; "value" = "java.lang.Number"; }, {"class" = "EOKeyValueQualifier"; "key" = "smartAttribute.className"; "selectorName" = "isEqualTo:"; "value" = "java.math.BigDecimal"; }); }); }; "rhs" = {"class" = "com.webobjects.directtoweb.Assignment"; "keyPath" = "componentName"; "value" = "ERD2WXMLDisplayNumber"; }; },
{"author" = "200"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "EOAndQualifier"; "qualifiers" = ({"class" = "EOOrQualifier"; "qualifiers" = ({"class" = "EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo:"; "value" = "list"; }, {"class" = "EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo:"; "value" = "select"; }, {"class" = "EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo:"; "value" = "inspect"; }); }, {"class" = "EOKeyValueQualifier"; "key" = "targetOutput"; "selectorName" = "isEqualTo:"; "value" = "xml"; }, {"class" = "EOKeyValueQualifier"; "key" = "propertyIsKeyPath"; "selectorName" = "isEqualTo:"; "value" = {"class" = "NSNumber"; "value" = "1"; }; }, {"class" = "EOKeyValueQualifier"; "key" = "pageConfiguration"; "selectorName" = "isLike:"; "value" = "*"; }); }; "rhs" = {"class" = "com.webobjects.directtoweb.Assignment"; "keyPath" = "componentName"; "value" = "ERD2WXMLDisplayString"; }; },
{"author" = "200"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "EOAndQualifier"; "qualifiers" = ({"class" = "EONotQualifier"; "qualifier" = {"class" = "EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo:"; "value" = "query"; }; }, {"class" = "EOKeyValueQualifier"; "key" = "targetOutput"; "selectorName" = "isEqualTo:"; "value" = "xml"; }, {"class" = "EOKeyValueQualifier"; "key" = "pageConfiguration"; "selectorName" = "isLike:"; "value" = "*"; }); }; "rhs" = {"class" = "com.webobjects.directtoweb.Assignment"; "keyPath" = "componentName"; "value" = "ERD2WXMLDisplayString"; }; },
Modified: branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERDirectToWeb/Sources/er/directtoweb/ERD2WPage.java
===================================================================
--- branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERDirectToWeb/Sources/er/directtoweb/ERD2WPage.java 2009-08-21 18:45:05 UTC (rev 9731)
+++ branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERDirectToWeb/Sources/er/directtoweb/ERD2WPage.java 2009-08-22 00:55:05 UTC (rev 9732)
@@ -124,6 +124,8 @@
public static final String tabSectionsContents = "tabSectionsContents";
public static final String alternateKeyInfo = "alternateKeyInfo";
+
+ public static final String displayVariant = "displayVariant";
public static final String clickToOpenEnabled = "clickToOpenEnabled";
@@ -884,6 +886,26 @@
return ERXComponentUtilities.booleanValueForBinding(this, "isEmbedded", false);
}
+ /**
+ * Gets the <code>displayVariant</code> for the current property key. The intention is that the display variant
+ * allows variation in the display method of property keys without needing different, slightly varying,
+ * <code>displayPropertyKeys</code> or <code>tabSectionsContents</code> rules. Template support has been added for
+ * the <code>omit</code> and <code>blank</code> variants. One could imagine others, such as <code>collapsed</code>,
+ * <code>ajax</code>, etc.
+ * @return the display variant, if specified
+ */
+ public String displayVariant() {
+ return (String)d2wContext().valueForKey(Keys.displayVariant);
+ }
+
+ /**
+ * Determines if display of the current property key should be <code>omitted</code>.
+ * @return true if key should be omitted
+ */
+ public boolean isKeyOmitted() {
+ return "omit".equals(displayVariant());
+ }
+
/*
* // FIXME: Should be dynamic public String pageTitle() { return "NetStruxr -
* "+d2wContext().valueForKey("displayNameForEntity")+" View"; }
Modified: branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUGroupingListPage.wo/ERNEUGroupingListPage.html
===================================================================
--- branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUGroupingListPage.wo/ERNEUGroupingListPage.html 2009-08-21 18:45:05 UTC (rev 9731)
+++ branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUGroupingListPage.wo/ERNEUGroupingListPage.html 2009-08-22 00:55:05 UTC (rev 9732)
@@ -37,6 +37,7 @@
<webobject name="ListTableHeaderRow">
<th> </th>
<webobject name="ColumnLabelRepetition">
+ <webobject name="IfPropertyKeyIsNotOmitted">
<th nowrap valign="bottom">
<table>
<tr>
@@ -54,7 +55,8 @@
<webobject name="ShouldDisplayDetailedPageMetrics">
<th scope="col" class="InlineMetrics"> </th>
</webobject>
- <td width="1"> </td>
+ <td width="1"> </td>
+ </webobject>
</webobject>
<th bgcolor="#999999"> </th>
</webobject>
@@ -88,6 +90,7 @@
</table>
</td>
<webobject name="AttributeRepetition">
+ <webobject name="IfPropertyKeyIsNotOmitted">
<webobject name="AttributeCell">
<font size="-1"><webobject name="AttributeDisplay"></webobject></font>
</webobject>
@@ -98,6 +101,7 @@
</webobject>
<td width="1"></td>
</webobject>
+ </webobject>
<td>
<webobject name="IsListing2">
<webobject name="IsEntityWritable2">
@@ -110,9 +114,11 @@
<tr class="MetricsSummary">
<td> </td>
<webobject name="AttributeRepetition">
+ <webobject name="IfPropertyKeyIsNotOmitted">
<td> </td>
<td class="InlineMetrics"><webobject name="MetricsDurationForCurrentPropertyKey"></webobject></td>
</webobject>
+ </webobject>
<td> </td>
</tr>
</webobject>
Modified: branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUGroupingListPage.wo/ERNEUGroupingListPage.wod
===================================================================
--- branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUGroupingListPage.wo/ERNEUGroupingListPage.wod 2009-08-21 18:45:05 UTC (rev 9731)
+++ branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUGroupingListPage.wo/ERNEUGroupingListPage.wod 2009-08-22 00:55:05 UTC (rev 9732)
@@ -144,6 +144,11 @@
negate = true;
}
+IfPropertyKeyIsNotOmitted: WOConditional {
+ condition = isKeyOmitted;
+ negate = true;
+}
+
InlineMetricsForPropertyKey: WOString {
escapeHTML = false;
value = latestEventForCurrentPropertyKey.duration;
Modified: branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUInspectPage.wo/ERNEUInspectPage.html
===================================================================
--- branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUInspectPage.wo/ERNEUInspectPage.html 2009-08-21 18:45:05 UTC (rev 9731)
+++ branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUInspectPage.wo/ERNEUInspectPage.html 2009-08-22 00:55:05 UTC (rev 9732)
@@ -40,6 +40,7 @@
<td valign="top" align="center">
<table border="0" cellpadding="2" cellspacing="2">
<webobject name="AttributeRepetition">
+ <webobject name="IfPropertyKeyIsNotOmitted">
<webobject name="InspectRow">
<td align="right"><webobject name="SwitchComponent1"></webobject></td>
<webobject name="PropertyKeyComponentGenericContainer"><webobject name="AttributeValue"></webobject></webobject>
@@ -49,6 +50,7 @@
</td>
</webobject>
</webobject>
+ </webobject>
</webobject>
</table>
</td>
Modified: branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUInspectPage.wo/ERNEUInspectPage.wod
===================================================================
--- branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUInspectPage.wo/ERNEUInspectPage.wod 2009-08-21 18:45:05 UTC (rev 9731)
+++ branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUInspectPage.wo/ERNEUInspectPage.wod 2009-08-22 00:55:05 UTC (rev 9732)
@@ -119,6 +119,11 @@
d2wContext = d2wContext;
}
+IfPropertyKeyIsNotOmitted: WOConditional {
+ condition = isKeyOmitted;
+ negate = true;
+}
+
InlineMetricsForPropertyKey: WOString {
escapeHTML = false;
value = latestEventForCurrentPropertyKey.duration;
Modified: branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUListPage.wo/ERNEUListPage.html
===================================================================
--- branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUListPage.wo/ERNEUListPage.html 2009-08-21 18:45:05 UTC (rev 9731)
+++ branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUListPage.wo/ERNEUListPage.html 2009-08-22 00:55:05 UTC (rev 9732)
@@ -40,6 +40,7 @@
<webobject name="ListTableHeaderRow">
<th> </th>
<webobject name="ColumnLabelRepetition">
+ <webobject name="IfPropertyKeyIsNotOmitted">
<th nowrap="nowrap" valign="bottom">
<table>
<tr>
@@ -52,6 +53,7 @@
<th scope="col" class="InlineMetrics"> </th>
</webobject>
</webobject>
+ </webobject>
<th> </th>
</webobject>
<webobject name="EntityRepetition">
@@ -77,6 +79,7 @@
</webobject>
</td>
<webobject name="AttributeRepetition">
+ <webobject name="IfPropertyKeyIsNotOmitted">
<webobject name="AttributeCell">
<webobject name="AttributeDisplay"></webobject>
</webobject>
@@ -86,6 +89,7 @@
</td>
</webobject>
</webobject>
+ </webobject>
<td>
<webobject name="IsListing2">
<webobject name="IsEntityWritable2">
@@ -102,9 +106,11 @@
<tr class="MetricsSummary">
<td> </td>
<webobject name="AttributeRepetition">
+ <webobject name="IfPropertyKeyIsNotOmitted">
<td> </td>
<td class="InlineMetrics"><webobject name="MetricsDurationForCurrentPropertyKey"></webobject></td>
</webobject>
+ </webobject>
<td> </td>
</tr>
</webobject>
Modified: branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUListPage.wo/ERNEUListPage.wod
===================================================================
--- branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUListPage.wo/ERNEUListPage.wod 2009-08-21 18:45:05 UTC (rev 9731)
+++ branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUListPage.wo/ERNEUListPage.wod 2009-08-22 00:55:05 UTC (rev 9732)
@@ -154,6 +154,11 @@
negate = true;
}
+IfPropertyKeyIsNotOmitted: WOConditional {
+ condition = isKeyOmitted;
+ negate = true;
+}
+
InlineMetricsForPropertyKey: WOString {
escapeHTML = false;
value = latestEventForCurrentPropertyKey.duration;
Modified: branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUPickListPage.wo/ERNEUPickListPage.html
===================================================================
--- branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUPickListPage.wo/ERNEUPickListPage.html 2009-08-21 18:45:05 UTC (rev 9731)
+++ branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUPickListPage.wo/ERNEUPickListPage.html 2009-08-22 00:55:05 UTC (rev 9732)
@@ -22,6 +22,7 @@
<webobject name="ListTableHeaderRow">
<th> </th>
<webobject name="ColumnLabelRepetition">
+ <webobject name="IfPropertyKeyIsNotOmitted">
<th nowrap="nowrap" valign="bottom" class="ERNEUPickListPageColumnLabelRepetition">
<table>
<tr>
@@ -40,6 +41,7 @@
</th>
</webobject>
</webobject>
+ </webobject>
<th valign="bottom">Select</th>
</webobject>
<webobject name="EntityRepetition">
@@ -53,6 +55,7 @@
</webobject>
</td>
<webobject name="AttributeRepetition">
+ <webobject name="IfPropertyKeyIsNotOmitted">
<webobject name="AttributeCell">
<webobject name="AttributeDisplay"></webobject>
</webobject>
@@ -62,6 +65,7 @@
</td>
</webobject>
</webobject>
+ </webobject>
<td>
<webobject name="CheckBox2"></webobject>
</td>
@@ -73,9 +77,11 @@
<tr class="MetricsSummary">
<td> </td>
<webobject name="AttributeRepetition">
+ <webobject name="IfPropertyKeyIsNotOmitted">
<td> </td>
<td class="InlineMetrics"><webobject name="MetricsDurationForCurrentPropertyKey"></webobject></td>
</webobject>
+ </webobject>
<td> </td>
</tr>
</webobject>
Modified: branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUPickListPage.wo/ERNEUPickListPage.wod
===================================================================
--- branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUPickListPage.wo/ERNEUPickListPage.wod 2009-08-21 18:45:05 UTC (rev 9731)
+++ branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUPickListPage.wo/ERNEUPickListPage.wod 2009-08-22 00:55:05 UTC (rev 9732)
@@ -149,6 +149,11 @@
negate = true;
}
+IfPropertyKeyIsNotOmitted: WOConditional {
+ condition = isKeyOmitted;
+ negate = true;
+}
+
InlineMetricsForPropertyKey: WOString {
escapeHTML = false;
value = latestEventForCurrentPropertyKey.duration;
Modified: branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUQueryPage.wo/ERNEUQueryPage.html
===================================================================
--- branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUQueryPage.wo/ERNEUQueryPage.html 2009-08-21 18:45:05 UTC (rev 9731)
+++ branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUQueryPage.wo/ERNEUQueryPage.html 2009-08-22 00:55:05 UTC (rev 9732)
@@ -29,6 +29,7 @@
<TD ALIGN=left VALIGN=top>
<TABLE BORDER=0 CELLPADDING=2 CELLSPACING=2>
<WEBOBJECT NAME=ResourceRepetition>
+ <webobject name="IfPropertyKeyIsNotOmitted">
<WEBOBJECT NAME=QueryTableRow>
<TD ALIGN=right VALIGN=middle> <WEBOBJECT NAME=SwitchComponent1></WEBOBJECT><FONT SIZE="-1"><B>
</B></FONT> </TD>
@@ -43,6 +44,7 @@
</td>
</webobject>
</WEBOBJECT>
+ </webobject>
</WEBOBJECT>
</TABLE>
</TD>
Modified: branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUQueryPage.wo/ERNEUQueryPage.wod
===================================================================
--- branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUQueryPage.wo/ERNEUQueryPage.wod 2009-08-21 18:45:05 UTC (rev 9731)
+++ branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUQueryPage.wo/ERNEUQueryPage.wod 2009-08-22 00:55:05 UTC (rev 9732)
@@ -67,6 +67,11 @@
d2wContext = d2wContext;
}
+IfPropertyKeyIsNotOmitted: WOConditional {
+ condition = isKeyOmitted;
+ negate = true;
+}
+
ListPage: D2WList {
dataSource = queryDataSource;
entityName = entity;
Modified: branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUTabInspectPage.wo/ERNEUTabInspectPage.html
===================================================================
--- branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUTabInspectPage.wo/ERNEUTabInspectPage.html 2009-08-21 18:45:05 UTC (rev 9731)
+++ branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUTabInspectPage.wo/ERNEUTabInspectPage.html 2009-08-22 00:55:05 UTC (rev 9732)
@@ -26,6 +26,7 @@
<TD ALIGN=left COLSPAN=3><WEBOBJECT NAME=NotUsingMatrixLayout>
<TABLE CELLSPACING=1 BORDER=0 CELLPADDING=0>
<WEBOBJECT NAME=AttributeRepetition>
+ <webobject name="IfPropertyKeyIsNotOmitted">
<TR>
<WEBOBJECT NAME=HasDisplayNameForProperty>
<TD ALIGN=LEFT VALIGN=TOP><WEBOBJECT NAME=SwitchComponent1></WEBOBJECT></TD>
@@ -39,9 +40,11 @@
</td>
</webobject>
</TR>
+ </webobject>
</WEBOBJECT>
</TABLE>
</WEBOBJECT><WEBOBJECT NAME=Conditional4><WEBOBJECT NAME=ERTable1>
+ <webobject name="IfPropertyKeyIsNotOmitted">
<TABLE CELLSPACING=0 BORDER=0 CELLPADDING=0>
<TR>
<TD ALIGN=LEFT WIDTH=120 VALIGN=TOP><WEBOBJECT NAME=SwitchComponent2></WEBOBJECT></TD>
@@ -54,6 +57,7 @@
</webobject>
</TR>
</TABLE>
+ </webobject>
</WEBOBJECT></WEBOBJECT></TD>
</TR>
<WEBOBJECT NAME=DoNotFlush>
Modified: branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUTabInspectPage.wo/ERNEUTabInspectPage.wod
===================================================================
--- branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUTabInspectPage.wo/ERNEUTabInspectPage.wod 2009-08-21 18:45:05 UTC (rev 9731)
+++ branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUTabInspectPage.wo/ERNEUTabInspectPage.wod 2009-08-22 00:55:05 UTC (rev 9732)
@@ -209,6 +209,11 @@
d2wContext = d2wContext;
}
+IfPropertyKeyIsNotOmitted: WOConditional {
+ condition = isKeyOmitted;
+ negate = true;
+}
+
Image1: WOImage {
filename = "floppy.gif";
framework = "ERExtensions";
Modified: branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUWizardCreationPage.wo/ERNEUWizardCreationPage.html
===================================================================
--- branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUWizardCreationPage.wo/ERNEUWizardCreationPage.html 2009-08-21 18:45:05 UTC (rev 9731)
+++ branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUWizardCreationPage.wo/ERNEUWizardCreationPage.html 2009-08-22 00:55:05 UTC (rev 9732)
@@ -27,6 +27,7 @@
<TD COLSPAN=4> </TD>
</TR>
</WEBOBJECT><WEBOBJECT NAME=NotUsingMatrixLayout><WEBOBJECT NAME=AttributeRepetition>
+ <webobject name="IfPropertyKeyIsNotOmitted">
<TR>
<TD ALIGN=LEFT VALIGN=TOP><WEBOBJECT NAME=SwitchComponent></WEBOBJECT></TD>
<TD ALIGN=left VALIGN=top COLSPAN=3><WEBOBJECT NAME="AttributeValue"></WEBOBJECT></TD>
@@ -36,9 +37,11 @@
</td>
</webobject>
</TR>
+ </webobject>
</WEBOBJECT></WEBOBJECT><WEBOBJECT NAME=Conditional4>
<TR>
<TD COLSPAN=4><WEBOBJECT NAME=ERTable1>
+ <webobject name="IfPropertyKeyIsNotOmitted">
<TABLE CELLSPACING=0 BORDER=0 CELLPADDING=0>
<TR>
<TD ALIGN=LEFT WIDTH=120 VALIGN=TOP><WEBOBJECT NAME=SwitchComponent></WEBOBJECT></TD>
@@ -51,6 +54,7 @@
</webobject>
</TR>
</TABLE>
+ </webobject>
</WEBOBJECT></TD>
</TR>
</WEBOBJECT></WEBOBJECT>
Modified: branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUWizardCreationPage.wo/ERNEUWizardCreationPage.wod
===================================================================
--- branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUWizardCreationPage.wo/ERNEUWizardCreationPage.wod 2009-08-21 18:45:05 UTC (rev 9731)
+++ branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Components/Nonlocalized.lproj/ERNEUWizardCreationPage.wo/ERNEUWizardCreationPage.wod 2009-08-22 00:55:05 UTC (rev 9732)
@@ -100,6 +100,11 @@
d2wContext = d2wContext;
}
+IfPropertyKeyIsNotOmitted: WOConditional {
+ condition = isKeyOmitted;
+ negate = true;
+}
+
Image1: WOImage {
border = 0;
filename = "Spacer.gif";
Modified: branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Sources/er/neutral/ERNEUListPage.java
===================================================================
--- branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Sources/er/neutral/ERNEUListPage.java 2009-08-21 18:45:05 UTC (rev 9731)
+++ branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Sources/er/neutral/ERNEUListPage.java 2009-08-22 00:55:05 UTC (rev 9732)
@@ -12,15 +12,30 @@
import er.directtoweb.ERD2WListPage;
+import java.util.Enumeration;
+
public class ERNEUListPage extends ERD2WListPage {
+ protected Integer colspan;
+
public ERNEUListPage(WOContext context) { super(context); }
public int colSpan() {
- int multiplier = 1;
- if (shouldDisplayDetailedPageMetrics()) {
- multiplier = 2;
+ if (null == colspan) {
+ int numVisibleKeys = 0;
+ int multiplier = shouldDisplayDetailedPageMetrics() ? 2 : 1;
+ String currentKey = d2wContext().propertyKey(); // Cache the current key.
+ NSArray displayPropertyKeys = (NSArray)d2wContext().valueForKey("displayPropertyKeys");
+ for (Enumeration keysEnum = displayPropertyKeys.objectEnumerator(); keysEnum.hasMoreElements();) {
+ String key = (String)keysEnum.nextElement();
+ d2wContext().setPropertyKey(key);
+ if (!isKeyOmitted()) {
+ numVisibleKeys++;
+ }
+ }
+ d2wContext().setPropertyKey(currentKey); // Restore the key.
+ colspan = (numVisibleKeys * multiplier) + 2;
}
- return (((NSArray)d2wContext().valueForKey("displayPropertyKeys")).count() * multiplier) + 2;
+ return colspan;
}
}
Modified: branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Sources/er/neutral/ERNEUPickListPage.java
===================================================================
--- branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Sources/er/neutral/ERNEUPickListPage.java 2009-08-21 18:45:05 UTC (rev 9731)
+++ branches/Wonder_2_0_0_Branch/Wonder/Common/Frameworks/ERNeutralLook/Sources/er/neutral/ERNEUPickListPage.java 2009-08-22 00:55:05 UTC (rev 9732)
@@ -11,18 +11,33 @@
import er.directtoweb.ERD2WPickListPage;
+import java.util.Enumeration;
+
public class ERNEUPickListPage extends ERD2WPickListPage {
+ protected Integer colspan;
+
public ERNEUPickListPage(WOContext context) {
super(context);
}
public int colSpan() {
- int multiplier = 1;
- if (shouldDisplayDetailedPageMetrics()) {
- multiplier = 2;
+ if (null == colspan) {
+ int numVisibleKeys = 0;
+ int multiplier = shouldDisplayDetailedPageMetrics() ? 2 : 1;
+ String currentKey = d2wContext().propertyKey(); // Cache the current key.
+ NSArray displayPropertyKeys = (NSArray)d2wContext().valueForKey("displayPropertyKeys");
+ for (Enumeration keysEnum = displayPropertyKeys.objectEnumerator(); keysEnum.hasMoreElements();) {
+ String key = (String)keysEnum.nextElement();
+ d2wContext().setPropertyKey(key);
+ if (!isKeyOmitted()) {
+ numVisibleKeys++;
+ }
+ }
+ d2wContext().setPropertyKey(currentKey); // Restore the key.
+ colspan = (numVisibleKeys * multiplier) + 2;
}
- return (((NSArray)d2wContext().valueForKey("displayPropertyKeys")).count() * multiplier) + 3;
+ return colspan;
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|