Fix typo in key name: typeAheadMinimumCharaceterCount => typeAheadMin…

…imumCharacterCount.
wocommunity · Nov 5, 2015 · 46eff6b · 46eff6b
1 parent 76e9972
commit 46eff6b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/Frameworks/D2W/ERModernDirectToWeb/Resources/d2w.d2wmodel b/Frameworks/D2W/ERModernDirectToWeb/Resources/d2w.d2wmodel
@@ -3,7 +3,7 @@
     {"author" = "0"; "class" = "com.webobjects.directtoweb.Rule"; "rhs" = {"class" = "com.webobjects.directtoweb.BooleanAssignment"; "keyPath" = "useAjaxControls"; "value" = "true"; }; }, 
     {"author" = "0"; "class" = "com.webobjects.directtoweb.Rule"; "rhs" = {"class" = "com.webobjects.directtoweb.Assignment"; "keyPath" = "displayKeyForEntity"; "value" = "entity.name"; }; }, 
     {"author" = "0"; "class" = "com.webobjects.directtoweb.Rule"; "rhs" = {"class" = "com.webobjects.directtoweb.BooleanAssignment"; "keyPath" = "includeOptionalForm"; "value" = "true"; }; }, 
-    {"author" = "0"; "class" = "com.webobjects.directtoweb.Rule"; "rhs" = {"class" = "com.webobjects.directtoweb.Assignment"; "keyPath" = "typeAheadMinimumCharaceterCount"; "value" = "3"; }; }, 
+    {"author" = "0"; "class" = "com.webobjects.directtoweb.Rule"; "rhs" = {"class" = "com.webobjects.directtoweb.Assignment"; "keyPath" = "typeAheadMinimumCharacterCount"; "value" = "3"; }; }, 
     {"author" = "0"; "class" = "com.webobjects.directtoweb.Rule"; "rhs" = {"class" = "com.webobjects.directtoweb.BooleanAssignment"; "keyPath" = "useAjaxControlsWhenEmbedded"; "value" = "false"; }; }, 
     {"author" = "0"; "class" = "com.webobjects.directtoweb.Rule"; "rhs" = {"class" = "com.webobjects.directtoweb.Assignment"; "keyPath" = "typeAheadSearchTemplate"; "value" = "*@@searchValue@@*"; }; }, 
     {"author" = "0"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "pageConfiguration"; "selectorName" = "isLike"; "value" = "*Embedded*"; }; "rhs" = {"class" = "com.webobjects.directtoweb.BooleanAssignment"; "keyPath" = "useAjaxControls"; "value" = "true"; }; }, 
@@ -26,12 +26,12 @@
     {"author" = "10"; "class" = "com.webobjects.directtoweb.Rule"; "rhs" = {"class" = "er.directtoweb.ERDDelayedLocalizedAssignment"; "keyPath" = "confirmRemoveRelatedMessage"; "value" = "ERMD.confirmRemoveRelatedMessage"; }; }, 
     {"author" = "10"; "class" = "com.webobjects.directtoweb.Rule"; "rhs" = {"class" = "er.directtoweb.ERDDelayedLocalizedAssignment"; "keyPath" = "editRelationshipButtonLabel"; "value" = "ERMD.editRelationshipButtonLabel"; }; }, 
     {"author" = "10"; "class" = "com.webobjects.directtoweb.Rule"; "rhs" = {"class" = "er.directtoweb.ERDDelayedLocalizedAssignment"; "keyPath" = "queryRelationshipButtonLabel"; "value" = "ERMD.queryRelationshipButtonLabel"; }; }, 
-    {"author" = "10"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOAndQualifier"; "qualifiers" = ({"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "hasForm"; "selectorName" = "isEqualTo"; "value" = {"class" = "java.lang.Number"; "value" = "1"; }; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "RuleIsDisabled"; "selectorName" = "isEqual"; "value" = "YES"; }); }; "rhs" = {"class" = "com.webobjects.directtoweb.BooleanAssignment"; "keyPath" = "includeOptionalForm"; "value" = "false"; }; }, 
     {"author" = "10"; "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" = "parentPageConfiguration"; "selectorName" = "isNotEqualTo"; "value" = {"class" = "com.webobjects.foundation.NSKeyValueCoding$Null"; }; }); }; "rhs" = {"class" = "com.webobjects.directtoweb.BooleanAssignment"; "keyPath" = "useAjaxControls"; "value" = "false"; }; }, 
     {"author" = "10"; "class" = "com.webobjects.directtoweb.Rule"; "rhs" = {"class" = "er.directtoweb.ERDDelayedLocalizedAssignment"; "keyPath" = "confirmDeleteOrRemoveRelatedMessage"; "value" = "ERMD.confirmDeleteOrRemoveRelatedMessage"; }; }, 
