glimmer-dsl-swt 4.18.5.0 → 4.18.5.1

data/lib/glimmer/swt/{directory_dialog_proxy.rb → dialog_proxy.rb}

@@ -22,10 +22,15 @@
 require 'glimmer/swt/swt_proxy'
 require 'glimmer/swt/widget_proxy'
 require 'glimmer/swt/display_proxy'
+require 'glimmer/swt/proxy_properties'
 
 module Glimmer
   module SWT
-    # Proxy for org.eclipse.swt.widgets.DirectoryDialog
+    # Proxy for org.eclipse.swt.widgets.Dialog superclass
+    # of dialogs like FileDialog, DirectoryDialog, ColorDialog, and FontDialog
+    #
+    # (if you're seeking the `dialog` keyword, that's just a `shell` variation
+    # under ShellProxy instead.
     #
     # Automatically uses the current shell if one is open.
     # Otherwise, it instantiates a new shell parent
@@ -33,14 +38,30 @@ module Glimmer
     # Optionally takes a shell as an argument
     #
     # Follows the Proxy Design Pattern
-    class DirectoryDialogProxy < WidgetProxy
+    class DialogProxy
       # TODO write rspec tests
+      include ProxyProperties
+      
       include_package 'org.eclipse.swt.widgets'
+      include_package 'org.eclipse.swt.printing'
+      
+      class << self
+        include_package 'org.eclipse.swt.widgets'
+        include_package 'org.eclipse.swt.printing'
+        
+        def dialog_class(keyword)
+          the_class = eval(keyword.camelcase(:upper))
+          the_class if the_class.ancestors.include?(org.eclipse.swt.widgets.Dialog)
+        end
+      end
 
-      def initialize(*args, swt_widget: nil)
-        auto_exec do
-          if swt_widget
-            @swt_widget = swt_widget
+      attr_reader :swt_dialog
+      
+      def initialize(keyword, *args, swt_dialog: nil)
+        DisplayProxy.instance.auto_exec do
+          dialog_class = self.class.dialog_class(keyword)
+          if swt_dialog
+            @swt_dialog = swt_dialog
           else
             style_args = args.select {|arg| arg.is_a?(Symbol) || arg.is_a?(String)}
             if style_args.any?
@@ -57,10 +78,14 @@ module Glimmer
             end
             parent = args[0]
             @parent_proxy = parent.is_a?(Shell) ? ShellProxy.new(swt_widget: parent) : parent
-            @swt_widget = DirectoryDialog.new(*args)
+            @swt_dialog = dialog_class.new(*args)
           end
         end
       end
+      
+      def proxy_source_object
+        @swt_dialog
+      end
 
     end
   end

data/lib/glimmer/swt/font_proxy.rb

@@ -54,13 +54,19 @@ module Glimmer
       # that is :normal, :bold, or :italic
       def initialize(widget_proxy = nil, font_properties)
         @widget_proxy = widget_proxy
-        @font_properties = font_properties
-        detect_invalid_font_property(font_properties)
-        font_properties[:style] = SWTProxy[*font_properties[:style]]
-        font_data_args = [:name, :height, :style].map do |font_property_name|
-          font_properties[font_property_name] || send(font_property_name)
+        if font_properties.is_a?(FontData)
+          font_datum = font_properties
+          @font_properties = {name: font_properties.name, height: font_properties.height, style: font_properties.style}
+        elsif font_properties.is_a?(Hash)
+          @font_properties = font_properties
+          detect_invalid_font_property(font_properties)
+          font_properties[:style] = SWTProxy[*font_properties[:style]]
+          # TODO consider supporting other properties like locale in the future
+          font_data_args = [:name, :height, :style].map do |font_property_name|
+            font_properties[font_property_name] || send(font_property_name)
+          end
+          font_datum = FontData.new(*font_data_args)
         end
-        font_datum = FontData.new(*font_data_args)
         @swt_font = Font.new(DisplayProxy.instance.swt_display, font_datum)
       end
 

data/lib/glimmer/swt/message_box_proxy.rb

@@ -35,6 +35,7 @@ module Glimmer
       attr_reader :swt_widget
       
       def initialize(parent, style)
+        # TODO consider consolidating with DialogProxy if it makes sense
         if parent.nil?
           @temporary_parent = parent = Glimmer::SWT::ShellProxy.new.swt_widget
         end

data/lib/glimmer/swt/properties.rb

@@ -69,6 +69,9 @@ module Glimmer
         Glimmer::SWT::Properties.normalized_attribute(attribute_name)
       end
       alias ruby_attribute_getter normalized_attribute
+      
     end
+    
   end
+  
 end

data/lib/glimmer/swt/proxy_properties.rb

