--- trunk/lib/Frey/Run.pm	2008/11/19 15:28:23	455
+++ trunk/lib/Frey/Run.pm	2008/11/20 14:39:43	480
@@ -7,7 +7,7 @@
 with 'Frey::Session';
 
 use Data::Dump qw/dump/;
-use Frey::Dumper;
+use Frey::View::Dumper;
 use JSON;
 use YAML;
 
@@ -78,14 +78,14 @@
 			if ( $is_role ) {
 				$o = $instance;
 			} else {
-				$o = $class->new( %{ $self->params } );
+				$o = $self->new_frey_class( $class, $self->params );
 			}
 
 			$o->depends if $o->can('depends');
 
-			push @{ $self->status }, { qq|<a target="editor" href="/editor+$class+1">$class</a>| => $self->params };
+			push @{ $self->status }, { $self->editor( $class ) => $self->params };
 
-			if ( $self->run eq 'markup' ) {
+			if ( $self->run eq 'as_markup' ) {
 				warn "## using ",ref($o), "->as_markup";
 				if ( $o->can('page') ) {
 					$html = $o->page;
@@ -93,7 +93,7 @@
 				$body = $o->as_markup unless $html;
 
 				warn ">>> markup $class ",length( $html || $body ), " ", $html ? 'html' : 'body', " bytes";
-			} elsif ( $self->run eq 'sponge' ) {
+			} elsif ( $self->run eq 'as_sponge' ) {
 				$data = $o->as_sponge;
 				confess "invalid data from sponge = ", dump( $data ) unless ref($data) eq 'HASH';
 				if ( $self->format eq 'html' ) {
@@ -105,7 +105,7 @@
 					$body .= '<tr><td>' . join('</td><td>', @$_ ) . '</td></tr>' foreach @{ $data->{rows} };
 					$body .= '</table>';
 				}
-			} elsif ( $self->run eq 'data' ) {
+			} elsif ( $self->run eq 'as_data' ) {
 				$data = $o->as_data;
 			} else {
 				$body = $self->error( "IGNORE: $class ", $o->dump );
@@ -117,7 +117,7 @@
 				push @{ $self->status }, { 'data' => $data };
 			}
 			if ( ! $html ) {
-				$body .= Frey::Dumper->new( data => $data )->as_markup;
+				$body .= Frey::View::Dumper->new( data => $data )->as_markup;
 			}
 
 			# override our status with one from object