glimmer-dsl-swt 0.2.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 564118c89658344e48e07e795447c78db4b4d61fd6e48c48ba0fae9e48e4cc2c
-  data.tar.gz: a36895cc1374171c078546a986cdbfb6b677d0547d20099c42d631be9d4865bd
+  metadata.gz: 8dda5c40a0a65d36e4615d40f3456b80d2d990121ed63fa9f447a1d110af3a93
+  data.tar.gz: 4bcdc319eda7a7c3542e0d1b8caeda9329726623ae20b87236be0690dbd263c4
 SHA512:
-  metadata.gz: 3f1edda00261bc1fa2f4d8459f08378b0924d440c6e0b7ebd42281c0d689a66870089da127f8ef45a18110808a201852d71481582f8712136151863cff848c88
-  data.tar.gz: 75742ed4193c5139a2a800787211342e19cee44bd0aa34abe794db8b8c37a2ccfc5300de35b31de95f5fa5826e23a8207db8d6bd097512eb0c1b256de4ffb277
+  metadata.gz: 12f2085517a77a30197dd499887e0ca55756b2a0d0ec26275be60b38d6b266722c6574256e3f9830e145763eec7cb74543b0df37932d9c751b0497c4ea277a38
+  data.tar.gz: bb174b6427e2814b02f4509dc4b31698ca2e28c460f2d18749c2505ec9cb0635641275a5300db0fbb7821d1fdb0cdc8474e9220d2718201073076d567b2865d0

data/README.md

