- Have Controller use the CommandEvent callback dispatch stuff once
the controller has located the appropriate function. - If the arg for a command or callback is an array, assume those are the parameters for the function. If you desire passing a single array argument, you've got to wrap it in another array, otherwise single args will be automatically wrapped for you. git-svn-id: svn+ssh://src.earth.threerings.net/narya/trunk@4676 542714f4-19e9-0310-aa3c-eee0fc999fb1
This commit is contained in:
@@ -78,32 +78,14 @@ public class Controller
|
||||
// this + "]");
|
||||
}
|
||||
}
|
||||
if (fn != null) {
|
||||
try {
|
||||
try {
|
||||
// try calling it with the arg
|
||||
fn(arg);
|
||||
} catch (ae :ArgumentError) {
|
||||
if (arg == null) {
|
||||
// try calling it without the arg
|
||||
fn();
|
||||
} else {
|
||||
throw ae;
|
||||
}
|
||||
}
|
||||
|
||||
} catch (e :Error) {
|
||||
var log :Log = Log.getLog(this);
|
||||
log.warning("Error handling controller " +
|
||||
"command [error=" + e + ", cmd=" + cmd +
|
||||
", arg=" + arg + "].");
|
||||
log.logStackTrace(e);
|
||||
}
|
||||
// we "handled" the event, even if it threw an error
|
||||
return true;
|
||||
if (fn == null) {
|
||||
// never found it?
|
||||
return false;
|
||||
}
|
||||
|
||||
return false; // not handled
|
||||
// finally, dispatch it
|
||||
CommandEvent.dispatch(_controlledPanel, fn, arg);
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user