glimmer-dsl-opal 0.9.3 → 0.11.0

data/lib/glimmer/dsl/opal/async_exec_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Andy Maleh
+# Copyright (c) 2020-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/dsl/opal/bind_expression.rb

@@ -1,36 +1,35 @@
+# Copyright (c) 2020-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/dsl/static_expression'
+require 'glimmer/dsl/bind_expression'
 require 'glimmer/data_binding/model_binding'
 
 module Glimmer
   module DSL
     module Opal
       # Responsible for setting up the return value of the bind keyword (command symbol)
-      # as a ModelBinding. It is then used by another command handler like
-      # DataBindingCommandHandler for text and selection properties on Text and Spinner
-      # or TableItemsDataBindingCommandHandler for items in a Table
+      # as a ModelBinding. It is then used by other data-binding expressions
       class BindExpression < StaticExpression
-        def can_interpret?(parent, keyword, *args, &block)
-          (
-            keyword == 'bind' and
-              (
-                (
-                  (args.size == 2) and
-                    textual?(args[1])
-                ) ||
-                  (
-                    (args.size == 3) and
-                      textual?(args[1]) and
-                      (args[2].is_a?(Hash))
-                  )
-              )
-          )
-        end
-  
-        def interpret(parent, keyword, *args, &block)
-          binding_options = args[2] || {}
-          binding_options[:on_read] = binding_options.delete(:on_read) || binding_options.delete('on_read') || block
-          DataBinding::ModelBinding.new(args[0], args[1].to_s, binding_options)
-        end
+        include Glimmer::DSL::BindExpression
       end
     end
   end

data/lib/glimmer/dsl/opal/block_property_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2020 Andy Maleh
+# Copyright (c) 2020-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/dsl/opal/checkbox_group_selection_data_binding_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Andy Maleh
+# Copyright (c) 2020-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/dsl/opal/color_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Andy Maleh
+# Copyright (c) 2020-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/dsl/opal/custom_widget_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Andy Maleh
+# Copyright (c) 2020-2021 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -51,7 +51,7 @@ module Glimmer
           custom_widget_class = UI::CustomWidget.for(keyword)
           # TODO clean code by extracting methods into CustomShell
           if !Glimmer::UI::CustomShell.requested? && custom_widget_class&.ancestors&.to_a.include?(Glimmer::UI::CustomShell)
-            if Glimmer::SWT::DisplayProxy.instance.shells.empty?
+            if Glimmer::SWT::DisplayProxy.instance.shells.empty? || Glimmer::SWT::DisplayProxy.open_custom_shells_in_current_window?
               custom_widget_class.new(parent, *args, {}, &block)
             else
               options = args.last.is_a?(Hash) ? args.pop : {}
@@ -80,12 +80,12 @@ module Glimmer
           end
         end
         
-        def add_content(parent, &content)
-          content.call(parent) if parent.is_a?(Glimmer::SWT::ShellProxy) || parent.is_a?(Glimmer::UI::CustomShell)
-        end
-        
+        # TODO delete if no longer needed
+#         def add_content(parent, &content)
+#           content.call(parent) if parent.is_a?(Glimmer::SWT::ShellProxy) || parent.is_a?(Glimmer::UI::CustomShell)
+#         end
   
-        def add_content(parent, &block)
+        def add_content(parent, keyword, *args, &block)
           return unless parent.is_a?(Glimmer::UI::CustomWidget)
           # TODO consider avoiding source_location
           if block.source_location == parent.content&.__getobj__.source_location

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

@@ -0,0 +1,20 @@
+require 'glimmer/dsl/static_expression'
+require 'glimmer/dsl/top_level_expression'
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/swt/dialog_proxy'
+
+module Glimmer
+  module DSL
+    module Opal
+      class DialogExpression < StaticExpression
+        include TopLevelExpression
+        include ParentExpression
+
+        def interpret(parent, keyword, *args, &block)
+          parent = args.delete_at(0)
+          Glimmer::SWT::DialogProxy.new(parent, args)
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/dsl/opal/display_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Andy Maleh
+# Copyright (c) 2020-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/dsl/opal/dsl.rb

@@ -27,7 +27,9 @@ require 'glimmer/dsl/opal/radio_group_selection_data_binding_expression'
 require 'glimmer/dsl/opal/checkbox_group_selection_data_binding_expression'
 require 'glimmer/dsl/opal/block_property_expression'
 require 'glimmer/dsl/opal/menu_expression'
-# require 'glimmer/dsl/opal/menu_bar_expression'
+require 'glimmer/dsl/opal/dialog_expression'
+require 'glimmer/dsl/opal/shape_expression'
+require 'glimmer/dsl/opal/shine_data_binding_expression'
 
 module Glimmer
   module DSL
@@ -47,6 +49,8 @@ module Glimmer
          layout
          block_property
          property
+         shine_data_binding
+         shape
          widget
        ]
       )

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Andy Maleh
+# Copyright (c) 2020-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/dsl/opal/font_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Andy Maleh
+# Copyright (c) 2020-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/dsl/opal/menu_bar_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2007-2020 Andy Maleh
+# Copyright (c) 2020-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/dsl/opal/menu_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Andy Maleh
+# Copyright (c) 2020-2021 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -47,7 +47,7 @@ module Glimmer
           Glimmer::SWT::MenuProxy.new(parent, args)
         end
         
