glimmer-dsl-swt 4.17.5.0 → 4.17.8.2

data/VERSION

@@ -1 +1 @@
-4.17.5.0
+4.17.8.2

data/glimmer-dsl-swt.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: glimmer-dsl-swt 4.17.5.0 ruby lib
+# stub: glimmer-dsl-swt 4.17.8.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.17.5.0"
+  s.version = "4.17.8.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["AndyMaleh".freeze]
-  s.date = "2020-10-24"
+  s.date = "2020-11-03"
   s.description = "Glimmer DSL for SWT (JRuby Desktop Development GUI Library)".freeze
   s.email = "andy.am@gmail.com".freeze
   s.executables = ["glimmer".freeze, "girb".freeze]
@@ -45,6 +45,7 @@ Gem::Specification.new do |s|
     "lib/glimmer/dsl/swt/async_exec_expression.rb",
     "lib/glimmer/dsl/swt/bind_expression.rb",
     "lib/glimmer/dsl/swt/block_property_expression.rb",
+    "lib/glimmer/dsl/swt/checkbox_group_selection_data_binding_expression.rb",
     "lib/glimmer/dsl/swt/color_expression.rb",
     "lib/glimmer/dsl/swt/column_properties_expression.rb",
     "lib/glimmer/dsl/swt/combo_selection_data_binding_expression.rb",
@@ -52,11 +53,13 @@ Gem::Specification.new do |s|
     "lib/glimmer/dsl/swt/custom_widget_expression.rb",
     "lib/glimmer/dsl/swt/data_binding_expression.rb",
     "lib/glimmer/dsl/swt/dialog_expression.rb",
+    "lib/glimmer/dsl/swt/directory_dialog_expression.rb",
     "lib/glimmer/dsl/swt/display_expression.rb",
     "lib/glimmer/dsl/swt/dnd_expression.rb",
     "lib/glimmer/dsl/swt/dsl.rb",
     "lib/glimmer/dsl/swt/exec_expression.rb",
     "lib/glimmer/dsl/swt/expand_item_expression.rb",
+    "lib/glimmer/dsl/swt/file_dialog_expression.rb",
     "lib/glimmer/dsl/swt/font_expression.rb",
     "lib/glimmer/dsl/swt/image_expression.rb",
     "lib/glimmer/dsl/swt/layout_data_expression.rb",
@@ -67,6 +70,7 @@ Gem::Specification.new do |s|
     "lib/glimmer/dsl/swt/message_box_expression.rb",
     "lib/glimmer/dsl/swt/observe_expression.rb",
     "lib/glimmer/dsl/swt/property_expression.rb",
+    "lib/glimmer/dsl/swt/radio_group_selection_data_binding_expression.rb",
     "lib/glimmer/dsl/swt/rgb_expression.rb",
     "lib/glimmer/dsl/swt/rgba_expression.rb",
     "lib/glimmer/dsl/swt/shell_expression.rb",
@@ -85,10 +89,14 @@ Gem::Specification.new do |s|
     "lib/glimmer/rake_task/scaffold.rb",
     "lib/glimmer/swt/color_proxy.rb",
     "lib/glimmer/swt/cursor_proxy.rb",
+    "lib/glimmer/swt/custom/checkbox_group.rb",
     "lib/glimmer/swt/custom/code_text.rb",
+    "lib/glimmer/swt/custom/radio_group.rb",
+    "lib/glimmer/swt/directory_dialog_proxy.rb",
     "lib/glimmer/swt/display_proxy.rb",
     "lib/glimmer/swt/dnd_proxy.rb",
     "lib/glimmer/swt/expand_item_proxy.rb",
+    "lib/glimmer/swt/file_dialog_proxy.rb",
     "lib/glimmer/swt/font_proxy.rb",
     "lib/glimmer/swt/image_proxy.rb",
     "lib/glimmer/swt/layout_data_proxy.rb",
