cheri 0.0.9 → 0.5.0

data/lib/cheri/jruby/explorer/viewer.rb

@@ -143,33 +143,19 @@ class NodeTypeValue < NodeType
 end
 
 module ViewerInterface
+  attr_reader :type, :main, :instance
+  attr_accessor :title, :icon, :tooltip
+  
   def initialize(node_type,main,instance,*r)
     @type = node_type
     @main = main
     @instance = instance  
   end
 
-  # The node type of this viewer
-  def type
-    @type  
-  end
-
-  def main
-    @main  
-  end
-  
-  def instance
-    @instance  
-  end
-
   def proxy
     @instance.proxy  
   end
   
-  def title
-    @title
-  end
-  
   def title_tree
     title  
   end
@@ -178,10 +164,6 @@ module ViewerInterface
     title  
   end
 
-  def icon
-    @icon
-  end
-
   def icon_tree
     icon  
   end
@@ -190,10 +172,6 @@ module ViewerInterface
     icon  
   end
 
-  def tooltip
-    @tooltip
-  end
-  
   def leaf?
     false  
   end
@@ -210,25 +188,24 @@ module ViewerInterface
   end
 
   def tab(&block)
-    @tab ||= x_panel do
+    @tab ||= grid_table{
       opaque false
-      label icon_tab
-      x_spacer 2
-      label title_tab
-      x_spacer 10
-      button CloseTabDimIcon do
-        rollover_icon CloseTabIcon
-        fixed_size 12,12
-        tool_tip_text 'Close'
-        content_area_filled false
-        border_painted false
-        on_click { close_view }
-      end
-    end
+      grid_row{
+        label title_tab, icon_tab, :LEFT, :a=>:nw, :px=>10
+        button(CloseTabDimIcon, :a=>:ne) {
+          rollover_icon CloseTabIcon
+          fixed_size 12,12
+          tool_tip_text 'Close'
+          content_area_filled false
+          border_painted false
+          on_click { close_view }
+        }
+      }
+    }
     cheri_yield @tab, &block if block_given?
     @tab
   end
-  
+
   def close_view
     @main.close_view(self)
   end
@@ -236,19 +213,17 @@ module ViewerInterface
 end #ViewerInterface
 
 module ValueViewerInterface
+  attr_reader :value
+  
   def initialize(node_type,main,instance,value,*r)
     super
     @value = value  
   end
-  def value
-    @value  
-  end
-end
+
+end #ValueViewerInterface
 
 module ParentViewerInterface
-  def children
-    @children
-  end
+  attr_reader :children
 
   def children_loaded?
   end
@@ -260,7 +235,7 @@ module ParentViewerInterface
     false  
   end
   
-end
+end #ParentViewerInterface
 
 class Viewer
   include ViewerInterface
@@ -285,7 +260,7 @@ class HtmlViewer < Viewer
     .hdr { font-family: sans-serif; font-size: large; font-weight: bold; color: #000080 }
     body { font-family: sans-serif; }
   ]
-  ContType = 'text/html'.freeze
+  ContType = 'text/html'
   
   def html_style
     HtmlStyle 
@@ -360,11 +335,11 @@ class HtmlTableViewer < HtmlViewer
 end
 
 class HtmlNameValueListViewer < HtmlTableViewer
-  HColor = '#f0faff'.freeze
-  NColor = '#f0e2e0'.freeze
-  VColor = '#f0f0f0'.freeze
-  Right = 'right'.freeze
-  Top = 'top'.freeze
+  HColor = '#f0faff'
+  NColor = '#f0e2e0'
+  VColor = '#f0f0f0'
+  Right = 'right'
+  Top = 'top'
 
   def name_value_row(name,value)
    v = tr do
@@ -422,7 +397,8 @@ class HtmlNameValueListViewer < HtmlTableViewer
 
 end #HtmlNameValueListViewer
 
-
+# FIXME: Keeping this deprecated module for now, since it's used
+# in ResultListViewer. 
 module NavViewerConstants
   Color = ::Java::JavaAwt::Color
   Font = ::Java::JavaAwt::Font
@@ -430,6 +406,8 @@ module NavViewerConstants
   NColor = Color.new(0xf0,0xe2,0xe0)
   VColor = Color.new(0xf0,0xf0,0xf0)
   HColor = Color.new(0xd0,0xe0,0xff)
+  White = Color::WHITE
+  Black = Color::BLACK
   TFont = Font.new('Dialog',Font::BOLD,18)
   NFont = Font.new('Dialog',Font::BOLD,14)
   VFont = Font.new('Monospaced',Font::PLAIN,14)
