cheri 0.0.9 → 0.5.0

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

@@ -166,6 +166,17 @@ private
   end
 end #ProcBuilder
 
+class PropAwareClassBuilder < ClassBuilder
+private
+  def create
+    if Hash === @props    
+      @args << @props
+      @props = nil
+    end
+    @obj = @clazz.new(*@args)
+  end
+end #PropAwareProcBuilder
+
 class CherifyBuilder < BaseBuilder
   def initialize(ctx,sym,obj,*args,&block)
     super(ctx,sym,*args,&block)
@@ -217,13 +228,16 @@ end #StandardFactory
 
 module GridTableFactory
   SwingLayout = org.cheri.swing.layout
-  @names = [:grid_table,:grid_row,:empty_cell]
+  @names = [:grid_table_layout,:grid_table,:grid_row,:empty_cell]
   def self.builder(ctx,sym,*args,&block)
-    if sym == :grid_table
+    case sym
+    when :grid_table_layout
+      PropAwareClassBuilder.new(ctx,sym,SwingLayout::GridTableLayout,*args,&block)
+    when :grid_table
       ClassBuilder.new(ctx,sym,SwingLayout::GridTable,*args,&block)
-    elsif sym == :grid_row
+    when :grid_row
       ClassBuilder.new(ctx,sym,SwingLayout::GridRow,*args,&block)
-    elsif sym == :empty_cell
+    when :empty_cell
       ClassBuilder.new(ctx,sym,SwingLayout::EmptyCell,*args,&block)
     else
       nil
@@ -248,8 +262,9 @@ RPC = javax.swing.RootPaneContainer
 @procs = {}
 class << self
   def builder(ctx,sym,*args,&block)
-    proc = @procs[sym]
-    proc ? ProcBuilder.new(ctx,sym,proc,*args,&block) : nil
+    if proc = @procs[sym]
+      ProcBuilder.new(ctx,sym,proc,*args,&block)
+    end
   end
   def box
     @box ||= CJava.get_class('javax.swing.Box')

data/lib/cheri/cheri.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
@@ -28,26 +28,15 @@ require 'thread'
 module Cheri
 module VERSION #:nodoc:
   MAJOR = 0
-  MINOR = 0
-  TINY  = 9
+  MINOR = 5
+  TINY  = 0
   STRING = [MAJOR, MINOR, TINY].join('.').freeze
 end
 #: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
-# TODO: not yet widely implemented by Cheri modules
-@threadsafe = false
 class << self
-  def threadsafe?
-    @threadsafe
-  end
-   # once threadsafe is set, it cannot be unset (by normal means)
-  def threadsafe!
-   @threadsafe ||= true
-  end
   def type_error(object, *expected_type)
     TypeError.new("wrong argument type #{object.class} (expected #{expected_type.join(' or ')})")
   end  

data/lib/cheri/explorer/explorer.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
@@ -331,6 +331,7 @@ end #MethodRec
 
 
 class RubyExplorer
+  DeprecatedVars = ["$="]
   # TODO: aggregate values that will be displayed together
   def ruby_platform
     RUBY_PLATFORM
@@ -348,6 +349,7 @@ class RubyExplorer
   def global_vars
     result = []
     global_variables.each do |v|
+      next if DeprecatedVars.include?v
       ev = eval(v) rescue '???'
       if Array === ev
         eva = []

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

@@ -112,6 +112,9 @@ class ClassBuilder < BaseBuilder
 private
   def create
     @obj = @clazz.new(*@args)
+    def @obj.java_class
+      self.class.java_class
+    end if BUG_JRUBY_3476
   end
 end #ClassBasedBuilder
 
@@ -249,7 +252,7 @@ Aliases = {:on_click => 'actionPerformed'.freeze}
     return false,nil unless (obj = bld.object).respond_to?(:java_class) &&
       ((method_name = Aliases[sym]) || (s = sym.to_s).rindex(On,0))
     method_name ||= Util.lcc(s[3,s.length])
-    unless (info = Interfaces.get_listener_info(obj.java_class,method_name))
+    unless (info = Interfaces.get_listener_info(obj.java_class||obj.class.java_class,method_name))
       raise NameError,"no Java interface found matching event handler name: #{sym}"
     end
     raise ArgumentError,"missing block for event handler: #{sym}" unless block

data/lib/cheri/java/java.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
@@ -25,15 +25,14 @@
 module Cheri
 module Java
 JRuby = Cheri::JRuby #:nodoc:
-class LocatableIcon < ::Java::JavaxSwing::ImageIcon
-  def initialize(location,*r)
-    super
-    @location = location
-  end
-  def location
-    @location  
-  end
-end
+ImageIcon = javax.swing.ImageIcon
+CL = java.lang.ClassLoader
+@icons = {}
+
+#check for singleton/java_class bug in JRuby versions 1.1.4, 1.1.5 and 1.1.6 (see JRUBY-3476)
+x = java.lang.Object.new
+def x.foo; end
+BUG_JRUBY_3476 = !x.java_class
 
 class << self
   def get_class(*r)