@@ -0,0 +1,145 @@
+# Copyright (c) 2007-2021 Andy Maleh
+#
+# 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.
+
+require 'glimmer/swt/properties'
+
+module Glimmer
+  module SWT
+    # Provides a default implementation for proxy properties, that is
+    # properties that come from a proxy object source such as swt_widget
+    # having Java camelcase format
+    module ProxyProperties
+      include Properties
+      
+      # Subclasses must override to privde a proxy source if they want to take advantage of
+      # default implementation of attribute setters/getters
+      # It tries swt_widget, swt_display, swt_image, and swt_dialog by default.
+      def proxy_source_object
+        if respond_to?(:swt_widget)
+          swt_widget
+        elsif respond_to?(:swt_display)
+          swt_display
+        elsif respond_to?(:swt_image)
+          swt_image
+        elsif respond_to?(:swt_dialog)
+          swt_dialog
+        elsif respond_to?(:swt_transform)
+          swt_transform
+        end
+      end
+      
+      def has_attribute_getter?(attribute_getter_name, *args)
+        attribute_getter_name = attribute_getter_name.to_s.underscore
+        return false unless !attribute_getter_name.end_with?('=') && !attribute_getter_name.start_with?('set_')
+        args.empty? && proxy_source_object&.respond_to?(attribute_getter_name)
+      end
+      
+      def has_attribute_setter?(attribute_setter_name, *args)
+        attribute_setter_name = attribute_setter_name.to_s
+        underscored_attribute_setter_name = attribute_setter_name.underscore
+        return false unless attribute_setter_name.end_with?('=') || (attribute_setter_name.start_with?('set_') && !args.empty?)
+        attribute_name = underscored_attribute_setter_name.sub(/^set_/, '').sub(/=$/, '')
+        has_attribute?(attribute_name, *args)
+      end
+
+      def has_attribute?(attribute_name, *args)
+        Glimmer::SWT::DisplayProxy.instance.auto_exec do
+          proxy_source_object&.respond_to?(attribute_setter(attribute_name), args) ||
+            respond_to?(ruby_attribute_setter(attribute_name), args)
+        end
+      end
+      
+      def set_attribute(attribute_name, *args)
+        swt_widget_operation = false
+        result = nil
+        Glimmer::SWT::DisplayProxy.instance.auto_exec do
+          result = if proxy_source_object&.respond_to?(attribute_setter(attribute_name))
+            swt_widget_operation = true
+            proxy_source_object&.send(attribute_setter(attribute_name), *args) unless proxy_source_object&.send(attribute_getter(attribute_name)) == args.first
+          elsif proxy_source_object&.respond_to?(ruby_attribute_setter(attribute_name))
+            swt_widget_operation = true
+            proxy_source_object&.send(ruby_attribute_setter(attribute_name), args)
+          end
+        end
+        unless swt_widget_operation
+          result = send(ruby_attribute_setter(attribute_name), args)
+        end
+        result
+      end
+
+      def get_attribute(attribute_name)
+        swt_widget_operation = false
+        result = nil
+        Glimmer::SWT::DisplayProxy.instance.auto_exec do
+          result = if proxy_source_object&.respond_to?(attribute_getter(attribute_name))
+            swt_widget_operation = true
+            proxy_source_object&.send(attribute_getter(attribute_name))
+          elsif proxy_source_object&.respond_to?(ruby_attribute_getter(attribute_name))
+            swt_widget_operation = true
+            proxy_source_object&.send(ruby_attribute_getter(attribute_name))
+          elsif proxy_source_object&.respond_to?(attribute_name)
+            swt_widget_operation = true
+            proxy_source_object&.send(attribute_name)
+          end
+        end
+        unless swt_widget_operation
+          result = if respond_to?(ruby_attribute_getter(attribute_name))
+            send(ruby_attribute_getter(attribute_name))
+          else
+            send(attribute_name)
+          end
+        end
+        result
+      end
+      
+      def method_missing(method, *args, &block)
+        if has_attribute_setter?(method, *args)
+          set_attribute(method, *args)
+        elsif has_attribute_getter?(method, *args)
+          get_attribute(method, *args)
+        else
+          Glimmer::SWT::DisplayProxy.instance.auto_exec do
+            proxy_source_object&.send(method, *args, &block)
+          end
+        end
+      rescue => e
+        begin
+          super
+        rescue Exception => inner_error
+          Glimmer::Config.logger.error { "Neither self.class.name nor #{proxy_source_object&.class.name} can handle the method ##{method}" }
+          Glimmer::Config.logger.error { e.full_message }
+          raise inner_error
+        end
+      end
+      
+      def respond_to?(method, *args, &block)
+        result = super
+        return true if result
+        Glimmer::SWT::DisplayProxy.instance.auto_exec do
+          proxy_source_object&.respond_to?(method, *args, &block)
+        end
+      end
+      
+    end
+    
+  end
+  
+end