@@ -441,167 +419,90 @@ module NavViewerConstants
   BUTTON2 = MouseEvent::BUTTON2
   BUTTON3 = MouseEvent::BUTTON3
   SHIFT = MouseEvent::SHIFT_DOWN_MASK
-  HdrName = 'Name'.freeze
-  HdrVarName = 'Variable name'.freeze
-  HdrType = 'Type'.freeze
-  HdrId = 'Id'.freeze
-  HdrValue = 'Value'.freeze
+  HdrName = 'Name'
+  HdrVarName = 'Variable name'
+  HdrType = 'Type'
+  HdrId = 'Id'
+  HdrValue = 'Value'
 end
 
-module NavViewer
-  include NavViewerConstants
-
-  class ColDef
-    attr :col, true
-    attr :hbg, true
-    attr :hfg, true
-    attr :hfont, true
-    attr :dbg, true
-    attr :dfg, true
-    attr :dfont, true
-    attr :dtext, true
-    attr :maxh, true
-    attr :clk, true
-    def initialize(hbg,hfg,hfont,dbg,dfg,dfont,dtext=nil,maxh=nil)
-      @hbg = hbg if hbg
-      @hfg = hfg if hfg
-      @hfont = hfont if hfont
-      @dbg = dbg if dbg
-      @dfg = dfg if dfg
-      @dfont = dfont if dfont
-      @dtext = dtext if dtext
-      @maxh = maxh if maxh
-    end
-  end
+module GBLViewer
+  import java.awt.Color
+  import java.awt.Font
+  import java.awt.Insets
+  import java.awt.event.MouseEvent
+  import javax.swing.SwingConstants
+  
+  White = Color::WHITE
+  Black = Color::BLACK
+  TColor = Color.new(0,0,0x80)
+  NColor = Color.new(0xf0,0xe2,0xe0)
+  VColor = Color.new(0xf0,0xf0,0xf0)
+  HColor = Color.new(0xd0,0xe0,0xff)
+
+  TFont = Font.new('Dialog',Font::BOLD,18)
+  NFont = Font.new('Dialog',Font::BOLD,14)
+  VFont = Font.new('Monospaced',Font::PLAIN,14)
+  IFont = Font.new('Monospaced',Font::BOLD,14)
+  CFont = Font.new('Dialog',Font::PLAIN,14)
+  ResFont = Font.new('Monospaced',Font::PLAIN,12)
+
+  SHIFT = MouseEvent::SHIFT_DOWN_MASK
+  BUTTON1 = MouseEvent::BUTTON1
+  BUTTON2 = MouseEvent::BUTTON2
+  BUTTON3 = MouseEvent::BUTTON3
+  
+  TOP = SwingConstants::TOP
+
+  LabelBorder = javax.swing.border.EmptyBorder.new 0,2,0,0
+  LineInset = Insets.new 1,0,0,0
+  CellInset = Insets.new 0,0,1,1
+  HeaderInset = Insets.new 12,0,1,1
 
   def initialize(*r)
     super
     swing[:auto]
   end
   
-  def title_section(title)
-    x_box do
-      align :LEFT
-      label title do
-        align :LEFT
-        set_font TFont
-        foreground TColor
-      end
-      x_spacer 2
+  def cell_label(text,font=ResFont,bgcolor=White,fgcolor=Black,*opts)
+    label(text, *opts) do
+      vertical_alignment TOP
+      border LabelBorder
+      opaque true
+      background bgcolor
+      foreground fgcolor
+      set_font font
     end
   end
   
-  def init_cols(*coldefs)
-    coldefs.each do |cd|
-      cd.col = y_panel do
-        align :LEFT,:TOP
-        opaque false
-      end
+  def value_label(value,font=ResFont,bgcolor=White,fgcolor=Black,*opts)
+    # not actually a label but a text area to support multiple lines
+    text_area(*opts) do
+      border LabelBorder
+      opaque true
+      editable false
+      line_wrap true
+      background bgcolor
+      foreground fgcolor
+      set_font font
+      text value
     end
   end
-
-  def last_row(cols)
-    cols.each do |col|
-      cheri_yield col.col do
-        y_glue
-      end    
-    end  
-  end
   