@@ -44,7 +43,8 @@ class << self
   #   
   # Returns an instance of LocatableIcon for file at #{Cheri.img_path}#{filename}.
   def get_icon(n)
-    LocatableIcon.new("#{Cheri.img_path}#{n}")
+    path = "#{Cheri.img_path}#{n}"
+    @icons[path] ||= ImageIcon.new(CL.get_system_resource(path) || path)
   end
   # Returns the 16x16 Cheri icon.
   def cheri_icon

data/lib/cheri/jruby.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
@@ -24,6 +24,7 @@
 
 if RUBY_PLATFORM =~ /java/ && defined?JRUBY_VERSION
   require 'java'
+  require 'jruby'
   require 'cheri/cheri'
   require 'cheri/jruby/jruby'
 else

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

@@ -0,0 +1,407 @@
+#--
+# Copyright (C) 2007,2008 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
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+#
+
+
+module Cheri
+module JRuby
+module Explorer
+
+class ConnectionDialog
+  include Cheri::Swing
+  def initialize(main)
+    swing[:auto=>true]
+    @main = main
+    @main_frame = main.main_frame
+    @dialog = dialog @main_frame, 'New Connection', true do |d|
+      box_layout(d, :Y_AXIS)
+      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:'
+        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
+          end
+        end
+        x_glue
+      end
+      y_glue
+    end
+    reset_fields
+    @main.center(@main_frame,@dialog)
+  end
+
+  def reset_fields
+    @con_host.text = 'localhost'
+    @con_port.text = ''
+    @con_name.text = ''
+  end
+  private :reset_fields
+  
+  def value
+    @dialog  
+  end
+  
+  def show
+    @dialog.visible = true  
+  end
+  
+  def hide
+    @dialog.visible = false  
+  end
+  
+end
+
+class SearchDialog
+  include Cheri::Swing
+  def initialize(main)
+    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
+      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
+
+      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?
+              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
+              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
+
+    @main.center(@main_frame,@dialog)
+  end
+
+  def nil_if_empty(val)
+    if val
+      val.strip!
+      val = nil if val.empty?
+    end
+    val  
+  end
+
+  def reset_fields
+    @clazz.text = ''
+    @name1.text = ''
+    @value1.text = ''
+    @gc.selected = false
+  end
+  private :reset_fields
+  
+  def value
+    @dialog  
+  end
+  
+  def show(clazz = nil)
+    @clazz.text = clazz if clazz
+    update_instance_list
+    @dialog.visible = true  
+  end
+  
+  def hide
+    @dialog.visible = false  
+  end
+
+  def instance_list
+    @instances = @main.instance_list
+    arr = Array.new(@instances.length) {|i| @instances[i].name}
+    arr.to_java
+  end
+  
+  def update_instance_list
+    new_list = instance_list
+    @instance_list.remove_all_items
+    new_list.each do |name|
+      @instance_list.add_item name
+    end
+  end
+
+
+end
+
+class AboutDialog
+  include Cheri::Swing
+  include Cheri::Html
+
+  # Undefining this so I can use it in Cheri::Html.  Could always
+  # just use html.p instead.
+  undef_method :p
+
+  def initialize(main)
+    swing[:auto]
+    @main = main
+    @main_frame = main.main_frame
+    @dialog = dialog @main_frame, 'About Cheri::JRuby::Explorer', true do |d|
+      size 600,450
+      default_close_operation :HIDE_ON_CLOSE
+      @view ||= scroll_pane do
+        align :LEFT
+        @html_view = editor_pane do
+          editable false
+          content_type 'text/html'
+          html { head { style 'body { font-family: sans-serif; }' }
+            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'
+            p
+            table(:width=>'97%') {
+              tr{td(:align=>:left) {
+                p 'Cheri::JRuby::Explorer (CJX) demonstrates some of the features ',
+                '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
+                p 'This is a ',i('very'),' early Beta release, of both Cheri and CJX, so do ',
+                'expect bugs, crashes, and the like. The Cheri framework itself is pretty ',
+                'stable (though I refactor it weekly, it seems), but the CJX code is mostly ',
+                'untested beyond the confines of my desktop.'
+                p
+                p 'For more information, and to report bugs or suggest features, please visit ',
+                'the Cheri project pages on RubyForge, at ', a(b('http://cheri.rubyforge.org'), 
+                :href=>'http://cheri.rubyforge.org/'), ' and ', a(b('http://rubyforge.org/projects/cheri'),
+                :href=>'http://rubyforge.org/projects/cheri'), '.'
+              }}
+            }
+          }}}
+        end
+      end
+    end
+     @main.center(@main_frame,@dialog)
+  end
+  
+  def value
+    @dialog  
+  end
+  
+  def show
+    @dialog.visible = true  
+  end
+  
+  def hide
+    @dialog.visible = false  
+  end
+  
+end
+
+
+end #Explorer
+end #JRuby
+end #Cheri