glimmer-dsl-swt 4.18.4.4 → 4.18.4.9

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

@@ -1,54 +1,54 @@
-# 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'
-require 'glimmer/dsl/static_expression'
-require 'glimmer/dsl/parent_expression'
-require 'glimmer/swt/menu_proxy'
-
-module Glimmer
-  module DSL
-    module SWT
-      class MenuBarExpression < StaticExpression
-        include ParentExpression
-  
-        include_package 'org.eclipse.swt.widgets'
-  
-        def can_interpret?(parent, keyword, *args, &block)
-          initial_condition = (keyword == 'menu_bar')
-          if initial_condition
-            if parent.swt_widget.is_a?(Shell)
-              return true
-            else
-              raise Glimmer::Error, "menu_bar may only be nested under a shell!"
-            end
-          end
-          false
-        end
-  
-        def interpret(parent, keyword, *args, &block)
-          args = args.unshift(:bar)
-          Glimmer::SWT::MenuProxy.new(parent, args)
-        end
-      end
-    end
-  end
-end
+# 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'
+require 'glimmer/dsl/static_expression'
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/swt/menu_proxy'
+
+module Glimmer
+  module DSL
+    module SWT
+      class MenuBarExpression < StaticExpression
+        include ParentExpression
+  
+        include_package 'org.eclipse.swt.widgets'
+  
+        def can_interpret?(parent, keyword, *args, &block)
+          initial_condition = (keyword == 'menu_bar')
+          if initial_condition
+            if parent.swt_widget.is_a?(Shell)
+              return true
+            else
+              raise Glimmer::Error, "menu_bar may only be nested under a shell!"
+            end
+          end
+          false
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          args = args.unshift(:bar)
+          Glimmer::SWT::MenuProxy.new(parent, args)
+        end
+      end
+    end
+  end
+end

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

@@ -1,53 +1,53 @@
-# 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'
-require 'glimmer/dsl/static_expression'
-require 'glimmer/dsl/parent_expression'
-require 'glimmer/swt/menu_proxy'
-
-module Glimmer
-  module DSL
-    module SWT
-      class MenuExpression < StaticExpression
-        include ParentExpression
-  
-        include_package 'org.eclipse.swt.widgets'
-  
-        def can_interpret?(parent, keyword, *args, &block)
-          initial_condition = (keyword == 'menu')
-          if initial_condition
-            if parent.respond_to?(:swt_widget)
-              return true
-            else
-              raise Glimmer::Error, "menu may only be nested under a widget (like shell or another menu)!"
-            end
-          end
-          false
-        end
-  
-        def interpret(parent, keyword, *args, &block)
-          Glimmer::SWT::MenuProxy.new(parent, args)
-        end
-      end
-    end
-  end
-end
+# 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'
+require 'glimmer/dsl/static_expression'
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/swt/menu_proxy'
+
+module Glimmer
+  module DSL
+    module SWT
+      class MenuExpression < StaticExpression
+        include ParentExpression
+  
+        include_package 'org.eclipse.swt.widgets'
+  
+        def can_interpret?(parent, keyword, *args, &block)
+          initial_condition = (keyword == 'menu')
+          if initial_condition
+            if parent.respond_to?(:swt_widget)
+              return true
+            else
+              raise Glimmer::Error, "menu may only be nested under a widget (like shell or another menu)!"
+            end
+          end
+          false
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::SWT::MenuProxy.new(parent, args)
+        end
+      end
+    end
+  end
+end

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

@@ -1,54 +1,54 @@
-# 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/dsl/static_expression'
-require 'glimmer/dsl/parent_expression'
-require 'glimmer/dsl/top_level_expression'
-require 'glimmer/swt/shell_proxy'
-require 'glimmer/swt/message_box_proxy'
-require 'glimmer/swt/swt_proxy'
-
-module Glimmer
-  module DSL
-    module SWT
-      class MessageBoxExpression < StaticExpression
-        include TopLevelExpression
-        include ParentExpression
-
-        include_package 'org.eclipse.swt.widgets'
-
-        def interpret(parent, keyword, *args, &block)
-          potential_parent = args.first
-          potential_parent = potential_parent.swt_widget if potential_parent.respond_to?(:swt_widget)
-          parent = nil          
-          if potential_parent.is_a?(Shell)
-            args.shift
-            parent = potential_parent
-          elsif potential_parent.is_a?(Widget)
-            args.shift
-            parent = potential_parent.shell
-          end
-          Glimmer::SWT::MessageBoxProxy.new(parent, Glimmer::SWT::SWTProxy[args])
-        end
-      end
-    end
-  end
-end
+# 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/dsl/static_expression'
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/dsl/top_level_expression'
+require 'glimmer/swt/shell_proxy'
+require 'glimmer/swt/message_box_proxy'
+require 'glimmer/swt/swt_proxy'
+
+module Glimmer
+  module DSL
+    module SWT
+      class MessageBoxExpression < StaticExpression
+        include TopLevelExpression
+        include ParentExpression
+
+        include_package 'org.eclipse.swt.widgets'
+
+        def interpret(parent, keyword, *args, &block)
+          potential_parent = args.first
+          potential_parent = potential_parent.swt_widget if potential_parent.respond_to?(:swt_widget)
+          parent = nil          
+          if potential_parent.is_a?(Shell)
+            args.shift
+            parent = potential_parent
+          elsif potential_parent.is_a?(Widget)
+            args.shift
+            parent = potential_parent.shell
+          end
+          Glimmer::SWT::MessageBoxProxy.new(parent, Glimmer::SWT::SWTProxy[args])
+        end
+      end
+    end
+  end
+end

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