-  def header_row(cols,*labels)
-    last = labels.length - 1
-    labels.length.times do |i|
-      col = cols[i] || cols.last
-      cheri_yield col.col do
-        x_panel do
-          align :LEFT,:TOP
-          background col.hbg || NColor
-          maximum_size 1000, 24
-          x_spacer 2
-          label labels[i] do
-            align :LEFT,:TOP
-            set_font col.hfont || NFont
-            foreground col.hfg if col.hfg
-          end
-          x_spacer 2
-          x_glue if i == last
-        end
-        x_spacer 1
-        y_spacer 2
-      end
-    end
-    cheri_yield cols.last.col do
-      x_glue    
+  def click_label(text,id,font=ResFont,bgcolor=White,altcolor=bgcolor,fgcolor=Black,*opts)
+    label(text, *opts) do
+      vertical_alignment TOP
+      border LabelBorder
+      opaque true
+      background bgcolor
+      foreground fgcolor
+      set_font font
+      on_mouse_entered  {|e| e.source.background = altcolor}
+      on_mouse_exited   {|e| e.source.background = bgcolor}
+      on_mouse_clicked  {|e| mouse_clicked(e,id) }
+      on_mouse_pressed  {|e| mouse_action(e,id) }
+      on_mouse_released {|e| mouse_action(e,id) }
     end
-    y_spacer 2
-  end
-
-  def value_row(cols,*values) 
-    last = values.length - 1
-    values.length.times do |i|
-      col = cols[i] || cols.last
-      cheri_yield col.col do
-        #y_glue
-        x_panel do
-          align :LEFT,:TOP
-          background col.dbg || VColor
-          maximum_size 1000,col.maxh || 24
-          x_spacer 2
-          if col.clk
-            on_mouse_entered do |e|
-              e.source.background = HColor
-            end
-            on_mouse_exited do |e|
-              e.source.background = VColor
-            end
-          end
-          if col.dtext
-            text_area do
-              align :LEFT,:TOP
-              editable false
-              line_wrap true
-              set_font col.dfont || VFont
-              background col.dbg || VColor
-              foreground col.dfg if col.dfg
-              text values[i]
-            end
-          else
-            label values[i] do
-              align :LEFT,:TOP
-              set_font col.dfont || VFont
-              foreground col.dfg if col.dfg
-              if (click_val = col.clk)
-                on_mouse_entered do |e|
-                  e.source.parent.background = HColor
-                end
-                on_mouse_exited do |e|
-                  e.source.parent.background = VColor
-                end
-                on_mouse_clicked   {|e| mouse_clicked(e,click_val) }
-                on_mouse_pressed   {|e| mouse_action(e,click_val) }
-                on_mouse_released  {|e| mouse_action(e,click_val) }
-              end
-            end
-          end
-          x_spacer 2
-          x_glue if i == last
-        end
-        x_spacer 1
-        y_spacer 2
-      end
-    end
-    cheri_yield cols.last.col do
-      x_glue    
-    end
-    y_spacer 2
-  end
-
-  def empty_row(glue=nil)
-    x_box do
-      align :LEFT,:TOP
-      spacer 1,12
-    end
-    y_glue if glue
   end
   
   def mouse_clicked(e,val=nil)
@@ -610,7 +511,19 @@ module NavViewer
   def mouse_action(e,val=nil)
   end
   
-end
+  def header_row(header_list,font=ResFont,bgcolor=White,fgcolor=Black,opts={})
+    grid_row(opts) {
+      size = header_list.size
+      last = size - 1
+      wx = 0.0
+      size.times {|i|
+        wx = 0.1 if i == last
+        cell_label(header_list[i],font,bgcolor,fgcolor,:wx=>wx)
+      }
+    }
+  end
+
+end #GBLViewer
 
 module DRbHelper
   # work around DRb (or possibly JRuby) issue iterating pseudo-array.

data/lib/cheri/jruby/explorer/viewers.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (C) 2007,2008 William N Dortch <bill.dortch@gmail.com>
+# Copyright (C) 2007,2008,2009 William N Dortch <bill.dortch@gmail.com>
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -71,13 +71,13 @@ class RubyInstanceViewer < HtmlNameValueListViewer
 end #RubyInstanceViewer
 
 class JRubyInstanceViewer < RubyInstanceViewer
-  JVersion = 'java.version'.freeze
-  JVendor = 'java.vendor'.freeze
-  RtName = 'java.runtime.name'.freeze
-  RtVersion = 'java.runtime.version'.freeze
-  VmName = 'java.vm.name'.freeze
-  VmVersion = 'java.vm.version'.freeze
-  VmVendor = 'java.vm.vendor'.freeze
+  JVersion = 'java.version'
+  JVendor = 'java.vendor'
+  RtName = 'java.runtime.name'
+  RtVersion = 'java.runtime.version'
+  VmName = 'java.vm.name'
+  VmVersion = 'java.vm.version'
+  VmVendor = 'java.vm.vendor'
 
   def table_rows
     super
