--- trunk/lib/Frey/ClassBrowser.pm	2008/09/13 15:31:54	187
+++ trunk/lib/Frey/ClassBrowser.pm	2008/11/05 20:18:33	314
@@ -1,40 +1,34 @@
 package Frey::ClassBrowser;
 use Moose;
 
-extends 'Frey';
-with 'Frey::Web';
+extends 'Frey::ClassLoader';
 
-use Frey::ClassLoader;
+use Frey::Run;
 
 our $markup;
 
 sub markup {
+	my $self = shift;
 	return $markup if $markup;
-	my $f = Frey::ClassLoader->new;
 	my $html;
-	foreach my $package ( $f->classes ) {
-		$html .= qq|<tr><td><a href="/~/$package" title="| . $f->package_path( $package ) . qq|">$package</a></td><td>|;
-		if ( $package->can('meta') ) {
-			if ( $package->meta->isa('Moose::Meta::Role') ) {
+	foreach my $class ( $self->classes ) {
+		$html .= qq|<tr><td><a href="/$class" title="| . $self->class_path( $class ) . qq|">$class</a></td><td>|;
+		if ( $class->can('meta') ) {
+			if ( $class->meta->isa('Moose::Meta::Role') ) {
 				$html .= qq|role|;
 			} else {
-				$html .= qq|<a href="/od/$package">design</a>| if $package->can('collection');
+				$html .= qq|<a href="/Frey-ObjectDesigner?class=$class">design</a>| if $class->can('collection');
 			}
 		}
 		my @inspect;
-		push @inspect, qq|<a href="/ob/$package">collection</a>| if $package->can('collection_table');
-		push @inspect, qq|<a href="/markup/$package">markup</a>| if $package->can('markup');
-		push @inspect, qq|<a href="/html/$package">html</a>| if $package->can('html');
+		push @inspect, qq|<a href="/Frey-ObjectBrowser?class=$class">collection</a>| if $class->can('collection_table');
+		foreach my $try ( Frey::Run->runnable ) {
+			push @inspect, qq|<a href="/$class/$try">$try</a>| if $class->can($try);
+		}
 		$html .= qq|</td><td>| . join('&nbsp;', @inspect) . qq|</td></tr>|;
 	}
 	$html = "<table>$html</table>" if $html;
 	$markup = $html;
 }
 
-sub html {
-	my ( $self, $req ) = @_;
-	my $html = $self->page( body => qq|<h1>Classes</h1>| . $self->markup );
-	$req->print( $html );
-}
-
 1;