data/lib/glimmer/swt/transform_proxy.rb

@@ -37,32 +37,36 @@ module Glimmer
       attr_reader :swt_transform, :parent
       
       def initialize(parent, *args, swt_transform: nil, multiply: false)
-        @parent = parent
-        @multiply = multiply
-        if swt_transform.nil?
-          if !args.first.is_a?(Display) && !args.first.is_a?(DisplayProxy)
-            args.prepend DisplayProxy.instance.swt_display
-          end
-          if args.first.is_a?(DisplayProxy)
-            args[0] = args[0].swt_display
-          end
-          if args.last.is_a?(TransformProxy)
-            args[-1] = args[-1].swt_transform
-          end
-          if args.last.nil? || args.last.is_a?(Transform)
-            @swt_transform = args.last
-            @parent&.set_attribute('transform', self)
+        Glimmer::SWT::DisplayProxy.instance.auto_exec do
+          @parent = parent
+          @multiply = multiply
+          if swt_transform.nil?
+            if !args.first.is_a?(Display) && !args.first.is_a?(DisplayProxy)
+              args.prepend DisplayProxy.instance.swt_display
+            end
+            if args.first.is_a?(DisplayProxy)
+              args[0] = args[0].swt_display
+            end
+            if args.last.is_a?(TransformProxy)
+              args[-1] = args[-1].swt_transform
+            end
+            if args.last.nil? || args.last.is_a?(Transform)
+              @swt_transform = args.last
+              @parent&.set_attribute('transform', self)
+            else
+              @swt_transform = Transform.new(*args)
+            end
           else
-            @swt_transform = Transform.new(*args)
+            @swt_transform = swt_transform
           end
-        else
-          @swt_transform = swt_transform
         end
       end
       
       def post_add_content
         if @multiply
-          @parent.multiply(@swt_transform)
+          Glimmer::SWT::DisplayProxy.instance.auto_exec {
+            @parent.multiply(@swt_transform)
+          }
         else
           @parent&.set_attribute('transform', self)
         end
@@ -72,28 +76,12 @@ module Glimmer
         Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::SWT::TransformExpression.new, &block)
       end
       
-      def has_attribute?(attribute_name, *args)
-        @swt_transform.respond_to?(attribute_name) || @swt_transform.respond_to?(attribute_setter(attribute_name))
-      end
-
-      def set_attribute(attribute_name, *args)
-        if @swt_transform.respond_to?(attribute_name)
-          @swt_transform.send(attribute_name, *args)
-        elsif @swt_transform.respond_to?(attribute_setter(attribute_name))
-          @swt_transform.send(attribute_setter(attribute_name), *args)
-        end
-      end
-
-      def get_attribute(attribute_name)
-        if @swt_transform.respond_to?(attribute_getter(attribute_name))
-          @swt_transform.send(attribute_getter(attribute_name))
-        else
-          @swt_transform.send(attribute_name)
-        end
+      def proxy_source_object
+        @swt_transform
       end
       
       def method_missing(method_name, *args, &block)
-        result = @swt_transform.send(method_name, *args, &block)
+        result = Glimmer::SWT::DisplayProxy.instance.auto_exec { @swt_transform.send(method_name, *args, &block) }
         result.nil? ? self : result
       rescue => e
         Glimmer::Config.logger.debug {"Neither MessageBoxProxy nor #{@swt_transform.class.name} can handle the method ##{method}"}

data/lib/glimmer/swt/widget_proxy.rb

@@ -26,7 +26,7 @@ require 'glimmer/swt/swt_proxy'
 require 'glimmer/swt/display_proxy'
 require 'glimmer/swt/dnd_proxy'
 require 'glimmer/swt/image_proxy'
-require 'glimmer/swt/properties'
+require 'glimmer/swt/proxy_properties'
 require 'glimmer/swt/custom/drawable'
 
 # TODO refactor to make file smaller and extract sub-widget-proxies out of this
@@ -44,7 +44,7 @@ module Glimmer
     # Follows the Proxy Design Pattern
     class WidgetProxy
       include Packages
