glimmer-dsl-swt 4.17.10.7 → 4.18.1.0

data/lib/glimmer/swt/packages.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2020 Andy Maleh
+# 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

data/lib/glimmer/swt/properties.rb

@@ -0,0 +1,49 @@
+# 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.
+
+module Glimmer
+  module SWT
+    module Properties
+      def ruby_attribute_setter(attribute_name)
+        "#{normalized_attribute(attribute_name)}="
+      end
+
+      def attribute_setter(attribute_name)
+        "set#{normalized_attribute(attribute_name).camelcase(:upper)}"
+      end
+
+      def attribute_getter(attribute_name)
+        "get#{normalized_attribute(attribute_name).camelcase(:upper)}"
+      end
+      
+      def normalized_attribute(attribute_name)
+        attribute_name = attribute_name.to_s if attribute_name.is_a?(Symbol)
+        attribute_name = attribute_name.underscore unless attribute_name.downcase?
+        attribute_name = attribute_name.sub(/^get_/, '') if attribute_name.start_with?('get_')
+        attribute_name = attribute_name.sub(/^set_/, '') if attribute_name.start_with?('set_')
+        attribute_name = attribute_name.sub(/=$/, '') if attribute_name.end_with?('=')
+        attribute_name
+      end
+      alias ruby_attribute_getter normalized_attribute
+      
+    end
+  end
+end

data/lib/glimmer/swt/sash_form_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2020 Andy Maleh
+# 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
@@ -28,7 +28,7 @@ module Glimmer
     # Follows the Proxy Design Pattern
     class SashFormProxy < WidgetProxy
       def post_add_content
-        swt_widget.setWeights(@weights) unless @weights.nil?
+        self.weights = @weights unless @weights.nil?
       end
       
       def set_attribute(attribute_name, *args)

data/lib/glimmer/swt/scrolled_composite_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2020 Andy Maleh
+# 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

data/lib/glimmer/swt/shell_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2020 Andy Maleh
+# 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
@@ -64,10 +64,11 @@ module Glimmer
           @swt_widget.setLayout(FillLayout.new)
           @swt_widget.setMinimumSize(WIDTH_MIN, HEIGHT_MIN)
           # TODO make this an option not the default
+          shell_swt_display = Glimmer::SWT::DisplayProxy.instance.swt_display
           on_swt_show do
             Thread.new do
               sleep(0.25)
-              async_exec do
+              shell_swt_display.async_exec do
                 @swt_widget.setActive unless @swt_widget.isDisposed
               end
             end

data/lib/glimmer/swt/style_constantizable.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2020 Andy Maleh
+# 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
@@ -89,11 +89,15 @@ module Glimmer
             negative ? ~bit_value : bit_value
           rescue => e
 #             Glimmer::Config.logger.debug {e.full_message}
-            bit_value = extra_styles[swt_constant_symbol]
-            if bit_value
-              negative ? ~bit_value : bit_value
+            if symbol.to_s.size == 1 # accelerator key
+              symbol.to_s.bytes.first
             else
-              symbol
+              bit_value = extra_styles[swt_constant_symbol]
+              if bit_value
+                negative ? ~bit_value : bit_value
+              else
+                symbol
+              end
             end
           end
         end

data/lib/glimmer/swt/styled_text_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2020 Andy Maleh
+# 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

data/lib/glimmer/swt/swt_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2020 Andy Maleh
+# 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

data/lib/glimmer/swt/tab_item_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2020 Andy Maleh
+# 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

data/lib/glimmer/swt/table_column_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2020 Andy Maleh
+# 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

data/lib/glimmer/swt/table_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2020 Andy Maleh
+# 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

data/lib/glimmer/swt/tree_proxy.rb

@@ -1,5 +1,5 @@
-# Copyright (c) 2007-2020 Andy Maleh
-# 
+# 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
@@ -7,10 +7,10 @@
 # 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
@@ -59,7 +59,7 @@ module Glimmer
                 observer.call(@swt_widget.getSelection)
               }
             end
-          },        
+          },
         })
       end
       
