cheri 0.0.4 → 0.0.5

data/README

@@ -6,7 +6,7 @@ based on the framework, as well as a builder-builder tool for easily creating
 simple builders.  Cheri also comes with a demo application, Cheri::JRuby::Explorer,
 that is built using two of the supplied builders (Cheri::Swing and Cheri::Html).
 
-This version (0.0.4) is an early beta release. Some features are not yet fully
+This version (0.0.5) is an early beta release. Some features are not yet fully
 developed, in particular the HTML/XML components.  On the other hand, Cheri::Swing,
 which is the successor to JRBuilder (http://www2.webng.com/bdortch/jrbuilder), is
 relatively mature, in an adolescent sort of way, though many features could be added.
@@ -40,8 +40,13 @@ Cheri gem):
   
   Cheri::JRuby::Explorer.run
   
+Alternatively, you can load and run it in one step:
+
+  require 'rubygems'
+  require 'cheri/cjx'
+
 This will take several seconds to load and start -- performance will be one area
-of improvement for versions 0.0.5 and beyond.  Once it loads, it should be fairly
+of improvement for versions 0.0.6 and beyond.  Once it loads, it should be fairly
 clear what to do.
 
 Some known issues:
@@ -49,22 +54,13 @@ Some known issues:
 * Browsing the class hierarchy is very slow right now -- this actually slowed down
   in the past couple of days when I switched from HTML to straight Swing layout, the
   opposite of what I expected to happen.
-  
-* ObjectSpace searches that return large numbers of objects sometimes result in a
-  NullPointerException (JList seems to get overwhelmed), requiring a restart of
-  CJX. I had a fix in that did a GC on the target instance before each search,
-  which seemed to help, but also seemed a little extreme. This will be a search
-  option in 0.0.5.
-  
+    
 * There are lots of layout issues; neither HTML (JEditorPane) nor BoxLayout provide 
   exactly what I'm looking for. Will probably have to bite the bullet and go to
   GridBagLayout.  Ugh.
-  
-* Tab management (and navigation in general) is not yet quite right.
-  Will have history/back buttons and better tab management in 0.0.5.
-  
+    
 * Global variables are currently shown, um, globally, when many of them should be shown
