antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

default parameter is now used for all macros, including those handled by

Browse source 
request, response and parameter objects.
Slightly optimized retrieval of prefix and suffix, which is now done only once instead
of each time the macro is rendered.
This commit is contained in:
hns 2002-09-25 14:22:18 +00:00
parent 7e7a335f14
commit 8a598b3371
1 changed files with 37 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
src/helma/framework/core/Skin.java
View file

@ -155,7 +155,8 @@ public final class Skin {
int start, end; int start, end;
String handler; String handler;
String name; String name;
String fullname; String prefix;
String suffix;
HashMap parameters; HashMap parameters;
public Macro (int start, int end) { public Macro (int start, int end) {
@ -242,6 +243,9 @@ public final class Skin {
else if (state <= MACRO) else if (state <= MACRO)
name = b.toString().trim(); name = b.toString().trim();
} }
// get prefix and suffix from parameters
prefix = (String) parameters.get ("prefix");
suffix = (String) parameters.get ("suffix");
} }
@ -324,36 +328,27 @@ public final class Skin {
// check if a function called name_macro is defined. // check if a function called name_macro is defined.
// if so, the macro evaluates to the function. Otherwise, // if so, the macro evaluates to the function. Otherwise,
// a property/field with the name is used, if defined. // a property/field with the name is used, if defined.
Object v = null;
// remember length of response buffer before calling macro // remember length of response buffer before calling macro
int oldLength = reval.res.getBufferLength (); int oldLength = reval.res.getBufferLength ();
if (reval.scriptingEngine.hasFunction (handlerObject, name+"_macro")) { if (reval.scriptingEngine.hasFunction (handlerObject, name+"_macro")) {
// System.err.println ("Getting macro from function"); // System.err.println ("Getting macro from function");
v = reval.scriptingEngine.invoke (handlerObject, name+"_macro", arguments, false); Object v = reval.scriptingEngine.invoke (handlerObject, name+"_macro", arguments, false);
// check if macro wrote out to response buffer
if (reval.res.getBufferLength () > oldLength) {
// insert prefix and append suffix
if (prefix != null)
reval.res.insert (oldLength, prefix);
if (suffix != null)
reval.res.write (suffix);
writeToResponse (v, reval.res, false);
} else {
writeToResponse (v, reval.res, true);
}
} else { } else {
// System.err.println ("Getting macro from property"); // System.err.println ("Getting macro from property");
v = reval.scriptingEngine.get (handlerObject, name); Object v = reval.scriptingEngine.get (handlerObject, name);
} writeToResponse (v, reval.res, true);
// check if macro wrote out to response buffer
if (reval.res.getBufferLength () > oldLength) {
// insert prefix and append suffix
String prefix = (String) parameters.get ("prefix");
String suffix = (String) parameters.get ("suffix");
if (prefix != null)
reval.res.insert (oldLength, prefix);
if (suffix != null)
reval.res.write (suffix);
}
// if macro returned something append it to response
if (v != null) {
writeToResponse (v.toString (), reval.res);
}
// if the macro hasn't produced any output, write default attribute
// if it is specified.
if (reval.res.getBufferLength () == oldLength) {
String defaultValue = (String) parameters.get ("default");
if (defaultValue != null)
reval.res.write (defaultValue);
} }
} else { } else {
String msg = "[HopMacro unhandled: "+getFullName()+"]"; String msg = "[HopMacro unhandled: "+getFullName()+"]";
@ -389,14 +384,12 @@ public final class Skin {
value = reval.res.message; value = reval.res.message;
if (value == null) if (value == null)
value = reval.res.get (name); value = reval.res.get (name);
if (value != null) writeToResponse (value, reval.res, true);
writeToResponse (value.toString (), reval.res);
} }
private void renderFromRequest (RequestEvaluator reval) { private void renderFromRequest (RequestEvaluator reval) {
Object value = reval.req.get (name); Object value = reval.req.get (name);
if (value != null) writeToResponse (value, reval.res, true);
writeToResponse (value.toString (), reval.res);
} }
private void renderFromParam (RequestEvaluator reval, HashMap paramObject) { private void renderFromParam (RequestEvaluator reval, HashMap paramObject) {
@ -404,20 +397,26 @@ public final class Skin {
reval.res.write ("[HopMacro error: Skin requires a parameter object]"); reval.res.write ("[HopMacro error: Skin requires a parameter object]");
else { else {
Object value = paramObject.get (name); Object value = paramObject.get (name);
if (value != null) writeToResponse (value, reval.res, true);
writeToResponse (value.toString (), reval.res);
} }
} }
/** /**
* Utility method for writing text out to the response object. * Utility method for writing text out to the response object.
*/ */
void writeToResponse (String text, ResponseTrans res) { void writeToResponse (Object value, ResponseTrans res, boolean useDefault) {
String text;
if (value == null) {
if (useDefault)
text = (String) parameters.get ("default");
else
return;
} else {
text = value.toString ();
}
if (text == null || text.length() == 0) if (text == null || text.length() == 0)
return; return;
String encoding = (String) parameters.get ("encoding"); String encoding = (String) parameters.get ("encoding");
String prefix = (String) parameters.get ("prefix");
String suffix = (String) parameters.get ("suffix");
res.write (prefix); res.write (prefix);
res.write (encode (text, encoding)); res.write (encode (text, encoding));
res.write (suffix); res.write (suffix);
@ -450,13 +449,10 @@ public final class Skin {
* Return the full name of the macro in handler.name notation * Return the full name of the macro in handler.name notation
*/ */
public String getFullName () { public String getFullName () {
if (fullname == null) { if (handler == null)
if (handler == null) return name;
fullname = name; else
else return handler+"."+name;
fullname = handler+"."+name;
}
return fullname;
} }
} }