@@ -122,18 +130,25 @@ Gem::Specification.new do |s|
     "samples/elaborate/tic_tac_toe/cell.rb",
     "samples/elaborate/user_profile.rb",
     "samples/hello/hello_browser.rb",
+    "samples/hello/hello_checkbox.rb",
+    "samples/hello/hello_checkbox_group.rb",
     "samples/hello/hello_combo.rb",
     "samples/hello/hello_computed.rb",
     "samples/hello/hello_computed/contact.rb",
     "samples/hello/hello_custom_shell.rb",
     "samples/hello/hello_custom_widget.rb",
+    "samples/hello/hello_directory_dialog.rb",
     "samples/hello/hello_drag_and_drop.rb",
     "samples/hello/hello_expand_bar.rb",
+    "samples/hello/hello_file_dialog.rb",
+    "samples/hello/hello_group.rb",
     "samples/hello/hello_list_multi_selection.rb",
     "samples/hello/hello_list_single_selection.rb",
     "samples/hello/hello_menu_bar.rb",
     "samples/hello/hello_message_box.rb",
     "samples/hello/hello_pop_up_context_menu.rb",
+    "samples/hello/hello_radio.rb",
+    "samples/hello/hello_radio_group.rb",
     "samples/hello/hello_sash_form.rb",
     "samples/hello/hello_styled_text.rb",
     "samples/hello/hello_tab.rb",
@@ -153,7 +168,7 @@ Gem::Specification.new do |s|
   end
 
   if s.respond_to? :add_runtime_dependency then
-    s.add_runtime_dependency(%q<glimmer>.freeze, ["~> 1.0.1"])
+    s.add_runtime_dependency(%q<glimmer>.freeze, ["~> 1.0.2"])
     s.add_runtime_dependency(%q<super_module>.freeze, ["~> 1.4.1"])
     s.add_runtime_dependency(%q<nested_inherited_jruby_include_package>.freeze, ["~> 0.3.0"])
     s.add_runtime_dependency(%q<puts_debuggerer>.freeze, ["~> 0.10.2"])
@@ -172,7 +187,7 @@ Gem::Specification.new do |s|
     s.add_development_dependency(%q<simplecov>.freeze, ["~> 0.16.1"])
     s.add_development_dependency(%q<simplecov-lcov>.freeze, ["~> 0.7.0"])
   else
-    s.add_dependency(%q<glimmer>.freeze, ["~> 1.0.1"])
+    s.add_dependency(%q<glimmer>.freeze, ["~> 1.0.2"])
     s.add_dependency(%q<super_module>.freeze, ["~> 1.4.1"])
     s.add_dependency(%q<nested_inherited_jruby_include_package>.freeze, ["~> 0.3.0"])
     s.add_dependency(%q<puts_debuggerer>.freeze, ["~> 0.10.2"])

data/lib/glimmer/data_binding/tree_items_binding.rb

@@ -33,7 +33,7 @@ module Glimmer
 
       include_package 'org.eclipse.swt'
       include_package 'org.eclipse.swt.widgets'
-
+      
       def initialize(parent, model_binding, tree_properties)
         @tree = parent
         @model_binding = model_binding
@@ -53,13 +53,19 @@ module Glimmer
 
       def call(new_value=nil)
         @model_tree_root_node = @model_binding.evaluate_property
+        old_tree_items = @tree.all_tree_items
+        old_model_tree_nodes = old_tree_items.map(&:get_data)
+        new_model_tree_nodes = []
+        recursive_depth_first_search(@model_tree_root_node, @tree_properties, new_model_tree_nodes)
+        return if old_model_tree_nodes == new_model_tree_nodes && old_tree_items.map(&:text) == new_model_tree_nodes.map {|model_tree_node| model_tree_node.send(@tree_properties[:text])}
         populate_tree(@model_tree_root_node, @tree, @tree_properties)
       end
 
       def populate_tree(model_tree_root_node, parent, tree_properties)