@@ -289,15 +289,15 @@ class ObjectViewer < HtmlNameValueListViewer
   include ValueViewerInterface
   
   #:stopdoc:
-  HdrInstVars = 'Instance variables'.freeze
-  HdrInstVarName = 'Variable name'.freeze
-  HdrName = 'Name'.freeze
-  HdrType = 'Type'.freeze
-  HdrId = 'Id'.freeze
-  HdrValue = 'Value'.freeze
-  Center = 'center'.freeze
-  Left = 'left'.freeze
-  Right = 'right'.freeze
+  HdrInstVars = 'Instance variables'
+  HdrInstVarName = 'Variable name'
+  HdrName = 'Name'
+  HdrType = 'Type'
+  HdrId = 'Id'
+  HdrValue = 'Value'
+  Center = 'center'
+  Left = 'left'
+  Right = 'right'
   #:startdoc:
 
   def title
@@ -361,7 +361,6 @@ class ObjectViewer < HtmlNameValueListViewer
 end
 
 class ConstantViewer < ObjectViewer
-  HdrConstName = 'Constant name'.freeze
   def title
     "#{@instance.name}: #{@value.qname}"
   end
@@ -376,7 +375,7 @@ class ConstantViewer < ObjectViewer
   end
   
   def table_rows
-    col_header_row HdrConstName
+    col_header_row 'Constant name'
     name_type_id_value_row(@value.name,esc(@value.clazz),@value.id,esc(@value.value))
     instance_var_rows if @value.vars
   end
@@ -387,9 +386,9 @@ class ModuleViewer < ConstantViewer
   include ParentViewerInterface
   include DRbHelper
   #:stopdoc:
-  SuperClazz = 'Superclass'.freeze
-  Ancestors = 'Ancestors'.freeze
-  HdrAncName = 'Ancestor name'.freeze
+  SuperClazz = 'Superclass'
+  Ancestors = 'Ancestors'
+  HdrAncName = 'Ancestor name'
   #:startdoc:
   
   def title
@@ -459,44 +458,35 @@ class ModuleViewer < ConstantViewer
     method_rows
   end
 
-  #:stopdoc:
-  HdrPubClsMeth = 'Public class methods'.freeze
-  HdrPubInsMeth = 'Public instance methods'.freeze
-  HdrProClsMeth = 'Protected class methods'.freeze
-  HdrProInsMeth = 'Protected instance methods'.freeze
-  HdrPriClsMeth = 'Private class methods'.freeze
-  HdrPriInsMeth = 'Private instance methods'.freeze
-  #:startdoc:
-
   def method_rows
     if (meths = @methods ||= proxy.module_methods(@value.qname,@value.id))
       if (ms = meths.pub) && !ms.empty?
-        method_header_row HdrPubClsMeth
+        method_header_row 'Public class methods'
         ms.sort.each do |m| method_row(m); end
         empty_row
       end
       if (ms = meths.pub_inst) && !ms.empty?
-        method_header_row HdrPubInsMeth
+        method_header_row 'Public instance methods'
         ms.sort.each do |m| method_row(m); end
         empty_row
       end
       if (ms = meths.pro) && !ms.empty?
-        method_header_row HdrProClsMeth
+        method_header_row 'Protected class methods'
         ms.sort.each do |m| method_row(m); end
         empty_row
       end
       if (ms = meths.pro_inst) && !ms.empty?
-        method_header_row HdrProInsMeth
+        method_header_row 'Protected instance methods'
         ms.sort.each do |m| method_row(m); end
         empty_row
       end
       if (ms = meths.pri) && !ms.empty?
-        method_header_row HdrPriClsMeth
+        method_header_row 'Private class methods'
         ms.sort.each do |m| method_row(m); end
         empty_row
       end
       if (ms = meths.pri_inst) && !ms.empty?
-        method_header_row HdrPriInsMeth
+        method_header_row 'Private instance methods'
         ms.sort.each do |m| method_row(m); end
         empty_row
       end
@@ -513,15 +503,13 @@ class ModuleViewer < ConstantViewer
     tr td(esc(meth), :class => :method, :bgcolor => VColor, :colspan => cols)
   end
 
-  Cls = 'Class'.freeze #:nodoc:
-  Mod = 'Module'.freeze #:nodoc:
   def load_children
     recs = drb_to_array(proxy.const_recs(value.qname)).sort
     children = []
     recs.each do |rec|
       ntv = case rec.clazz