@@ -1,4 +1,4 @@
-# <img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 /> Glimmer DSL for SWT 0.2.2 (Desktop GUI)
+# <img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 /> Glimmer DSL for SWT 0.4.0 (Desktop GUI)
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-swt.svg)](http://badge.fury.io/rb/glimmer-dsl-swt)
 [![Travis CI](https://travis-ci.com/AndyObtiva/glimmer-dsl-swt.svg?branch=master)](https://travis-ci.com/github/AndyObtiva/glimmer-dsl-swt)
 [![Coverage Status](https://coveralls.io/repos/github/AndyObtiva/glimmer-dsl-swt/badge.svg?branch=master)](https://coveralls.io/github/AndyObtiva/glimmer-dsl-swt?branch=master)
@@ -10,7 +10,7 @@
 
 You may find full setup/usage instructions at the main [Glimmer project page](https://github.com/AndyObtiva/glimmer).
 
-Other Glimmer DSL gems:
+Other [Glimmer](https://github.com/AndyObtiva/glimmer) DSL gems:
 - [glimmer-dsl-opal](https://github.com/AndyObtiva/glimmer-dsl-opal): Glimmer DSL for Opal (Web GUI Adapter for Desktop Apps)
 - [glimmer-dsl-xml](https://github.com/AndyObtiva/glimmer-dsl-xml): Glimmer DSL for XML (& HTML)
 - [glimmer-dsl-css](https://github.com/AndyObtiva/glimmer-dsl-css): Glimmer DSL for CSS (Cascading Style Sheets)

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.4.0

data/lib/glimmer/data_binding/table_items_binding.rb

@@ -15,6 +15,7 @@ module Glimmer
       def initialize(parent, model_binding, column_properties)
         @table = parent
         @model_binding = model_binding
+        @table.swt_widget.data = @model_binding
         @column_properties = column_properties
         if @table.respond_to?(:column_properties=)
           @table.column_properties = @column_properties

data/lib/glimmer/dsl/swt/block_property_expression.rb

@@ -0,0 +1,20 @@
+require 'glimmer/dsl/expression'
+
+module Glimmer
+  module DSL
+    module SWT
+      class BlockPropertyExpression < Expression
+        def can_interpret?(parent, keyword, *args, &block)
+          block_given? and
+            args.size == 0 and
+            parent.respond_to?("#{keyword}_block=")
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          parent.send("#{keyword}_block=", block)
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/dsl/swt/dsl.rb

@@ -25,6 +25,7 @@ module Glimmer
           table_items_data_binding
           data_binding
           property
+          block_property
           widget
           custom_widget
         ]

data/lib/glimmer/dsl/swt/widget_expression.rb

@@ -31,5 +31,7 @@ module Glimmer
 end
 
 require 'glimmer/swt/widget_proxy'
+require 'glimmer/swt/scrolled_composite_proxy'
 require 'glimmer/swt/tree_proxy'
 require 'glimmer/swt/table_proxy'
+require 'glimmer/swt/table_column_proxy'

data/lib/glimmer/package.rb

@@ -7,6 +7,12 @@ module Glimmer
     class << self
       attr_accessor :javapackager_extra_args
       
+      def clean
+        require 'fileutils'
+        FileUtils.rm_rf('dist')
+        FileUtils.rm_rf('packages')
+      end
+      
       def config
         project_name = File.basename(File.expand_path('.'))
         if !File.exists?('config/warble.rb')
@@ -15,7 +21,7 @@ module Glimmer
           system('warble config')
           new_config = File.read('config/warble.rb').split("\n").inject('') do |output, line|
             if line.include?('config.dirs =')
-              line = line.sub('# ', '').sub(/=[^=\n]+$/, '= %w(app config db lib script bin docs fonts icons images sounds videos)')
+              line = line.sub('# ', '').sub(/=[^=\n]+$/, '= %w(app config db lib script bin docs fonts icons images sounds videos vendor)')
             end
             if line.include?('config.includes =')
               line = line.sub('# ', '').sub(/=[^=\n]+$/, "= FileList['LICENSE.txt', 'VERSION']")

data/lib/glimmer/rake_task.rb

@@ -4,6 +4,11 @@ require_relative 'package'
 
 namespace :glimmer do
   namespace :package do
+    desc 'Clean by removing "dist" and "packages" directories'
+    task :clean do
+      Glimmer::Package.clean
+    end
+
     desc 'Generate JAR config file'
     task :config do
       Glimmer::Package.config

data/lib/glimmer/scaffold.rb

@@ -179,6 +179,7 @@ class Scaffold
     end
 
     def custom_shell_gem(custom_shell_name, namespace)
+      return puts('Namespace is required! Usage: glimmer scaffold:custom_shell_gem[custom_shell_name,namespace]') unless `git config --get github.user`.to_s.strip == 'AndyObtiva'
       gem_name = "glimmer-cs-#{compact_name(custom_shell_name)}"
       gem_summary = "#{human_name(custom_shell_name)} - Glimmer Custom Shell"
       if namespace
@@ -218,6 +219,7 @@ class Scaffold
     end
 
     def custom_widget_gem(custom_widget_name, namespace)
+      return puts('Namespace is required! Usage: glimmer scaffold:custom_widget_gem[custom_widget_name,namespace]') unless `git config --get github.user`.to_s.strip == 'AndyObtiva'
       gem_name = "glimmer-cw-#{compact_name(custom_widget_name)}"
       gem_summary = "#{human_name(custom_widget_name)} - Glimmer Custom Widget"
       if namespace
@@ -483,12 +485,10 @@ class Scaffold
         custom_shell_file_content += <<-MULTI_LINE_STRING
 
     def display_about_dialog
-      message_box = MessageBox.new(swt_widget)
-      message_box.setText("About")
-      message = "#{human_name(namespace)} - #{human_name(custom_shell_name)} \#{VERSION}\n\n"
-      message += LICENSE
-      message_box.setMessage(message)
-      message_box.open
+      message_box(body_root) {
+        text 'About'
+        message "#{human_name(namespace)} - #{human_name(custom_shell_name)} \#{VERSION}\\n\\n\#{LICENSE}"
+      }.open
     end
     
     def display_preferences_dialog

data/lib/glimmer/swt/color_proxy.rb

@@ -48,6 +48,17 @@ module Glimmer
         end
         @swt_color
       end
+      
+      def method_missing(method, *args, &block)
+        swt_color.send(method, *args, &block)
+      rescue => e
+        Glimmer::Config.logger&.debug "Neither ColorProxy nor #{swt_color.class.name} can handle the method ##{method}"
+        super
+      end
+      
+      def respond_to?(method, *args, &block)
+        super || swt_color.respond_to?(method, *args, &block)
+      end      
     end
   end
 end

data/lib/glimmer/swt/display_proxy.rb

@@ -33,26 +33,28 @@ module Glimmer
 
       def initialize(*args)
         @swt_display = Display.new(*args)
+        @swt_display.set_data('proxy', self)
       end
 
       def dispose
         @swt_display.dispose
       end
 
-      # Executes code block asynchronously with respect to SWT UI thread
-      def async_exec(&block)
-        @swt_display.asyncExec(&block)
+      def method_missing(method, *args, &block)
+        swt_display.send(method, *args, &block)
+      rescue => e
+        Glimmer::Config.logger&.debug "Neither DisplayProxy nor #{swt_display.class.name} can handle the method ##{method}"
+        super
       end
-
-      # Executes code block synchronously with respect to SWT UI thread
-      def sync_exec(&block)
-        @swt_display.syncExec(&block)
+      
+      def respond_to?(method, *args, &block)
+        super || swt_display.respond_to?(method, *args, &block)
       end
 
       def can_handle_observation_request?(observation_request)
         observation_request = observation_request.to_s
-        if observation_request.start_with?('on_event_')
-          constant_name = observation_request.sub(/^on_event_/, '')
+        if observation_request.start_with?('on_swt_')
+          constant_name = observation_request.sub(/^on_swt_/, '')
           SWTProxy.has_constant?(constant_name)
         elsif observation_request.start_with?('on_')
           event_name = observation_request.sub(/^on_/, '')
@@ -63,8 +65,8 @@ module Glimmer
       end
 
       def handle_observation_request(observation_request, &block)
-        if observation_request.start_with?('on_event_')
-          constant_name = observation_request.sub(/^on_event_/, '')
+        if observation_request.start_with?('on_swt_')
+          constant_name = observation_request.sub(/^on_swt_/, '')
           add_swt_event_listener(constant_name, &block)
         elsif observation_request.start_with?('on_')
           event_name = observation_request.sub(/^on_/, '')

data/lib/glimmer/swt/scrolled_composite_proxy.rb

@@ -0,0 +1,21 @@
+require 'glimmer/swt/widget_proxy'
+
+module Glimmer
+  module SWT
+    class ScrolledCompositeProxy < Glimmer::SWT::WidgetProxy
+      def initialize(underscored_widget_name, parent, args)
+        unless args.first.is_a?(Numeric)
+          args.unshift(:h_scroll)
+          args.unshift(:v_scroll)
+        end
+        super
+        swt_widget.expand_horizontal = true
+        swt_widget.expand_vertical = true
+      end
+      
+      def post_initialize_child(child)
+        swt_widget.content = child.swt_widget        
+      end
+    end
+  end
+end

data/lib/glimmer/swt/shell_proxy.rb

@@ -40,9 +40,10 @@ module Glimmer
           end
           args = args.compact
           @swt_widget = Shell.new(*args)
+          @swt_widget.set_data('proxy', self)
           @swt_widget.setLayout(FillLayout.new)
           @swt_widget.setMinimumSize(WIDTH_MIN, HEIGHT_MIN)
-          on_event_show do
+          on_swt_show do
             Thread.new do      
               sleep(0.25)
               async_exec do
@@ -130,7 +131,11 @@ module Glimmer
       # This method is not needed except in rare circumstances where there is a need to start the SWT Event Loop before opening the shell.
       def start_event_loop
         until @swt_widget.isDisposed
-          @display.sleep unless @display.readAndDispatch
+          begin
+            @display.sleep unless @display.readAndDispatch
+          rescue => e
+            Glimmer::Config.logger&.debug e.full_message          
+          end
         end
       end
 
@@ -140,9 +145,9 @@ module Glimmer
           visibility_notifier = proc do
             observer.call(visible?)
           end
-          on_event_show(&visibility_notifier)
-          on_event_hide(&visibility_notifier)
-          on_event_close(&visibility_notifier)
+          on_swt_show(&visibility_notifier)
+          on_swt_hide(&visibility_notifier)
+          on_swt_close(&visibility_notifier)
         else
           super
         end

data/lib/glimmer/swt/swt_proxy.rb

@@ -31,7 +31,8 @@ module Glimmer
       end
       
       EXTRA_STYLES = {
-        NO_RESIZE: self[:shell_trim, :resize!, :max!]
+        NO_RESIZE: self[:shell_trim, :resize!, :max!],
+        NO_SORT: -7,
       }            
     end
   end

data/lib/glimmer/swt/table_column_proxy.rb

@@ -0,0 +1,28 @@
+require 'glimmer/swt/widget_proxy'
+
+module Glimmer
+  module SWT
+    class TableColumnProxy < Glimmer::SWT::WidgetProxy    
+      attr_reader :no_sort, :sort_property, :editor
+      alias no_sort? no_sort
+      attr_accessor :sort_block, :sort_by_block
+      
+      def initialize(underscored_widget_name, parent, args)
+        @no_sort = args.delete(:no_sort)
+        super
+        on_widget_selected do |event|
+          parent.sort_by_column(self)
+        end unless no_sort?
+      end
+      
+      def sort_property=(args)
+        @sort_property = args unless args.empty?
+      end
+      
+      def editor=(args)
+        @editor = args
+      end
+      
+    end
+  end
+end

data/lib/glimmer/swt/table_proxy.rb

@@ -23,8 +23,8 @@ module Glimmer
         def find_table_item_and_column_index
           {}.tap do |result|
             if respond_to?(:x) && respond_to?(:y)
-              result[:table_item] = widget.getItems.detect do |ti|
-                result[:column_index] = widget.getColumnCount.times.to_a.detect do |ci|
+              result[:table_item] = widget.items.detect do |ti|
+                result[:column_index] = widget.column_count.times.to_a.detect do |ci|
                   ti.getBounds(ci).contains(x, y)
                 end
               end
@@ -33,7 +33,61 @@ module Glimmer
         end   
       end
       
-      attr_reader :table_editor, :table_editor_text_proxy
+      class << self
+        def editors
+          @editors ||= {
+            text: {
+              widget_value_property: :text,
+              editor_gui: lambda do |args, model, property, table_proxy|
+                table_proxy.table_editor.minimumHeight = 20
+                table_editor_widget_proxy = text(*args) {
+                  text model.send(property)
+                  focus true
+                  on_focus_lost {
+                    table_proxy.finish_edit!
+                  }
+                  on_key_pressed { |key_event|
+                    if key_event.keyCode == swt(:cr)
+                      table_proxy.finish_edit!
+                    elsif key_event.keyCode == swt(:esc)
+                      table_proxy.cancel_edit!
+                    end
+                  }              
+                }
+                table_editor_widget_proxy.swt_widget.selectAll          
+                table_editor_widget_proxy
+              end,
+            },
+            combo: {
+              widget_value_property: :text,
+              editor_gui: lambda do |args, model, property, table_proxy|
+                table_proxy.table_editor.minimumHeight = 25
+                table_editor_widget_proxy = combo(*args) {
+                  items model.send("#{property}_options")
+                  text model.send(property)
+                  focus true
+                  on_focus_lost {
+                    table_proxy.finish_edit!
+                  }
+                  on_key_pressed { |key_event|
+                    if key_event.keyCode == swt(:cr)
+                      table_proxy.finish_edit!
+                    elsif key_event.keyCode == swt(:esc)
+                      table_proxy.cancel_edit!
+                    end
+                  }
+                  on_widget_selected {
+                    table_proxy.finish_edit!
+                  }
+                }
+                table_editor_widget_proxy
+              end,
+            }
+          }      
+        end
+      end
+      
+      attr_reader :table_editor, :table_editor_widget_proxy, :sort_property, :sort_direction, :sort_block, :sort_type, :sort_by_block, :additional_sort_properties, :editor
       attr_accessor :column_properties
       
       def initialize(underscored_widget_name, parent, args)
@@ -43,7 +97,95 @@ module Glimmer
         @table_editor.grabHorizontal = true
         @table_editor.minimumHeight = 20
       end
-    
+
+      def model_binding
+        swt_widget.data
+      end
+      
+      def sort_by_column(table_column_proxy)
+        index = swt_widget.columns.to_a.index(table_column_proxy.swt_widget)
+        new_sort_property = table_column_proxy.sort_property || [column_properties[index]]
+        if new_sort_property.size == 1 && !additional_sort_properties.to_a.empty?
+          selected_additional_sort_properties = additional_sort_properties.clone
+          if selected_additional_sort_properties.include?(new_sort_property.first)
+            selected_additional_sort_properties.delete(new_sort_property.first)
+            new_sort_property += selected_additional_sort_properties
+          else
+            new_sort_property += additional_sort_properties
+          end
+        end
+        
+        @sort_direction = @sort_direction.nil? || @sort_property != new_sort_property || @sort_direction == :descending ? :ascending : :descending        
+        swt_widget.sort_direction = @sort_direction == :ascending ? SWTProxy[:up] : SWTProxy[:down]
+        
+        @sort_property = new_sort_property
+        swt_widget.sort_column = table_column_proxy.swt_widget
+        
+        @sort_by_block = nil
+        @sort_block = nil
+        @sort_type = nil
+        if table_column_proxy.sort_by_block
+          @sort_by_block = table_column_proxy.sort_by_block
+        elsif table_column_proxy.sort_block
+          @sort_block = table_column_proxy.sort_block
+        else
+          detect_sort_type        
+        end
+        sort
+      end
+      
+      def detect_sort_type
+        @sort_type = sort_property.size.times.map { String }
+        array = model_binding.evaluate_property
+        sort_property.each_with_index do |a_sort_property, i|
+          values = array.map { |object| object.send(a_sort_property) }
+          value_classes = values.map(&:class).uniq
+          if value_classes.size == 1
+            @sort_type[i] = value_classes.first
+          elsif value_classes.include?(Integer)
+            @sort_type[i] = Integer
+          elsif value_classes.include?(Float)
+            @sort_type[i] = Float
+          end
+        end
+      end
+      
+      def additional_sort_properties=(args)
+        @additional_sort_properties = args unless args.empty?
+      end
+      
+      def editor=(args)
+        @editor = args
+      end 
+      
+      def sort
+        return unless sort_property && (sort_type || sort_block || sort_by_block)
+        array = model_binding.evaluate_property
+        # Converting value to_s first to handle nil cases. Should work with numeric, boolean, and date fields
+        if sort_block
+          sorted_array = array.sort(&sort_block)
+        elsif sort_by_block
+          sorted_array = array.sort_by(&sort_by_block)          
+        else
+          sorted_array = array.sort_by do |object|
+            sort_property.each_with_index.map do |a_sort_property, i|
+              value = object.send(a_sort_property)
+              # handle nil and difficult to compare types gracefully
+              if sort_type[i] == Integer
+                value = value.to_i
+              elsif sort_type[i] == Float
+                value = value.to_f
+              elsif sort_type[i] == String
+                value = value.to_s
+              end
+              value
+            end
+          end
+        end
+        sorted_array = sorted_array.reverse if sort_direction == :descending
+        model_binding.call(sorted_array)
+      end
+      
       # Performs a search for table items matching block condition
       # If no condition block is passed, returns all table items
       # Returns a Java TableItem array to easily set as selection on org.eclipse.swt.Table if needed
@@ -68,6 +210,14 @@ module Glimmer
         })
       end
       
+      def post_initialize_child(table_column_proxy)
+        table_column_proxies << table_column_proxy
+      end
+      
+      def table_column_proxies
+        @table_column_proxies ||= []
+      end
+      
       # Indicates if table is in edit mode, thus displaying a text widget for a table item cell
       def edit_mode?
         !!@edit_mode
@@ -93,58 +243,62 @@ module Glimmer
             
       def edit_table_item(table_item, column_index, before_write: nil, after_write: nil, after_cancel: nil)
         return if table_item.nil?
+        model = table_item.data
+        property = column_properties[column_index]
         @cancel_edit&.call if @edit_mode
+        action_taken = false
         @edit_mode = true
-        content {
-          @table_editor_text_proxy = text {
-            focus true
-            text table_item.getText(column_index)
-            action_taken = false
-            @cancel_edit = lambda do
-              @cancel_in_progress = true
-              @table_editor_text_proxy&.swt_widget&.dispose
-              @table_editor_text_proxy = nil
-              after_cancel&.call
+        
+        editor_config = table_column_proxies[column_index].editor || editor
+        editor_config = editor_config.to_a
+        editor_widget_options = editor_config.last.is_a?(Hash) ? editor_config.last : {}
+        editor_widget_arg_last_index = editor_config.last.is_a?(Hash) ? -2 : -1
+        editor_widget = editor_config[0] || :text
+        editor_widget_args = editor_config[1..editor_widget_arg_last_index]
+        model_editing_property = editor_widget_options[:property] || property
+        widget_value_property = TableProxy::editors[editor_widget][:widget_value_property]
+        
+        @cancel_edit = lambda do |event=nil|
+          @cancel_in_progress = true
+          @table_editor_widget_proxy&.swt_widget&.dispose
+          @table_editor_widget_proxy = nil
+          after_cancel&.call
+          @edit_in_progress = false
+          @cancel_in_progress = false
+          @cancel_edit = nil
+          @edit_mode = false
+        end
+        
+        @finish_edit = lambda do |event=nil|
+          new_value = @table_editor_widget_proxy&.swt_widget&.send(widget_value_property)
+          if table_item.isDisposed
+            @cancel_edit.call
+          elsif new_value && !action_taken && !@edit_in_progress && !@cancel_in_progress
+            action_taken = true
+            @edit_in_progress = true
+            if new_value == model.send(model_editing_property)
+              @cancel_edit.call
+            else
+              before_write&.call
+              model.send("#{model_editing_property}=", new_value) # makes table update itself, so must search for selected table item again
+              # Table refresh happens here because of model update triggering observers, so must retrieve table item again
+              edited_table_item = search { |ti| ti.getData == model }.first
+              swt_widget.showItem(edited_table_item)
+              @table_editor_widget_proxy&.swt_widget&.dispose
+              @table_editor_widget_proxy = nil
+              after_write&.call(edited_table_item)              
               @edit_in_progress = false
-              @cancel_in_progress = false
-              @cancel_edit = nil
-              @edit_mode = false
-            end
-            @finish_edit = lambda do |event=nil|
-              if table_item.isDisposed
-                @cancel_edit.call
-              elsif !action_taken && !@edit_in_progress && !@cancel_in_progress
-                action_taken = true
-                @edit_in_progress = true
-                new_text = @table_editor_text_proxy.swt_widget.getText
-                if new_text == table_item.getText(column_index)
-                  @cancel_edit.call
-                else
-                  before_write&.call
-                  table_item.setText(column_index, new_text)
-                  model = table_item.getData
-                  model.send("#{column_properties[column_index]}=", new_text) # makes table update itself, so must search for selected table item again
-                  edited_table_item = search { |ti| ti.getData == model }.first
-                  swt_widget.showItem(edited_table_item)
-                  @table_editor_text_proxy&.swt_widget&.dispose
-                  @table_editor_text_proxy = nil
-                  after_write&.call(edited_table_item)
-                  @edit_in_progress = false
-                end
-              end
             end
-            on_focus_lost(&@finish_edit)
-            on_key_pressed { |key_event|
-              if key_event.keyCode == swt(:cr)
-                @finish_edit.call(key_event)
-              elsif key_event.keyCode == swt(:esc)
-                @cancel_edit.call
-              end
-            }
-          }
-          @table_editor_text_proxy.swt_widget.selectAll
+          end
+        end
+
+        content { 
+          @table_editor_widget_proxy = TableProxy::editors[editor_widget][:editor_gui].call(editor_widget_args, model, model_editing_property, self)
         }
-        @table_editor.setEditor(@table_editor_text_proxy.swt_widget, table_item, column_index)
+        @table_editor.setEditor(@table_editor_widget_proxy.swt_widget, table_item, column_index)
+      rescue => e
+        Glimmer::Config.logger&.error e.full_message
+        raise e
       end
       
       def add_listener(underscored_listener_name, &block)

data/lib/glimmer/swt/widget_proxy.rb

@@ -60,7 +60,14 @@ module Glimmer
         styles, extra_options = extract_args(underscored_widget_name, args)
         swt_widget_class = self.class.swt_widget_class_for(underscored_widget_name)
         @swt_widget = swt_widget_class.new(parent.swt_widget, style(underscored_widget_name, styles), *extra_options)
+        @swt_widget.set_data('proxy', self)
         DEFAULT_INITIALIZERS[underscored_widget_name]&.call(@swt_widget)
+        parent.post_initialize_child(self)
+      end
+      
+      # Subclasses may override to perform post initialization work on an added child
+      def post_initialize_child(child)
+        # No Op by default
       end
 
       def extract_args(underscored_widget_name, args)
@@ -145,6 +152,16 @@ module Glimmer
                 observer.call(false)
               }
             end,
+            :selection => lambda do |observer|
+              on_widget_selected { |selection_event|
+                observer.call(@swt_widget.getSelection)
+              } if can_handle_observation_request?(:on_widget_selected)
+            end,
+            :text => lambda do |observer|
+              on_modify_text { |modify_event|
+                observer.call(@swt_widget.getText)
+              } if can_handle_observation_request?(:on_modify_text)
+            end,
           },
           Java::OrgEclipseSwtWidgets::Combo => {
             :text => lambda do |observer|
@@ -160,44 +177,44 @@ module Glimmer
               }
             end,
             :caret_position => lambda do |observer|
-              on_event_keydown { |event|
+              on_swt_keydown { |event|
                 observer.call(@swt_widget.getCaretPosition)
               }
-              on_event_keyup { |event|
+              on_swt_keyup { |event|
                 observer.call(@swt_widget.getCaretPosition)
               }
-              on_event_mousedown { |event|
+              on_swt_mousedown { |event|
                 observer.call(@swt_widget.getCaretPosition)
               }
-              on_event_mouseup { |event|
+              on_swt_mouseup { |event|
                 observer.call(@swt_widget.getCaretPosition)
               }
             end,
             :selection => lambda do |observer|
-              on_event_keydown { |event|
+              on_swt_keydown { |event|
                 observer.call(@swt_widget.getSelection)
               }
-              on_event_keyup { |event|
+              on_swt_keyup { |event|
                 observer.call(@swt_widget.getSelection)
               }
-              on_event_mousedown { |event|
+              on_swt_mousedown { |event|
                 observer.call(@swt_widget.getSelection)
               }
-              on_event_mouseup { |event|
+              on_swt_mouseup { |event|
                 observer.call(@swt_widget.getSelection)
               }
             end,
             :selection_count => lambda do |observer|
-              on_event_keydown { |event|
+              on_swt_keydown { |event|
                 observer.call(@swt_widget.getSelectionCount)
               }
-              on_event_keyup { |event|
+              on_swt_keyup { |event|
                 observer.call(@swt_widget.getSelectionCount)
               }
-              on_event_mousedown { |event|
+              on_swt_mousedown { |event|
                 observer.call(@swt_widget.getSelectionCount)
               }
-              on_event_mouseup { |event|
+              on_swt_mouseup { |event|
                 observer.call(@swt_widget.getSelectionCount)
               }
             end,
@@ -255,12 +272,12 @@ module Glimmer
           return nil
         end
         swt_widget_class
-      rescue NameError => e
-        Glimmer::Config.logger&.debug e.message
+      rescue SyntaxError, NameError => e
+        Glimmer::Config.logger&.debug e.full_message
         # Glimmer::Config.logger&.debug("#{e.message}\n#{e.backtrace.join("\n")}")
         nil
       rescue => e
-        Glimmer::Config.logger&.debug e.message
+        Glimmer::Config.logger&.debug e.full_message
         # Glimmer::Config.logger&.debug("#{e.message}\n#{e.backtrace.join("\n")}")
         nil
       end
@@ -296,9 +313,7 @@ module Glimmer
       def add_observer(observer, property_name)
         property_listener_installers = @swt_widget.class.ancestors.map {|ancestor| widget_property_listener_installers[ancestor]}.compact
         widget_listener_installers = property_listener_installers.map{|installer| installer[property_name.to_s.to_sym]}.compact if !property_listener_installers.empty?
-        widget_listener_installers.to_a.each do |widget_listener_installer|
-          widget_listener_installer.call(observer)
-        end
+        widget_listener_installers.to_a.first&.call(observer)
       end
 
       def remove_observer(observer, property_name)
@@ -324,8 +339,8 @@ module Glimmer
 
       def can_handle_observation_request?(observation_request)
         observation_request = observation_request.to_s
-        if observation_request.start_with?('on_event_')
-          constant_name = observation_request.sub(/^on_event_/, '')
+        if observation_request.start_with?('on_swt_')
+          constant_name = observation_request.sub(/^on_swt_/, '')
           SWTProxy.has_constant?(constant_name)
         elsif observation_request.start_with?('on_')
           event = observation_request.sub(/^on_/, '')
@@ -343,6 +358,9 @@ module Glimmer
             @drag_source_proxy = nil
           end
         end
+      rescue => e
+        Glimmer::Config.logger&.debug(e.full_message)
+        false        
       end
 
       def can_handle_drop_observation_request?(observation_request)
@@ -358,8 +376,8 @@ module Glimmer
       end
 
       def handle_observation_request(observation_request, &block)
-        if observation_request.start_with?('on_event_')
-          constant_name = observation_request.sub(/^on_event_/, '')
+        if observation_request.start_with?('on_swt_')
+          constant_name = observation_request.sub(/^on_swt_/, '')
           add_swt_event_listener(constant_name, &block)
         elsif observation_request.start_with?('on_')
           event = observation_request.sub(/^on_/, '')
@@ -378,6 +396,17 @@ module Glimmer
         Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::SWT::WidgetExpression.new, &block)
       end
 
+      def method_missing(method, *args, &block)
+        swt_widget.send(method, *args, &block)
+      rescue => e
+        Glimmer::Config.logger&.debug "Neither WidgetProxy nor #{swt_widget.class.name} can handle the method ##{method}"
+        super
+      end
+      
+      def respond_to?(method, *args, &block)
+        super || swt_widget.respond_to?(method, *args, &block)
+      end
+
       private
 
       def style(underscored_widget_name, styles)
@@ -423,7 +452,7 @@ module Glimmer
       def add_listener(underscored_listener_name, &block)
         widget_add_listener_method, listener_class, listener_method = self.class.find_listener(@swt_widget.getClass, underscored_listener_name)        
         widget_listener_proxy = nil
-        safe_block = lambda { |event| block.call(event) unless @swt_widget.isDisposed }        
+        safe_block = lambda { |*args| block.call(*args) unless @swt_widget.isDisposed }        
         listener = listener_class.new(listener_method => safe_block)
         @swt_widget.send(widget_add_listener_method, listener)
         widget_listener_proxy = WidgetListenerProxy.new(swt_widget: @swt_widget, swt_listener: listener, widget_add_listener_method: widget_add_listener_method, swt_listener_class: listener_class, swt_listener_method: listener_method)
@@ -465,9 +494,9 @@ module Glimmer
             listener_class.define_method('initialize') do |event_method_block_mapping|
               @event_method_block_mapping = event_method_block_mapping
             end
-            listener_type.getMethods.each do |event_method|
-              listener_class.define_method(event_method.getName) do |event|
-                @event_method_block_mapping[event_method.getName]&.call(event)
+            listener_type.getMethods.each do |event_method|              
+              listener_class.define_method(event_method.getName) do |*args|
+                @event_method_block_mapping[event_method.getName]&.call(*args)
               end
             end
           end
@@ -478,7 +507,7 @@ module Glimmer
       def add_swt_event_listener(swt_constant, &block)
         event_type = SWTProxy[swt_constant]
         widget_listener_proxy = nil
-        safe_block = lambda { |event| block.call(event) unless @swt_widget.isDisposed }
+        safe_block = lambda { |*args| block.call(*args) unless @swt_widget.isDisposed }
         @swt_widget.addListener(event_type, &safe_block)
         widget_listener_proxy = WidgetListenerProxy.new(swt_widget: @swt_widget, swt_listener: @swt_widget.getListeners(event_type).last, event_type: event_type, swt_constant: swt_constant)
       end
@@ -565,7 +594,7 @@ module Glimmer
               end
               image_data = ImageData.new(value)
               # TODO in the future, look into unregistering this listener when no longer needed
-              on_event_Resize do |resize_event|
+              on_swt_Resize do |resize_event|
                 new_image_data = image_data.scaledTo(@swt_widget.getSize.x, @swt_widget.getSize.y)
                 @swt_widget.getBackgroundImage&.dispose
                 @swt_widget.setBackgroundImage(Image.new(@swt_widget.getDisplay, new_image_data))

data/lib/glimmer/ui/custom_shell.rb

@@ -8,6 +8,7 @@ module Glimmer
 
       def initialize(parent, *swt_constants, options, &content)
         super
+        @swt_widget.set_data('custom_shell', self)
         raise Error, 'Invalid custom shell body root! Must be a shell or another custom shell.' unless body_root.swt_widget.is_a?(org.eclipse.swt.widgets.Shell)
       end
 

data/lib/glimmer/ui/custom_widget.rb

@@ -134,11 +134,13 @@ module Glimmer
         body_block = self.class.instance_variable_get("@body_block")
         raise Glimmer::Error, 'Invalid custom widget for having no body! Please define body block!' if body_block.nil?
         @body_root = instance_exec(&body_block)
-        execute_hooks('after_body')
         @swt_widget = @body_root.swt_widget
+        @swt_widget.set_data('custom_widget', self)
+        execute_hooks('after_body')
       end
-
+      
       def can_handle_observation_request?(observation_request)
+        observation_request = observation_request.to_s
         result = false
         if observation_request.start_with?('on_updated_')
           property = observation_request.sub(/^on_updated_/, '')
@@ -148,6 +150,7 @@ module Glimmer
       end
 
       def handle_observation_request(observation_request, &block)
+        observation_request = observation_request.to_s
         if observation_request.start_with?('on_updated_')
           property = observation_request.sub(/^on_updated_/, '') # TODO look into eliminating duplication from above
           add_observer(DataBinding::Observer.proc(&block), property) if can_add_observer?(property)
@@ -157,7 +160,7 @@ module Glimmer
       end
 
       def can_add_observer?(attribute_name)
-        has_instance_method?(attribute_name) || respond_to?("#{attribute_name}?") || @body_root.can_add_observer?(attribute_name)
+        has_instance_method?(attribute_name) || has_instance_method?("#{attribute_name}?") || @body_root.can_add_observer?(attribute_name)
       end
 
       def add_observer(observer, attribute_name)
@@ -169,12 +172,12 @@ module Glimmer
       end
 
       def has_attribute?(attribute_name, *args)
-        respond_to?(attribute_setter(attribute_name), args) ||
+        has_instance_method?(attribute_setter(attribute_name)) ||
           @body_root.has_attribute?(attribute_name, *args)
       end
 
       def set_attribute(attribute_name, *args)
-        if respond_to?(attribute_setter(attribute_name), args)
+        if has_instance_method?(attribute_setter(attribute_name))
           send(attribute_setter(attribute_name), *args)
         else
           @body_root.set_attribute(attribute_name, *args)
@@ -183,7 +186,10 @@ module Glimmer
 
       # This method ensures it has an instance method not coming from Glimmer DSL
       def has_instance_method?(method_name)
-        respond_to?(method_name) && !method(method_name)&.source_location&.first&.include?('glimmer/dsl/engine.rb')
+        respond_to?(method_name) && 
+          !swt_widget.respond_to?(method_name) &&
+          !method(method_name)&.source_location&.first&.include?('glimmer/dsl/engine.rb') && 
+          !method(method_name)&.source_location&.first&.include?('glimmer/swt/widget_proxy.rb')
       end
 
       def get_attribute(attribute_name)
@@ -198,7 +204,6 @@ module Glimmer
         "#{attribute_name}="
       end
 
-
       def has_style?(style)
         (swt_style & SWT::SWTProxy[style]) == SWT::SWTProxy[style]
       end
@@ -224,14 +229,16 @@ module Glimmer
         end
       end
 
-      def dispose
-        body_root.dispose
-      end
-      
       def method_missing(method, *args, &block)
         body_root.send(method, *args, &block)
       end
 
+      alias local_respond_to? respond_to?      
+      def respond_to?(method, *args, &block)
+        super or
+          body_root.respond_to?(method, *args, &block)
+      end
+
       private
 
       def execute_hooks(hook_name)

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.4.0
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-11 00:00:00.000000000 Z
+date: 2020-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.9.5
   name: glimmer
   type: :runtime
   prerelease: false
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.3
+        version: 0.9.5
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -256,7 +256,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.7.0
-description: Glimmer DSL for SWT (Desktop GUI)
+description: Glimmer DSL for SWT (Desktop GUI) - JRuby on SWT
 email: andy.am@gmail.com
 executables:
 - glimmer
@@ -285,6 +285,7 @@ files:
 - lib/glimmer/data_binding/widget_binding.rb
 - lib/glimmer/dsl/swt/async_exec_expression.rb
 - lib/glimmer/dsl/swt/bind_expression.rb
+- lib/glimmer/dsl/swt/block_property_expression.rb
 - lib/glimmer/dsl/swt/color_expression.rb
 - lib/glimmer/dsl/swt/column_properties_expression.rb
 - lib/glimmer/dsl/swt/combo_selection_data_binding_expression.rb
@@ -328,10 +329,12 @@ files:
 - lib/glimmer/swt/menu_proxy.rb
 - lib/glimmer/swt/message_box_proxy.rb
 - lib/glimmer/swt/packages.rb
+- lib/glimmer/swt/scrolled_composite_proxy.rb
 - lib/glimmer/swt/shell_proxy.rb
 - lib/glimmer/swt/style_constantizable.rb
 - lib/glimmer/swt/swt_proxy.rb
 - lib/glimmer/swt/tab_item_proxy.rb
+- lib/glimmer/swt/table_column_proxy.rb
 - lib/glimmer/swt/table_proxy.rb
 - lib/glimmer/swt/tree_proxy.rb
 - lib/glimmer/swt/widget_listener_proxy.rb