glimmer 0.7.4 → 0.8.0

data/lib/glimmer/swt/display_proxy.rb

@@ -16,6 +16,8 @@ module Glimmer
     class DisplayProxy
       include_package 'org.eclipse.swt.widgets'
 
+      OBSERVED_MENU_ITEMS = ['about', 'preferences']
+
       class << self
         # Returns singleton instance
         def instance(*args)
@@ -52,6 +54,9 @@ module Glimmer
         if observation_request.start_with?('on_event_')
           constant_name = observation_request.sub(/^on_event_/, '')
           SWTProxy.has_constant?(constant_name)
+        elsif observation_request.start_with?('on_')
+          event_name = observation_request.sub(/^on_/, '')
+          OBSERVED_MENU_ITEMS.include?(event_name)
         else
           false
         end
@@ -61,6 +66,15 @@ module Glimmer
         if observation_request.start_with?('on_event_')
           constant_name = observation_request.sub(/^on_event_/, '')
           add_swt_event_listener(constant_name, &block)
+        elsif observation_request.start_with?('on_')
+          event_name = observation_request.sub(/^on_/, '')
+          if OBSERVED_MENU_ITEMS.include?(event_name)
+            if OS.mac?
+              system_menu = swt_display.getSystemMenu
+              menu_item = system_menu.getItems.find {|menu_item| menu_item.getID == SWTProxy["ID_#{event_name.upcase}"]}
+              menu_item.addListener(SWTProxy[:Selection], &block)
+            end
+          end
         end
       end
 

data/lib/glimmer/swt/menu_proxy.rb

@@ -79,6 +79,23 @@ module Glimmer
           super(attribute_name)
         end
       end
+      
+      def can_handle_observation_request?(observation_request, super_only: false)
+        super_result = super(observation_request)
+        if observation_request.start_with?('on_') && !super_result && !super_only
+          return menu_item_proxy.can_handle_observation_request?(observation_request)
+        else
+          super_result
+        end
+      end
+      
+      def handle_observation_request(observation_request, &block)
+        if can_handle_observation_request?(observation_request, super_only: true)
+          super
+        else
+          menu_item_proxy.handle_observation_request(observation_request, &block)
+        end
+      end      
     end
   end
 end

data/lib/glimmer/swt/shell_proxy.rb

@@ -14,7 +14,6 @@ module Glimmer
 
       WIDTH_MIN = 130
       HEIGHT_MIN = 0
-      OBSERVED_MENU_ITEMS = ['about', 'preferences']
 
       attr_reader :opened_before
       alias opened_before? opened_before
@@ -47,7 +46,7 @@ module Glimmer
             Thread.new do      
               sleep(0.25)
               async_exec do
-                @swt_widget.setActive
+                @swt_widget.setActive unless @swt_widget.isDisposed
               end
             end
           end
@@ -128,30 +127,6 @@ module Glimmer
         end
       end
 
-      def can_handle_observation_request?(observation_request)
-        result = false
-        if observation_request.start_with?('on_')
-          event_name = observation_request.sub(/^on_/, '')
-          result = OBSERVED_MENU_ITEMS.include?(event_name)
-        end
-        result || super
-      end
-
-      def handle_observation_request(observation_request, &block)
-        if observation_request.start_with?('on_')
-          event_name = observation_request.sub(/^on_/, '')
-          if OBSERVED_MENU_ITEMS.include?(event_name)
-            if OS.mac?
-              system_menu = DisplayProxy.instance.swt_display.getSystemMenu
-              menu_item = system_menu.getItems.find {|menu_item| menu_item.getID == SWTProxy["ID_#{event_name.upcase}"]}
-              menu_item.addListener(SWTProxy[:Selection], &block)
-            end
-          else
-            super
-          end
-        end
-      end
-
       def add_observer(observer, property_name)
         case property_name.to_s
         when 'visible?' #TODO see if you must handle non-? version and/or move elsewhere

data/lib/glimmer/swt/tab_item_proxy.rb

@@ -54,6 +54,12 @@ module Glimmer
           super(attribute_name)
         end
       end
+      
+      def dispose
+        swt_tab_item.setControl(nil)
+        swt_widget.dispose
+        swt_tab_item.dispose
+      end
     end
   end
 end

data/lib/glimmer/swt/tree_proxy.rb

