Skip to content

Commit

Permalink
Substitutes for missing method.
Browse files Browse the repository at this point in the history
AjaxUtils.stringValueForBinding() was deprecated some time ago, and
then removed in Wonder 7. Here we substitute the API-identical
ERXComponentUtilities.stringValueForBinding().
  • Loading branch information
paulhoadley committed Apr 19, 2016
1 parent 283fcfe commit 042cce2
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 19 deletions.
6 changes: 3 additions & 3 deletions Archives/Frameworks/YUI/Sources/er/yui/YUIBlock.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -21,7 +21,7 @@ public YUIBlock(String aName, NSDictionary<String, Object> associations, WOEleme

@Override
protected String divID(WOContext context) {
return AjaxUtils.stringValueForBinding("id", associations(), context.component());
return ERXComponentUtilities.stringValueForBinding("id", associations(), context.component());
}

@Override
Expand All @@ -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());
}

}
6 changes: 3 additions & 3 deletions Archives/Frameworks/YUI/Sources/er/yui/YUIBody.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -20,14 +20,14 @@ 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) {
return "bd";
}

protected String divStyle(WOContext context) {
return AjaxUtils.stringValueForBinding("style", associations(), context.component());
return ERXComponentUtilities.stringValueForBinding("style", associations(), context.component());
}
}
6 changes: 3 additions & 3 deletions Archives/Frameworks/YUI/Sources/er/yui/YUIFooter.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -20,14 +20,14 @@ 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) {
return "ft";
}

protected String divStyle(WOContext context) {
return AjaxUtils.stringValueForBinding("style", associations(), context.component());
return ERXComponentUtilities.stringValueForBinding("style", associations(), context.component());
}
}
6 changes: 3 additions & 3 deletions Archives/Frameworks/YUI/Sources/er/yui/YUIHeader.java
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -20,14 +20,14 @@ 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) {
return "hd";
}

protected String divStyle(WOContext context) {
return AjaxUtils.stringValueForBinding("style", associations(), context.component());
return ERXComponentUtilities.stringValueForBinding("style", associations(), context.component());
}
}
3 changes: 2 additions & 1 deletion Archives/Frameworks/YUI/Sources/er/yui/YUIPanel.java
Original file line number Diff line number Diff line change
Expand Up @@ -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/).
Expand Down Expand Up @@ -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) {
Expand Down
6 changes: 3 additions & 3 deletions Archives/Frameworks/YUI/Sources/er/yui/YUIShowPanelLink.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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("<input");
Expand Down
7 changes: 4 additions & 3 deletions Archives/Frameworks/YUI/Sources/er/yui/YUIUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.webobjects.foundation.NSDictionary;

import er.ajax.AjaxUtils;
import er.extensions.components.ERXComponentUtilities;
import er.extensions.foundation.ERXProperties;
import er.extensions.foundation.ERXStringUtilities;

Expand Down Expand Up @@ -59,15 +60,15 @@ public static void addStylesheetResourceInHead(WOContext context, WOResponse res
}

public static String id(String idBindingName, NSDictionary associations, WOContext context) {
String id = AjaxUtils.stringValueForBinding(idBindingName, associations, context.component());
String id = ERXComponentUtilities.stringValueForBinding(idBindingName, associations, context.component());
if (id == null) {
id = ERXStringUtilities.safeIdentifierName(context.elementID());
}
return id;
}

public static String varName(String name, NSDictionary associations, WOContext context) {
String namespace = AjaxUtils.stringValueForBinding("namespace", associations, context.component());
String namespace = ERXComponentUtilities.stringValueForBinding("namespace", associations, context.component());
return YUIUtils.varName(name, namespace);
}

Expand All @@ -80,7 +81,7 @@ public static String varName(String name, String namespace) {
}

public static void appendAttributeValue(WOResponse response, WOContext context, NSDictionary associations, String name) {
String value = AjaxUtils.stringValueForBinding(name, associations, context.component());
String value = ERXComponentUtilities.stringValueForBinding(name, associations, context.component());
YUIUtils.appendAttributeValue(response, context, name, value);
}

Expand Down

0 comments on commit 042cce2

Please sign in to comment.