--- trunk/lib/Frey/ClassBrowser.pm	2008/11/05 08:20:46	272
+++ trunk/lib/Frey/ClassBrowser.pm	2008/11/18 16:54:10	418
@@ -1,32 +1,41 @@
 package Frey::ClassBrowser;
 use Moose;
 
-extends 'Frey';
+extends 'Frey::ClassLoader';
+with 'Frey::Web';
 
-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="/Frey-Introspect?class=$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="/Frey-ObjectDesigner?class=$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="/Frey-ObjectBrowser?class=$package">collection</a>| if $package->can('collection_table');
-		foreach my $try ( Frey::Run->execute ) {
-			push @inspect, qq|<a href="/$package/$try">$try</a>| if $package->can($try);
+		my @run;
+		my @input;
+		push @run, qq|<a href="/Frey-ObjectBrowser?class=$class">collection</a>| if $class->can('collection_table');
+		my $class_method = $self->class_methods( $class );
+		foreach my $try ( Frey::Run->runnable ) {
+			next unless $class->can($try);
+			if ( $class_method->{ $try } ) {
+				push @run, qq|<a href="/$class/$try">$try</a>|;
+			} else {
+				push @input, $try;
+			}
 		}
-		$html .= qq|</td><td>| . join('&nbsp;', @inspect) . qq|</td></tr>|;
+		$html .= qq|</td><td>| . join(' ', @run) . qq|</td><td>| .
+			( @input ? '&larr; ' . join(' ', @input) : '' ) .
+			qq|</td></tr>|;
 	}
 	$html = "<table>$html</table>" if $html;
 	$markup = $html;