glimmer-dsl-swt 0.4.0 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8dda5c40a0a65d36e4615d40f3456b80d2d990121ed63fa9f447a1d110af3a93
-  data.tar.gz: 4bcdc319eda7a7c3542e0d1b8caeda9329726623ae20b87236be0690dbd263c4
+  metadata.gz: 7ce0b74d98304d4ef0a093bf6dcd2a05612f4e437a4468307bf04bb98751bd67
+  data.tar.gz: 16624ff216b60f6448d624a778e021115a9bd83c548a9dd9e637f40693d33641
 SHA512:
-  metadata.gz: 12f2085517a77a30197dd499887e0ca55756b2a0d0ec26275be60b38d6b266722c6574256e3f9830e145763eec7cb74543b0df37932d9c751b0497c4ea277a38
-  data.tar.gz: bb174b6427e2814b02f4509dc4b31698ca2e28c460f2d18749c2505ec9cb0635641275a5300db0fbb7821d1fdb0cdc8474e9220d2718201073076d567b2865d0
+  metadata.gz: eec38142ade569bc1bcca40d075ef64f8be649df9b0322fedbcd1c0e9df4b1ee481b878489531ebbee74d6b8f23c160e64cbac732f15fb850365ce352ecdc45b
+  data.tar.gz: e24d03c58b50294cfef56300f7bcfb2371856be1ff22f4c81ffb6089455d8f99b2a3df7e4b0e0cc9628ffd0a241297167b3a4898a54014bb5fc894cce63a33a1

data/README.md