-  per thread.  This will be fixed in 0.0.5, which will include a Thread section with
+  per thread.  This will be fixed in 0.0.6, which will include a Thread section with
   other goodies as well (thread-local vars, status, etc.).
   
 To install the CJX DRb server component in an instance (assuming the Cheri gem is

data/lib/cheri/builder/connecter.rb

@@ -81,7 +81,7 @@ class TypeConnecter
     t = @t
     bld_anc = (class<<builder.object;self;end).ancestors
     anc ||= (class<<obj;self;end).ancestors
-    key = [bld_anc,anc,sym]
+    key = [sym,bld_anc,anc]
     if (ctr = @c[key])
       return ctr.prepare(ctx,builder,obj,sym,props)
     end

data/lib/cheri/builder/context.rb

@@ -557,6 +557,11 @@ class Context
 #  alias_method :check, :ck
 #
 
+  # Overrides the default Object#inspect to prevent mind-boggling circular displays in IRB.
+  def inspect
+    "#<#{self.class}:instance>"  
+  end
+
   # We want to prevent built objects passed as parameters from
   # being dynamically connected, since presumably the method/ctor
   # being called will do whatever is needed (except for cherify,

data/lib/cheri/builder/swing/connecter.rb

@@ -28,6 +28,9 @@ module Swing
 
 # note: inherits connection types from AWTConnecter
 SwingConnecter = Cheri::Builder::TypeConnecter.new(Cheri::AWT::AWTConnecter) do
+  jver = ENV_JAVA['java.version']
+  Java5 = String === jver && jver >= '1.5'
+  Java6 = String === jver && jver >= '1.6'
   S = java.lang.String.new ''
   TreePath = javax.swing.tree.TreePath
   
@@ -81,13 +84,13 @@ SwingConnecter = Cheri::Builder::TypeConnecter.new(Cheri::AWT::AWTConnecter) do
     # TODO: close button (:default or user JButton)
     connect java.awt.Component do |pane,cmp,sym,props|
       if props
-        if (tc = props[:tab])
+        if Java6 && (tc = props[:tab])
           pane.addTab(S,cmp)
           i = pane.indexOfComponent(cmp)
           pane.setTabComponentAt(i,tc)
           # TODO: tooltip allowed for custom tab?
         else
-          title = props[:title] || cmp.name || ''
+          title = props[:title] || cmp.name || S
           icon = props[:icon]
           tooltip = props[:tooltip]
           pane.addTab(title,icon,cmp,tooltip)

data/lib/cheri/cheri.rb

@@ -29,10 +29,12 @@ module Cheri
 module VERSION #:nodoc:
   MAJOR = 0
   MINOR = 0
-  TINY  = 4
+  TINY  = 5
   STRING = [MAJOR, MINOR, TINY].join('.').freeze
 end
-PathExp = Regexp.new "cheri-#{VERSION::STRING}\\/lib$" #:nodoc:
+#:stopdoc:
+PathExp = Regexp.new "cheri-#{VERSION::STRING}\\/lib$"
+#:startdoc:
 class CheriException < StandardError; end
 # global threadsafe; set if all Cheri module instances in a system
 # must be threadsafe

data/lib/cheri/explorer/explorer.rb

@@ -79,6 +79,9 @@ module Explorer
   end
 
 class ObjectRec
+  # TODO: make this configurable (or settable in search dialog)
+  MaxDataLength = 100000
+
   def initialize(obj)
     @z = obj.class.to_s rescue nil
     @i = obj.__id__ rescue nil
@@ -95,6 +98,8 @@ class ObjectRec
     end
     @u = (obj.superclass.to_s rescue nil) if obj.respond_to?(:superclass)
     @s = obj.inspect rescue nil
+    # we're going allow a maximum of ~ 64K for value
+    @s = @s[0,MaxDataLength] << '...' if @s && @s.length > MaxDataLength
   end
   def clazz
     @z  
@@ -186,7 +191,7 @@ class NameValue
     raise Cheri.type_error(name,String) unless String === name
     @n = name
     @i = value.__id__ rescue '?'
-    @v = String === value ? value[0,100] : (value.to_s[0,100] rescue '?')
+    @v = String === value ? value[0,128] : (value.to_s[0,128] rescue '?')
   end
   def name
     @n  
@@ -229,6 +234,7 @@ class NameTypeValue < NameValue
 end #NameTypeValue
 
 class SearchArgs
+  attr :gc, true
   def initialize(clazz,vars=nil,any=nil)
     raise Cheri.type_error(clazz,String) unless String === clazz
     raise ArgumentError,"Invalid class "+ clazz unless /^([A-Z])((\w|::[A-Z])*)$/.match clazz
@@ -237,7 +243,7 @@ class SearchArgs
       raise Cheri.type_error(vars,Array) unless Array === vars
       vars.each do |v|
         raise Cheri.type_error(v,SearchNameValue) unless SearchNameValue === v
-        raise Cheri.type_error(v.name,Symbol) unless Symbol === v.name
+        raise Cheri.type_error(v.name,Symbol) if v.name && !(Symbol === v.name)
       end
       @v = vars
       @a = !(any == nil || any == false)
@@ -402,7 +408,9 @@ class RubyExplorer
   def module_methods(name,id=nil)
     if id && defined?ObjectSpace
       raise Cheri.type_error(id,Fixnum) unless Fixnum === id
-      if Module === (mod = ObjectSpace._id2ref(id) rescue nil)
+      # doing this in two steps to work around JRuby bug (JRUBY-1125)
+      mod = ObjectSpace._id2ref(id)
+      if Module === mod
         return MethodRec.new(mod)
       end
     elsif name
@@ -420,7 +428,9 @@ class RubyExplorer
   def object(id)
     return unless id && defined?ObjectSpace
     raise Cheri.type_error(id,Fixnum) unless Fixnum === id
-    if (obj = ObjectSpace._id2ref(id) rescue nil) && !(Fixnum === obj)
+    # doing this in two steps to work around JRuby bug (JRUBY-1125)
+    obj = ObjectSpace._id2ref(id)
+    if obj && !(Fixnum === obj)
       if Module === obj && (name = obj.name rescue nil)
         if (ix = name.rindex('::'))
           parent = name[0,ix]
@@ -440,18 +450,22 @@ class RubyExplorer
   def object_methods(id)
     return unless id && defined?ObjectSpace
     raise Cheri.type_error(id,Fixnum) unless Fixnum === id
-    if (obj = ObjectSpace._id2ref(id) rescue nil) && !(Fixnum === obj)
+    # doing this in two steps to work around JRuby bug (JRUBY-1125)
+    obj = ObjectSpace._id2ref(id)
+    if obj && !(Fixnum === obj)
       return MethodRec.new(obj)    
     end
   end
   
-  def simple_value(id)
+  def simple_value(id,maxlen=80)
     return unless id && defined?ObjectSpace
     raise Cheri.type_error(id,Fixnum) unless Fixnum === id
-    if (obj = ObjectSpace._id2ref(id)) && !(Fixnum === obj)
-      obj.to_s[0,40] rescue 'Unreadable'
+    # doing this in two steps to work around JRuby bug (JRUBY-1125)
+    obj = ObjectSpace._id2ref(id)
+    if obj && !(Fixnum === obj)
+      obj.to_s[0,maxlen] rescue 'Unreadable'
     else
-      'Unavailable'
+      nil
     end
   end
   
@@ -463,30 +477,67 @@ class RubyExplorer
     # make sure we don't have anything executable before we eval it
     raise ArgumentError,"Invalid class "+ sclazz unless /^([A-Z])((\w|::[A-Z])*)$/.match sclazz
     if Module === (clazz = (eval("::#{sclazz}") rescue nil))
-      #GC.start
+      GC.start if sargs.gc
       result = []
-      vars = sargs.vars
-      len = vars.length if vars
-      any = sargs.any
-      ObjectSpace.each_object(clazz) do |o|
-        if (id = o.__id__ rescue nil)
-          if vars
-            match = 0
-            vars.each do |v|
-              if (iv = o.instance_variable_get(v.name) rescue nil) &&
-                  (v.rx? ? (iv.to_s =~ v.value rescue nil) : (iv.to_s.index(v.value) rescue nil))
-                if any
-                  match = 1
-                  break
-                else
-                  match += 1                
+      if (vars = sargs.vars) && !vars.empty?
+        # just supporting one var name and/or value for now
+        sname = vars[0].name
+        raise ArgumentError,"Invalid instance variable" if sname && !(Symbol === sname)
+        sval = vars[0].value
+        sval = nil if String === sval && sval.empty?
+        rx = Regexp === sval
+      else
+        sname = nil
+        sval = nil
+      end
+      if sname && sval
+        ObjectSpace.each_object(clazz) do |o|
+          if Fixnum === (id = o.__id__ rescue nil) &&
+              #(o.respond_to?(:instance_variable_get) rescue nil) &&
+              (iv = o.instance_variable_get(sname) rescue nil) &&
+              (String === iv || String === (iv = iv.to_s rescue nil)) &&
+              (rx ? (iv =~ sval rescue nil) : (iv.index(sval) rescue nil))
+            result << id
+          end
+        end
+      elsif sname
+        sname = sname.to_s
+        ObjectSpace.each_object(clazz) do |o|
+          if Fixnum === (id = o.__id__ rescue nil) &&
+              #(o.respond_to?(:instance_variables) rescue nil) &&
+              Array === (ivs = o.instance_variables rescue nil) &&
+              (ivs.include?(sname) rescue nil)
+            result << id
+          end
+        end
+      elsif sval
+        # note: _not_ calling inspect here to avoid circular reference trap;
+        # examining (potentially) each instance var instead
+        ObjectSpace.each_object(clazz) do |o|
+          if Fixnum === (id = o.__id__ rescue nil)
+            if (String === (os = o) || String === (os = o.to_s rescue nil)) &&
+                (rx ? (os =~ sval rescue nil) : (os.index(sval) rescue nil))
+              result << id
+            elsif Array === (ivs = o.instance_variables rescue nil)
+              hit = nil
+              ivs.each do |ivn|
+                if (iv = o.instance_variable_get(ivn.to_sym) rescue nil) &&
+                    (String === iv || String === (iv = iv.to_s rescue nil)) &&
+                    (rx ? (iv =~ sval rescue nil) : (iv.index(sval) rescue nil))
+                  result << id unless hit
+                  hit = true
+                  # this doesn't appear to be breaking?
+                  break # TODO: check for LocalJumpError
                 end
               end
             end
-            result << id if (any && match == 1) || match == len
-          else
-            result << id          
-          end        
+          end
+        end
+      else
+        ObjectSpace.each_object(clazz) do |o|
+          if Fixnum === (id = o.__id__ rescue nil)
+            result << id
+          end
         end
       end
       result

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

@@ -165,8 +165,6 @@ class SearchDialog
           @object_id = text_field do
              columns 16
              fixed_size 100,24
-             #maximum_size dimension(100,24)
-             #minimum_size dimension(100,24)
           end
           y_glue
         end
@@ -182,6 +180,7 @@ class SearchDialog
                   'Search Error', JOptionPane::ERROR_MESSAGE)
               else
                 @dialog.visible = false