@@ -85,24 +85,28 @@ module Glimmer
               @edit_in_progress = false
             }
             action = lambda { |event|
-              if !action_taken && !@edit_in_progress
-                action_taken = true
-                @edit_in_progress = true
-                new_text = @tree_editor_text_proxy.swt_widget.getText
-                if new_text == tree_item.getText
-                  cancel.call
-                else
-                  before_write&.call
-                  tree_item.setText(new_text)
-                  model = tree_item.getData
-                  model.send("#{tree_properties[:text]}=", new_text) # makes tree update itself, so must search for selected tree item again
-                  edited_tree_item = depth_first_search { |ti| ti.getData == model }.first
-                  swt_widget.showItem(edited_tree_item)
-                  @tree_editor_text_proxy.swt_widget.dispose
-                  @tree_editor_text_proxy = nil
-                  after_write&.call(edited_tree_item)
-                  @edit_in_progress = false
+              begin
+                if !action_taken && !@edit_in_progress
+                  action_taken = true
+                  @edit_in_progress = true
+                  new_text = @tree_editor_text_proxy.swt_widget.getText
+                  if new_text == tree_item.getText
+                    cancel.call
+                  else
+                    before_write&.call
+                    tree_item.setText(new_text)
+                    model = tree_item.getData
+                    model.send("#{tree_properties[:text]}=", new_text) # makes tree update itself, so must search for selected tree item again
+                    edited_tree_item = depth_first_search { |ti| ti.getData == model }.first
+                    swt_widget.showItem(edited_tree_item)
+                    @tree_editor_text_proxy.swt_widget.dispose
+                    @tree_editor_text_proxy = nil
+                    after_write&.call(edited_tree_item)
+                    @edit_in_progress = false
+                  end
                 end
+              rescue => e
+                Glimmer::Config.logger.error {"Error encountered while editing tree item!\n#{e.full_message}"}
               end
             }
             on_focus_lost(&action)

data/lib/glimmer/swt/widget_listener_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2020 Andy Maleh
+# 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

data/lib/glimmer/swt/widget_proxy.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2020 Andy Maleh
+# 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
@@ -26,6 +26,8 @@ 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/custom/drawable'
 
 # TODO refactor to make file smaller and extract sub-widget-proxies out of this
 
@@ -42,6 +44,8 @@ module Glimmer
     # Follows the Proxy Design Pattern
     class WidgetProxy
       include Packages
+      include Properties
+      include Custom::Drawable
 
       DEFAULT_STYLES = {
         'arrow'               => [:arrow],
@@ -202,7 +206,22 @@ module Glimmer
         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? && swt_widget.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)
+        # TODO test that attribute getter responds too
         widget_custom_attribute = widget_custom_attribute_mapping[attribute_name.to_s]
         if widget_custom_attribute
           @swt_widget.respond_to?(widget_custom_attribute[:setter][:name])
@@ -214,11 +233,13 @@ module Glimmer
       def set_attribute(attribute_name, *args)
         # TODO Think about widget subclasses overriding set_attribute to add more attributes vs adding as Ruby attributes directly
         widget_custom_attribute = widget_custom_attribute_mapping[attribute_name.to_s]
+        apply_property_type_converters(normalized_attribute(attribute_name), args)
         if widget_custom_attribute
           widget_custom_attribute[:setter][:invoker].call(@swt_widget, args)
         elsif @swt_widget.respond_to?(attribute_setter(attribute_name))
-          apply_property_type_converters(attribute_name, args)
           @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.send(ruby_attribute_setter(attribute_name), args)
         else
           send(ruby_attribute_setter(attribute_name), args)
         end
@@ -234,6 +255,12 @@ module Glimmer
           end
         elsif @swt_widget.respond_to?(attribute_getter(attribute_name))
           @swt_widget.send(attribute_getter(attribute_name))