@@ -1,7 +1,8 @@
-# <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)
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 0.5.3 (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)
+[![Maintainability](https://api.codeclimate.com/v1/badges/aaf1cba142dd351f84bd/maintainability)](https://codeclimate.com/github/AndyObtiva/glimmer-dsl-swt/maintainability)
 [![Join the chat at https://gitter.im/AndyObtiva/glimmer](https://badges.gitter.im/AndyObtiva/glimmer.svg)](https://gitter.im/AndyObtiva/glimmer?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 [Glimmer](https://github.com/AndyObtiva/glimmer) DSL for [SWT](https://www.eclipse.org/swt/) enables desktop development with [Glimmer](https://github.com/AndyObtiva/glimmer).
@@ -66,5 +67,11 @@ These features have been suggested. You might see them in a future version of Gl
 
 ## License
 
-Copyright (c) 2020 Andy Maleh.
-See LICENSE.txt for further details.
+[MIT](https://opensource.org/licenses/MIT)
+
+Copyright (c) 2020 - Andy Maleh. 
+See [LICENSE.txt](LICENSE.txt) for further details.
+
+--
+
+[<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=40 />](https://github.com/AndyObtiva/glimmer) Built for [Glimmer](https://github.com/AndyObtiva/glimmer) (Ruby Desktop Development GUI Library).

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.3

data/lib/ext/glimmer/config.rb

@@ -21,6 +21,94 @@ module Glimmer
         @@import_swt_packages = DEFAULT_IMPORT_SWT_PACKAGES if !defined?(@@import_swt_packages) || (defined?(@@import_swt_packages) && @@import_swt_packages == true)
         @@import_swt_packages
       end
+      
+      # Returns Logging Devices. Default is [:stdout, :syslog]
+      def logging_devices
+        unless defined? @@logging_devices
+          @@logging_devices = [:stdout, :syslog]
+        end
+        @@logging_devices
+      end
+      
+      # Logging Devices is an array of these possible values: :stdout (default), :stderr, :file, :syslog (default), :stringio
+      def logging_devices=(devices)
+        @@logging_devices = devices
+        reset_logger!
+      end
+      
+      def logging_device_file_options
+        @@logging_device_file_options = {size: 1_000_000, age: 'daily', roll_by: 'number'} unless defined? @@logging_device_file_options
+        @@logging_device_file_options
+      end
+      
+      def logging_device_file_options=(custom_options)
+        @@logging_device_file_options = custom_options
+        reset_logger!
+      end
+      
+      def logging_appender_options
+        @@logging_appender_options = {async: true, auto_flushing: 500, write_size: 500, flush_period: 60, immediate_at: [:error, :fatal], layout: logging_layout} unless defined? @@logging_appender_options
+        @@logging_appender_options
+      end
+      
+      def logging_appender_options=(custom_options)
+        @@logging_appender_options = custom_options
+        reset_logger!
+      end
+      
+      def logging_layout
+        unless defined? @@logging_layout
+          @@logging_layout = Logging.layouts.pattern(
+            pattern: '[%d] %-5l %c: %m\n',
+            date_pattern: '%Y-%m-%d %H:%M:%S'
+          )
+        end
+        @@logging_layout
+      end
+      
+      def logging_layout=(custom_layout)
+        @@logging_layout = custom_layout
+        reset_logger!
+      end
+      
+      def reset_logger!
+        @first_time = !defined?(@@logger)        
+        old_level = logger.level unless @first_time
+        self.logger = Logging.logger['glimmer'].tap do |logger| 
+          logger.level = old_level || :error
+          appenders = []
+          appenders << Logging.appenders.stdout(logging_appender_options) if logging_devices.include?(:stdout)
+          appenders << Logging.appenders.stderr(logging_appender_options) if logging_devices.include?(:stderr)
+          if logging_devices.include?(:file)
+            require 'fileutils'
+            FileUtils.mkdir_p('log')
+            appenders << Logging.appenders.rolling_file('log/glimmer.log', logging_appender_options.merge(logging_device_file_options)) if logging_devices.include?(:file)
+          end
+          if Object.const_defined?(:Syslog) && logging_devices.include?(:syslog)
+            Syslog.close if Syslog.opened?
+            appenders << Logging.appenders.syslog('glimmer', logging_appender_options)
+          end
+          logger.appenders = appenders
+        end
+      end
     end
   end
 end
+
+Glimmer::Config.reset_logger!
+if ENV['GLIMMER_LOGGER_LEVEL']
+  # if glimmer log level is being overridden for debugging purposes, then disable async logging making logging immediate
+  Glimmer::Config.logging_appender_options = Glimmer::Config.logging_appender_options.merge(async: false, auto_flushing: 1)
+  Glimmer::Config.logging_devices = [:stdout]
+  Glimmer::Config.logger.level = ENV['GLIMMER_LOGGER_LEVEL']
+end
+Glimmer::Config.excluded_keyword_checkers << lambda do |method_symbol, *args|
+  method = method_symbol.to_s
+  result = false
+  result ||= method.start_with?('on_swt_') && is_a?(Glimmer::UI::CustomWidget) && respond_to?(method)
+  result ||= method == 'dispose' && is_a?(Glimmer::UI::CustomWidget) && respond_to?(method)
+  result ||= ['drag_source_proxy', 'drop_target_proxy'].include?(method) && is_a?(Glimmer::UI::CustomWidget)
+  result ||= method == 'post_initialize_child'
+  result ||= method.end_with?('=')
+  result ||= ['finish_edit!', 'search', 'all_tree_items', 'depth_first_search'].include?(method) && is_a?(Glimmer::UI::CustomWidget) && body_root.respond_to?(method)
+end

data/lib/glimmer-dsl-swt.rb

@@ -6,9 +6,10 @@ if ENV['BUNDLER_REQUIRE'].to_s.downcase == 'true'
   require 'bundler'
   Bundler.require
 else
+  require 'glimmer'
+  require 'logging'
   require 'nested_inherited_jruby_include_package'
   require 'super_module'
-  require 'glimmer'
 end
 
 # Internal requires

data/lib/glimmer/data_binding/table_items_binding.rb

@@ -23,16 +23,18 @@ module Glimmer
           @table.body_root.column_properties = @column_properties
         end
         call(@model_binding.evaluate_property)
-        observe(model_binding)
+        @table_observer_registration = observe(model_binding)
         @table.on_widget_disposed do |dispose_event|
           unregister_all_observables
         end
       end
 
       def call(new_model_collection=nil)
-        new_model_collection = @model_binding.evaluate_property # this ensures applying converters (e.g. :on_read)
+        new_model_collection = @model_binding.evaluate_property # this ensures applying converters (e.g. :on_read)        
         if new_model_collection and new_model_collection.is_a?(Array)
-          observe(new_model_collection, @column_properties)
+          @table_items_observer_registration&.unobserve
+          @table_items_observer_registration = observe(new_model_collection, @column_properties)
+          add_dependent(@table_observer_registration => @table_items_observer_registration)
           @model_collection = new_model_collection
         end
         populate_table(@model_collection, @table, @column_properties)        
@@ -41,6 +43,7 @@ module Glimmer
       def populate_table(model_collection, parent, column_properties)
         selected_table_item_models = parent.swt_widget.getSelection.map(&:getData)
         parent.finish_edit!
+        parent.swt_widget.items.each(&:dispose)
         parent.swt_widget.removeAll
         model_collection.each do |model|
           table_item = TableItem.new(parent.swt_widget, SWT::SWTProxy[:none])
@@ -52,6 +55,7 @@ module Glimmer
         selected_table_items = parent.search {|item| selected_table_item_models.include?(item.getData) }
         selected_table_items = [parent.swt_widget.getItems.first].to_java(TableItem) if selected_table_items.empty? && !parent.swt_widget.getItems.empty?
         parent.swt_widget.setSelection(selected_table_items) unless selected_table_items.empty?
+        parent.sort
       end
     end
   end

data/lib/glimmer/data_binding/tree_items_binding.rb

@@ -41,10 +41,9 @@ module Glimmer
         old_tree_items = parent.all_tree_items
         old_tree_item_expansion_by_data = old_tree_items.reduce({}) {|hash, ti| hash.merge(ti.getData => ti.getExpanded)}
         old_tree_items.each do |tree_item|
-          tree_item.getData('observer_registrations').each do |key, observer_registration|
-            observer_registration.unregister
-          end          
+          tree_item.getData('observer_registrations').each(&:unregister)
         end        
+        parent.swt_widget.items.each(&:dispose)
         parent.swt_widget.removeAll
         populate_tree_node(model_tree_root_node, parent.swt_widget, tree_properties)
         parent.all_tree_items.each { |ti| ti.setExpanded(!!old_tree_item_expansion_by_data[ti.getData]) }
@@ -54,10 +53,9 @@ module Glimmer
 
       def populate_tree_node(model_tree_node, parent, tree_properties)
         return if model_tree_node.nil?
-        # TODO anticipate default tree properties if none were passed (like literal values text and children)
         tree_item = TreeItem.new(parent, SWT::SWTProxy[:none])
-        observer_registrations = @tree_properties.reduce({}) do |hash, key_value_pair|
-          hash.merge(key_value_pair.first => observe(model_tree_node, key_value_pair.last))
+        observer_registrations = @tree_properties.reduce([]) do |array, key_value_pair|
+          array + [observe(model_tree_node, key_value_pair.last)]
         end
         tree_item.setData('observer_registrations', observer_registrations)
         tree_item.setData(model_tree_node)

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

@@ -1,3 +1,4 @@
+
 require 'glimmer'
 require 'glimmer/dsl/expression'
 require 'glimmer/dsl/parent_expression'

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

@@ -20,7 +20,7 @@ module Glimmer
         end
   
         def interpret(parent, keyword, *args, &block)
-          Glimmer::SWT::DisplayProxy.instance.send(exec_operation, &block)
+          Glimmer::SWT::DisplayProxy.instance.swt_display.send(exec_operation, &block)
         end
       end
     end

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

@@ -18,7 +18,7 @@ module Glimmer
             if parent.swt_widget.is_a?(TabFolder)
               return true
             else
-              Glimmer::Config.logger&.error "tab_item widget may only be used directly under a tab_folder widget!"
+              Glimmer::Config.logger.error {"tab_item widget may only be used directly under a tab_folder widget!"}
             end
           end
           false

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

@@ -8,17 +8,17 @@ module Glimmer
         include_package 'org.eclipse.swt.widgets'
   
         def can_interpret?(parent, keyword, *args, &block)
-          Glimmer::Config.logger&.debug "keyword starts with on_: #{keyword.start_with?('on_')}"
+          Glimmer::Config.logger.debug {"keyword starts with on_: #{keyword.start_with?('on_')}"}
           return false unless keyword.start_with?('on_')
           widget_or_display_parentage = parent.respond_to?(:swt_widget) || parent.is_a?(Glimmer::SWT::DisplayProxy)
-          Glimmer::Config.logger&.debug "parent is a widget or display: #{widget_or_display_parentage}"
+          Glimmer::Config.logger.debug {"parent #{parent} is a widget or display: #{widget_or_display_parentage}"}
           return false unless widget_or_display_parentage
-          Glimmer::Config.logger&.debug "block exists?: #{!block.nil?}"
+          Glimmer::Config.logger.debug {"block exists?: #{!block.nil?}"}
           raise Glimmer::Error, "Listener is missing block for keyword: #{keyword}" unless block_given?
-          Glimmer::Config.logger&.debug "args are empty?: #{args.empty?}"
+          Glimmer::Config.logger.debug {"args are empty?: #{args.empty?}"}
           raise Glimmer::Error, "Invalid listener arguments for keyword: #{keyword}(#{args})" unless args.empty?
           result = parent.can_handle_observation_request?(keyword)
-          Glimmer::Config.logger&.debug "can add listener? #{result}"
+          Glimmer::Config.logger.debug {"can add listener? #{result}"}
           raise Glimmer::Error, "Invalid listener keyword: #{keyword}" unless result
           true
         end

data/lib/glimmer/package.rb

@@ -17,7 +17,7 @@ module Glimmer
         project_name = File.basename(File.expand_path('.'))
         if !File.exists?('config/warble.rb')
           puts 'Generating JAR configuration (config/warble.rb) to use with Warbler...'
-          system('mkdir -p config')
+          FileUtils.mkdir_p('config')
           system('warble config')
           new_config = File.read('config/warble.rb').split("\n").inject('') do |output, line|
             if line.include?('config.dirs =')
@@ -36,7 +36,7 @@ module Glimmer
       end
       
       def jar
-        system('mkdir -p dist')
+        FileUtils.mkdir_p('dist')
         puts "Generating JAR with Warbler..."
         system('warble')      
       end
@@ -49,11 +49,13 @@ module Glimmer
         version = (File.read(version_file).strip if File.exists?(version_file) && File.file?(version_file)) rescue nil
         license_file = File.expand_path('./LICENSE.txt')
         license = (File.read(license_file).strip if File.exists?(license_file) && File.file?(license_file)) rescue nil
+        copyright = license.split("\n").first
         human_name = project_name.underscore.titlecase
-        command = "javapackager -deploy -native -outdir packages -outfile \"#{project_name}\" -srcfiles \"dist/#{project_name}.jar\" -appclass JarMain -name \"#{human_name}\" -title \"#{human_name}\" -Bmac.CFBundleName=\"#{human_name}\" -Bmac.CFBundleIdentifier=\"org.#{project_name}.application.#{project_name}\" -Bmac.category=\"public.app-category.business\" "
+        command = "javapackager -deploy -native -outdir packages -outfile \"#{project_name}\" -srcfiles \"dist/#{project_name}.jar\" -appclass JarMain -name \"#{human_name}\" -title \"#{human_name}\" -Bmac.CFBundleName=\"#{human_name}\" -Bmac.CFBundleIdentifier=\"org.#{project_name}.application.#{project_name}\" -Bmac.category=\"public.app-category.business\" -BinstalldirChooser=true -Bvendor=\"#{human_name}\" -Bwin.menuGroup=\"#{human_name}\" -BsystemWide=#{OS.mac?} "
         command += " -BjvmOptions=-XstartOnFirstThread " if OS.mac?
         command += " -BappVersion=#{version} -Bmac.CFBundleVersion=#{version} " if version
         command += " -srcfiles LICENSE.txt -BlicenseFile=LICENSE.txt " if license
+        command += " -Bcopyright=\"#{copyright}\" " if copyright
         command += " #{javapackager_extra_args} " if javapackager_extra_args
         command += " #{ENV['JAVAPACKAGER_EXTRA_ARGS']} " if ENV['JAVAPACKAGER_EXTRA_ARGS']
         puts "Generating DMG/PKG/APP/JNLP with javapackager..."

data/lib/glimmer/rake_task.rb

@@ -33,57 +33,97 @@ namespace :glimmer do
   end
 
 
-  desc 'Scaffold a Glimmer application directory structure to begin building a new app'
+  desc 'Scaffold Glimmer application directory structure to build a new app'
   task :scaffold, [:app_name] do |t, args|
     require_relative 'scaffold'
     Scaffold.app(args[:app_name])
   end
 
   namespace :scaffold do
-    desc 'Scaffold a Glimmer::UI::CustomShell subclass (represents a full window view) under app/views (namespace is optional)'
-    task :custom_shell, [:custom_shell_name, :namespace] do |t, args|
+    desc 'Scaffold Glimmer::UI::CustomShell subclass (full window view) under app/views (namespace is optional) [alt: scaffold:cs]'
+    task :customshell, [:name, :namespace] do |t, args|
       require_relative 'scaffold'
-      Scaffold.custom_shell(args[:custom_shell_name], args[:namespace])
+      Scaffold.custom_shell(args[:name], args[:namespace])
     end
     
-    desc 'Scaffold a Glimmer::UI::CustomWidget subclass (represents a part of a view) under app/views (namespace is optional)'
-    task :custom_widget, [:custom_widget_name, :namespace] do |t, args|
-      require_relative 'scaffold'
-      Scaffold.custom_widget(args[:custom_widget_name], args[:namespace])
-    end
+    task :cs, [:name, :namespace] => :customshell
+    task :custom_shell, [:name, :namespace] => :customshell
+    task :"custom-shell", [:name, :namespace] => :customshell
     
-    desc 'Scaffold a Glimmer::UI::CustomShell subclass (represents a full window view) under its own Ruby gem + app project (namespace is required)'
-    task :custom_shell_gem, [:custom_shell_name, :namespace] do |t, args|
+    desc 'Scaffold Glimmer::UI::CustomWidget subclass (part of a view) under app/views (namespace is optional) [alt: scaffold:cw]'
+    task :customwidget, [:name, :namespace] do |t, args|
       require_relative 'scaffold'
-      Scaffold.custom_shell_gem(args[:custom_shell_name], args[:namespace])
+      Scaffold.custom_widget(args[:name], args[:namespace])
     end
     
-    desc 'Scaffold a Glimmer::UI::CustomWidget subclass (represents a part of a view) under its own Ruby gem project (namespace is required)'
-    task :custom_widget_gem, [:custom_widget_name, :namespace] do |t, args|
-      require_relative 'scaffold'
-      Scaffold.custom_widget_gem(args[:custom_widget_name], args[:namespace])
+    task :cw, [:name, :namespace] => :customwidget
+    task :custom_widget, [:name, :namespace] => :customwidget
+    task :"custom-widget", [:name, :namespace] => :customwidget
+    
+    namespace :gem do
+      desc 'Scaffold Glimmer::UI::CustomShell subclass (full window view) under its own Ruby gem + app project (namespace is required) [alt: scaffold:gem:cs]'
+      task :customshell, [:name, :namespace] do |t, args|
+        require_relative 'scaffold'
+        Scaffold.custom_shell_gem(args[:name], args[:namespace])
+      end
+      
+      task :cs, [:name, :namespace] => :customshell
+      task :custom_shell, [:name, :namespace] => :customshell
+      task :"custom-shell", [:name, :namespace] => :customshell
+      
+      desc 'Scaffold Glimmer::UI::CustomWidget subclass (part of a view) under its own Ruby gem project (namespace is required) [alt: scaffold:gem:cw]'
+      task :customwidget, [:name, :namespace] do |t, args|
+        require_relative 'scaffold'
+        Scaffold.custom_widget_gem(args[:name], args[:namespace])
+      end
+    
+      task :cw, [:name, :namespace] => :customwidget
+      task :custom_widget, [:name, :namespace] => :customwidget
+      task :"custom-widget", [:name, :namespace] => :customwidget      
     end
+    
+    # legacy support
+    
+    task :custom_shell_gem, [:name, :namespace] => 'gem:customshell'
+    task :custom_widget_gem, [:name, :namespace] => 'gem:customwidget'
+    
   end
   
   namespace :list do
     task :list_require do
       require_relative 'rake_task/list'
     end
-  
-    desc 'List Glimmer custom widget gems available at rubygems.org (query is optional)'
-    task :custom_widget_gems, [:query] => :list_require do |t, args|
-      Glimmer::RakeTask::List.custom_widget_gems(args[:query])
-    end
     
-    desc 'List Glimmer custom shell gems available at rubygems.org (query is optional)'
-    task :custom_shell_gems, [:query] => :list_require do |t, args|
-      Glimmer::RakeTask::List.custom_shell_gems(args[:query])
-    end
+    namespace :gems do
+      desc 'List Glimmer custom widget gems available at rubygems.org (query is optional) [alt: list:gems:cw]'
+      task :customwidget, [:query] => :list_require do |t, args|
+        Glimmer::RakeTask::List.custom_widget_gems(args[:query])
+      end
+      
+      task :cw, [:query] => :customwidget
+      task :custom_widget, [:query] => :customwidget
+      task :"custom-widget", [:query] => :customwidget
+      
+      desc 'List Glimmer custom shell gems available at rubygems.org (query is optional) [alt: list:gems:cs]'
+      task :customshell, [:query] => :list_require do |t, args|
+        Glimmer::RakeTask::List.custom_shell_gems(args[:query])
+      end
+      
+      task :cs, [:query] => :customshell
+      task :custom_shell, [:query] => :customshell
+      task :"custom-shell", [:query] => :customshell
+      
+      desc 'List Glimmer DSL gems available at rubygems.org (query is optional)'
+      task :dsl, [:query] => :list_require do |t, args|
+        Glimmer::RakeTask::List.dsl_gems(args[:query])
+      end
     
-    desc 'List Glimmer DSL gems available at rubygems.org (query is optional)'
-    task :dsl_gems, [:query] => :list_require do |t, args|
-      Glimmer::RakeTask::List.dsl_gems(args[:query])
     end
     
+    # legacy support
+    
+    task :custom_shell_gems, [:name, :namespace] => 'gems:customshell'
+    task :custom_widget_gems, [:name, :namespace] => 'gems:customwidget'    
+    
   end
 end

data/lib/glimmer/swt/color_proxy.rb

@@ -52,7 +52,7 @@ module Glimmer
       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}"
+        Glimmer::Config.logger.debug {"Neither ColorProxy nor #{swt_color.class.name} can handle the method ##{method}"}
         super
       end
       

data/lib/glimmer/swt/display_proxy.rb

@@ -36,14 +36,10 @@ module Glimmer
         @swt_display.set_data('proxy', self)
       end
 
-      def dispose
-        @swt_display.dispose
-      end
-
       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}"
+        Glimmer::Config.logger.debug {"Neither DisplayProxy nor #{swt_display.class.name} can handle the method ##{method}"}
         super
       end
       

data/lib/glimmer/swt/layout_data_proxy.rb

@@ -31,7 +31,7 @@ module Glimmer
         begin
           @swt_layout_data = swt_layout_data_class.new(*args)
         rescue => e
-          Glimmer::Config.logger&.debug "#{e.message}\n#{e.backtrace.join("\n")}"
+          Glimmer::Config.logger.debug {"#{e.message}\n#{e.backtrace.join("\n")}"}
           @swt_layout_data = args.first if args.count == 1
         end
         @widget_proxy.swt_widget.setLayoutData(@swt_layout_data)

data/lib/glimmer/swt/layout_proxy.rb

@@ -34,8 +34,8 @@ module Glimmer
           end
           swt_layout_class
         rescue => e
-          Glimmer::Config.logger&.debug e.message
-          # Glimmer::Config.logger&.debug "#{e.message}\n#{e.backtrace.join("\n")}"
+          Glimmer::Config.logger.debug {e.message}
+          # Glimmer::Config.logger.debug {"#{e.message}\n#{e.backtrace.join("\n")}"}
           raise e
         end
       end

data/lib/glimmer/swt/message_box_proxy.rb

@@ -15,11 +15,13 @@ module Glimmer
       
       def initialize(parent, style)
         parent = parent.swt_widget if parent.respond_to?(:swt_widget) && parent.swt_widget.is_a?(Shell)
+        @temporary_parent = parent = Glimmer::SWT::ShellProxy.new.swt_widget if parent.nil?
         @swt_widget = MessageBox.new(parent, style)
       end
       
       def open
         @swt_widget.open
+        @temporary_parent&.dispose
       end
       
       # TODO refactor the following methods to put in a JavaBean mixin or somethin (perhaps contribute to OSS project too)

data/lib/glimmer/swt/shell_proxy.rb

@@ -84,10 +84,6 @@ module Glimmer
         @swt_widget.setVisible(false)
       end
 
-      def close
-        @swt_widget.close
-      end
-
       def visible?
         @swt_widget.isDisposed ? false : @swt_widget.isVisible
       end
@@ -134,7 +130,7 @@ module Glimmer
           begin
             @display.sleep unless @display.readAndDispatch
           rescue => e
-            Glimmer::Config.logger&.debug e.full_message          
+            Glimmer::Config.logger.debug {e.full_message}
           end
         end
       end

data/lib/glimmer/swt/style_constantizable.rb

@@ -61,12 +61,12 @@ module Glimmer
           negative ? ~bit_value : bit_value
         rescue => e
           begin
-#             Glimmer::Config.logger&.debug(e.full_message)
+#             Glimmer::Config.logger.debug {e.full_message}
             alternative_swt_constant_symbol = constant_source_class.constants.find {|c| c.to_s.upcase == swt_constant_symbol.to_s.upcase}
             bit_value = constant_source_class.const_get(alternative_swt_constant_symbol)
             negative ? ~bit_value : bit_value
           rescue => e
-#             Glimmer::Config.logger&.debug(e.full_message)
+#             Glimmer::Config.logger.debug {e.full_message}
             bit_value = extra_styles[swt_constant_symbol]
             if bit_value
               negative ? ~bit_value : bit_value

data/lib/glimmer/swt/table_proxy.rb

@@ -61,6 +61,7 @@ module Glimmer
             combo: {
               widget_value_property: :text,
               editor_gui: lambda do |args, model, property, table_proxy|
+                first_time = true
                 table_proxy.table_editor.minimumHeight = 25
                 table_editor_widget_proxy = combo(*args) {
                   items model.send("#{property}_options")
@@ -77,7 +78,9 @@ module Glimmer
                     end
                   }
                   on_widget_selected {
-                    table_proxy.finish_edit!
+                    if !OS.windows? || !first_time || first_time && model.send(property) != table_editor_widget_proxy.swt_widget.text
+                      table_proxy.finish_edit! 
+                    end 
                   }
                 }
                 table_editor_widget_proxy
@@ -297,7 +300,7 @@ module Glimmer
         }
         @table_editor.setEditor(@table_editor_widget_proxy.swt_widget, table_item, column_index)
       rescue => e
-        Glimmer::Config.logger&.error e.full_message
+        Glimmer::Config.logger.error {e.full_message}
         raise e
       end
       

data/lib/glimmer/swt/widget_proxy.rb

@@ -3,7 +3,6 @@ require 'glimmer/swt/color_proxy'
 require 'glimmer/swt/font_proxy'
 require 'glimmer/swt/swt_proxy'
 require 'glimmer/swt/dnd_proxy'
-require 'glimmer/data_binding/observable_widget'
 
 # TODO refactor to make file smaller and extract sub-widget-proxies out of this
 
@@ -20,11 +19,10 @@ module Glimmer
     # Follows the Proxy Design Pattern
     class WidgetProxy
       include Packages
-      include DataBinding::ObservableWidget
 
       DEFAULT_STYLES = {
         "text"        => [:border],
-        "table"       => [:border],
+        "table"       => [:virtual, :border, :full_selection],
         "tree"       =>  [:virtual, :border, :h_scroll, :v_scroll],
         "spinner"     => [:border],
         "styled_text" => [:border],
@@ -268,17 +266,17 @@ module Glimmer
         swt_widget_name = underscored_widget_name.camelcase(:upper)
         swt_widget_class = eval(swt_widget_name)
         unless swt_widget_class.ancestors.include?(org.eclipse.swt.widgets.Widget)
-          Glimmer::Config.logger&.debug("Class #{swt_widget_class} matching #{underscored_widget_name} is not a subclass of org.eclipse.swt.widgets.Widget")
+          Glimmer::Config.logger.debug {"Class #{swt_widget_class} matching #{underscored_widget_name} is not a subclass of org.eclipse.swt.widgets.Widget"}
           return nil
         end
         swt_widget_class
       rescue SyntaxError, NameError => e
-        Glimmer::Config.logger&.debug e.full_message
-        # Glimmer::Config.logger&.debug("#{e.message}\n#{e.backtrace.join("\n")}")
+        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.full_message
-        # Glimmer::Config.logger&.debug("#{e.message}\n#{e.backtrace.join("\n")}")
+        Glimmer::Config.logger.debug {e.full_message}
+        # Glimmer::Config.logger.debug {"#{e.message}\n#{e.backtrace.join("\n")}"}
         nil
       end
 
@@ -337,7 +335,7 @@ module Glimmer
       
       # TODO eliminate duplication in the following methods perhaps by relying on exceptions
 
-      def can_handle_observation_request?(observation_request)
+      def can_handle_observation_request?(observation_request)        
         observation_request = observation_request.to_s
         if observation_request.start_with?('on_swt_')
           constant_name = observation_request.sub(/^on_swt_/, '')
@@ -359,7 +357,7 @@ module Glimmer
           end
         end
       rescue => e
-        Glimmer::Config.logger&.debug(e.full_message)
+        Glimmer::Config.logger.debug {e.full_message}
         false        
       end
 
@@ -376,6 +374,7 @@ module Glimmer
       end
 
       def handle_observation_request(observation_request, &block)
+        observation_request = observation_request.to_s
         if observation_request.start_with?('on_swt_')
           constant_name = observation_request.sub(/^on_swt_/, '')
           add_swt_event_listener(constant_name, &block)
@@ -397,14 +396,20 @@ module Glimmer
       end
 
       def method_missing(method, *args, &block)
-        swt_widget.send(method, *args, &block)
+        if can_handle_observation_request?(method)          
+          handle_observation_request(method, &block)
+        else
+          swt_widget.send(method, *args, &block)
+        end
       rescue => e
-        Glimmer::Config.logger&.debug "Neither WidgetProxy nor #{swt_widget.class.name} can handle the method ##{method}"
+        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)
+        super || 
+          can_handle_observation_request?(method) ||
+          swt_widget.respond_to?(method, *args, &block)
       end
 
       private
@@ -613,6 +618,36 @@ module Glimmer
               value
             end
           end,
+          :image => lambda do |value|
+            if value.is_a?(String)
+              if value.start_with?('uri:classloader')
+                value = value.sub(/^uri\:classloader\:\//, '')
+                object = java.lang.Object.new
+                value = object.java_class.resource_as_stream(value)
+                value = java.io.BufferedInputStream.new(value)
+              end
+              image_data = ImageData.new(value)
+              Image.new(@swt_widget.getDisplay, image_data)
+            else
+              value
+            end
+          end,
+          :images => lambda do |array|
+            array.to_a.map do |value|
+              if value.is_a?(String)
+                if value.start_with?('uri:classloader')
+                  value = value.sub(/^uri\:classloader\:\//, '')
+                  object = java.lang.Object.new
+                  value = object.java_class.resource_as_stream(value)
+                  value = java.io.BufferedInputStream.new(value)
+                end
+                image_data = ImageData.new(value)
+                Image.new(@swt_widget.getDisplay, image_data)
+              else
+                value
+              end
+            end.to_java(Image)
+          end,
           :items => lambda do |value|
             value.to_java :string
           end,

data/lib/glimmer/ui/custom_shell.rb

@@ -5,7 +5,7 @@ module Glimmer
     module CustomShell
       include SuperModule
       include Glimmer::UI::CustomWidget
-
+      
       def initialize(parent, *swt_constants, options, &content)
         super
         @swt_widget.set_data('custom_shell', self)

data/lib/glimmer/ui/custom_widget.rb

@@ -5,7 +5,6 @@ require 'glimmer/swt/display_proxy'
 require 'glimmer/util/proc_tracker'
 require 'glimmer/data_binding/observer'
 require 'glimmer/data_binding/observable_model'
-require 'glimmer/data_binding/observable_widget'
 
 module Glimmer
   module UI
@@ -15,7 +14,6 @@ module Glimmer
 
       super_module_included do |klass|
         klass.include(Glimmer) unless klass.name.include?('Glimmer::UI::CustomShell')
-        klass.prepend DataBinding::ObservableWidget
         Glimmer::UI::CustomWidget.add_custom_widget_namespaces_for(klass) unless klass.name.include?('Glimmer::UI::CustomShell')
       end
 
@@ -36,15 +34,15 @@ module Glimmer
                 return constant if constant.ancestors.include?(Glimmer::UI::CustomWidget)
                 constant
               rescue => e
-                # Glimmer::Config.logger&.debug "#{e.message}\n#{e.backtrace.join("\n")}"
+                # Glimmer::Config.logger.debug {"#{e.message}\n#{e.backtrace.join("\n")}"}
                 result
               end
             end
           end
           raise "#{underscored_custom_widget_name} has no custom widget class!"
         rescue => e
-          Glimmer::Config.logger&.debug e.message
-          Glimmer::Config.logger&.debug "#{e.message}\n#{e.backtrace.join("\n")}"
+          Glimmer::Config.logger.debug {e.message}
+          Glimmer::Config.logger.debug {"#{e.message}\n#{e.backtrace.join("\n")}"}
           nil
         end
  
@@ -139,6 +137,11 @@ module Glimmer
         execute_hooks('after_body')
       end
       
+      # Subclasses may override to perform post initialization work on an added child
+      def post_initialize_child(child)
+        # No Op by default
+      end
+
       def can_handle_observation_request?(observation_request)
         observation_request = observation_request.to_s
         result = false
@@ -230,12 +233,17 @@ module Glimmer
       end
 
       def method_missing(method, *args, &block)
-        body_root.send(method, *args, &block)
+        if can_handle_observation_request?(method)
+          handle_observation_request(method, &block)
+        else
+          body_root.send(method, *args, &block)
+        end
       end
 
       alias local_respond_to? respond_to?      
       def respond_to?(method, *args, &block)
         super or
+          can_handle_observation_request?(method) or
           body_root.respond_to?(method, *args, &block)
       end
 

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.3
 platform: ruby
 authors:
 - AndyMaleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-20 00:00:00.000000000 Z
+date: 2020-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 0.10.1
   name: glimmer
   type: :runtime
   prerelease: false
@@ -23,7 +23,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 0.10.1
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -57,7 +57,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.9.0
   name: puts_debuggerer
   type: :runtime
   prerelease: false
@@ -65,67 +65,67 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: 0.9.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 2.3.9
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
-  name: text-table
+        version: 3.0.0
+  name: jeweler
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.4
+        version: 2.3.9
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.3.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
-  name: os
+        version: 3.0.0
+  name: logging
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.3.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 1.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
-  name: warbler
+        version: 2.0.0
+  name: os
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.5
+        version: 1.0.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -151,41 +151,61 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.9
+        version: 6.2.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
-  name: jeweler
+        version: 7.0.0
+  name: rdoc
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.9
+        version: 6.2.1
     - - "<"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: 7.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.2.1
+        version: 1.2.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.0.0
-  name: rdoc
+        version: 2.0.0
+  name: text-table
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.2.1
+        version: 1.2.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: 7.0.0
+        version: 2.0.0
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  name: warbler
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.5
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: