cheri 0.0.9 → 0.5.0

data/lib/cheri/jruby/explorer/dialogs.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
@@ -33,77 +33,28 @@ class ConnectionDialog
     swing[:auto=>true]
     @main = main
     @main_frame = main.main_frame
-    @dialog = dialog @main_frame, 'New Connection', true do |d|
-      box_layout(d, :Y_AXIS)
+    @dialog = dialog @main_frame, 'New Connection', true do |dlg|
+      grid_table_layout dlg
+      empty_border 4,4,4,4
       size 240,180
       default_close_operation :HIDE_ON_CLOSE
-      y_glue
-      
-      x_box do
-        y_box do
-          label 'Host:'
-          y_spacer 4
-          label 'Port:'
-          y_spacer 4
-          label 'Display name:'
+      grid_row do
+        grid_table :i=>[0,8] do
+          compound_border etched_border(:LOWERED), empty_border(7,7,7,7)
+          defaults :i=>[4,1], :a=>:w
+          grid_row {label 'Host:'; @con_host = text_field('localhost') {columns 10}}
+          grid_row {label 'Port:'; @con_port = text_field {columns 10}}
+          grid_row {label 'Display name:'; @con_name = text_field {columns 10}}
         end
-        x_spacer 10
-        y_box do
-          @con_host = text_field do
-             columns 10
-             maximum_size dimension(100,24)
-             text 'localhost'
-          end
-          y_spacer 4
-          @con_port = text_field do
-             columns 10
-             maximum_size dimension(100,24)
-          end
-          y_spacer 4
-          @con_name = text_field do
-            #align :RIGHT
-            columns 10
-            maximum_size dimension(100,24)
-          end
-        end      
       end
-      y_spacer 16
-      x_box do
-        x_glue
-        button 'Connect' do
-          on_click do
-            host = @con_host.text
-            host.strip! if host
-            port = @con_port.text
-            port.strip! if port
-            name = @con_name.text
-            if name
-              name.strip!
-              name = nil if name.empty?
-            end
-            if !port || port.empty?
-              JOptionPane.show_message_dialog(@main_frame,"Please enter a port number",
-                'Connection Error', JOptionPane::ERROR_MESSAGE)
-            elsif !(port = Integer(port) rescue nil)
-              JOptionPane.show_message_dialog(@main_frame,"Invalid port: #{@con_port.text}",
-                'Connection Error', JOptionPane::ERROR_MESSAGE)
-            else
-              @dialog.visible = false
-              reset_fields
-              @main.new_connection(port,name,host)
-            end
-          end
-        end
-        x_spacer 10
-        button 'Cancel' do
-          on_click do
-            @dialog.visible = false
-            reset_fields
+      grid_row  do
+        grid_table :wy=>0.1, :a=>:s do
+          grid_row :i=>4 do
+            button('Connect') {on_click{do_connect}}
+            button('Cancel') {on_click{@dialog.visible = false; reset_fields}}
           end
         end
-        x_glue
       end
-      y_glue
     end
     reset_fields
     @main.center(@main_frame,@dialog)
@@ -116,6 +67,25 @@ class ConnectionDialog
   end
   private :reset_fields
   
+  def do_connect
+    host = @con_host.text.strip
+    port = @con_port.text.strip
+    name = @con_name.text.strip
+    name = nil if name.empty?
+    if port.empty?
+      JOptionPane.show_message_dialog(@main_frame,"Please enter a port number",
+        'Connection Error', JOptionPane::ERROR_MESSAGE)
+    elsif !(port = Integer(port) rescue nil)
+      JOptionPane.show_message_dialog(@main_frame,"Invalid port: #{@con_port.text}",
+        'Connection Error', JOptionPane::ERROR_MESSAGE)
+    else
+      @dialog.visible = false
+      reset_fields
+      @main.new_connection(port,name,host)
+    end
+  end
+  private :do_connect
+  
   def value
     @dialog  
   end
@@ -136,153 +106,88 @@ class SearchDialog
     swing[:auto=>true]
     @main = main
     @main_frame = main.main_frame
-    @dialog = dialog @main_frame, 'Search ObjectSpace', true do |d|
-      box_layout d, :Y_AXIS
-      size 400,300
+    @dialog = dialog @main_frame, 'Search ObjectSpace', true do |dlg|
+      grid_table_layout dlg, :a=>:nw, :wx=>0.1, :wy=>0.1, :f=>:h
+      empty_border 4,4,4,4
+      size 400,350
       default_close_operation :HIDE_ON_CLOSE
