glimmer-dsl-swt 4.17.7.0 → 4.17.8.0

data/VERSION

@@ -1 +1 @@
-4.17.7.0
+4.17.8.0

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.7.0 ruby lib
+# stub: glimmer-dsl-swt 4.17.8.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "glimmer-dsl-swt".freeze
-  s.version = "4.17.7.0"
+  s.version = "4.17.8.0"
 
   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-29"
+  s.date = "2020-11-01"
   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]
@@ -53,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",
@@ -90,9 +92,11 @@ Gem::Specification.new do |s|
     "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",
@@ -133,8 +137,10 @@ Gem::Specification.new do |s|
     "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_list_multi_selection.rb",
     "samples/hello/hello_list_single_selection.rb",
     "samples/hello/hello_menu_bar.rb",

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/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/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/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
@@ -43,4 +43,4 @@ module Glimmer
       end
     end
   end
-end
+end

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
@@ -57,4 +57,4 @@ require 'glimmer/swt/tree_proxy'
 require 'glimmer/swt/table_proxy'
 require 'glimmer/swt/table_column_proxy'
 require 'glimmer/swt/sash_form_proxy'
-require 'glimmer/swt/styled_text_proxy'
+require 'glimmer/swt/styled_text_proxy'

data/lib/glimmer/swt/custom/code_text.rb

@@ -40,21 +40,20 @@ module Glimmer
         
         def syntax_highlighting          
           return [] if text.to_s.strip.empty?
-          code = text
-          return @syntax_highlighting if @last_code == code
-          @last_code = code
-          @lexer ||= Rouge::Lexer.find_fancy('ruby', code)
-          lex = @lexer.lex(code).to_a
-          code_size = 0
+          return @syntax_highlighting if already_syntax_highlighted?
+          @last_text = text
+          @lexer ||= Rouge::Lexer.find_fancy('ruby', text)
+          lex = @lexer.lex(text).to_a
+          text_size = 0
           lex_hashes = lex.map do |pair|
             {token_type: pair.first, token_text: pair.last}
           end.each do |hash|
-            hash[:token_index] = code_size
-            code_size += hash[:token_text].size
+            hash[:token_index] = text_size
+            text_size += hash[:token_text].size
           end
-          code_lines = code.split("\n")
+          text_lines = text.split("\n")
           line_index = 0
-          @syntax_highlighting = code_lines_map = code_lines.reduce({}) do |hash, line|
+          @syntax_highlighting = text_lines_map = text_lines.reduce({}) do |hash, line|
             line_hashes = []
             line_hashes << lex_hashes.shift while lex_hashes.any? && lex_hashes.first[:token_index].between?(line_index, line_index + line.size)
             hash.merge(line_index => line_hashes).tap do
@@ -63,6 +62,10 @@ module Glimmer
           end          
         end
         
+        def already_syntax_highlighted?
+          @last_text == text
+        end
+        
         before_body {
           @swt_style = swt_style == 0 ? [:border, :multi, :v_scroll, :h_scroll] : swt_style
         }
@@ -77,15 +80,19 @@ module Glimmer
             bottom_margin 5
                   
             on_line_get_style { |line_style_event|
-              styles = []
-              syntax_highlighting[line_style_event.lineOffset].to_a.each do |token_hash|
-                start_index = token_hash[:token_index]
-                size = token_hash[:token_text].size
-                token_color = SYNTAX_COLOR_MAP[token_hash[:token_type].name] || [:black]
-                token_color = color(*token_color).swt_color
-                styles << StyleRange.new(start_index, size, token_color, nil)
+              @styles = {} unless already_syntax_highlighted?
+              if @styles[line_style_event.lineOffset].nil?
+                styles = []
+                syntax_highlighting[line_style_event.lineOffset].to_a.each do |token_hash|
+                  start_index = token_hash[:token_index]
+                  size = token_hash[:token_text].size
+                  token_color = SYNTAX_COLOR_MAP[token_hash[:token_type].name] || [:black]
+                  token_color = color(*token_color).swt_color
+                  styles << StyleRange.new(start_index, size, token_color, nil)
+                end
+                @styles[line_style_event.lineOffset] = styles.to_java(StyleRange)
               end
-              line_style_event.styles = styles.to_java(StyleRange) unless styles.empty?
+              line_style_event.styles = @styles[line_style_event.lineOffset] unless @styles[line_style_event.lineOffset].empty?
             }            
           }
         }