@@ -1,53 +1,53 @@
-# 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/dsl/expression'
-require 'glimmer/dsl/parent_expression'
-require 'glimmer/swt/transform_proxy'
-
-module Glimmer
-  module DSL
-    module SWT
-      # Special treatment for transform {multiply(){} } operation
-      class MultiplyExpression < Expression
-        include ParentExpression
-
-        def can_interpret?(parent, keyword, *args, &block)
-          keyword == 'multiply' and
-            parent.is_a?(Glimmer::SWT::TransformProxy)
-        end
-
-        def interpret(parent, keyword, *args, &block)
-          Glimmer::SWT::TransformProxy.new(parent, *args, multiply: true)
-        end
-        
-        def add_content(parent, &block)
-          super
-          parent.post_add_content
-        end
-      
-      end
-
-    end
-
-  end
-
-end
+# 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/dsl/expression'
+require 'glimmer/dsl/parent_expression'
+require 'glimmer/swt/transform_proxy'
+
+module Glimmer
+  module DSL
+    module SWT
+      # Special treatment for transform {multiply(){} } operation
+      class MultiplyExpression < Expression
+        include ParentExpression
+
+        def can_interpret?(parent, keyword, *args, &block)
+          keyword == 'multiply' and
+            parent.is_a?(Glimmer::SWT::TransformProxy)
+        end
+
+        def interpret(parent, keyword, *args, &block)
+          Glimmer::SWT::TransformProxy.new(parent, *args, multiply: true)
+        end
+        
+        def add_content(parent, &block)
+          super
+          parent.post_add_content
+        end
+      
+      end
+
+    end
+
+  end
+
+end

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

@@ -1,53 +1,56 @@
-# 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/dsl/static_expression'
-require 'glimmer/dsl/top_level_expression'
-require 'glimmer/data_binding/observer'
-require 'glimmer/data_binding/model_binding'
-
-module Glimmer
-  module DSL
-    module SWT
-      class ObserveExpression < StaticExpression
-        include TopLevelExpression
-
-        REGEX_NESTED_OR_INDEXED_PROPERTY = /([^\[]+)(\[[^\]]+\])?/
-  
-        def can_interpret?(parent, keyword, *args, &block)
-          keyword == 'observe' and
-            block_given? and
-            (args.size == 2) and
-            textual?(args[1])
-        end
-  
-        def interpret(parent, keyword, *args, &block)
-          observer = DataBinding::Observer.proc(&block)
-          if args[1].to_s.match(REGEX_NESTED_OR_INDEXED_PROPERTY)
-            observer.observe(DataBinding::ModelBinding.new(args[0], args[1]))
-          else
-            observer.observe(args[0], args[1])
-          end
-        end
-      end
-    end
-  end
-end
+# 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/dsl/static_expression'
+require 'glimmer/dsl/top_level_expression'
+require 'glimmer/data_binding/observer'
+require 'glimmer/data_binding/model_binding'
+require 'glimmer/ui/custom_widget'
+
+module Glimmer
+  module DSL
+    module SWT
+      class ObserveExpression < StaticExpression
+        include TopLevelExpression
+
+        REGEX_NESTED_OR_INDEXED_PROPERTY = /([^\[]+)(\[[^\]]+\])?/
+  
+        def can_interpret?(parent, keyword, *args, &block)
+          keyword == 'observe' and
+            block_given? and
+            (args.size == 2) and
+            textual?(args[1])
+        end
+  
+        def interpret(parent, keyword, *args, &block)
+          observer = DataBinding::Observer.proc(&block)
+          if args[1].to_s.match(REGEX_NESTED_OR_INDEXED_PROPERTY)
+            observer_registration = observer.observe(DataBinding::ModelBinding.new(args[0], args[1]))
+          else
+            observer_registration = observer.observe(args[0], args[1])
+          end
+          Glimmer::UI::CustomWidget.current_custom_widgets.last&.observer_registrations&.push(observer_registration)
+          observer_registration
+        end
+      end
+    end
+  end
+end