glimmer-dsl-swt 4.17.8.2 → 4.17.10.2

data/lib/glimmer-dsl-swt.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
@@ -35,6 +35,7 @@ require 'logging'
 require 'nested_inherited_jruby_include_package'
 require 'super_module'
 require 'rouge'
+require 'date'
 
 # Internal requires
 require 'ext/glimmer/config'

data/lib/glimmer/data_binding/table_items_binding.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
@@ -61,7 +61,7 @@ module Glimmer
           add_dependent(@table_observer_registration => @table_items_observer_registration)
           @model_collection = new_model_collection
         end
-        populate_table(@model_collection, @table, @column_properties)        
+        populate_table(@model_collection, @table, @column_properties)
       end
       
       def populate_table(model_collection, parent, column_properties)
@@ -79,7 +79,7 @@ module Glimmer
         selected_table_items = parent.search {|item| selected_table_item_models.include?(item.getData) }
         selected_table_items = [parent.swt_widget.getItems.first].to_java(TableItem) if selected_table_items.empty? && !parent.swt_widget.getItems.empty?
         parent.swt_widget.setSelection(selected_table_items) unless selected_table_items.empty?
-        parent.sort
+        parent.sort!
         parent.swt_widget.redraw if parent&.swt_widget&.respond_to?(:redraw)
       end
     end

data/lib/glimmer/dsl/swt/table_items_data_binding_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

@@ -58,3 +58,4 @@ 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/date_time_proxy'

data/lib/glimmer/launcher.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
@@ -31,12 +31,12 @@ module Glimmer
     OPERATING_SYSTEMS_SUPPORTED = ["mac", "windows", "linux"]
     
     TEXT_USAGE = <<~MULTI_LINE_STRING
-      Glimmer (Ruby Desktop Development GUI Library) - JRuby Gem: glimmer-dsl-swt v#{File.read(File.expand_path('../../../VERSION', __FILE__))}      
+      Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v#{File.read(File.expand_path('../../../VERSION', __FILE__))}
       Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
     
-      Runs Glimmer applications and tasks.    
+      Runs Glimmer applications and tasks.
     
-      When applications are specified, they are run using JRuby, 
+      When applications are specified, they are run using JRuby,
       automatically preloading the glimmer Ruby gem and SWT jar dependency.
     
       Optionally, extra Glimmer options, JRuby options, and/or environment variables may be passed in.
@@ -112,7 +112,7 @@ module Glimmer
       def launch(application, jruby_options: [], env_vars: {}, glimmer_options: {})
         jruby_options_string = jruby_options.join(' ') + ' ' if jruby_options.any?
         env_vars = env_vars.merge(glimmer_option_env_vars(glimmer_options))
-        env_vars_string = env_vars.map do |k,v| 
+        env_vars_string = env_vars.map do |k,v|
           if OS.windows? && ENV['PROMPT'] # detect command prompt (or powershell)
             "set #{k}=#{v} && "
           else
@@ -224,8 +224,8 @@ module Glimmer
           task_name = task.name_with_args.sub('glimmer:', '')
           line = "glimmer #{task_name.ljust(max_task_size)} # #{task.comment}"
           bound = TTY::Screen.width - 6
-          line.size <= bound ? line : "#{line[0..(bound - 3)]}..."          
-        end    
+          line.size <= bound ? line : "#{line[0..(bound - 3)]}..."
+        end
       end
     end
 

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

@@ -38,32 +38,25 @@ module Glimmer
           swt_widget&.text
         end
         
-        def syntax_highlighting
+        def syntax_highlighting(text)
           return [] if text.to_s.strip.empty?
-          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] = text_size
-            text_size += hash[:token_text].size
-          end
-          text_lines = text.split("\n")
-          line_index = 0
-          @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
-              line_index += line.size + 1
+          @syntax_highlighting ||= {}
+          unless @syntax_highlighting.keys.include?(text)
+            lex = lexer.lex(text).to_a
+            text_size = 0
+            @syntax_highlighting[text] = lex.map do |pair|
+              {token_type: pair.first, token_text: pair.last}
+            end.each do |hash|
+              hash[:token_index] = text_size
+              text_size += hash[:token_text].size
             end
           end
+          @syntax_highlighting[text]
         end
         