-        when Cls : NodeTypeValue.new(Class,rec.value,rec)
-        when Mod : NodeTypeValue.new(Module,rec.value,rec)
+        when 'Class' : NodeTypeValue.new(Class,rec.value,rec)
+        when 'Module' : NodeTypeValue.new(Module,rec.value,rec)
         else NodeTypeValue.new(:constant,rec.clazz,rec)
       end
       children << ntv
@@ -820,298 +808,102 @@ class ResultListViewer < Viewer
   end
 end
 
-
-class NavObjectViewer
+class GBLObjectViewer
   include ViewerInterface
   include ValueViewerInterface
-  include NavViewer
-  include Cheri::Swing
+  include GBLViewer
   
+  include Cheri::Swing
+
   def title
-    "#{@instance.name}: #{@value.clazz}"
+    "#{@instance.name}: #{@value.clazz} value"
   end
+  
   def title_tree
     "#{@value.clazz}" 
   end
+
   def title_tab
-    "#{@instance.name}: #{@value.clazz}"
+    title
   end
+
   def icon
     ObjectIcon  
   end
+
   def leaf?
     true  
   end
 
-  def content_section
-    empty_row
-    value_section
-    if @value.vars
-      empty_row
-      variables_section
-      last_row(@icols)
-    else
-      last_row(@vcols)
-    end
-    empty_row true
-  end
-  
-  def value_section
-    idcol = ColDef.new(NColor,nil,NFont,VColor,nil,CFont)
-    typecol = ColDef.new(NColor,nil,NFont,VColor,nil,CFont)
-    valcol = ColDef.new(NColor,nil,NFont,VColor,TColor,VFont,true,10000)    
-
-    @vcols = [idcol,typecol,valcol]
-    @vsec = x_box do
-      init_cols(*@vcols)
-      align :LEFT,:TOP
-    end
-    header_row(@vcols,HdrId,HdrType,HdrValue)
-    value_row(@vcols,@value.id.to_s,@value.clazz,@value.value)  
-  end
-  
-  def variables_section
-    return unless (vars = value.vars)
-    idcol = ColDef.new(NColor,nil,NFont,VColor,nil,CFont)
-    namecol = ColDef.new(NColor,nil,NFont,VColor,nil,IFont)
-    typecol = ColDef.new(NColor,nil,NFont,VColor,nil,CFont)
-    valcol = ColDef.new(NColor,nil,NFont,VColor,TColor,VFont)
-
-    @icols = [idcol,namecol,typecol,valcol]
-    @isec = x_box do
-      init_cols(*@icols)
-      align :LEFT,:TOP
-    end
-    header_row(@icols,HdrId,HdrVarName,HdrType,HdrValue)
-    vars.each do |name,type,value,id|
-      idcol.clk = id
-      namecol.clk = id
-      value_row(@icols,id.to_s,name,type,value) 
-    end   
-  end
-
-  def send_selection(id,new_tab=nil)
-    @main.show_linked_object(self,id,new_tab)
-  end
+  def view
+    @view ||= scroll_pane {
+      grid_table{ #Body
+        background :WHITE
+        opaque true
+        defaults :a=>:nw, :wx=>0.1, :wy=>0.0, :f=>:h
+        grid_row{ #Title
+          cell_label title, TFont, White, TColor
+        } #Title
+        grid_row{ #Value
+          grid_table{
+            defaults :a=>:nw, :wx=>0.0, :wy=>0.0, :f=>:h, :i=>CellInset
+            opaque false
+            header_row ['Id','Type','Value'], NFont, NColor, Black, :px=>16
 
-  def mouse_clicked(e,id)
-    send_selection(id,(e.modifiers_ex & SHIFT) == SHIFT)
-  end
+            grid_row(:f=>:both, :wy=>0.1, :px=>12){
+              cell_label @value.id.to_s, VFont, VColor, Black
+              cell_label @value.clazz, VFont, VColor, Black
+              value_label @value.value, VFont, VColor, Black, :px=>0, :wx=>0.1
+            }
+          }
+        } #Value
 
-  def mouse_action(e,id)
-    if e.popup_trigger?
-      @menu_pending = id
-      selection_popup.show(e.component,e.x,e.y)
-    end
-  end
-  
-  def menu_selection(new_tab)
-    if id = @menu_pending
-      @menu_pending = nil
-      send_selection(id,new_tab)
-    end
-  end
-  
-  def selection_popup
-    @popup ||= popup_menu 'Open item in ... ' do
-      menu_item 'Open in new tab' do
-        on_click {menu_selection true}
-      end
-      menu_item 'Open in default tab' do
-        on_click {menu_selection false}
-      end
-    end  
+        # FIXME: forcing stuff upwards; there *must* be a better way...
+        grid_row{empty_cell(:a=>:se, :wy=>0.1, :f=>:v)}
+      } #Body
+    } # scroll_pane
   end
   
