glimmer-dsl-swt 4.17.10.5 → 4.18.0.1

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
@@ -69,7 +69,7 @@ module Glimmer
       }
 
       DEFAULT_INITIALIZERS = {
-        'composite' => lambda do |composite|
+        composite: lambda do |composite|
           if composite.get_layout.nil?
             layout = GridLayout.new
             layout.marginWidth = 15
@@ -77,18 +77,18 @@ module Glimmer
             composite.layout = layout
           end
         end,
-        'scrolled_composite' => lambda do |scrolled_composite|
+        scrolled_composite: lambda do |scrolled_composite|
           scrolled_composite.expand_horizontal = true
           scrolled_composite.expand_vertical = true
         end,
-        'table' => lambda do |table|
+        table: lambda do |table|
           table.setHeaderVisible(true)
           table.setLinesVisible(true)
         end,
-        'table_column' => lambda do |table_column|
+        table_column: lambda do |table_column|
           table_column.setWidth(80)
         end,
-        'group' => lambda do |group|
+        group: lambda do |group|
           group.layout = GridLayout.new if group.get_layout.nil?
         end,
       }
@@ -160,7 +160,7 @@ module Glimmer
         end
         if @swt_widget&.get_data('proxy').nil?
           @swt_widget.set_data('proxy', self)
-          DEFAULT_INITIALIZERS[underscored_widget_name]&.call(@swt_widget)
+          DEFAULT_INITIALIZERS[underscored_widget_name.to_s.to_sym]&.call(@swt_widget)
           @parent_proxy.post_initialize_child(self)
         end
       end
@@ -202,7 +202,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])
@@ -212,12 +227,15 @@ module Glimmer
       end
 
       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
@@ -233,6 +251,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
@@ -607,11 +631,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,16 +668,26 @@ module Glimmer
       end
 
       def ruby_attribute_setter(attribute_name)
-        "#{attribute_name}="
+        "#{normalized_attribute(attribute_name)}="
       end
 
       def attribute_setter(attribute_name)
-        "set#{attribute_name.to_s.camelcase(:upper)}"
+        "set#{normalized_attribute(attribute_name).camelcase(:upper)}"
       end
 
       def attribute_getter(attribute_name)
-        "get#{attribute_name.to_s.camelcase(:upper)}"
+        "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
 
       # TODO refactor following methods to eliminate duplication
       # perhaps consider relying on raising an exception to avoid checking first
@@ -799,11 +838,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]
+          },
+          alignment: lambda { |*value|
             SWTProxy[*value]
           },
-          :background => color_converter,
-          :background_image => lambda do |*value|
+          background: color_converter,
+          background_image: lambda do |*value|
             image_proxy = ImageProxy.create(*value)
             
             if image_proxy&.file_path&.end_with?('.gif')
@@ -844,7 +886,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
@@ -856,8 +898,9 @@ module Glimmer
           :enabled => lambda do |value|
             !!value
           end,
-          :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
@@ -865,21 +908,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
@@ -898,9 +941,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

data/samples/elaborate/contact_manager.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/samples/elaborate/contact_manager/contact.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/samples/elaborate/contact_manager/contact_manager_presenter.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/samples/elaborate/contact_manager/contact_repository.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/samples/elaborate/login.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
@@ -19,7 +19,6 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#Presents login screen data
 class LoginPresenter
 
   attr_accessor :user_name
@@ -35,7 +34,6 @@ class LoginPresenter
   def status=(status)
     @status = status
 
-    #TODO add feature to bind dependent properties to master property (2017-07-25 nested data binding)
     notify_observers("logged_in")
     notify_observers("logged_out")
   end
@@ -65,7 +63,6 @@ class LoginPresenter
 
 end
 
-#Login screen
 class Login
   include Glimmer
 
@@ -77,10 +74,10 @@ class Login
         grid_layout 2, false #two columns with differing widths
 
         label { text "Username:" } # goes in column 1
-        @user_name_text = text {                     # goes in column 2
+        @user_name_text = text {   # goes in column 2
           text bind(presenter, :user_name)
           enabled bind(presenter, :logged_out)
-          on_key_pressed { |event| 
+          on_key_pressed { |event|
             @password_text.set_focus if event.keyCode == swt(:cr)
           }
         }
@@ -89,7 +86,7 @@ class Login
         @password_text = text(:password, :border) {
           text bind(presenter, :password)
           enabled bind(presenter, :logged_out)
-          on_key_pressed { |event| 
+          on_key_pressed { |event|
             presenter.login if event.keyCode == swt(:cr)
           }
         }
@@ -101,21 +98,21 @@ class Login
           text "Login"
           enabled bind(presenter, :logged_out)
           on_widget_selected { presenter.login }
-          on_key_pressed { |event| 
+          on_key_pressed { |event|
             presenter.login if event.keyCode == swt(:cr)
-          }          
+          }
         }
 
         button {
           text "Logout"
           enabled bind(presenter, :logged_in)
           on_widget_selected { presenter.logout }
-          on_key_pressed { |event| 
+          on_key_pressed { |event|
             if event.keyCode == swt(:cr)
               presenter.logout
               @user_name_text.set_focus
             end
-          }          
+          }
         }
       }
     }