+                @object_id.text = ''
                 @main.new_find(@instances[@instance_list.selected_index],id)
               end
             end
@@ -192,11 +191,12 @@ class SearchDialog
 
       y_glue
 
-      x_panel do
+      y_panel do
         compound_border( 
           titled_border('Search for instances by type and optional variable/value') { etched_border :LOWERED },
           empty_border(4,8,4,8)
         )
+       x_panel do
         y_box do
           y_glue
           label 'Class or Module:' 
@@ -217,22 +217,16 @@ class SearchDialog
           @clazz = text_field do
              columns 20
              fixed_size 200,24
-             #maximum_size dimension(200,24)
-             #minimum_size dimension(200,24)
           end
           y_glue
           @name1 = text_field do
              columns 20
              fixed_size 200,24
-             #maximum_size dimension(200,24)
-             #minimum_size dimension(200,24)
           end
           y_glue
           @value1 = text_field do
              columns 20
              fixed_size 200,24
-             #maximum_size dimension(200,24)
-             #minimum_size dimension(200,24)
           end
           y_glue
         end
@@ -253,24 +247,38 @@ class SearchDialog
               elsif name && name !~ /^([A-Za-z_])(\w*)$/
                 JOptionPane.show_message_dialog(@dialog,"Invalid variable name, please re-enter",
                   'Search Error', JOptionPane::ERROR_MESSAGE)
-              elsif value && !name && !value.empty?
-                JOptionPane.show_message_dialog(@dialog,"Please enter a variable name (or omit value)",
-                  'Search Error', JOptionPane::ERROR_MESSAGE)
               else
-                @dialog.visible = false
-                @main.new_search(@instances[@instance_list.selected_index],clazz,name,value)
+                if value && value.strip.length != value.length
+                  rsp = JOptionPane.show_confirm_dialog(@main_frame,
+                    "Value contains leading/trailing whitespace -- continue?")
+                else
+                  rsp = nil
+                end
+                unless rsp && rsp != JOptionPane::YES_OPTION
+                  @dialog.visible = false
+                  gc = @gc.selected
+                  reset_fields
+                  @main.new_search(@instances[@instance_list.selected_index],clazz,name,value,gc)
+                end
               end
             end
           end
         end
+       end
+       x_panel do
+        @gc = check_box 'GC target instance before search'
+       end
       end
       y_glue
+        x_box do
+          x_glue
           button 'Cancel' do
             on_click do
             @dialog.visible = false
             end
           end
-      
+          x_glue
+        end
       y_glue
     end
 
@@ -285,6 +293,14 @@ class SearchDialog
     val  
   end
 
+  def reset_fields
+    @clazz.text = ''
+    @name1.text = ''
+    @value1.text = ''
+    @gc.selected = false
+  end
+  private :reset_fields
+  
   def value
     @dialog  
   end