-  
-  def view(&block)
-    @view ||= scroll_pane do
-      align :LEFT
-      @top_view = y_panel do
-        align :LEFT
-        empty_border 4,4,4,4
-        background :WHITE
-        title_section title
-        content_section
-      end
-    end
-  end
+end #GBLObjectViewer
 
-end #NavObjectViewer
-
-class NavModuleViewer
+class GBLModuleViewer
   include ViewerInterface
   include ValueViewerInterface
   include ParentViewerInterface
-  include NavViewer
+  include GBLViewer
+
   include Cheri::Swing
   include DRbHelper
-  #:stopdoc:
-  SuperClazz = 'Superclass'.freeze
-  Ancestors = 'Ancestors'.freeze
-  HdrAncName = 'Ancestor name'.freeze
-  HdrPubClsMeth = 'Public class methods'.freeze
-  HdrPubInsMeth = 'Public instance methods'.freeze
-  HdrProClsMeth = 'Protected class methods'.freeze
-  HdrProInsMeth = 'Protected instance methods'.freeze
-  HdrPriClsMeth = 'Private class methods'.freeze
-  HdrPriInsMeth = 'Private instance methods'.freeze
-  #:startdoc:
   
-
   def title
     "#{@instance.name}: #{@value.qname.empty? ? @value.value : @value.qname}"
   end
+
   def title_tree
     "#{@value.name}" 
   end
+
   def title_tab
     "#{@instance.name}: #{@value.name.empty? ? @value.value : @value.name}"
   end
+
   def icon
     ModuleIcon  
   end
+
   def leaf?
     false  
   end
 
-  def content_section
-    val = @value
-    header_section
-    empty_row
-    if (anc = val.ancestors) && (first = anc.first)
-      anc.shift if first.id == val.id && first.value == val.qname
-    end
-    if anc && !anc.empty?
-      ancestor_section    
-      empty_row
-    end
-    if val.vars
-      variables_section
-      empty_row
-    end
-    methods_section
-    last_row @last_cols
-    empty_row true
-  end
-  
-  def header_section
-    namecol = ColDef.new(NColor,nil,NFont,NColor,nil,NFont)
-    valcol = ColDef.new(VColor,nil,CFont,VColor,nil,CFont)
-
-    @hcols = [namecol,valcol]
-    @hsec = x_box do
-      init_cols(*@hcols)
-      align :LEFT,:TOP
-    end
-    val = @value
-    header_row(@hcols,val.clazz, val.qname.empty? ? val.value : val.qname)  
-    header_row(@hcols,HdrId,val.id.to_s)
-    if (sc = val.superclazz)
-      header_row(@hcols,SuperClazz,sc)    
-    end
-    @last_cols = @hcols
-  end
-
-  def ancestor_section
-    idcol = ColDef.new(NColor,nil,NFont,VColor,nil,CFont)
-    namecol = ColDef.new(NColor,nil,NFont,VColor,nil,CFont)
-    typecol = ColDef.new(NColor,nil,NFont,VColor,nil,CFont)
-
-    @acols = [idcol,namecol,typecol]
-    @asec = x_box do
-      init_cols(*@acols)
-      align :LEFT,:TOP
-    end
-    header_row(@acols,HdrId,HdrAncName,HdrType)
-    @value.ancestors.each do |name,type,id|
-      idcol.clk = id
-      namecol.clk = id
-      value_row(@acols,id.to_s,name,type)   
-    end
-    @last_cols = @acols
-  end
-
-  def variables_section
-    return unless (vars = value.vars)
-    idcol = ColDef.new(NColor,nil,NFont,VColor,nil,CFont)
-    namecol = ColDef.new(NColor,nil,NFont,VColor,nil,IFont)
-    typecol = ColDef.new(NColor,nil,NFont,VColor,nil,CFont)
-    valcol = ColDef.new(NColor,nil,NFont,VColor,TColor,VFont)
-
-    @icols = [idcol,namecol,typecol,valcol]
-    @isec = x_box do
-      init_cols(*@icols)
-      align :LEFT,:TOP
-    end
-    header_row(@icols,HdrId,HdrVarName,HdrType,HdrValue)
-    vars.each do |name,type,value,id|
-      idcol.clk = id
-      namecol.clk = id
-      value = value + '...' if value.length == 100
-      value_row(@icols,id.to_s,name,type,value) 
-    end   
-    @last_cols = @icols
-  end
-  
-  def methods_section
-    return unless (meths = @methods ||= proxy.module_methods(@value.qname,@value.id))
-    coldef = ColDef.new(NColor,nil,NFont,VColor,nil,VFont)
-
-    @mcols = [coldef]
-    @msec = x_box do
-      init_cols(*@mcols)
-      align :LEFT,:TOP
-    end
-    if (ms = meths.pub) && !ms.empty?
-      header_row(@mcols,HdrPubClsMeth)
-      ms.sort.each do |m|
-        value_row(@mcols,m)
-      end
-    end
-    if (ms = meths.pub_inst) && !ms.empty?
-      header_row(@mcols,HdrPubInsMeth)
-      ms.sort.each do |m|
-        value_row(@mcols,m)
-      end
-    end
-    if (ms = meths.pro) && !ms.empty?
-      header_row(@mcols,HdrProClsMeth)
-      ms.sort.each do |m|
-        value_row(@mcols,m)
-      end
-    end
-    if (ms = meths.pro_inst) && !ms.empty?
-      header_row(@mcols,HdrProInsMeth)
-      ms.sort.each do |m|
-        value_row(@mcols,m)
-      end
-    end
-    if (ms = meths.pri) && !ms.empty?
-      header_row(@mcols,HdrPriClsMeth)
-      ms.sort.each do |m|
-        value_row(@mcols,m)
-      end
-    end
-    if (ms = meths.pri_inst) && !ms.empty?
-      header_row(@mcols, HdrPriInsMeth)
-      ms.sort.each do |m|
-        value_row(@mcols,m)
-      end
-    end
-    @last_cols = @mcols
-  end
-  
-  Cls = 'Class'.freeze #:nodoc:
-  Mod = 'Module'.freeze #:nodoc:
   def load_children
     recs = drb_to_array(proxy.const_recs(value.qname)).sort
     children = []
     recs.each do |rec|
       ntv = case rec.clazz
