--- trunk/lib/Frey/ClassBrowser.pm	2008/11/18 13:52:26	409
+++ trunk/lib/Frey/ClassBrowser.pm	2008/11/26 05:14:27	531
@@ -2,42 +2,85 @@
 use Moose;
 
 extends 'Frey::ClassLoader';
+with 'Frey::Web';
+with 'Frey::Session';
 
 use Frey::Run;
+use Data::Dump qw/dump/;
 
-our $markup;
+has 'usage_on_top' => (
+	is => 'rw',
+	isa => 'Bool',
+	default => 1,
+	documentation => 'Show usage on top of list',
+);
 
-sub markup {
+sub as_markup {
 	my $self = shift;
-	return $markup if $markup;
-	my $html;
+	my $row;
+
+	my $usage = $self->session_dump( $self->usage );
+	#warn "# usage ",dump( $usage );
 	foreach my $class ( $self->classes ) {
-		$html .= qq|<tr><td><a href="/$class" title="| . $self->class_path( $class ) . qq|">$class</a></td><td>|;
+
+		my $icon = '';
+		if ( $self->can('icon_path') ) {
+			$icon = $self->icon_path( $class );
+			$icon = qq|<img src="/$icon" alt="$class">| if $icon;
+		} else {
+			warn "## $self doesn't know how to return icon_path";
+		}
+
+		my $html
+			= qq|<tr><td>$icon</td><td><a target="$class" 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=$class">design</a>| if $class->can('collection');
-			}
-		}
-		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|<a target="$class" href="/Frey-ObjectDesigner?class=$class">design</a>| if $class->can('collection');
 			}
 		}
-		$html .= qq|</td><td>| . join(' ', @run) . qq|</td><td>| .
-			( @input ? '&larr; ' . join(' ', @input) : '' ) .
-			qq|</td></tr>|;
+
+		my @run = map {
+			s{^as_}{};
+			qq|<a target="$class" href="/$class/as_$_" title="$class->as_$_">$_</a>|;
+		} $self->class_runnable( $class );
+		push @run, qq|<a target="$class" href="/Frey-ObjectBrowser?class=$class">collection</a>| if $class->can('collection_table');
+
+		my @inputs = $self->class_inputs( $class );
+
+		$usage->{$class} ||= 0;
+		$html
+			.= qq|</td><td>|
+			. join(' ', @run)
+			. qq|</td><td>|
+			. ( @inputs ? '&larr; ' . join(' ', @inputs) : '' )
+			. qq|</td><td>|
+			. ( $usage->{$class} || '' )
+			. qq|</td></tr>|
+			;
+		$row->{$class} = $html;
 	}
-	$html = "<table>$html</table>" if $html;
-	$markup = $html;
+
+	return 
+		qq|<table>| . join("\n",
+			map { $row->{$_} }
+			sort {
+				if ( $usage->{$a} || $usage->{$b} ) {
+					if ( $self->usage_on_top ) {
+						$usage->{$b} <=> $usage->{$a};
+					} else {
+						$usage->{$a} <=> $usage->{$b};
+					}
+				} else {
+					$a cmp $b;
+				}
+			}
+			keys %$row
+		) . qq|</table>|;
 }
 
 1;