-      y_glue
-      x_panel do
-        x_spacer 4
-        label 'Instance:'
-        x_spacer 10
-        @instance_list = combo_box instance_list do
-          editable false
-        end
-        x_spacer 4 
-      end
-      y_glue
-      x_panel do
-        compound_border( 
-          titled_border('Find specific object') { etched_border :LOWERED },
-          empty_border(4,8,4,8)
-        )
-        y_box do
-          label 'Object id:'        
-        end
-        x_spacer 10
-        y_box do
-          y_glue
-          @object_id = text_field do
-             columns 16
-             fixed_size 100,24
-          end
-          y_glue
-        end
-        x_glue
-        y_box do
-          y_glue
-          button 'Find' do
-            on_click do
-              id = nil_if_empty(@object_id.text)
-              id = Integer(id) rescue nil if id
-              if !id
-                JOptionPane.show_message_dialog(@dialog,"Please enter a valid id",
-                  'Search Error', JOptionPane::ERROR_MESSAGE)
-              else
-                @dialog.visible = false
-                @object_id.text = ''
-                @main.new_find(@instances[@instance_list.selected_index],id)
-              end
-            end
-          end
-          y_glue
-        end
-      end
-
-      y_glue
+      grid_row{grid_table{
+        defaults :a=>:w, :i=>[4,2]
+        compound_border titled_border('Select instance') {etched_border :LOWERED}, empty_border(2,2,2,2)
+        grid_row {label 'Instance:'; @instance_list = combo_box(instance_list,:f=>:h,:wx=>0.1) {editable false}}
+      }}
+      grid_row{grid_table{
+        defaults :a=>:w,:i=>[4,2]
+        compound_border titled_border('Find specific object') {etched_border :LOWERED}, empty_border(2,2,2,2)
+        grid_row {
+          label 'Object id:'
+          @object_id = text_field(:wx=>0.1) {columns 16}
+          button('Find') {on_click {find_by_id}}
+        }
+      }}
+      grid_row{grid_table{
+        defaults :a=>:w,:i=>[4,2]
+        compound_border titled_border('Search for instances by type and optional variable/value') {etched_border :LOWERED},
+          empty_border(2,2,2,2)
+        grid_row {
+          label 'Class or Module:', :w=>2
+          @clazz = text_field(:wx=>0.1,:f=>:h) {columns 16}
+          button('Find', :h=>3,:a=>:c) {on_click {find_by_type}}
+        }
+        grid_row {label 'Variable name:'; label '@',:i=>0,:a=>:e; @name1 = text_field(:wx=>0.1,:f=>:h) {columns 16}}
+        grid_row {label 'Search string or /regexp/:',:w=>2; @value1 = text_field(:wx=>0.1,:f=>:h) {columns 16}}
+        grid_row {@gc = check_box 'GC target instance before search', :a=>:c, :w=>4}
+      }}
+      grid_row {button('Cancel', :a=>:c, :wx=>0.1, :f=>:none) {on_click {@dialog.visible = false; reset_fields}}}
+    end
+    @main.center(@main_frame,@dialog)
+  end
 