-    {"author" = "10"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOAndQualifier"; "qualifiers" = ({"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "pageConfiguration"; "selectorName" = "isLike"; "value" = "*Embedded*"; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "useAjaxControls"; "selectorName" = "isEqualTo"; "value" = {"class" = "java.lang.Number"; "value" = "1"; }; }); }; "rhs" = {"class" = "com.webobjects.directtoweb.BooleanAssignment"; "keyPath" = "useAjaxControlsWhenEmbedded"; "value" = "true"; }; }, 
+    {"author" = "10"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOAndQualifier"; "qualifiers" = ({"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "hasForm"; "selectorName" = "isEqualTo"; "value" = {"class" = "java.lang.Number"; "value" = "1"; }; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "RuleIsDisabled"; "selectorName" = "isEqual"; "value" = "YES"; }); }; "rhs" = {"class" = "com.webobjects.directtoweb.BooleanAssignment"; "keyPath" = "includeOptionalForm"; "value" = "false"; }; }, 
     {"author" = "10"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOOrQualifier"; "qualifiers" = ({"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "pageConfiguration"; "selectorName" = "isLike"; "value" = "*Embedded*"; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "pageConfiguration"; "selectorName" = "isLike"; "value" = "EditRelationship*"; }); }; "rhs" = {"class" = "com.webobjects.directtoweb.BooleanAssignment"; "keyPath" = "allowInlineEditing"; "value" = "true"; }; }, 
     {"author" = "10"; "class" = "com.webobjects.directtoweb.Rule"; "rhs" = {"class" = "er.modern.directtoweb.assignments.defaults.ERMDDefaultConfigurationNameAssignment"; "keyPath" = "inlineConfigurationName"; "value" = "<ERMDDefaultConfigurationNameAssignment>"; }; }, 