+        # TODO get rid of model_tree_root_node, parent, tree_properties as an argument given it is stored as an instance variable
         # TODO make it change things by delta instead of removing all
-        selected_tree_item_model = parent.swt_widget.getSelection.map(&:getData).first
         old_tree_items = parent.all_tree_items
+        selected_tree_item_model = parent.swt_widget.getSelection.map(&:get_data).first
         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(&:unregister)
@@ -78,6 +84,7 @@ module Glimmer
         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)
         tree_item.setText((model_tree_node && model_tree_node.send(tree_properties[:text])).to_s)
@@ -85,6 +92,17 @@ module Glimmer
           populate_tree_node(child, tree_item, tree_properties)
         end
       end
+      
+      def recursive_depth_first_search(model_tree_node, tree_properties, collection)
+        return if model_tree_node.nil?
+        collection << model_tree_node
+        model_tree_node.send(tree_properties[:children]).to_a.each do |child_model_tree_node|
+          recursive_depth_first_search(child_model_tree_node, tree_properties, collection)
+        end
+      end
+      
     end
+    
   end
+  
 end

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

@@ -0,0 +1,61 @@
+# Copyright (c) 2007-2020 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/dsl/expression'
+require 'glimmer/data_binding/model_binding'
+require 'glimmer/data_binding/widget_binding'
+
+module Glimmer
+  module DSL
+    module SWT
+      class CheckboxGroupSelectionDataBindingExpression < Expression
+ 
+        def can_interpret?(parent, keyword, *args, &block)
+          keyword == 'selection' and
+            block.nil? and
+            (parent.is_a?(Glimmer::SWT::Custom::CheckboxGroup) or (parent.is_a?(Glimmer::UI::CustomWidget) and parent.body_root.is_a?(Glimmer::SWT::Custom::CheckboxGroup)) ) and
+            args.size == 1 and
+            args[0].is_a?(DataBinding::ModelBinding) and
+            args[0].evaluate_options_property.is_a?(Array)
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          model_binding = args[0]
+  
+          #TODO make this options observer dependent and all similar observers in widget specific data binding handlers
+          # TODO consider delegating some of this work
+          widget_binding = DataBinding::WidgetBinding.new(parent, 'items')
+          widget_binding.call(model_binding.evaluate_options_property)
+          model = model_binding.base_model
+          widget_binding.observe(model, model_binding.options_property_name)
+  
+          widget_binding = DataBinding::WidgetBinding.new(parent, 'selection')
+          widget_binding.call(model_binding.evaluate_property)
+          widget_binding.observe(model, model_binding.property_name_expression)
+  
+          parent.on_widget_selected do
+            model_binding.call(widget_binding.evaluate_property)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -26,6 +26,8 @@ require 'glimmer/dsl/top_level_expression'
 require 'glimmer/ui/custom_widget'
 require 'glimmer/ui/custom_shell'
 require 'glimmer/swt/custom/code_text'
+require 'glimmer/swt/custom/radio_group'
+require 'glimmer/swt/custom/checkbox_group'
 
 module Glimmer
   module DSL

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

@@ -37,6 +37,7 @@ module Glimmer
         end
   
         def interpret(parent, keyword, *args, &block)
+          # TODO reconcile this with the actual org.eclipse.swt.widgets.Dialog widget (maybe rename this as dialog_shell)
           args = [parent] + args unless parent.nil?
           args += [:dialog_trim, :application_modal]
           Glimmer::SWT::ShellProxy.send(:new, *args)

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

@@ -0,0 +1,48 @@
+# Copyright (c) 2007-2020 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/dsl/static_expression'
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/dsl/top_level_expression'
+require 'glimmer/swt/directory_dialog_proxy'
+
+module Glimmer
+  module DSL
+    module SWT
+      class DirectoryDialogExpression < StaticExpression
+        include TopLevelExpression
+        include ParentExpression
+        
+        include_package 'org.eclipse.swt.widgets'
+
+        def can_interpret?(parent, keyword, *args, &block)
+          keyword == 'directory_dialog' and
+            (parent.nil? or parent.is_a?(Shell) or parent.is_a?(Glimmer::SWT::ShellProxy))
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          args = [parent] + args unless parent.nil?
+          Glimmer::SWT::DirectoryDialogProxy.send(:new, *args)
+        end
+      end
+    end
+  end
+end

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