-      include Properties
+      include ProxyProperties
       include Custom::Drawable
 
       DEFAULT_STYLES = {
@@ -223,23 +223,11 @@ module Glimmer
           [args, extra_options]
         end
       end
-
-      def has_attribute_getter?(attribute_getter_name, *args)
-        attribute_getter_name = attribute_getter_name.to_s.underscore
-        return false unless !attribute_getter_name.end_with?('=') && !attribute_getter_name.start_with?('set_')
-        auto_exec do
-          args.empty? && swt_widget.respond_to?(attribute_getter_name)
-        end
-      end
       
-      def has_attribute_setter?(attribute_setter_name, *args)
-        attribute_setter_name = attribute_setter_name.to_s
-        underscored_attribute_setter_name = attribute_setter_name.underscore
-        return false unless attribute_setter_name.end_with?('=') || (attribute_setter_name.start_with?('set_') && !args.empty?)
-        attribute_name = underscored_attribute_setter_name.sub(/^set_/, '').sub(/=$/, '')
-        has_attribute?(attribute_name, *args)
+      def proxy_source_object
+        @swt_widget
       end
-      
+
       def has_attribute?(attribute_name, *args)
         # TODO test that attribute getter responds too
         widget_custom_attribute = widget_custom_attribute_mapping[attribute_name.to_s]
@@ -247,7 +235,7 @@ module Glimmer
           if widget_custom_attribute
             @swt_widget.respond_to?(widget_custom_attribute[:setter][:name])
           else
-            @swt_widget.respond_to?(attribute_setter(attribute_name), args) || respond_to?(ruby_attribute_setter(attribute_name), args)
+            super
           end
         end
       end
@@ -264,17 +252,9 @@ module Glimmer
           result = if widget_custom_attribute
             swt_widget_operation = true
             widget_custom_attribute[:setter][:invoker].call(@swt_widget, args)
-          elsif @swt_widget.respond_to?(attribute_setter(attribute_name))
-            swt_widget_operation = true
-            @swt_widget.send(attribute_setter(attribute_name), *args) unless @swt_widget.send(attribute_getter(attribute_name)) == args.first
-          elsif @swt_widget.respond_to?(ruby_attribute_setter(attribute_name))
-            swt_widget_operation = true
-            @swt_widget.send(ruby_attribute_setter(attribute_name), args)
           end
         end
-        unless swt_widget_operation
-          result = send(ruby_attribute_setter(attribute_name), args)
-        end
+        result = super unless swt_widget_operation
         result
       end
 
@@ -290,24 +270,9 @@ module Glimmer
             else
               @swt_widget.send(widget_custom_attribute[:getter][:name])
             end
-          elsif @swt_widget.respond_to?(attribute_getter(attribute_name))
-            swt_widget_operation = true
-            @swt_widget.send(attribute_getter(attribute_name))
-          elsif @swt_widget.respond_to?(ruby_attribute_getter(attribute_name))
-            swt_widget_operation = true
-            @swt_widget.send(ruby_attribute_getter(attribute_name))
-          elsif @swt_widget.respond_to?(attribute_name)
-            swt_widget_operation = true
-            @swt_widget.send(attribute_name)
-          end
-        end
-        unless swt_widget_operation
-          result = if respond_to?(ruby_attribute_getter(attribute_name))
-            send(ruby_attribute_getter(attribute_name))
-          else
-            send(attribute_name)
           end
         end
+        result = super unless swt_widget_operation
         result
       end
 
@@ -327,6 +292,8 @@ module Glimmer
         end
       end
 
+      # these work in tandem with the property_type_converters
+      # sometimes, they are specified in subclasses instead
       def widget_property_listener_installers
         @swt_widget_property_listener_installers ||= {
           Java::OrgEclipseSwtWidgets::Control => {
@@ -734,24 +701,11 @@ module Glimmer
       end
 
       def method_missing(method, *args, &block)
+        # TODO push most of this logic down to Properties (and perhaps create Listeners module as well)
         if can_handle_observation_request?(method)
           handle_observation_request(method, &block)
-        elsif has_attribute_setter?(method, *args)
-          set_attribute(method, *args)
-        elsif has_attribute_getter?(method, *args)
-          get_attribute(method, *args)
         else
-          auto_exec do
-            swt_widget.send(method, *args, &block)
-          end
-        end
-      rescue => e
-        begin
           super
-        rescue Exception => inner_error
-          Glimmer::Config.logger.error { "Neither WidgetProxy nor #{swt_widget.class.name} can handle the method ##{method}" }
-          Glimmer::Config.logger.error { e.full_message }
-          raise inner_error
         end
       end
       
@@ -759,7 +713,7 @@ module Glimmer
         result = super
         return true if result
         auto_exec do
-          can_handle_observation_request?(method) || swt_widget.respond_to?(method, *args, &block)
+          can_handle_observation_request?(method)
         end
       end
       
@@ -946,6 +900,8 @@ module Glimmer
         color_converter = lambda do |value|
           if value.is_a?(Symbol) || value.is_a?(String)
             ColorProxy.new(value).swt_color
+          elsif value.is_a?(RGB)
+            ColorProxy.new(value.red, value.green, value.blue).swt_color
           else
             value
           end
@@ -1015,7 +971,7 @@ module Glimmer
           foreground: color_converter,
           link_foreground: color_converter,
           font: lambda do |value|
-            if value.is_a?(Hash)
+            if value.is_a?(Hash) || value.is_a?(FontData)
               font_properties = value
               FontProxy.new(self, font_properties).swt_font
             else