cheri 0.0.2 → 0.0.3

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.2) is an early beta release. Some features are not yet fully
+This version (0.0.3) 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.
@@ -54,7 +54,7 @@ Some known issues:
   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.3.
+  option in 0.0.4.
   
 * 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
@@ -62,13 +62,13 @@ Some known issues:
   
 * Close buttons on tabs aren't available pre-Java 1.6.  There are alternatives for
   the top tabs, but currently not for the bottom (search result) tabs.  Will resolve
-  in 0.0.3.
+  in 0.0.4.
   
 * Speaking of tabs, tab management (and navigation in general) is not yet quite right.
-  Will have history/back buttons and better tab management in 0.0.3.
+  Will have history/back buttons and better tab management in 0.0.4.
   
 * Global variables are currently shown, um, globally, when many of them should be shown
-  per thread.  This will be fixed in 0.0.3, which will include a Thread section with
+  per thread.  This will be fixed in 0.0.4, 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

@@ -26,6 +26,8 @@ module Cheri
 module Builder
 
 class TypeConnecter
+  # TODO: cache based on parent/child ancestors
+  #@cache = {}
 
   def initialize(*parents,&k)
     @t = {}

data/lib/cheri/cheri.rb

@@ -29,7 +29,7 @@ module Cheri
 module VERSION #:nodoc:
   MAJOR = 0
   MINOR = 0
-  TINY  = 2
+  TINY  = 3
   STRING = [MAJOR, MINOR, TINY].join('.').freeze
 end
 PathExp = Regexp.new "cheri-#{VERSION::STRING}\\/lib$" #:nodoc:

data/lib/cheri/cjx.rb

@@ -1,3 +1,4 @@
 # Loads and runs Cheri::JRuby::Explorer
+require 'rubygems'
 require 'cheri/jruby/explorer'
 Cheri::JRuby::Explorer.run

data/lib/cheri/java/builder/util.rb

@@ -128,6 +128,7 @@ CJava = Cheri::Java
 #:startdoc:
 ListenerInfo = Struct.new(:clazz, :methods, :add_method_name)
 @impls = {}
+@info = {}
 class << self
   def get_listener_impl(info)
     @impls[info.clazz] ||= create_listener_impl(info)
@@ -155,6 +156,9 @@ class << self
     impl
   end
   def get_listener_info(java_class,method_name)
+    if (info = @info[key = [java_class,method_name]])
+      return info
+    end
     java_class.java_instance_methods.each do |m|
       if m.name.match(/add(\w+)Listener/) &&
          m.argument_types.length == 1 &&
@@ -163,7 +167,8 @@ class << self
         methods = clazz.java_instance_methods
         methods.each do |im|
           if im.name == method_name
-            return ListenerInfo.new(CJava.get_class(clazz.name),methods,m.name)
+            info = @info[key] =  ListenerInfo.new(CJava.get_class(clazz.name),methods,m.name)
+            return info
           end
         end
       end

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

@@ -63,7 +63,7 @@ class Main
   include Cheri::Swing
   System = ::Java::JavaLang::System
   Thread = ::Java::JavaLang::Thread
-  JComponent = ::JavaxSwing::JComponent
+  JComponent = ::Java::JavaxSwing::JComponent
   WeakHashMap = ::Java::JavaUtil::WeakHashMap
   JOptionPane = ::Java::JavaxSwing::JOptionPane
   Math = ::Java::JavaLang::Math
@@ -246,6 +246,11 @@ class Main
           close_active_view        
         end      
       end
+      menu_item 'Close current search results' do
+        on_click do
+          close_active_search_view        
+        end      
+      end
     end
     cheri_yield(@view_menu,&block) if block
     @view_menu
@@ -540,6 +545,12 @@ class Main
     end
   end
   
+  def close_active_search_view
+    if (viewer = search_tab_pane.active_viewer)
+      close_search_view(viewer)    
+    end
+  end
+  
   def close_view(viewer)
     view = viewer.view
     main_tab_pane.remove(view)

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

@@ -552,30 +552,25 @@ class ResultListViewer < Viewer
   include NavViewerConstants
     
   class ResultListItem
-    def initialize(id,viewer)
-      #puts "RLI init, id = #{id}"
+    def initialize(id,value)
       @i = id
-      @w = viewer
+      @v = value || 'Unavailable'
+    end
+    def id
+      @i
     end
     def value
-      unless @v
-        @v = @w.item_value(@i)
-        #@v = @v.to_s unless String === @v
-        #puts "RLI set value [#{@v}] class #{@v.class}"
-      end
       @v
     end
     def to_s
-      value || 'Unavailable'
+      @v
     end
-    alias_method :to_str,:to_s
+    alias_method :to_str, :to_s
+    #alias_method :toString, :to_s
   end
 
   def item_value(id)
-    #@count += 1
-    v = @main.simple_value(@instance,id)
-    #puts "#{@count} val [#{v}]"
-    #v
+    @main.simple_value(@instance,id)
   end
 
   def initialize(*r,&k)
@@ -585,11 +580,20 @@ class ResultListViewer < Viewer
   
   def create_object_list
     res = @value.results
-    #puts "results.length = #{res.length}"
-    arr = Array.new(res.length) {|i| ResultListItem.new(res[i],self)}
-    @obj_list = arr.to_java
-    #puts "list.length = #{@obj_list.length}"
-    #@count = 0
+    proxy = @instance.proxy
+    len = res.length;
+    list = @obj_list = ::Java::JavaLang::Object[len].new
+    len.times do |i|
+      id = res[i]
+      val = nil
+      begin
+        val = proxy.simple_value
+      rescue
+        val = 'Unavailable'
+      end
+      list[i] = ResultListItem.new(id,value)
+    end
+    list
   end
 
   def title
@@ -872,18 +876,18 @@ class NavModuleViewer
 
   def content_section
     val = @value
-    empty_row
     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?
-      empty_row
       ancestor_section    
+      empty_row
     end
     if val.vars
-      empty_row
       variables_section
+      empty_row
     end
     methods_section
     last_row @last_cols
@@ -951,7 +955,6 @@ class NavModuleViewer
   
   def methods_section
     return unless (meths = @methods ||= proxy.module_methods(@value.qname,@value.id))
-    empty_row
     coldef = ColDef.new(NColor,nil,NFont,VColor,nil,VFont)
 
     @mcols = [coldef]
@@ -961,27 +964,39 @@ class NavModuleViewer
     end
     if (ms = meths.pub) && !ms.empty?
       header_row(@mcols,HdrPubClsMeth)
-      ms.sort.each do |m| value_row(@mcols,m); end
+      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
+      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
+      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
+      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
+      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
+      ms.sort.each do |m|
+        value_row(@mcols,m)
+      end
     end
     @last_cols = @mcols
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: cheri
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
-date: 2007-06-08 00:00:00 -07:00
+  version: 0.0.3
+date: 2007-06-10 00:00:00 -07:00
 summary: Cheri Builder Platform
 require_paths: 
 - lib