-        when Cls : NodeTypeValue.new(Class,rec.value,rec)
-        when Mod : NodeTypeValue.new(Module,rec.value,rec)
+        when 'Class' : NodeTypeValue.new(Class,rec.value,rec)
+        when 'Module' : NodeTypeValue.new(Module,rec.value,rec)
         else NodeTypeValue.new(:constant,rec.clazz,rec)
+        
       end
       children << ntv
     end
@@ -1119,9 +911,9 @@ class NavModuleViewer
   end
   
   def children_loaded?
-    @children  
+    !!@children  
   end
-
+  
   def send_selection(id,new_tab=nil)
     @main.show_linked_object(self,id,new_tab)
   end
@@ -1154,30 +946,151 @@ class NavModuleViewer
       end
     end  
   end
+
+  def title_section
+    grid_row{
+      cell_label title, TFont, White, TColor
+    }
+  end
+
+  def header_section
+    val = @value
+    grid_row{ #Header
+      grid_table {
+        defaults :a=>:nw, :f=>:both, :wx=>0.0, :wy=>0.0, :i=>CellInset
+        opaque false
+        grid_row{
+          cell_label 'Module', NFont, NColor, Black
+          cell_label(val.qname.empty? ? val.value : val.qname, VFont, VColor, Black, :wx=>0.1)
+        }
+        grid_row{
+          cell_label 'Id', NFont, NColor, Black
+          cell_label(val.id.to_s, VFont, VColor, Black, :wx=>0.1)
+        }
+      }
+    } #Header
+  end
+
+  def ancestors_section
+    val = @value
+    if (anc = val.ancestors) && (first = anc.first)
+      anc.shift if first.id == val.id && first.value == val.qname
+    end
+    return unless anc && !anc.empty?
+
+    grid_row{ #Ancestors
+      grid_table {
+        defaults :a=>:nw, :f=>:h, :wx=>0.0
+        opaque false
+        header_row ['Id', 'Ancestor name', 'Type'], NFont, NColor, Black, :px=>16, :i=>[16,0,1,1]
+        anc.each {|name,type,id|
+          grid_row(:i=>[0,0,1,1], :f=>:both, :a=>:nw, :wy=>0.1, :px=>12){
+            click_label id.to_s, id, VFont, VColor, Color::CYAN, Black
+            click_label name, id, VFont, VColor, Color::CYAN, Black
+            cell_label type, VFont, VColor, Black
+          }
+        }
+      }
+    } #Ancestors
+  end
   