@@ -345,7 +361,7 @@ class AboutDialog
             table(:width=>'97%') {
               tr{td(:align=>:left) {
                 p 'Cheri::JRuby::Explorer (CJX) demonstrates some of the features ',
-                'of the Cheri builder framework, and with any luck may prove useful ',
+                'of the Cheri builder framework, and may even prove useful ',
                 'in its own right.  CJX is built using the Cheri::Swing and Cheri::Html ',
                 'components of the framework.'
                 p

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

@@ -72,6 +72,9 @@ class Main
   SearchIcon = CJava.get_icon('Search24.gif')
   RefreshIcon = CJava.get_icon('Refresh24.gif')
   CloseIcon = CJava.get_icon('Delete24.gif')
+  # TODO: I *hate* these next two -- find replacements!
+  NextIcon = CJava.get_icon('Forward24.gif')
+  PrevIcon = CJava.get_icon('Back24.gif')
   ClassIcon = CJava.get_icon('class_16x16.png')
   ModuleIcon = CJava.get_icon('mod_tree.png')
   Viewers = Cheri::JRuby::Explorer
@@ -106,9 +109,10 @@ class Main
     @instances = {}
     @instance_listeners = []  
     @main_tabs = {}
-    @search_tabs = {}
+    @result_tabs = {}
+    @main_tab_history = []
     @main_tabs[:global] = {}
-    @search_tabs[:global] = {}
+    @result_tabs[:global] = {}
     @local_instance = JRubyInstance.new(RubyExplorer.new,'Local','local')
     add_instance(@local_instance)
   end
@@ -122,14 +126,14 @@ class Main
     @main_frame.set_location(Math.max(0,(bounds.width - 800)/2), Math.max(0,(bounds.height - 760)/2))
     @main_frame.show
     @main_frame.to_front
-    sleep 2
+    sleep 1.5
     @main_tree.selection_row = 0
     @main_frame.content_pane.remove(splash_screen)
     @main_menu.visible = true
     @main_tool_bar.visible = true
     @main_panel.visible = true
     @footer_panel.visible = true
-    @search_tab_pane.visible = false
+    @result_tab_pane.visible = false
   end
 
   def release_resources
@@ -157,7 +161,7 @@ class Main
           right_pane do
             right_splitter do
               main_tab_pane
-              search_tab_pane
+              result_tab_pane
             end
           end
         end
@@ -212,10 +216,10 @@ class Main
   def view_menu(&block)
     @view_menu ||= menu 'View' do |mn|
       mnemonic :VK_V
-      @search_results_select = check_box_menu_item 'Search Results pane' do
+      @results_select = check_box_menu_item 'Search Results pane' do
         selected true
         on_click do |e|
-          if (@search_tab_pane.visible = e.source.selected = !@search_tab_pane.visible)
+          if (@result_tab_pane.visible = e.source.selected = !@result_tab_pane.visible)
             adjust_right_splitter
           end
         end      
@@ -264,7 +268,12 @@ class Main
         on_click do
           show_search_dialog        
         end
-      
+      end
+      menu_item 'Repeat last search' do
+        mnemonic :VK_R
+        on_click do
+          repeat_search
+        end
       end
     end
     cheri_yield(@search_menu,&block) if block
@@ -304,9 +313,24 @@ class Main
           show_search_dialog       
         end      
       end
-      button FindAgainIcon
-      button SearchIcon
+      button FindAgainIcon do
+        tool_tip_text 'Repeat last search'
+        on_click do
+          repeat_search
+        end
+      end
+      button SearchIcon do
+        tool_tip_text "We don't know what this does yet"
+      end
       x_glue
+      button PrevIcon do
+        tool_tip_text 'Previous tab view'
+        on_click {prev_view}
+      end
+      button NextIcon do
+        tool_tip_text 'Next tab view'
+        on_click {next_view}
+      end
       button CloseActiveIcon do
         tool_tip_text 'Close active view'
         on_click do
@@ -372,15 +396,15 @@ class Main
     @main_tab_pane
   end
 
-  def search_tab_pane(&block)
-    unless @search_tab_pane
-      @search_tab_pane = tabbed_pane do
+  def result_tab_pane(&block)
+    unless @result_tab_pane
+      @result_tab_pane = tabbed_pane do
         align :LEFT
       end
-      @search_tab_pane.extend TabbedPaneMethods
+      @result_tab_pane.extend TabbedPaneMethods
     end
-    cheri_yield(@search_tab_pane,&block) if block
-    @search_tab_pane
+    cheri_yield(@result_tab_pane,&block) if block
+    @result_tab_pane
   end
 
   def main_panel(&block)
@@ -469,32 +493,51 @@ class Main
     tabs = main_tab_pane
     unless tabs.include?(view)
       set_view_viewer(view,viewer)
-      instance = viewer.instance || :global
+      if instance = viewer.instance
+        tab_group = instance.__id__
+      else
+        tab_group = :global
+      end
       ntype = viewer.type.type
       tab_type = TypeTabMap[ntype] || ntype
-      current_viewer = @main_tabs[instance][tab_type]
-      if current_viewer && (ix = tabs.index(current_viewer.view))
-        tabs[ix] = view
-        if Java6 && (tab = viewer.tab)
-          tabs[ix,:tab] = tab
-        else
-          tabs[ix,:title] = viewer.title_tab
-          tabs[ix,:icon] = viewer.icon_tab
-        end
+      current_viewer = @main_tabs[tab_group][tab_type]
+      if current_viewer && (index = tabs.index(current_viewer.view))
+        replace_view_tab(tabs,view,viewer,index)
       else
-        cheri_yield tabs do
-          if Java6 && (tab = viewer.tab)
-            cherify(view, :tab => tab)
-          else
-            cherify(view, :title => viewer.title_tab, :icon => viewer.icon_tab)
-          end
-        end
+        add_view_tab(tabs,view,viewer)
       end
-      @main_tabs[instance][tab_type] = viewer
+      @main_tabs[tab_group][tab_type] = viewer
     end
     tabs.set_selected_component(view)
   end
 
+  def add_view_tab(tabs,view,viewer)
+    cheri_yield tabs do
+      cherify(view, :tab => viewer.tab, :title => viewer.title_tab, :icon => viewer.icon_tab)
+    end
+    if tabs == @main_tab_pane
+      index = tabs.index(view)
+      @main_tab_history[index] = TabHistory.new(viewer)
+    end
+  end 
+  
+  def replace_view_tab(tabs,view,viewer,index)
+    tabs[index] = view
+    if Java6 && (tab = viewer.tab)
+      tabs[index,:tab] = tab
+    else
+      tabs[index,:title] = viewer.title_tab
+      tabs[index,:icon] = viewer.icon_tab
+    end
+    if tabs == @main_tab_pane
+      if hist = @main_tab_history[index]
+        hist << viewer
+      else
+        @main_tab_history[index] = TabHistory.new(viewer)
+      end
+    end
+  end
+
   def prepare_for_node_expansion(node)
     unless node.child_count > 0
       vwr = node.user_object
@@ -533,6 +576,36 @@ class Main
     view.get_client_property(:viewer)  
   end
 
+  def next_view
+    tabs = main_tab_pane
+    if (oldvwr = tabs.active_viewer) &&
+        (ix = tabs.index(oldvwr.view)) &&
+        (hist = @main_tab_history[ix]) &&
+        (newvwr = hist.next!)
+      replace_view(tabs,ix,newvwr)
+    end
+  end
+  
+  def prev_view
+    tabs = main_tab_pane
+    if (oldvwr = tabs.active_viewer) &&
+        (ix = tabs.index(oldvwr.view)) &&
+        (hist = @main_tab_history[ix]) &&
+        (newvwr = hist.prev!)
+      replace_view(tabs,ix,newvwr)
+    end
+  end
+  
+  def replace_view(tabs,index,viewer)
+    tabs[index] = viewer.view
+    if Java6 && (tab = viewer.tab)
+      tabs[index,:tab] = tab
+    else
+      tabs[index,:title] = viewer.title_tab
+      tabs[index,:icon] = viewer.icon_tab
+    end
+  end
+
   def refresh_active_view
     if (viewer = main_tab_pane.active_viewer)
       viewer.refresh if viewer.respond_to?(:refresh)    
@@ -546,29 +619,39 @@ class Main
   end
   
   def close_active_search_view
-    if (viewer = search_tab_pane.active_viewer)
-      close_search_view(viewer)    
+    if (viewer = result_tab_pane.active_viewer)
+      close_results_view(viewer)    
     end
   end
   
   def close_view(viewer)
     view = viewer.view
-    main_tab_pane.remove(view)
-    instance = viewer.instance || :global
+    index = (tabs = main_tab_pane).index(view)
+    tabs.remove(view)
+    @main_tab_history.delete_at(index)
+    if instance = viewer.instance
+      tab_group = instance.__id__
+    else
+      tab_group = :global    
+    end
     ntype = viewer.type.type
     tab_type = TypeTabMap[ntype] || ntype
-    @main_tabs[instance].delete(tab_type) if @main_tabs[instance][tab_type] == viewer
-    @main_tabs[instance].delete(viewer.__id__)
+    @main_tabs[tab_group].delete(tab_type) if @main_tabs[tab_group][tab_type] == viewer
+    @main_tabs[tab_group].delete(viewer.__id__)
   end
 
-  def close_search_view(viewer)
+  def close_results_view(viewer)
     view = viewer.view
-    search_tab_pane.remove(view)
-    instance = viewer.instance || :global
+    result_tab_pane.remove(view)
+    if instance = viewer.instance
+      tab_group = instance.__id__
+    else
+      tab_group = :global    
+    end
     ntype = viewer.type.type
     tab_type = TypeTabMap[ntype] || ntype
-    @search_tabs[instance].delete(tab_type) if @search_tabs[instance][tab_type] == viewer
-    @search_tabs[instance].delete(viewer.__id__)
+    @result_tabs[tab_group].delete(tab_type) if @result_tabs[tab_group][tab_type] == viewer
+    @result_tabs[tab_group].delete(viewer.__id__)
   end
 
   def close_views_for_instance(inst)
@@ -577,41 +660,39 @@ class Main
     views.each do |view|
       close_view(view_viewer(view))    
     end
-    views = search_tab_pane.select {|view| view_viewer(view).instance == inst}
+    views = result_tab_pane.select {|view| view_viewer(view).instance == inst}
     views.each do |view|
-      close_search_view(view_viewer(view))    
+      close_results_view(view_viewer(view))    
     end
   end
   
-  def open_search_view(viewer)
+  def open_results_view(viewer)
     view = viewer.view
-    tabs = search_tab_pane
+    tabs = result_tab_pane
     set_view_viewer(view,viewer)
-    instance = viewer.instance || :global
+    if instance = viewer.instance
+      tab_group = instance.__id__
+    else
+      tab_group = :global    
+    end
     ntype = viewer.type.type
     tab_type = TypeTabMap[ntype] || ntype
-    cheri_yield tabs do
-      if Java6 && (tab = viewer.tab)
-        cherify(view, :tab => tab)
-      else
-        cherify(view, :title => viewer.title_tab, :icon => viewer.icon_tab)
-      end
-    end
-    @search_tabs[instance][tab_type] = viewer
+    add_view_tab(tabs,view,viewer)
+    @result_tabs[tab_group][tab_type] = viewer
     tabs.set_selected_component(view)
     show_search_results
   end
 
   def show_search_results
-    @search_tab_pane.visible = true
-    @search_results_select.selected = true
+    @result_tab_pane.visible = true
+    @results_select.selected = true
     adjust_right_splitter
   end
 
   def add_instance(instance)
     @instances[instance.address] = instance
-    @main_tabs[instance] = {}
-    @search_tabs[instance] = {}
+    @main_tabs[instance.__id__] = {}
+    @result_tabs[instance.__id__] = {}
     @instance_listeners.each do |lst|
       lst.instance_added(instance)    
     end
@@ -621,8 +702,8 @@ class Main
     close_views_for_instance(inst)
     main_tree_model.remove_node_from_parent(inst.tree_node) if inst.tree_node
     @instances.delete(inst.address)
-    @main_tabs.delete(inst)
-    @search_tabs.delete(inst)
+    @main_tabs.delete(inst.__id__)
+    @result_tabs.delete(inst.__id__)
     @instance_listeners.each do |lst|
       lst.instance_removed(inst)    
     end
@@ -684,64 +765,137 @@ class Main
     @connection_dialog ||= ConnectionDialog.new(self)  
   end
   
-  def new_search(instance,clazz,var,value)
+  def new_search(instance,clazz,var,value,gc=nil)
     raise Cheri.type_error(clazz,RubyInstance) unless RubyInstance === instance
     raise ArgumentError, "invalid class name #{clazz}" unless clazz =~ /^([A-Z])((\w|::[A-Z])*)$/
     raise ArgumentError, "invalid variable name #{var}" if var && var !~ /^([A-Za-z_])(\w*)$/
-    if var
-      var = ('@' + var).to_sym rescue nil     
-      if value
-        if value =~ /^(\/)(.*)(\/)$/
-          unless (val = Regexp.new($2) rescue nil)
-            JOptionPane.show_message_dialog(@main_frame,"Invalid regular expression #{value}")
-            return
-          end
-        else
-          val = value
+    var = ('@' + var).to_sym rescue nil if var
+    if value
+      if value =~ /^(\/)(.*)(\/)$/
+        unless (val = Regexp.new($2) rescue nil)
+          JOptionPane.show_message_dialog(@main_frame,"Invalid regular expression #{value}")
+          return
         end
       else
-        val = ''
+        val = value
       end
+    end
+    if var || value
       nv = Cheri::Explorer::SearchNameValue.new(var,val)
       args = Cheri::Explorer::SearchArgs.new(clazz,[nv])
     else
       args = Cheri::Explorer::SearchArgs.new(clazz)
     end
-    res = instance.proxy.find(args)
+    args.gc = true if gc
+    @last_search = [instance,args]
     if (res = instance.proxy.find(args))
       results = Cheri::Explorer::SearchResults.new(args,res)
       vwr = viewer(:results).new(NodeTypes[:results],self,instance,results)
-      open_search_view(vwr)
+      open_results_view(vwr)
     end
   end
   
-  def new_find(instance,id)
-    if rec = instance.proxy.object(id)
-      ntv = case rec.clazz
-        when 'Class' : NodeTypeValue.new(Class,rec.value,rec)
-        when 'Module' : NodeTypeValue.new(Module,rec.value,rec)
-        else NodeTypeValue.new(:object,rec.clazz,rec)
-      end
-      if (clazz = viewer(ntv.type,ntv.subtype))
-        vwr = clazz.new(ntv,self,instance,ntv.value)
-        view = vwr.view
-        set_view_viewer(view,vwr)
-        tabs = main_tab_pane
-        cheri_yield tabs do
-          if Java6 && (tab = vwr.tab)
-            cherify(view, :tab => tab)
-          else
-            cherify(view, :title => vwr.title_tab, :icon => vwr.icon_tab)
-          end
-        end
-        @main_tabs[instance][vwr.__id__] = vwr
-        tabs.set_selected_component(view)
+  def repeat_search
+    if (last = @last_search)
+      instance = last[0]
+      args = last[1]  
+      if (res = instance.proxy.find(args))
+        results = Cheri::Explorer::SearchResults.new(args,res)
+        vwr = viewer(:results).new(NodeTypes[:results],self,instance,results)
+        open_results_view(vwr)
+      end
+    end
+  end
+  
+#  def new_find(instance,id,new_tab=nil)
+#    if rec = instance.proxy.object(id)
+#      ntv = case rec.clazz
+#        when 'Class' : NodeTypeValue.new(Class,rec.value,rec)
+#        when 'Module' : NodeTypeValue.new(Module,rec.value,rec)
+#        else NodeTypeValue.new(:object,rec.clazz,rec)
+#      end
+#      if (clazz = viewer(ntv.type,ntv.subtype))
+#        vwr = clazz.new(ntv,self,instance,ntv.value)
+#        view = vwr.view
+#        set_view_viewer(view,vwr)
+#        tabs = main_tab_pane
+#        add_view_tab(tabs,view,vwr)
+#        @main_tabs[instance.__id__][vwr.__id__] = vwr
+#        tabs.set_selected_component(view)
+#      else
+#        JOptionPane.show_message_dialog(@main_frame,"Unable to display object #{id} (no viewer)") 
+#      end
+#    else
+#      JOptionPane.show_message_dialog(@main_frame,"Unable to retrieve object #{id} (garbage-collected?)") 
+#    end
+#  end
+#  
+  def show_linked_object(curvwr,id,new_tab=nil)
+    instance = curvwr.instance
+    unless rec = instance.proxy.object(id)
+      JOptionPane.show_message_dialog(@main_frame,"Unable to retrieve object #{id} (garbage-collected?)") 
+      return
+    end
+    ntv = case rec.clazz
+      when 'Class' : NodeTypeValue.new(Class,rec.value,rec)
+      when 'Module' : NodeTypeValue.new(Module,rec.value,rec)
+      else NodeTypeValue.new(:object,rec.clazz,rec)
+    end
+    unless clazz = viewer(ntv.type,ntv.subtype)
+      JOptionPane.show_message_dialog(@main_frame,"Unable to display object #{id} (no viewer)") 
+    end
+    vwr = clazz.new(ntv,self,instance,ntv.value)
+    view = vwr.view
+    set_view_viewer(view,vwr)
+    tabs = main_tab_pane
+    if new_tab
+      add_view_tab(tabs,view,vwr)
+      @main_tabs[instance.__id__][vwr.__id__] = vwr
+    else
+      ntype = vwr.type.type
+      tab_type = TypeTabMap[ntype] || ntype
+      current_viewer = @main_tabs[instance.__id__][tab_type]
+      if current_viewer && (index = tabs.index(current_viewer.view))
+        replace_view_tab(tabs,view,vwr,index)
       else
-        JOptionPane.show_message_dialog(@main_frame,"Unable to display object #{id}") 
+        add_view_tab(tabs,view,vwr)
       end
+      @main_tabs[instance.__id__][tab_type] = vwr
+    end
+    tabs.set_selected_component(view)
+  end
+
+  def show_result_object(resvwr,id,new_tab=nil)
+    instance = resvwr.instance
+    unless rec = instance.proxy.object(id)
+      JOptionPane.show_message_dialog(@main_frame,"Unable to retrieve object #{id} (garbage-collected?)") 
+      return
+    end
+    ntv = case rec.clazz
+      when 'Class' : NodeTypeValue.new(Class,rec.value,rec)
+      when 'Module' : NodeTypeValue.new(Module,rec.value,rec)
+      else NodeTypeValue.new(:object,rec.clazz,rec)
+    end
+    unless clazz = viewer(ntv.type,ntv.subtype)
+      JOptionPane.show_message_dialog(@main_frame,"Unable to display object #{id} (no viewer)") 
+    end
+    vwr = clazz.new(ntv,self,instance,ntv.value)
+    view = vwr.view
+    set_view_viewer(view,vwr)
+    tabs = main_tab_pane
+    if new_tab
+      add_view_tab(tabs,view,vwr)
+      @main_tabs[instance.__id__][vwr.__id__] = vwr
     else
-      JOptionPane.show_message_dialog(@main_frame,"Unable to retrieve object #{id}") 
+      current_viewer = @main_tabs[instance.__id__][resvwr.__id__]
+      if current_viewer && (index = tabs.index(current_viewer.view))
+        replace_view_tab(tabs,view,vwr,index)
+      else
+        add_view_tab(tabs,view,vwr)
+      end
+      @main_tabs[instance.__id__][resvwr.__id__] = vwr
     end
+    tabs.set_selected_component(view)
   end
   
   def simple_value(instance,id)
@@ -898,6 +1052,45 @@ module TabbedPaneMethods
   end
 end #TabbedPaneMethods
 
+class TabHistory
+  def initialize(viewer)
+    @h = [viewer]
+    @c = 1
+  end
+  def <<(viewer)
+    if (len = @h.length) > @c
+      @h = @h[0,@c]
+    end
+    @h << viewer
+    @c = @h.length
+  end
+  def curr
+    @h[@c-1]
+  end
+  def next
+    @h[@c]
+  end
+  def prev
+    if @c >= 2 
+      @h[@c-2]
+    end
+  end
+  def next!
+    if @c < @h.length
+      v = @h[@c]
+      @c += 1
+      v
+    end
+  end
+  def prev!
+    if @c > 1
+       @c -= 1
+       @h[@c-1]
+    end
+  end
+end #TabHistory
+
+
 # TODO: may want JComponent version that uses get/put client property?
 # TODO: had to do this, see note at set_view_viewer
 #module ComponentViewMethods

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

@@ -436,6 +436,11 @@ module NavViewerConstants
   IFont = Font.new('Monospaced',Font::BOLD,14)
   CFont = Font.new('Dialog',Font::PLAIN,14)
   ResFont = Font.new('Monospaced',Font::PLAIN,12)
+  MouseEvent = ::Java::JavaAwtEvent::MouseEvent
+  BUTTON1 = MouseEvent::BUTTON1
+  BUTTON2 = MouseEvent::BUTTON2
+  BUTTON3 = MouseEvent::BUTTON3
+  SHIFT = MouseEvent::SHIFT_DOWN_MASK
   HdrName = 'Name'.freeze
   HdrVarName = 'Variable name'.freeze
   HdrType = 'Type'.freeze
@@ -566,15 +571,15 @@ module NavViewer
               set_font col.dfont || VFont
               foreground col.dfg if col.dfg
               if (click_val = col.clk)
-                on_mouse_clicked do
-                  mouse_clicked(click_val)
-                end              
                 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
@@ -599,7 +604,10 @@ module NavViewer
     y_glue if glue
   end
   
-  def mouse_clicked(val)
+  def mouse_clicked(e,val=nil)
+  end
+  
+  def mouse_action(e,val=nil)
   end
   
 end

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

@@ -550,29 +550,42 @@ end
 class ResultListViewer < Viewer
   include ValueViewerInterface
   include NavViewerConstants
-    
+  #:stopdoc:
+  Empty = '(empty)'
+  #:startdoc:
+
   class ResultListItem
     def initialize(id,value)
       @i = id
-      @v = value || 'Unavailable'
+      @v = value
     end
     def id
       @i
     end
-    def value
+    def v
       @v
     end
+    alias_method :value,:v
+    def ==(other)
+      @v == other.v
+    end    
+    def eql?(other)
+      @v.eql?(other.v)
+    end
+    def <=>(other)
+      @v <=> other.v      
+    end
     def to_s
       @v
     end
     alias_method :to_str, :to_s
-    #alias_method :toString, :to_s
-  end
-
-  def item_value(id)
-    @main.simple_value(@instance,id)
-  end
+    
+  end #ResultListItem
 
+#  def item_value(id)
+#    @main.simple_value(@instance,id)
+#  end
+#
   def initialize(*r,&k)
     super
     create_object_list
@@ -581,19 +594,16 @@ class ResultListViewer < Viewer
   def create_object_list
     res = @value.results
     proxy = @instance.proxy
-    len = res.length;
-    list = @obj_list = ::Java::JavaLang::Object[len].new
-    len.times do |i|
+    items = []
+    res.length.times do |i|
       id = res[i]
-      val = nil
-      begin
-        val = proxy.simple_value(id)
-      rescue
-        val = 'Unavailable'
+      if (val = proxy.simple_value(id) rescue nil)
+        val.strip!
+        val = Empty if val.empty?
+        items << ResultListItem.new(id,val)
       end
-      list[i] = ResultListItem.new(id,val)
     end
-    list
+    @obj_list = items.sort.to_java
   end
 
   def title
@@ -647,8 +657,13 @@ class ResultListViewer < Viewer
         name_value_row('Class/Module',@value.args.clazz,CFont)
         if (vars = @value.args.vars) && !vars.empty?
           vname = vars[0].name.to_s
-          vval = vars[0].value || ''
-          vval = vval.inspect if Regexp === vval
+          vname = '  ' if vname.empty?
+          vval = vars[0].value || '  '
+          if Regexp === vval
+            vval = vval.inspect
+          elsif String === vval
+            vval = '  ' if vval.empty?
+          end
           name_value_row('Variable',vname)
           name_value_row('Value',vval)
         end
@@ -682,12 +697,64 @@ class ResultListViewer < Viewer
     super
   end
   
-  def item_selected
+  def set_selection
     if (ix = @list.selected_index) >= 0
-      @main.new_find(@instance,@value.results[ix])
+      @pending = ix
+    end
+  end
+  def send_selection(new_tab=nil)
+    if ix = @pending
+      @pending = nil
+      @main.show_result_object(self,@obj_list[ix].id,new_tab)
+    end
+  end
+  def list_clicked(e)
+    list = @list
+    point = e.point
+    if BUTTON1 == e.button &&
+        (ix = list.location_to_index(point)) >= 0 &&
+        list.get_cell_bounds(ix,ix).contains(point)
+      send_selection((e.modifiers_ex & SHIFT) == SHIFT)
+    end
+  end
+
+  def list_keyed(e)
+    if @pending && e.action_key?
+      send_selection((e.modifiers_ex & SHIFT) == SHIFT)
+    end
+  end
+  
+  def mouse_action(e)
+    if e.popup_trigger?
+      list = @list
+      point = e.point
+      if (ix = list.location_to_index(point)) >= 0 &&
+          list.get_cell_bounds(ix,ix).contains(point)
+        @menu_pending = ix
+        selection_popup.show(e.component,e.x,e.y)
+      end
     end
   end
   
+  def menu_selection(new_tab)
+    if ix = @menu_pending
+      @menu_pending = nil
+      @list.selected_index = ix
+      send_selection(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  
+  end
+  
   def result_list
     @list = list @obj_list do
       align :LEFT
@@ -696,9 +763,14 @@ class ResultListViewer < Viewer
       selection_mode :SINGLE_SELECTION
       on_value_changed do |e|
         unless e.value_is_adjusting
-          item_selected
+          set_selection
         end
-      end    
+      end
+      on_mouse_clicked   {|e| list_clicked e}
+      on_mouse_pressed   {|e| mouse_action e}
+      on_mouse_released  {|e| mouse_action e}
+      on_key_pressed     {|e| list_keyed e}
+      on_key_released    {|e| list_keyed e}
     end
   end
   
@@ -744,7 +816,7 @@ class ResultListViewer < Viewer
   end
   
   def close_view
-    @main.close_search_view(self)
+    @main.close_results_view(self)
   end
 end
 
@@ -818,8 +890,37 @@ class NavObjectViewer
     end   
   end
 
-  def mouse_clicked(val)
-    @main.new_find(@instance,val)
+  def send_selection(id,new_tab=nil)
+    @main.show_linked_object(self,id,new_tab)
+  end
+
+  def mouse_clicked(e,id)
+    send_selection(id,(e.modifiers_ex & SHIFT) == SHIFT)
+  end
+
+  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  
   end
   
   
@@ -1021,9 +1122,39 @@ class NavModuleViewer
     @children  
   end
 
-  def mouse_clicked(val)
-    @main.new_find(@instance,val)
+  def send_selection(id,new_tab=nil)
+    @main.show_linked_object(self,id,new_tab)
   end
+
+  def mouse_clicked(e,id)
+    send_selection(id,(e.modifiers_ex & SHIFT) == SHIFT)
+  end
+
+  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  
+  end
+  
   
   def view(&block)
     @view ||= scroll_pane do

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: cheri
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
-date: 2007-06-10 00:00:00 -07:00
+  version: 0.0.5
+date: 2007-06-11 00:00:00 -07:00
 summary: Cheri Builder Platform
 require_paths: 
 - lib
@@ -75,6 +75,7 @@ files:
 - lib/cheri/explorer.rb
 - lib/cheri/html.rb
 - lib/cheri/image
+- lib/cheri/image/Back24.gif
 - lib/cheri/image/cheri_icon_16x16.png
 - lib/cheri/image/cheri_icon_24x24.png
 - lib/cheri/image/cheri_logo_medium.png
@@ -90,6 +91,7 @@ files:
 - lib/cheri/image/Delete24.gif
 - lib/cheri/image/Find24.gif
 - lib/cheri/image/FindAgain24.gif
+- lib/cheri/image/Forward24.gif
 - lib/cheri/image/jruby_14x16.png
 - lib/cheri/image/jruby_logo.png
 - lib/cheri/image/mod_tree.png