Menu
▾
▴
[Wonder-cvs] SF.net SVN: wonder:[10097] trunk/Wonder/Frameworks/Ajax/ERDivaLook
|
From: <rm...@us...> - 2009-10-19 03:11:14
|
Revision: 10097
http://wonder.svn.sourceforge.net/wonder/?rev=10097&view=rev
Author: rmendis
Date: 2009-10-19 03:11:04 +0000 (Mon, 19 Oct 2009)
Log Message:
-----------
Removing redundant/unused functionality/component
Modified Paths:
--------------
trunk/Wonder/Frameworks/Ajax/ERDivaLook/Components/ERDIVListPage.wo/ERDIVListPage.html
trunk/Wonder/Frameworks/Ajax/ERDivaLook/Components/ERDIVListPage.wo/ERDIVListPage.wod
trunk/Wonder/Frameworks/Ajax/ERDivaLook/Components/ERDIVQueryPage.wo/ERDIVQueryPage.html
trunk/Wonder/Frameworks/Ajax/ERDivaLook/Components/ERDIVQueryPage.wo/ERDIVQueryPage.wod
trunk/Wonder/Frameworks/Ajax/ERDivaLook/Resources/d2w.d2wmodel
trunk/Wonder/Frameworks/Ajax/ERDivaLook/Resources/d2w.d2wmodel.txt
Removed Paths:
-------------
trunk/Wonder/Frameworks/Ajax/ERDivaLook/Components/ERD2WPropertyName2.wo/
trunk/Wonder/Frameworks/Ajax/ERDivaLook/Sources/er/directtoweb/components/_xhtml/ERD2WPropertyName2.java
Modified: trunk/Wonder/Frameworks/Ajax/ERDivaLook/Components/ERDIVListPage.wo/ERDIVListPage.html
===================================================================
--- trunk/Wonder/Frameworks/Ajax/ERDivaLook/Components/ERDIVListPage.wo/ERDIVListPage.html 2009-10-18 23:42:56 UTC (rev 10096)
+++ trunk/Wonder/Frameworks/Ajax/ERDivaLook/Components/ERDIVListPage.wo/ERDIVListPage.html 2009-10-19 03:11:04 UTC (rev 10097)
@@ -16,7 +16,7 @@
<webobject name = "ColumnLabelRepetition">
<webobject name = "HeaderCell">
<div class = "property">
- <webobject name = "SwitchComponent1" />
+ <webobject name = "PropertyName" />
<webobject name = "DebugPropertyName" />
</div>
<webobject name = "IsPropertySortable">
Modified: trunk/Wonder/Frameworks/Ajax/ERDivaLook/Components/ERDIVListPage.wo/ERDIVListPage.wod
===================================================================
--- trunk/Wonder/Frameworks/Ajax/ERDivaLook/Components/ERDIVListPage.wo/ERDIVListPage.wod 2009-10-18 23:42:56 UTC (rev 10096)
+++ trunk/Wonder/Frameworks/Ajax/ERDivaLook/Components/ERDIVListPage.wo/ERDIVListPage.wod 2009-10-19 03:11:04 UTC (rev 10097)
@@ -141,9 +141,9 @@
container = d2wContext.container;
}
-SwitchComponent1: WOSwitchComponent {
- WOComponentName = d2wContext.propertyNameComponentName;
- localContext = d2wContext;
+PropertyName: WOString {
+ value=d2wContext.displayNameForProperty;
+ escapeHTML = d2wContext.escapeHTML;
}
SwitchComponent2: WOSwitchComponent {
Modified: trunk/Wonder/Frameworks/Ajax/ERDivaLook/Components/ERDIVQueryPage.wo/ERDIVQueryPage.html
===================================================================
--- trunk/Wonder/Frameworks/Ajax/ERDivaLook/Components/ERDIVQueryPage.wo/ERDIVQueryPage.html 2009-10-18 23:42:56 UTC (rev 10096)
+++ trunk/Wonder/Frameworks/Ajax/ERDivaLook/Components/ERDIVQueryPage.wo/ERDIVQueryPage.html 2009-10-19 03:11:04 UTC (rev 10097)
@@ -13,7 +13,7 @@
<webobject name = "ResourceRepetition">
<webobject name = "AttributeContainer">
<fieldset>
- <legend><webobject name = "SwitchComponent1" /><webobject name = "DebugPropertyName" /></legend>
+ <legend><webobject name = "PropertyName" /><webobject name = "DebugPropertyName" /></legend>
<webobject name = "ContentContainer"><webobject name = "DebugComponentName" /><webobject name = "ResourceInputRepresentation" /></webobject>
</fieldset>
</webobject>
Modified: trunk/Wonder/Frameworks/Ajax/ERDivaLook/Components/ERDIVQueryPage.wo/ERDIVQueryPage.wod
===================================================================
--- trunk/Wonder/Frameworks/Ajax/ERDivaLook/Components/ERDIVQueryPage.wo/ERDIVQueryPage.wod 2009-10-18 23:42:56 UTC (rev 10096)
+++ trunk/Wonder/Frameworks/Ajax/ERDivaLook/Components/ERDIVQueryPage.wo/ERDIVQueryPage.wod 2009-10-19 03:11:04 UTC (rev 10097)
@@ -76,9 +76,9 @@
condition = showCancel;
}
-SwitchComponent1: WOSwitchComponent {
- WOComponentName = subContext.propertyNameComponentName;
- localContext = subContext;
+PropertyName: WOString {
+ value=subContext.displayNameForProperty;
+ escapeHTML = subContext.escapeHTML;
}
DebugPropertyName: ERD2WDebugPropertyName {
Modified: trunk/Wonder/Frameworks/Ajax/ERDivaLook/Resources/d2w.d2wmodel
===================================================================
--- trunk/Wonder/Frameworks/Ajax/ERDivaLook/Resources/d2w.d2wmodel 2009-10-18 23:42:56 UTC (rev 10096)
+++ trunk/Wonder/Frameworks/Ajax/ERDivaLook/Resources/d2w.d2wmodel 2009-10-19 03:11:04 UTC (rev 10097)
@@ -67,7 +67,6 @@
{"author" = "20"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOAndQualifier"; "qualifiers" = ({"class" = "com.webobjects.eocontrol.EONotQualifier"; "qualifier" = {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "propertyKey"; "selectorName" = "isEqualTo"; "value" = ""; }; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo"; "value" = "list"; }); }; "rhs" = {"class" = "er.directtoweb.assignments.delayed.ERDDelayedKeyValueAssignment"; "keyPath" = "class"; "value" = "classForColumn"; }; },
{"author" = "20"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOAndQualifier"; "qualifiers" = ({"class" = "com.webobjects.eocontrol.EONotQualifier"; "qualifier" = {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "propertyKey"; "selectorName" = "isEqualTo"; "value" = ""; }; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo"; "value" = "query"; }); }; "rhs" = {"class" = "er.directtoweb.assignments.delayed.ERDDelayedKeyValueAssignment"; "keyPath" = "class"; "value" = "classForAttribute"; }; },
{"author" = "20"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOAndQualifier"; "qualifiers" = ({"class" = "com.webobjects.eocontrol.EONotQualifier"; "qualifier" = {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "propertyKey"; "selectorName" = "isEqualTo"; "value" = ""; }; }, {"class" = "com.webobjects.eocontrol.EONotQualifier"; "qualifier" = {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isEqualTo"; "value" = {"class" = "com.webobjects.foundation.NSKeyValueCoding$Null"; }; }; }, {"class" = "com.webobjects.eocontrol.EONotQualifier"; "qualifier" = {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "entity.name"; "selectorName" = "isEqualTo"; "value" = {"class" = "com.webobjects.foundation.NSKeyValueCoding$Null"; }; }; }); }; "rhs" = {"class" = "er.directtoweb.assignments.delayed.ERDDelayedKeyValueAssignment"; "keyPath" = "id"; "value" = "idForProperty"; }; },
- {"author" = "21"; "class" = "com.webobjects.directtoweb.Rule"; "rhs" = {"class" = "com.webobjects.directtoweb.Assignment"; "keyPath" = "propertyNameComponentName"; "value" = "ERD2WPropertyName2"; }; },
{"author" = "21"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "smartAttribute.className"; "selectorName" = "isEqualTo"; "value" = "com.webobjects.foundation.NSTimestamp"; }; "rhs" = {"class" = "com.webobjects.directtoweb.Assignment"; "keyPath" = "formatter"; "value" = "%B %d, %Y"; }; },
{"author" = "21"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOAndQualifier"; "qualifiers" = ({"class" = "com.webobjects.eocontrol.EONotQualifier"; "qualifier" = {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "propertyKey"; "selectorName" = "isEqualTo"; "value" = ""; }; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "componentName"; "selectorName" = "isEqualTo"; "value" = "ERD2WDisplayString"; }); }; "rhs" = {"class" = "er.directtoweb.assignments.delayed.ERDDelayedKeyValueAssignment"; "keyPath" = "class"; "value" = "classForProperty"; }; },
{"author" = "50"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "pageConfiguration"; "selectorName" = "isLike"; "value" = "*Embedded*"; }; "rhs" = {"class" = "com.webobjects.directtoweb.Assignment"; "keyPath" = "defaultBatchSize"; "value" = "0"; }; },
Modified: trunk/Wonder/Frameworks/Ajax/ERDivaLook/Resources/d2w.d2wmodel.txt
===================================================================
--- trunk/Wonder/Frameworks/Ajax/ERDivaLook/Resources/d2w.d2wmodel.txt 2009-10-18 23:42:56 UTC (rev 10096)
+++ trunk/Wonder/Frameworks/Ajax/ERDivaLook/Resources/d2w.d2wmodel.txt 2009-10-19 03:11:04 UTC (rev 10097)
@@ -66,7 +66,6 @@
20 : (not (propertyKey = '') and task = 'list') => class = classForColumn [er.directtoweb.assignments.delayed.ERDDelayedKeyValueAssignment],
20 : (not (propertyKey = '') and task = 'query') => class = classForAttribute [er.directtoweb.assignments.delayed.ERDDelayedKeyValueAssignment],
20 : (not (propertyKey = '') and not (task = null) and not (entity.name = null)) => id = idForProperty [er.directtoweb.assignments.delayed.ERDDelayedKeyValueAssignment],
- 21 : *true* => propertyNameComponentName = ERD2WPropertyName2 [com.webobjects.directtoweb.Assignment],
21 : smartAttribute.className = 'com.webobjects.foundation.NSTimestamp' => formatter = %B %d, %Y [com.webobjects.directtoweb.Assignment],
21 : (not (propertyKey = '') and componentName = 'ERD2WDisplayString') => class = classForProperty [er.directtoweb.assignments.delayed.ERDDelayedKeyValueAssignment],
50 : pageConfiguration like '*Embedded*' => defaultBatchSize = 0 [com.webobjects.directtoweb.Assignment],
Deleted: trunk/Wonder/Frameworks/Ajax/ERDivaLook/Sources/er/directtoweb/components/_xhtml/ERD2WPropertyName2.java
===================================================================
--- trunk/Wonder/Frameworks/Ajax/ERDivaLook/Sources/er/directtoweb/components/_xhtml/ERD2WPropertyName2.java 2009-10-18 23:42:56 UTC (rev 10096)
+++ trunk/Wonder/Frameworks/Ajax/ERDivaLook/Sources/er/directtoweb/components/_xhtml/ERD2WPropertyName2.java 2009-10-19 03:11:04 UTC (rev 10097)
@@ -1,40 +0,0 @@
-package er.directtoweb.components._xhtml;
-
-import com.webobjects.appserver.*;
-
-import er.directtoweb.components.ERD2WPropertyName;
-import er.directtoweb.components.ERD2WStatelessComponent;
-import er.extensions.foundation.ERXValueUtilities;
-
-import org.apache.log4j.Logger;
-
-// Generated by the WOLips Templateengine Plug-in at May 23, 2008 11:58:14 AM
-public class ERD2WPropertyName2 extends ERD2WStatelessComponent {
- public static final Logger log = Logger.getLogger(ERD2WPropertyName.class);
- protected String _displayNameForProperty;
-
- public ERD2WPropertyName2(WOContext context) {
- super(context);
- }
-
- public String displayNameForProperty() {
- if(_displayNameForProperty == null) {
- _displayNameForProperty = (String)d2wContext().valueForKey("displayNameForProperty");
- }
- return _displayNameForProperty;
- }
-
- public void reset() {
- super.reset();
- _displayNameForProperty = null;
- }
-
- public boolean hasPropertyName() {
- return !ERXValueUtilities.booleanValue(d2wContext().valueForKey("hidePropertyName"));
- }
-
- public boolean displayRequiredMarker() {
- boolean displayRequiredMarker = ERXValueUtilities.booleanValue(d2wContext().valueForKey("displayRequiredMarker"));
- return displayRequiredMarker;
- }
-}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|