-        def add_content(parent, &block)
+        def add_content(parent, keyword, *args, &block)
           super(parent, &block)
           parent.post_add_content
         end

data/lib/glimmer/dsl/opal/message_box_expression.rb

@@ -11,7 +11,7 @@ module Glimmer
         include ParentExpression
 
         def interpret(parent, keyword, *args, &block)
-          parent = args.delete_at(0)
+          parent = args.delete_at(0) if !textual?(args.first)
           Glimmer::SWT::MessageBoxProxy.new(parent, args)
         end
       end

data/lib/glimmer/dsl/opal/property_expression.rb

@@ -6,8 +6,9 @@ module Glimmer
       class PropertyExpression < StaticExpression
         include TopLevelExpression
 
-        def can_interpret?(parent, keyword, *args, &block)          
+        def can_interpret?(parent, keyword, *args, &block)
           parent and
+            (!args.empty?) and
             parent.respond_to?(:set_attribute) and
             parent.respond_to?(keyword, *args) and
             keyword and

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

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Andy Maleh
+# Copyright (c) 2020-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/dsl/opal/rgb_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Andy Maleh
+# Copyright (c) 2020-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/dsl/opal/rgba_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Andy Maleh
+# Copyright (c) 2020-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/dsl/opal/shape_expression.rb

@@ -0,0 +1,26 @@
+require 'glimmer/dsl/expression'
+require 'glimmer/dsl/parent_expression'
+
+module Glimmer
+  module DSL
+    module Opal
+      class ShapeExpression < Expression
+        include ParentExpression
+        
+        INCLUDED_KEYWORDS = %w[rectangle polygon]
+  
+        def can_interpret?(parent, keyword, *args, &block)
+          INCLUDED_KEYWORDS.include?(keyword)
+        end
+
+        def interpret(parent, keyword, *args, &block)
+          # TODO
+        end
+        
+        def add_content(parent, keyword, *args, &block)
+          # TODO
+        end
+      end
+    end
+  end
+end

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

@@ -27,7 +27,7 @@ module Glimmer
           end
         end
         
-        def add_content(parent, &block)
+        def add_content(parent, keyword, *args, &block)
           super(parent, &block)
           parent.post_add_content
         end

data/lib/glimmer/dsl/opal/shine_data_binding_expression.rb

@@ -0,0 +1,49 @@
+# Copyright (c) 2020-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/dsl/expression'
+require 'glimmer/data_binding/model_binding'
+require 'glimmer/swt/table_proxy'
+require 'glimmer/data_binding/shine'
+
+module Glimmer
+  module DSL
+    module Opal
+      class ShineDataBindingExpression < Expression
+        def can_interpret?(parent, keyword, *args, &block)
+          args.size == 0 and
+            block.nil? and
+            (
+              (parent.respond_to?(:set_attribute) and parent.respond_to?(keyword)) or
+              (parent.is_a?(Glimmer::SWT::TableProxy)) # TODO support tree element
+            )
+            # TODO support canvas elements
+#             and
+#             !(parent.respond_to?(:swt_widget) && parent.swt_widget.class == org.eclipse.swt.widgets.Canvas && keyword == 'image')
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::DataBinding::Shine.new(parent, keyword)
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/dsl/opal/swt_expression.rb

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

data/lib/glimmer/dsl/opal/sync_exec_expression.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Andy Maleh
+# Copyright (c) 2020-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/dsl/opal/widget_expression.rb

@@ -20,7 +20,7 @@ module Glimmer
           Glimmer::SWT::WidgetProxy.for(keyword, parent, args, block)
         end
         
-        def add_content(parent, &block)
+        def add_content(parent, keyword, *args, &block)
           if parent.rendered? || parent.skip_content_on_render_blocks?
             super(parent, &block)
             parent.post_add_content

data/lib/glimmer/swt.rb

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

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

@@ -6,6 +6,7 @@ module Glimmer
     class ComboProxy < WidgetProxy
       include Glimmer::DataBinding::ObservableElement
       attr_reader :text, :items
+      attr_accessor :selection # virtual attribute just to pass the shine data-binding test (TODO THINK OF A BETTER WAY OF HANDLING THIS)
       
       def initialize(parent, args, block)
         super(parent, args, block)

data/lib/glimmer/swt/composite_proxy.rb

@@ -4,8 +4,6 @@ require 'glimmer/swt/widget_proxy'
 module Glimmer
   module SWT
     class CompositeProxy < WidgetProxy
-      attr_reader :layout
-      
       def initialize(parent, args, block)
         super(parent, args, block)
         @layout = default_layout
@@ -27,9 +25,27 @@ module Glimmer
       def layout=(the_layout)
         @layout = the_layout
       end
+      alias set_layout layout=
+      alias setLayout layout=
       
+      def get_layout
+        @layout
+      end
+      alias getLayout get_layout #TODO consider pregenerating these aliases with an easy method in the future
+
+      def pack(*args)
+        # No Op (just a shim) TODO consider if it should be implemented
+      end
+      
+      def layout​(changed = nil, all = nil)
+        # TODO implement layout(changed = nil, all = nil) just as per SWT API
+        @layout&.layout(self, changed)
+      end
+            
     end
     
+    CanvasProxy = CompositeProxy # TODO implement fully eventually
+    
   end
   
 end

data/lib/glimmer/swt/control_editor.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2020 Andy Maleh
+# Copyright (c) 2020-2021 Andy Maleh
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the