Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add a 'type' argument to the string expander interface so that string expanders can support multiple types. Also split getExpandedString so that callers can expand strings separately from getting strings, in case that is ever necessary.

Browse Source
This commit is contained in:
ian%hixie.ch 2002-04-05 19:13:14 +00:00
parent 275e8b2cd4
commit b52700b1d2
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
webtools/PLIF/PLIF/Output/Generic.pm
View File

@ -128,6 +128,9 @@ sub output {
$self->fillData($data);
$self->outputter->output($self->app, $session,
$self->app->getService('dataSource.strings')->getExpandedString($self->app, $session, $self->actualProtocol, $string, $data));
# it's not that anyone would override dataSource.strings, it's just that
# people might call it without calling output(), so the right thing here
# is also to call it through getService().
}
# output.generic service instance method
@ -157,19 +160,6 @@ sub fillData {
$data->{'output'} = $self->outputter->hash;
}
# dataSource.strings default implementation
sub getExpandedString {
my $self = shift;
my($app, $session, $protocol, $name, $data) = @_;
my($type, $version, $string) = $self->getString($app, $session, $protocol, $name);
my $expander = $app->getService("string.expander.named.$name");
if (not defined($expander)) {
$expander = $app->getService("string.expander.$type");
$self->assert($expander, 1, "Could not find a string expander for string '$name' of type '$type'");
}
return $expander->expand($app, $self, $session, $protocol, $string, $data);
}
# dataSource.strings default implementation
sub getString {
my $self = shift;
@ -181,3 +171,23 @@ sub getString {
}
return @string;
}
# dataSource.strings default implementation
sub expandString {
my $self = shift;
my($app, $session, $protocol, $name, $type, $string, $data) = @_;
my $expander = $app->getService("string.expander.named.$name"); # XXX when would anyone override the expander based on the name??
if (not defined($expander)) {
$expander = $app->getService("string.expander.$type");
$self->assert($expander, 1, "Could not find a string expander for string '$name' of type '$type'");
}
return $expander->expand($app, $self, $session, $protocol, $string, $data, $type);
}
# dataSource.strings default implementation
sub getExpandedString {
my $self = shift;
my($app, $session, $protocol, $name, $data) = @_;
my($type, $version, $string) = $self->getString($app, $session, $protocol, $name);
return $self->expandString($app, $session, $protocol, $name, $type, $string, $data);
}