@@ -3,22 +3,118 @@ require 'glimmer/swt/widget_proxy'
 module Glimmer
   module SWT
     class TreeProxy < Glimmer::SWT::WidgetProxy
+      include Glimmer
+      
+      attr_reader :tree_editor, :tree_editor_text_proxy
+      attr_accessor :tree_properties
+      
+      def initialize(underscored_widget_name, parent, args)
+        super
+        @tree_editor = TreeEditor.new(swt_widget)
+        @tree_editor.horizontalAlignment = SWTProxy[:left]
+        @tree_editor.grabHorizontal = true
+        @tree_editor.minimumHeight = 20
+      end
+    
       # Performs depth first search for tree items matching block condition
-      # Returns a Java TreeItem array to easily set as selection on org.eclipse.swt.Tree when needed
+      # If no condition block is passed, returns all tree items
+      # Returns a Java TreeItem array to easily set as selection on org.eclipse.swt.Tree if needed
       def depth_first_search(&condition)
         found = []
         recursive_depth_first_search(swt_widget.getItems.first, found, &condition)
         found.to_java(TreeItem)
       end
+      
+      # Returns all tree items including descendants
+      def all_tree_items
+        depth_first_search
+      end
 
+      def widget_property_listener_installers
+        super.merge({
+          Java::OrgEclipseSwtWidgets::Tree => {
+            selection: lambda do |observer|
+              on_widget_selected { |selection_event|
+                observer.call(@swt_widget.getSelection)
+              }
+            end
+          },        
+        })
+      end
+      
+      def edit_in_progress?
+        !!@edit_in_progress
+      end
+      
+      def edit_selected_tree_item(before_write: nil, after_write: nil, after_cancel: nil)
+        edit_tree_item(swt_widget.getSelection.first, before_write: before_write, after_write: after_write, after_cancel: after_cancel)
+      end
+            
+      def edit_tree_item(tree_item, before_write: nil, after_write: nil, after_cancel: nil)
+        return if tree_item.nil?
+        content {
+          @tree_editor_text_proxy = text {
+            focus true
+            text tree_item.getText
+            action_taken = false
+            cancel = lambda {
+              @tree_editor_text_proxy.swt_widget.dispose
+              @tree_editor_text_proxy = nil
+              after_cancel&.call
+              @edit_in_progress = false
+            }
+            action = lambda { |event|
+              if !action_taken && !@edit_in_progress
+                action_taken = true
+                @edit_in_progress = true
+                new_text = @tree_editor_text_proxy.swt_widget.getText
+                if new_text == tree_item.getText
+                  cancel.call
+                else
+                  before_write&.call
+                  tree_item.setText(new_text)
+                  model = tree_item.getData
+                  model.send("#{tree_properties[:text]}=", new_text) # makes tree update itself, so must search for selected tree item again
+                  edited_tree_item = depth_first_search { |ti| ti.getData == model }.first
+                  swt_widget.showItem(edited_tree_item)
+                  @tree_editor_text_proxy.swt_widget.dispose
+                  @tree_editor_text_proxy = nil
+                  after_write&.call(edited_tree_item)
+                  @edit_in_progress = false
+                end
+              end
+            }
+            on_focus_lost(&action)
+            on_key_pressed { |key_event|
+              if key_event.keyCode == swt(:cr)
+                action.call(key_event)
+              elsif key_event.keyCode == swt(:esc)
+                cancel.call
+              end
+            }
+          }
+          @tree_editor_text_proxy.swt_widget.selectAll
+        }
+        @tree_editor.setEditor(@tree_editor_text_proxy.swt_widget, tree_item);      
+      end
+      
       private
 
       def recursive_depth_first_search(tree_item, found, &condition)
+        return if tree_item.nil?
         found << tree_item if condition.nil? || condition.call(tree_item)
         tree_item.getItems.each do |child_tree_item|
           recursive_depth_first_search(child_tree_item, found, &condition)
         end
       end
+      
+      def property_type_converters
+        super.merge({
+          selection: lambda do |value|
+            depth_first_search {|ti| ti.getData == value}
+          end,
+        })
+      end
     end
   end
 end

data/lib/glimmer/swt/widget_listener_proxy.rb

@@ -5,12 +5,29 @@ module Glimmer
     # Follows the Proxy Design Pattern
     class WidgetListenerProxy
 
-      attr_reader :swt_listener
+      attr_reader :swt_widget, :swt_listener, :widget_add_listener_method, :swt_listener_class, :swt_listener_method, :event_type, :swt_constant
 