+  def variables_section
+    val = @value
+    return unless (vars = val.vars) && !vars.empty?
+    
+    grid_row{ #Variables
+      grid_table {
+        defaults :a=>:nw, :f=>:h, :wx=>0.0
+        opaque false
+        header_row ['Id', 'Variable name', 'Type', 'Value'], NFont, NColor, Black, :px=>16, :i=>[16,0,1,1]
+        vars.each {|name,type,value,id|
+          value = value + '...' if value.length >= 100
+          grid_row(:i=>[0,0,1,1], :f=>:both, :a=>:nw, :wy=>0.1, :px=>12){
+            click_label id.to_s, id, CFont, VColor, Color::CYAN, Black
+            click_label name, id, IFont, VColor, Color::CYAN, Black
+            cell_label type, CFont, VColor, Black
+            value_label value, VFont, VColor, TColor,  :px=>0, :wx=>0.0
+          }
+        }
+      }
+    } #Variables
+  end
   
-  def view(&block)
-    @view ||= scroll_pane do
-      align :LEFT
-      @top_view = y_panel do
-        align :LEFT
-        empty_border 4,4,4,4
+  def methods_section
+    return unless (methods = @methods ||= proxy.module_methods(@value.qname,@value.id))
+    [
+      [methods.pub,'Public class methods'],
+      [methods.pub_inst,'Public instance methods'],
+      [methods.pro,'Protected class methods'],
+      [methods.pro_inst,'Protected instance methods'],
+      [methods.pri,'Private class methods'],
+      [methods.pri_inst,'Private instance methods']
+    ].each do |meths, title|
+      if meths && !meths.empty?
+        grid_row{cell_label title, NFont, NColor, Black, :i=>HeaderInset}
+        meths.sort.each do |name|
+          grid_row{cell_label name, VFont, VColor, Black, :i=>LineInset}
+        end
+      end    
+    end  
+  end
+
+  def view
+    @view ||= scroll_pane {
+      val = @value
+      grid_table{ #Body
         background :WHITE
-        title_section title
-        content_section
-      end
-    end
+        opaque true
+        defaults :a=>:nw, :wx=>0.1, :wy=>0.0, :f=>:h
+
+        title_section
+
+        header_section
+        
+        ancestors_section
+        
+        variables_section
+        
+        methods_section
+        
+        # FIXME: forcing stuff upwards; there *must* be a better way...
+        grid_row{empty_cell(:a=>:se, :wy=>0.1, :f=>:v)}
+      } #Body
+    } # scroll_pane
   end
 
-end
+end #GBLModuleViewer
 
-class NavClassViewer < NavModuleViewer
+class GBLClassViewer < GBLModuleViewer
 
   def icon
     ClassIcon  
   end
 
-end
+  def header_section
+    val = @value
+    superclazz = val.superclazz
+    grid_row{ #Header
+      grid_table {
+        defaults :a=>:nw, :f=>:both, :wx=>0.0, :wy=>0.0, :i=>CellInset
+        opaque false
+        grid_row{
+          cell_label 'Class', NFont, NColor, Black
+          cell_label(val.qname.empty? ? val.value : val.qname, VFont, VColor, Black, :wx=>0.1)
+        }
+        grid_row{
+          cell_label 'Id', NFont, NColor, Black
+          cell_label(val.id.to_s, VFont, VColor, Black, :wx=>0.1)
+        }
+        grid_row{
+          cell_label 'Superclass', NFont, NColor, Black
+          cell_label(superclazz, VFont, VColor, Black, :wx=>0.1)
+        } if superclazz
+      }
+    } #Header
+  end
+
+end #GBLClassViewer
 
 
 register_viewer(:root_node,nil,RootNodeViewer)
@@ -1188,13 +1101,10 @@ register_viewer(:env_java,nil,JavaEnvViewer)
 register_viewer(:global_vars,nil,GlobalVariablesViewer)
 register_viewer(:global_const,nil,ConstantsViewer)
 register_viewer(:config,nil,ConfigViewer)
-#register_viewer(:object,nil,ObjectViewer)
-register_viewer(:object,nil,NavObjectViewer)
 register_viewer(:constant,nil,ConstantViewer)
-#register_viewer(Class,nil,ClassViewer)
-#register_viewer(Module,nil,ModuleViewer)
-register_viewer(Class,nil,NavClassViewer)
-register_viewer(Module,nil,NavModuleViewer)
+register_viewer(:object,nil,GBLObjectViewer)
+register_viewer(Module,nil,GBLModuleViewer)
+register_viewer(Class,nil,GBLClassViewer)
 register_viewer(:results,nil,ResultListViewer)