data/lib/glimmer/swt/directory_dialog_proxy.rb

@@ -0,0 +1,65 @@
+# 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/swt/swt_proxy'
+require 'glimmer/swt/widget_proxy'
+require 'glimmer/swt/display_proxy'
+
+module Glimmer
+  module SWT
+    # Proxy for org.eclipse.swt.widgets.DirectoryDialog
+    #
+    # Automatically uses the current shell if one is open.
+    # Otherwise, it instantiates a new shell parent
+    #
+    # Optionally takes a shell as an argument
+    #
+    # Follows the Proxy Design Pattern
+    class DirectoryDialogProxy < WidgetProxy
+      # TODO write rspec tests
+      include_package 'org.eclipse.swt.widgets'
+
+      def initialize(*args, swt_widget: nil)
+        if swt_widget
+          @swt_widget = swt_widget
+        else
+          style_args = args.select {|arg| arg.is_a?(Symbol) || arg.is_a?(String)}
+          if style_args.any?
+            style_arg_start_index = args.index(style_args.first)
+            style_arg_last_index = args.index(style_args.last)
+            args[style_arg_start_index..style_arg_last_index] = SWTProxy[style_args]
+          end
+          if !args.first.is_a?(Shell)
+            current_shell = DisplayProxy.instance.swt_display.shells.first
+            args.unshift(current_shell.nil? ? ShellProxy.new : current_shell)
+          end
+          if args.first.is_a?(ShellProxy)
+            args[0] = args[0].swt_widget
+          end
+          parent = args[0]
+          @parent_proxy = parent.is_a?(Shell) ? ShellProxy.new(swt_widget: parent) : parent
+          @swt_widget = DirectoryDialog.new(*args)
+        end
+      end
+
+    end
+  end
+end

data/lib/glimmer/swt/file_dialog_proxy.rb

@@ -0,0 +1,66 @@
+# 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/swt/swt_proxy'
+require 'glimmer/swt/widget_proxy'
+require 'glimmer/swt/display_proxy'
+
+module Glimmer
+  module SWT
+    # Proxy for org.eclipse.swt.widgets.FileDialog
+    #
+    # Automatically uses the current shell if one is open.
+    # Otherwise, it instantiates a new shell parent
+    #
+    # Optionally takes a shell as an argument
+    #
+    # Follows the Proxy Design Pattern
+    class FileDialogProxy < WidgetProxy
+      # TODO write rspec tests
+      # TODO consider refactoring and sharing code with DirectoryDialogProxy (and do the same with their expressions)
+      include_package 'org.eclipse.swt.widgets'
+
+      def initialize(*args, swt_widget: nil)
+        if swt_widget
+          @swt_widget = swt_widget
+        else
+          style_args = args.select {|arg| arg.is_a?(Symbol) || arg.is_a?(String)}
+          if style_args.any?
+            style_arg_start_index = args.index(style_args.first)
+            style_arg_last_index = args.index(style_args.last)
+            args[style_arg_start_index..style_arg_last_index] = SWTProxy[style_args]
+          end
+          if !args.first.is_a?(Shell)
+            current_shell = DisplayProxy.instance.swt_display.shells.first
+            args.unshift(current_shell.nil? ? ShellProxy.new : current_shell)
+          end
+          if args.first.is_a?(ShellProxy)
+            args[0] = args[0].swt_widget
+          end
+          parent = args[0]
+          @parent_proxy = parent.is_a?(Shell) ? ShellProxy.new(swt_widget: parent) : parent
+          @swt_widget = FileDialog.new(*args)
+        end
+      end
+
+    end
+  end
+end