-      # TODO capture its widget and support unregistering 
-
-      def initialize(swt_listener)
+      def initialize(swt_widget:, swt_listener:, widget_add_listener_method: nil, swt_listener_class: nil, swt_listener_method: nil, event_type: nil, swt_constant: nil)
+        @swt_widget = swt_widget
         @swt_listener = swt_listener
+        @widget_add_listener_method = widget_add_listener_method
+        @swt_listener_class = swt_listener_class
+        @swt_listener_method = swt_listener_method
+        @event_type = event_type
+        @swt_constant = swt_constant
+      end
+      
+      def widget_remove_listener_method
+        @widget_add_listener_method.sub('add', 'remove')
+      end      
+      
+      def unregister
+        # TODO consider renaming to deregister (and in Observer too)
+        if @event_type
+          @swt_widget.removeListener(@event_type, @swt_listener)
+        else
+          @swt_widget.send(widget_remove_listener_method, @swt_listener)
+        end
       end
     end
   end

data/lib/glimmer/swt/widget_proxy.rb

@@ -5,6 +5,8 @@ require 'glimmer/swt/font_proxy'
 require 'glimmer/swt/swt_proxy'
 require 'glimmer/data_binding/observable_widget'
 
+# TODO refactor to make file smaller and extract sub-widget-proxies out of this
+
 module Glimmer
   module SWT
     # Proxy for SWT Widget objects
@@ -23,6 +25,7 @@ module Glimmer
       DEFAULT_STYLES = {
         "text"        => [:border],
         "table"       => [:border],
+        "tree"       =>  [:virtual, :border, :h_scroll, :v_scroll],
         "spinner"     => [:border],
         "styled_text" => [:border],
         "list"        => [:border, :v_scroll],
@@ -31,17 +34,17 @@ module Glimmer
       }
 
       DEFAULT_INITIALIZERS = {
-        "composite" => proc do |composite|
+        "composite" => lambda do |composite|
           composite.setLayout(GridLayout.new)
         end,
-        "table" => proc do |table|
+        "table" => lambda do |table|
           table.setHeaderVisible(true)
           table.setLinesVisible(true)
         end,
-        "table_column" => proc do |table_column|
+        "table_column" => lambda do |table_column|
           table_column.setWidth(80)
         end,
-        "group" => proc do |group|
+        "group" => lambda do |group|
           group.setLayout(GridLayout.new)
         end,
       }
@@ -119,7 +122,7 @@ module Glimmer
       def widget_property_listener_installers
         @swt_widget_property_listener_installers ||= {
           Java::OrgEclipseSwtWidgets::Control => {
-            :focus => proc do |observer|
+            :focus => lambda do |observer|
               on_focus_gained { |focus_event|
                 observer.call(true)
               }
@@ -129,12 +132,12 @@ module Glimmer
             end,
           },
           Java::OrgEclipseSwtWidgets::Text => {
-            :text => proc do |observer|
+            :text => lambda do |observer|
               on_modify_text { |modify_event|
                 observer.call(@swt_widget.getText)
               }
             end,
-            :caret_position => proc do |observer|
+            :caret_position => lambda do |observer|
               on_event_keydown { |event|
                 observer.call(@swt_widget.getCaretPosition)
               }
@@ -148,7 +151,21 @@ module Glimmer
                 observer.call(@swt_widget.getCaretPosition)
               }
             end,
-            :selection_count => proc do |observer|
+            :selection => lambda do |observer|
+              on_event_keydown { |event|
+                observer.call(@swt_widget.getSelection)
+              }
+              on_event_keyup { |event|
+                observer.call(@swt_widget.getSelection)
+              }
+              on_event_mousedown { |event|
+                observer.call(@swt_widget.getSelection)
+              }
+              on_event_mouseup { |event|
+                observer.call(@swt_widget.getSelection)
+              }
+            end,
+            :selection_count => lambda do |observer|
               on_event_keydown { |event|
                 observer.call(@swt_widget.getSelectionCount)
               }
@@ -162,7 +179,7 @@ module Glimmer
                 observer.call(@swt_widget.getSelectionCount)
               }
             end,