-        def already_syntax_highlighted?
-          @last_text == text
+        def lexer
+          # TODO Try to use Rouge::Lexer.find_fancy('guess', code) in the future to guess the language or otherwise detect it from file extension
+          @lexer ||= Rouge::Lexer.find_fancy('ruby')
         end
         
         before_body {
@@ -78,22 +71,31 @@ module Glimmer
             top_margin 5
             right_margin 5
             bottom_margin 5
+            
+            on_modify_text { |event|
+              # clear unnecessary syntax highlighting cache on text updates, and do it async to avoid affecting performance
+              new_text = event.data
+              async_exec {
+                unless @syntax_highlighting.nil?
+                  lines = new_text.to_s.split("\n")
+                  line_diff = @syntax_highlighting.keys - lines
+                  line_diff.each do |line|
+                    @syntax_highlighting.delete(line)
+                  end
+                end
+              }
+            }
                   
             on_line_get_style { |line_style_event|
-              @styles ||= {}
-              @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)
+              styles = []
+              syntax_highlighting(line_style_event.lineText).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(line_style_event.lineOffset + start_index, size, token_color, nil)
               end
-              line_style_event.styles = @styles[line_style_event.lineOffset] unless @styles[line_style_event.lineOffset].empty?
+              line_style_event.styles = styles.to_java(StyleRange) unless styles.empty?
             }
           }
         }

data/lib/glimmer/swt/date_time_proxy.rb

@@ -0,0 +1,87 @@
+# 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 'date'
+require 'glimmer/swt/widget_proxy'
+
+module Glimmer
+  module SWT
+    # Proxy for org.eclipse.swt.widgets.DateTime
+    #
+    # Follows the Proxy Design Pattern
+    class DateTimeProxy < WidgetProxy
+      CUSTOM_ATTRIBUTES = %w[date_time date time month]
+      
+      def date_time
+        DateTime.new(year, month, day, hours, minutes, seconds)
+      end
+      
+      def date_time=(date_time_value)
+        self.time = date_time_value.to_time
+      end
+      
+      def date
+        date_time.to_date
+      end
+      
+      def date=(date_value)
+        self.year = date_value.year
+        self.month = date_value.month
+        self.day = date_value.day
+      end
+      
+      def time
+        date_time.to_time
+      end
+      
+      def time=(time_value)
+        self.date = time_value.to_date
+        self.hours = time_value.hour
+        self.minutes = time_value.min
+        self.seconds = time_value.sec
+      end
+      
+      def month
+        swt_widget.month + 1
+      end
+      
+      def month=(new_value)
+        swt_widget.month = new_value - 1
+      end
+      
+      def set_attribute(attribute_name, *args)
+        if CUSTOM_ATTRIBUTES.include?(attribute_name.to_s)
+          send(ruby_attribute_setter(attribute_name), args.first)
+        else
+          super(attribute_name, *args)
+        end
+      end
+ 
+      def get_attribute(attribute_name)
+        if CUSTOM_ATTRIBUTES.include?(attribute_name.to_s)
+          send(attribute_name)
+        else
+          super(attribute_name)
+        end
+      end
+    end
+  end
+end

data/lib/glimmer/swt/display_proxy.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
@@ -59,7 +59,7 @@ module Glimmer
       
       def content(&block)
         Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::SWT::DisplayExpression.new, &block)
-      end      
+      end
 
       def method_missing(method, *args, &block)
         if can_handle_observation_request?(method)
@@ -73,8 +73,8 @@ module Glimmer
       end
       
       def respond_to?(method, *args, &block)
-        super || 
-          can_handle_observation_request?(method) ||        
+        super ||
+          can_handle_observation_request?(method) ||
           swt_display.respond_to?(method, *args, &block)
       end
 

data/lib/glimmer/swt/dnd_proxy.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
@@ -26,15 +26,15 @@ module Glimmer
     # Proxy for org.eclipse.swt.dnd.DND
     #
     # Follows the Proxy Design Pattern
-    class DNDProxy            
-      include StyleConstantizable      
+    class DNDProxy
+      include StyleConstantizable
 
       class << self
         JAVA_IMPORT = 'org.eclipse.swt.dnd.DND'
         
         java_import JAVA_IMPORT
         
-        def constant_java_import 
+        def constant_java_import
           JAVA_IMPORT
         end
 
@@ -45,10 +45,6 @@ module Glimmer
         def constant_value_none
           DND::DROP_NONE
         end
-        
-        def extra_styles
-          {}
-        end
       end
     end
   end

data/lib/glimmer/swt/message_box_proxy.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
@@ -38,7 +38,7 @@ module Glimmer
         if parent.nil?
           @temporary_parent = parent = Glimmer::SWT::ShellProxy.new.swt_widget
         end
-        @swt_widget = MessageBox.new(parent, style)        
+        @swt_widget = MessageBox.new(parent, style)
       end
       
       def open
@@ -49,7 +49,7 @@ module Glimmer
       
       def content(&block)
         Glimmer::DSL::Engine.add_content(self, Glimmer::DSL::SWT::MessageBoxExpression.new, &block)
-      end            
+      end
       
       # TODO refactor the following methods to put in a JavaBean mixin or somethin (perhaps contribute to OSS project too)
       
@@ -81,9 +81,9 @@ module Glimmer
       end
       
       def respond_to?(method, *args, &block)
-        super || 
+        super ||
           swt_widget.respond_to?(method, *args, &block)
-      end      
+      end
     end
   end
 end