@@ -41,6 +41,8 @@ module Glimmer
           layout
           widget_listener
           combo_selection_data_binding
+          checkbox_group_selection_data_binding
+          radio_group_selection_data_binding
           list_selection_data_binding
           tree_items_data_binding
           table_items_data_binding

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

@@ -0,0 +1,48 @@
+# Copyright (c) 2007-2020 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/dsl/static_expression'
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/dsl/top_level_expression'
+require 'glimmer/swt/file_dialog_proxy'
+
+module Glimmer
+  module DSL
+    module SWT
+      class FileDialogExpression < StaticExpression
+        include TopLevelExpression
+        include ParentExpression
+        
+        include_package 'org.eclipse.swt.widgets'
+
+        def can_interpret?(parent, keyword, *args, &block)
+          keyword == 'file_dialog' and
+            (parent.nil? or parent.is_a?(Shell) or parent.is_a?(Glimmer::SWT::ShellProxy))
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          args = [parent] + args unless parent.nil?
+          Glimmer::SWT::FileDialogProxy.send(:new, *args)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,61 @@
+# Copyright (c) 2007-2020 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/dsl/expression'
+require 'glimmer/data_binding/model_binding'
+require 'glimmer/data_binding/widget_binding'
+
+module Glimmer
+  module DSL
+    module SWT
+      class RadioGroupSelectionDataBindingExpression < Expression
+ 
+        def can_interpret?(parent, keyword, *args, &block)
+          keyword == 'selection' and
+            block.nil? and
+            (parent.is_a?(Glimmer::SWT::Custom::RadioGroup) or (parent.is_a?(Glimmer::UI::CustomWidget) and parent.body_root.is_a?(Glimmer::SWT::Custom::RadioGroup)) ) and
+            args.size == 1 and
+            args[0].is_a?(DataBinding::ModelBinding) and
+            args[0].evaluate_options_property.is_a?(Array)
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          model_binding = args[0]
+  
+          #TODO make this options observer dependent and all similar observers in widget specific data binding handlers
+          # TODO consider delegating some of this work
+          widget_binding = DataBinding::WidgetBinding.new(parent, 'items')
+          widget_binding.call(model_binding.evaluate_options_property)
+          model = model_binding.base_model
+          widget_binding.observe(model, model_binding.options_property_name)
+  
+          widget_binding = DataBinding::WidgetBinding.new(parent, 'selection')
+          widget_binding.call(model_binding.evaluate_property)
+          widget_binding.observe(model, model_binding.property_name_expression)
+  
+          parent.on_widget_selected do
+            model_binding.call(widget_binding.evaluate_property)
+          end
+        end
+      end
+    end
+  end
+end

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

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

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

@@ -1,5 +1,5 @@
 # Copyright (c) 2007-2020 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
@@ -28,24 +28,24 @@ module Glimmer
     module SWT
       class WidgetExpression < Expression
         include ParentExpression
-  
+
         EXCLUDED_KEYWORDS = %w[shell display tab_item]
-  
+
         def can_interpret?(parent, keyword, *args, &block)
           !EXCLUDED_KEYWORDS.include?(keyword) and
             parent.respond_to?(:swt_widget) and #TODO change to composite?(parent)
             Glimmer::SWT::WidgetProxy.widget_exists?(keyword)
         end
-  
+
         def interpret(parent, keyword, *args, &block)
           Glimmer::SWT::WidgetProxy.create(keyword, parent, args)
         end
-        
+
         def add_content(parent, &block)
           super
           parent.post_add_content
         end
-        
+
       end
     end
   end