+    {"author" = "10"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOAndQualifier"; "qualifiers" = ({"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "pageConfiguration"; "selectorName" = "isLike"; "value" = "*Embedded*"; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "useAjaxControls"; "selectorName" = "isEqualTo"; "value" = {"class" = "java.lang.Number"; "value" = "1"; }; }); }; "rhs" = {"class" = "com.webobjects.directtoweb.BooleanAssignment"; "keyPath" = "useAjaxControlsWhenEmbedded"; "value" = "true"; }; }, 
     {"author" = "15"; "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" = "parentPageConfiguration"; "selectorName" = "isNotEqualTo"; "value" = {"class" = "com.webobjects.foundation.NSKeyValueCoding$Null"; }; }); }; "rhs" = {"class" = "com.webobjects.directtoweb.BooleanAssignment"; "keyPath" = "allowInlineEditing"; "value" = "false"; }; }, 
     {"author" = "20"; "class" = "com.webobjects.directtoweb.Rule"; "rhs" = {"class" = "com.webobjects.directtoweb.BooleanAssignment"; "keyPath" = "datePickerHideControl"; "value" = "true"; }; }, 
     {"author" = "20"; "class" = "com.webobjects.directtoweb.Rule"; "lhs" = {"class" = "com.webobjects.eocontrol.EOAndQualifier"; "qualifiers" = ({"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "task"; "selectorName" = "isNotEqualTo"; "value" = "edit"; }, {"class" = "com.webobjects.eocontrol.EOKeyValueQualifier"; "key" = "RuleIsDisabled"; "selectorName" = "isEqual"; "value" = "YES"; }); }; "rhs" = {"class" = "com.webobjects.directtoweb.BooleanAssignment"; "keyPath" = "hasForm"; "value" = "false"; }; }, 

diff --git a/Frameworks/D2W/ERModernDirectToWeb/Resources/d2w.d2wmodel.txt b/Frameworks/D2W/ERModernDirectToWeb/Resources/d2w.d2wmodel.txt
@@ -2,7 +2,7 @@
     0 : *true* => useAjaxControls = "true" [com.webobjects.directtoweb.BooleanAssignment],
     0 : *true* => displayKeyForEntity = "entity.name" [com.webobjects.directtoweb.Assignment],
     0 : *true* => includeOptionalForm = "true" [com.webobjects.directtoweb.BooleanAssignment],
-    0 : *true* => typeAheadMinimumCharaceterCount = "3" [com.webobjects.directtoweb.Assignment],
+    0 : *true* => typeAheadMinimumCharacterCount = "3" [com.webobjects.directtoweb.Assignment],
     0 : *true* => useAjaxControlsWhenEmbedded = "false" [com.webobjects.directtoweb.BooleanAssignment],
     0 : *true* => typeAheadSearchTemplate = "*@@searchValue@@*" [com.webobjects.directtoweb.Assignment],
     0 : pageConfiguration like '*Embedded*' => useAjaxControls = "true" [com.webobjects.directtoweb.BooleanAssignment],
@@ -25,12 +25,12 @@
     10 : *true* => confirmRemoveRelatedMessage = "ERMD.confirmRemoveRelatedMessage" [er.directtoweb.ERDDelayedLocalizedAssignment],
     10 : *true* => editRelationshipButtonLabel = "ERMD.editRelationshipButtonLabel" [er.directtoweb.ERDDelayedLocalizedAssignment],
     10 : *true* => queryRelationshipButtonLabel = "ERMD.queryRelationshipButtonLabel" [er.directtoweb.ERDDelayedLocalizedAssignment],
-    10 : (hasForm = 1 and RuleIsDisabled isEqual: 'YES') => includeOptionalForm = "false" [com.webobjects.directtoweb.BooleanAssignment],
     10 : (task = 'list' and parentPageConfiguration != null) => useAjaxControls = "false" [com.webobjects.directtoweb.BooleanAssignment],
     10 : *true* => confirmDeleteOrRemoveRelatedMessage = "ERMD.confirmDeleteOrRemoveRelatedMessage" [er.directtoweb.ERDDelayedLocalizedAssignment],
-    10 : (pageConfiguration like '*Embedded*' and useAjaxControls = 1) => useAjaxControlsWhenEmbedded = "true" [com.webobjects.directtoweb.BooleanAssignment],
+    10 : (hasForm = (java.lang.Number)'1' and RuleIsDisabled isEqual: 'YES') => includeOptionalForm = "false" [com.webobjects.directtoweb.BooleanAssignment],
     10 : (pageConfiguration like '*Embedded*' or pageConfiguration like 'EditRelationship*') => allowInlineEditing = "true" [com.webobjects.directtoweb.BooleanAssignment],
     10 : *true* => inlineConfigurationName = "<ERMDDefaultConfigurationNameAssignment>" [er.modern.directtoweb.assignments.defaults.ERMDDefaultConfigurationNameAssignment],
+    10 : (pageConfiguration like '*Embedded*' and useAjaxControls = (java.lang.Number)'1') => useAjaxControlsWhenEmbedded = "true" [com.webobjects.directtoweb.BooleanAssignment],
     15 : (task = 'list' and parentPageConfiguration != null) => allowInlineEditing = "false" [com.webobjects.directtoweb.BooleanAssignment],
     20 : *true* => datePickerHideControl = "true" [com.webobjects.directtoweb.BooleanAssignment],
     20 : (task != 'edit' and RuleIsDisabled isEqual: 'YES') => hasForm = "false" [com.webobjects.directtoweb.BooleanAssignment],

diff --git a/...oWeb/Sources/er/modern/directtoweb/components/relationships/ERMD2WEditToOneTypeAhead.java b/...oWeb/Sources/er/modern/directtoweb/components/relationships/ERMD2WEditToOneTypeAhead.java
@@ -51,7 +51,7 @@
  * @d2wKey restrictingFetchSpecification - name of the model FetchSpec supplies the list of objects to be searched from (keyWhenRelationship is NOT an attribute) or that additionally qualifies the fetch
  * @d2wKey extraRestrictingQualifier - an additional qualifier (defined in the rules) that additionally qualifies the search
  * @d2wKey typeAheadSearchTemplate - a template that wraps the searchValue (for the inclusion of pre/post wildcards: i.e: "*@@searchValue@@*" )
- * @d2wKey typeAheadMinimumCharaceterCount - minimum number of characters before a search is performed
+ * @d2wKey typeAheadMinimumCharacterCount - minimum number of characters before a search is performed
  * @d2wKey sortKey
  * @d2wKey isMandatory
  * @d2wKey propertyKey
@@ -80,7 +80,7 @@ public interface Keys extends ERDCustomEditComponent.Keys {
 		public static final String typeAheadSearchTemplate = "typeAheadSearchTemplate";
 		public static final String extraRestrictingQualifier = "extraRestrictingQualifier";
 		public static final String keyWhenRelationship = "keyWhenRelationship";
-		public static final String typeAheadMinimumCharaceterCount = "typeAheadMinimumCharaceterCount";
+		public static final String typeAheadMinimumCharacterCount = "typeAheadMinimumCharacterCount";
 	}
 
 	public static Logger log = Logger.getLogger(ERMD2WEditToOneTypeAhead.class);
@@ -366,7 +366,7 @@ public EOQualifier extraQualifier() {
 
 	public Integer minimumCharacterCount() {
 		if (_minimumCharacterCount == null) {
-			_minimumCharacterCount = ERXValueUtilities.IntegerValueWithDefault(stringValueForBinding(Keys.typeAheadMinimumCharaceterCount), 1);
+			_minimumCharacterCount = ERXValueUtilities.IntegerValueWithDefault(stringValueForBinding(Keys.typeAheadMinimumCharacterCount), 1);
 		}
 		return _minimumCharacterCount;
 	}