+        elsif @swt_widget.respond_to?(ruby_attribute_getter(attribute_name))
+          @swt_widget.send(ruby_attribute_getter(attribute_name))
+        elsif @swt_widget.respond_to?(attribute_name)
+          @swt_widget.send(attribute_name)
+        elsif respond_to?(ruby_attribute_getter(attribute_name))
+          send(ruby_attribute_getter(attribute_name))
         else
           send(attribute_name)
         end
@@ -608,11 +635,16 @@ module Glimmer
       def method_missing(method, *args, &block)
         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
           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}" }
+        Glimmer::Config.logger.debug { e.full_message }
         super
         # TODO consider get_attribute too
       end
@@ -639,18 +671,6 @@ module Glimmer
         DEFAULT_STYLES[underscored_widget_name] || [:none]
       end
 
-      def ruby_attribute_setter(attribute_name)
-        "#{attribute_name}="
-      end
-
-      def attribute_setter(attribute_name)
-        "set#{attribute_name.to_s.camelcase(:upper)}"
-      end
-
-      def attribute_getter(attribute_name)
-        "get#{attribute_name.to_s.camelcase(:upper)}"
-      end
-
       # TODO refactor following methods to eliminate duplication
       # perhaps consider relying on raising an exception to avoid checking first
       # unless that gives obscure SWT errors
@@ -800,11 +820,14 @@ module Glimmer
         end
         # TODO consider detecting type on widget method and automatically invoking right converter (e.g. :to_s for String, :to_i for Integer)
         @property_type_converters ||= {
-          alignment: -> (*value) {
+          accelerator: lambda { |*value|
             SWTProxy[*value]
           },
-          :background => color_converter,
-          :background_image => lambda do |*value|
+          alignment: lambda { |*value|
+            SWTProxy[*value]
+          },
+          background: color_converter,
+          background_image: lambda do |*value|
             image_proxy = ImageProxy.create(*value)
             
             if image_proxy&.file_path&.end_with?('.gif')
@@ -845,7 +868,7 @@ module Glimmer
             
             image_proxy&.swt_image
           end,
-          :cursor => lambda do |value|
+          cursor: lambda do |value|
             cursor_proxy = nil
             if value.is_a?(CursorProxy)
               cursor_proxy = value
@@ -857,9 +880,9 @@ module Glimmer
           :enabled => lambda do |value|
             !!value
           end,
-          :foreground => color_converter,
-          :link_foreground => color_converter,
-          :font => lambda do |value|
+          foreground: color_converter,
+          link_foreground: color_converter,
+          font: lambda do |value|
             if value.is_a?(Hash)
               font_properties = value
               FontProxy.new(self, font_properties).swt_font
@@ -867,21 +890,21 @@ module Glimmer
               value
             end
           end,
-          :image => lambda do |*value|
+          image: lambda do |*value|
             ImageProxy.create(*value).swt_image
           end,
-          :images => lambda do |array|
+          images: lambda do |array|
             array.to_a.map do |value|
               ImageProxy.create(value).swt_image
             end.to_java(Image)
           end,
-          :items => lambda do |value|
+          items: lambda do |value|
             value.to_java :string
           end,
-          :text => lambda do |value|
+          text: lambda do |value|
             value.to_s
           end,
-          :transfer => lambda do |value|
+          transfer: lambda do |value|
             value = value.first if value.is_a?(Array) && value.size == 1 && value.first.is_a?(Array)
             transfer_object_extrapolator = lambda do |transfer_name|
               transfer_type = "#{transfer_name.to_s.camelcase(:upper)}Transfer".to_sym
@@ -900,9 +923,12 @@ module Glimmer
             result = result.to_java(Transfer) unless result.is_a?(ArrayJavaProxy)
             result
           end,
-          :visible => lambda do |value|
+          visible: lambda do |value|
             !!value
           end,
+          weights: lambda do |value|
+            value.to_java(:int)
+          end,
         }
       end
     end

data/lib/glimmer/ui/custom_shell.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2020 Andy Maleh
+# 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

data/lib/glimmer/ui/custom_widget.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2020 Andy Maleh
+# 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

data/lib/glimmer/util/proc_tracker.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2020 Andy Maleh
+# 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