From 042cce2f3d879b8fb4b9dc58b150fff17464b845 Mon Sep 17 00:00:00 2001 From: Paul Hoadley Date: Tue, 19 Apr 2016 10:59:20 +0930 Subject: [PATCH] Substitutes for missing method. AjaxUtils.stringValueForBinding() was deprecated some time ago, and then removed in Wonder 7. Here we substitute the API-identical ERXComponentUtilities.stringValueForBinding(). --- Archives/Frameworks/YUI/Sources/er/yui/YUIBlock.java | 6 +++--- Archives/Frameworks/YUI/Sources/er/yui/YUIBody.java | 6 +++--- Archives/Frameworks/YUI/Sources/er/yui/YUIFooter.java | 6 +++--- Archives/Frameworks/YUI/Sources/er/yui/YUIHeader.java | 6 +++--- Archives/Frameworks/YUI/Sources/er/yui/YUIPanel.java | 3 ++- .../Frameworks/YUI/Sources/er/yui/YUIShowPanelLink.java | 6 +++--- Archives/Frameworks/YUI/Sources/er/yui/YUIUtils.java | 7 ++++--- 7 files changed, 21 insertions(+), 19 deletions(-) diff --git a/Archives/Frameworks/YUI/Sources/er/yui/YUIBlock.java b/Archives/Frameworks/YUI/Sources/er/yui/YUIBlock.java index 63f5e6733bf..586f1bf9cea 100644 --- a/Archives/Frameworks/YUI/Sources/er/yui/YUIBlock.java +++ b/Archives/Frameworks/YUI/Sources/er/yui/YUIBlock.java @@ -4,7 +4,7 @@ import com.webobjects.appserver.WOElement; import com.webobjects.foundation.NSDictionary; -import er.ajax.AjaxUtils; +import er.extensions.components.ERXComponentUtilities; /** * Generates a YUI class = "yui-b" div. @@ -21,7 +21,7 @@ public YUIBlock(String aName, NSDictionary associations, WOEleme @Override protected String divID(WOContext context) { - return AjaxUtils.stringValueForBinding("id", associations(), context.component()); + return ERXComponentUtilities.stringValueForBinding("id", associations(), context.component()); } @Override @@ -31,7 +31,7 @@ protected String divClass(WOContext context) { @Override protected String divStyle(WOContext context) { - return AjaxUtils.stringValueForBinding("style", associations(), context.component()); + return ERXComponentUtilities.stringValueForBinding("style", associations(), context.component()); } } diff --git a/Archives/Frameworks/YUI/Sources/er/yui/YUIBody.java b/Archives/Frameworks/YUI/Sources/er/yui/YUIBody.java index 11ff5694b9c..2eb94895af3 100644 --- a/Archives/Frameworks/YUI/Sources/er/yui/YUIBody.java +++ b/Archives/Frameworks/YUI/Sources/er/yui/YUIBody.java @@ -4,7 +4,7 @@ import com.webobjects.appserver.WOElement; import com.webobjects.foundation.NSDictionary; -import er.ajax.AjaxUtils; +import er.extensions.components.ERXComponentUtilities; /** * Generates a YUI class = "bd" div. @@ -20,7 +20,7 @@ public YUIBody(String aName, NSDictionary associations, WOElement template) { } protected String divID(WOContext context) { - return AjaxUtils.stringValueForBinding("id", associations(), context.component()); + return ERXComponentUtilities.stringValueForBinding("id", associations(), context.component()); } protected String divClass(WOContext context) { @@ -28,6 +28,6 @@ protected String divClass(WOContext context) { } protected String divStyle(WOContext context) { - return AjaxUtils.stringValueForBinding("style", associations(), context.component()); + return ERXComponentUtilities.stringValueForBinding("style", associations(), context.component()); } } diff --git a/Archives/Frameworks/YUI/Sources/er/yui/YUIFooter.java b/Archives/Frameworks/YUI/Sources/er/yui/YUIFooter.java index d67f4f45fe5..f0e9f42720b 100644 --- a/Archives/Frameworks/YUI/Sources/er/yui/YUIFooter.java +++ b/Archives/Frameworks/YUI/Sources/er/yui/YUIFooter.java @@ -4,7 +4,7 @@ import com.webobjects.appserver.WOElement; import com.webobjects.foundation.NSDictionary; -import er.ajax.AjaxUtils; +import er.extensions.components.ERXComponentUtilities; /** * Generates a YUI class = "ft" div. @@ -20,7 +20,7 @@ public YUIFooter(String aName, NSDictionary associations, WOElement template) { } protected String divID(WOContext context) { - return AjaxUtils.stringValueForBinding("id", associations(), context.component()); + return ERXComponentUtilities.stringValueForBinding("id", associations(), context.component()); } protected String divClass(WOContext context) { @@ -28,6 +28,6 @@ protected String divClass(WOContext context) { } protected String divStyle(WOContext context) { - return AjaxUtils.stringValueForBinding("style", associations(), context.component()); + return ERXComponentUtilities.stringValueForBinding("style", associations(), context.component()); } } diff --git a/Archives/Frameworks/YUI/Sources/er/yui/YUIHeader.java b/Archives/Frameworks/YUI/Sources/er/yui/YUIHeader.java index 67c07181402..23905cc89cd 100644 --- a/Archives/Frameworks/YUI/Sources/er/yui/YUIHeader.java +++ b/Archives/Frameworks/YUI/Sources/er/yui/YUIHeader.java @@ -4,7 +4,7 @@ import com.webobjects.appserver.WOElement; import com.webobjects.foundation.NSDictionary; -import er.ajax.AjaxUtils; +import er.extensions.components.ERXComponentUtilities; /** * Generates a YUI class = "hd" div. @@ -20,7 +20,7 @@ public YUIHeader(String aName, NSDictionary associations, WOElement template) { } protected String divID(WOContext context) { - return AjaxUtils.stringValueForBinding("id", associations(), context.component()); + return ERXComponentUtilities.stringValueForBinding("id", associations(), context.component()); } protected String divClass(WOContext context) { @@ -28,6 +28,6 @@ protected String divClass(WOContext context) { } protected String divStyle(WOContext context) { - return AjaxUtils.stringValueForBinding("style", associations(), context.component()); + return ERXComponentUtilities.stringValueForBinding("style", associations(), context.component()); } } diff --git a/Archives/Frameworks/YUI/Sources/er/yui/YUIPanel.java b/Archives/Frameworks/YUI/Sources/er/yui/YUIPanel.java index 60fc586b64b..ef7c1c80a48 100644 --- a/Archives/Frameworks/YUI/Sources/er/yui/YUIPanel.java +++ b/Archives/Frameworks/YUI/Sources/er/yui/YUIPanel.java @@ -11,6 +11,7 @@ import er.ajax.AjaxOption; import er.ajax.AjaxOptions; import er.ajax.AjaxUtils; +import er.extensions.components.ERXComponentUtilities; /** * Generates a YUI panel (@see http://developer.yahoo.com/yui/container/panel/). @@ -55,7 +56,7 @@ protected String divClass(WOContext context) { } protected String divStyle(WOContext context) { - String style = AjaxUtils.stringValueForBinding("style", associations(), context.component()); + String style = ERXComponentUtilities.stringValueForBinding("style", associations(), context.component()); StringBuffer styleBuffer = new StringBuffer(); styleBuffer.append("visibility: hidden; "); if (style != null) { diff --git a/Archives/Frameworks/YUI/Sources/er/yui/YUIShowPanelLink.java b/Archives/Frameworks/YUI/Sources/er/yui/YUIShowPanelLink.java index cfa8c869eb5..0abaae27aad 100644 --- a/Archives/Frameworks/YUI/Sources/er/yui/YUIShowPanelLink.java +++ b/Archives/Frameworks/YUI/Sources/er/yui/YUIShowPanelLink.java @@ -6,7 +6,7 @@ import com.webobjects.appserver._private.WODynamicGroup; import com.webobjects.foundation.NSDictionary; -import er.ajax.AjaxUtils; +import er.extensions.components.ERXComponentUtilities; /** * YUIShowPanelLink generates either an hyperlink or an input button that @@ -28,9 +28,9 @@ public YUIShowPanelLink(String name, NSDictionary associations, WOElement templa } public void appendToResponse(WOResponse response, WOContext context) { - String id = AjaxUtils.stringValueForBinding("panelID", _associations, context.component()); + String id = ERXComponentUtilities.stringValueForBinding("panelID", _associations, context.component()); String varName = YUIUtils.varName(id, _associations, context); - String type = AjaxUtils.stringValueForBinding("type", _associations, context.component()); + String type = ERXComponentUtilities.stringValueForBinding("type", _associations, context.component()); String showScript = varName + ".render();" + varName + ".show();return false;"; if ("button".equals(type)) { response.appendContentString("