-            :top_index => proc do |observer|
+            :top_index => lambda do |observer|
               @last_top_index = @swt_widget.getTopIndex
               on_paint_control { |event|
                 if @swt_widget.getTopIndex != @last_top_index
@@ -173,33 +190,33 @@ module Glimmer
             end,
           },
           Java::OrgEclipseSwtCustom::StyledText => {
-            :text => proc do |observer|
+            :text => lambda do |observer|
               on_modify_text { |modify_event|
                 observer.call(@swt_widget.getText)
               }
             end,
           },
           Java::OrgEclipseSwtWidgets::Button => {
-            :selection => proc do |observer|
+            :selection => lambda do |observer|
               on_widget_selected { |selection_event|
                 observer.call(@swt_widget.getSelection)
               }
             end
           },
           Java::OrgEclipseSwtWidgets::MenuItem => {
-            :selection => proc do |observer|
+            :selection => lambda do |observer|
               on_widget_selected { |selection_event|
                 observer.call(@swt_widget.getSelection)
               }
             end
           },
           Java::OrgEclipseSwtWidgets::Spinner => {
-            :selection => proc do |observer|
+            :selection => lambda do |observer|
               on_widget_selected { |selection_event|
                 observer.call(@swt_widget.getSelection)
               }
             end
-          }
+          },
         }
       end
 
@@ -321,10 +338,12 @@ module Glimmer
       end
 
       def add_listener(underscored_listener_name, &block)
-        widget_add_listener_method, listener_class, listener_method = self.class.find_listener(@swt_widget.getClass, underscored_listener_name)
-        listener = listener_class.new(listener_method => block)
+        widget_add_listener_method, listener_class, listener_method = self.class.find_listener(@swt_widget.getClass, underscored_listener_name)        
+        widget_listener_proxy = nil
+        safe_block = lambda { |event| block.call(event) unless @swt_widget.isDisposed }
+        listener = listener_class.new(listener_method => safe_block)
         @swt_widget.send(widget_add_listener_method, listener)
-        WidgetListenerProxy.new(listener)
+        widget_listener_proxy = WidgetListenerProxy.new(swt_widget: @swt_widget, swt_listener: listener, widget_add_listener_method: widget_add_listener_method, swt_listener_class: listener_class, swt_listener_method: listener_method)
       end
 
       # Looks through SWT class add***Listener methods till it finds one for which
@@ -375,8 +394,10 @@ module Glimmer
 
       def add_swt_event_listener(swt_constant, &block)
         event_type = SWTProxy[swt_constant]
-        @swt_widget.addListener(event_type, &block)
-        WidgetListenerProxy.new(@swt_widget.getListeners(event_type).last)
+        widget_listener_proxy = nil
+        safe_block = lambda { |event| block.call(event) unless @swt_widget.isDisposed }
+        @swt_widget.addListener(event_type, &safe_block)
+        widget_listener_proxy = WidgetListenerProxy.new(swt_widget: @swt_widget, swt_listener: @swt_widget.getListeners(event_type).last, event_type: event_type, swt_constant: swt_constant)
       end
 
       def widget_custom_attribute_mapping
@@ -409,7 +430,7 @@ module Glimmer
       end
 
       def property_type_converters
-        color_converter = proc do |value|
+        color_converter = lambda do |value|
           if value.is_a?(Symbol) || value.is_a?(String)
             ColorProxy.new(value).swt_color
           else
@@ -419,7 +440,7 @@ module Glimmer
         # TODO consider detecting type on widget method and automatically invoking right converter (e.g. :to_s for String, :to_i for Integer)
         @property_type_converters ||= {
           :background => color_converter,
-          :background_image => proc do |value|
+          :background_image => lambda do |value|
             if value.is_a?(String)
               if value.start_with?('uri:classloader')
                 value = value.sub(/^uri\:classloader\:\//, '')
@@ -440,7 +461,7 @@ module Glimmer
             end
           end,
           :foreground => color_converter,
-          :font => proc do |value|
+          :font => lambda do |value|
             if value.is_a?(Hash)
               font_properties = value
               FontProxy.new(self, font_properties).swt_font
@@ -448,17 +469,17 @@ module Glimmer
               value
             end
           end,
-          :items => proc do |value|
+          :items => lambda do |value|
             value.to_java :string
           end,
-          :text => proc do |value|
+          :text => lambda do |value|
             if swt_widget.is_a?(Browser)
               value.to_s
             else
               value.to_s
             end
           end,
-          :visible => proc do |value|
+          :visible => lambda do |value|
             !!value
           end,
         }