-      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:' 
-          y_glue
-          label 'Variable name:'
-          y_glue
-          label 'Search string or /regexp/:'
-          y_glue
-        end
-        x_spacer 6
-        y_box do
-          y_glue
-          label '@'
-          y_glue        
-        end
-        y_box do
-          y_glue
-          @clazz = text_field do
-             columns 20
-             fixed_size 200,24
-          end
-          y_glue
-          @name1 = text_field do
-             columns 20
-             fixed_size 200,24
-          end
-          y_glue
-          @value1 = text_field do
-             columns 20
-             fixed_size 200,24
-          end
-          y_glue
-        end
-        x_glue
-        y_box do
-          button 'Find' do
-            on_click do
-              clazz = nil_if_empty(@clazz.text)
-              name = nil_if_empty(@name1.text)
-              value = @value1.text
-              value = nil if value.empty?
-              if !clazz
-                JOptionPane.show_message_dialog(@dialog,"Please enter a Class or Module name",
-                  'Search Error', JOptionPane::ERROR_MESSAGE)
-              elsif clazz !~ /^([A-Z])((\w|::[A-Z])*)$/
-                JOptionPane.show_message_dialog(@dialog,"Invalid Class or Module name, please re-enter",
-                  'Search Error', JOptionPane::ERROR_MESSAGE)
-              elsif name && name !~ /^([A-Za-z_])(\w*)$/
-                JOptionPane.show_message_dialog(@dialog,"Invalid variable name, please re-enter",
-                  'Search Error', JOptionPane::ERROR_MESSAGE)
-              else
-                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
+  def find_by_id
+    id = nil_if_empty(@object_id.text)
+    id = Integer(id) rescue nil if id
+    if !id
+      JOptionPane.show_message_dialog(@dialog,"Please enter a valid id",
+        'Search Error', JOptionPane::ERROR_MESSAGE)
+    else
+      @dialog.visible = false
+      @object_id.text = ''
+      @main.new_find(@instances[@instance_list.selected_index],id)
+    end
+  end
+  
+  def find_by_type
+    clazz = nil_if_empty(@clazz.text)
+    name = nil_if_empty(@name1.text)
+    value = @value1.text
+    value = nil if value.empty?
+    instance = @instances[@instance_list.selected_index]
+    if !clazz
+      JOptionPane.show_message_dialog(@dialog,"Please enter a Class or Module name",
+        'Search Error', JOptionPane::ERROR_MESSAGE)
+    elsif clazz !~ /^([A-Z])((\w|::[A-Z])*)$/
+      JOptionPane.show_message_dialog(@dialog,"Invalid Class or Module name, please re-enter",
+        'Search Error', JOptionPane::ERROR_MESSAGE)
+    elsif name && name !~ /^([A-Za-z_])(\w*)$/
+      JOptionPane.show_message_dialog(@dialog,"Invalid variable name, please re-enter",
+        'Search Error', JOptionPane::ERROR_MESSAGE)
+    elsif !instance.proxy.object_space?  && clazz != 'Class'
+      JOptionPane.show_message_dialog(@dialog,"Only class 'Class' supported when ObjectSpace disabled",
+        'Search Error', JOptionPane::ERROR_MESSAGE)
+    else
+      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(instance,clazz,name,value,gc)
       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
-
-    @main.center(@main_frame,@dialog)
   end
 
   def nil_if_empty(val)
@@ -317,7 +222,11 @@ class SearchDialog
 
   def instance_list
     @instances = @main.instance_list
-    arr = Array.new(@instances.length) {|i| @instances[i].name}
+    arr = Array.new(@instances.length) {|i|
+       instance = @instances[i]
+       pfx = instance.proxy.object_space? ? 'en' : 'dis'
+       "#{instance.name}  [#{pfx}abled]"
+    }
     arr.to_java
   end
   
@@ -356,7 +265,7 @@ class AboutDialog
             body(:bgolor=>:white) { div(:align=>:center) {
             h3 font(:color=>:blue) {"Cheri::JRuby::Explorer version #{Cheri::VERSION::STRING}"}
             p 'Written by Bill Dortch ', esc('<cheri.project@gmail.com>'), br,
-              'Copyright &copy; 2007 William N Dortch'
+              'Copyright &copy; 2007-2009 William N Dortch'
             p
             table(:width=>'97%') {
               tr{td(:align=>:left) {

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

@@ -61,12 +61,14 @@ end
 
 class Main
   include Cheri::Swing
-  System = ::Java::JavaLang::System
-  Thread = ::Java::JavaLang::Thread
-  JComponent = ::Java::JavaxSwing::JComponent
-  WeakHashMap = ::Java::JavaUtil::WeakHashMap
-  JOptionPane = ::Java::JavaxSwing::JOptionPane
-  Math = ::Java::JavaLang::Math
+  
+  import java.lang.Math
+  import java.lang.System
+  import java.lang.Thread
+  import java.util.WeakHashMap
+  import javax.swing.JComponent
+  import javax.swing.JOptionPane
+  
   FindIcon = CJava.get_icon('Find24.gif')
   FindAgainIcon = CJava.get_icon('FindAgain24.gif')
   SearchIcon = CJava.get_icon('Search24.gif')
@@ -82,6 +84,7 @@ class Main
   jver = ENV_JAVA['java.version']
   Java5 = String === jver && jver >= '1.5'
   Java6 = String === jver && jver >= '1.6'
+  MAIN_TITLE = "Cheri::JRuby::Explorer  v#{Cheri::VERSION::STRING}    (JRuby v#{JRUBY_VERSION})"
 
   # Maps viewer types into tab slots. Uncategorized viewers 
   # will be opened in tabs slots based on their primary type.
@@ -141,7 +144,8 @@ class Main
   end
 
   def main_frame(&block)
-    @main_frame ||= frame 'Cheri::JRuby::Explorer' do |frame|
+    
+    @main_frame ||= frame MAIN_TITLE do |frame|
       size 800,600
       box_layout frame, :Y_AXIS
       #content_pane do box_layout frame, :Y_AXIS; end
@@ -807,29 +811,29 @@ class Main
     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 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)