glimmer 0.1.0.0 → 0.1.2

data/{src → lib}/command_handler_chain_factory.rb

@@ -1,23 +1,30 @@
-# Copyright (C) 2007-2008 Annas Al Maleh
-# Licensed under the LGPL. See /COPYING.LGPL for more details.
-
-require File.dirname(__FILE__) + "/command_handler_chain_link"
-
-class CommandHandlerChainFactory
-  @@last_chain_link = nil
-  @@chain = nil
-  
-  def self.set_command_handlers(*command_handler_array)
-    command_handler_array.each do |command_handler|
-      puts "Loading #{command_handler.class.to_s}..."
-      chain_link = CommandHandlerChainLink.new(command_handler)
-      @@last_chain_link.chain_to(chain_link) if @@last_chain_link
-      @@last_chain_link = chain_link
-      @@chain = chain_link unless @@chain
-    end
-  end
-  
-  def self.chain
-    @@chain
-  end
+require File.dirname(__FILE__) + "/command_handler_chain_link"
+
+class CommandHandlerChainFactory
+  @@dsls = {}
+  
+  def self.def_dsl(dsl, *command_handler_array)
+    @@last_chain_link = nil
+    @@chain = nil
+    command_handler_array.each do |command_handler|
+      puts "Loading #{command_handler.class.to_s}..."
+      chain_link = CommandHandlerChainLink.new(command_handler)
+      @@last_chain_link.chain_to(chain_link) if @@last_chain_link
+      @@last_chain_link = chain_link
+      @@chain = chain_link unless @@chain
+    end
+    @@dsls[dsl] = {
+      :last_chain_link => @@last_chain_link,
+      :chain => @@chain
+    }
+  end
+
+  def self.select_dsl(dsl)
+    @@last_chain_link = @@dsls[dsl][:last_chain_link]
+    @@chain = @@dsls[dsl][:chain]
+  end
+  
+  def self.chain
+    @@chain
+  end
 end

data/{src → lib}/command_handler_chain_link.rb

@@ -1,22 +1,19 @@
-# Copyright (C) 2007-2008 Annas Al Maleh
-# Licensed under the LGPL. See /COPYING.LGPL for more details.
-
-class CommandHandlerChainLink
-  def initialize(command_handler)
-    @command_handler = command_handler
-  end
-  def chain_to(next_chain_link)
-    @next_chain_link = next_chain_link
-  end
-  def handle(parent, command_symbol, *args, &block)
-    if (@command_handler.can_handle?(parent, command_symbol, *args, &block))
-      puts "#{@command_handler.class.to_s} will handle command: #{command_symbol} with arguments #{args}"
-      return @command_handler.do_handle(parent, command_symbol, *args, &block)
-    elsif @next_chain_link
-      return @next_chain_link.handle(parent, command_symbol, *args, &block)
-    else
-      puts "Command: #{command_symbol} cannot be handled!"
-      return nil
-    end
-  end
-end
+class CommandHandlerChainLink
+  def initialize(command_handler)
+    @command_handler = command_handler
+  end
+  def chain_to(next_chain_link)
+    @next_chain_link = next_chain_link
+  end
+  def handle(parent, command_symbol, *args, &block)
+    if (@command_handler.can_handle?(parent, command_symbol, *args, &block))
+      puts "#{@command_handler.class.to_s} will handle command: #{command_symbol} with arguments #{args}"
+      return @command_handler.do_handle(parent, command_symbol, *args, &block)
+    elsif @next_chain_link
+      return @next_chain_link.handle(parent, command_symbol, *args, &block)
+    else
+      puts "Command: #{command_symbol} cannot be handled!"
+      return nil
+    end
+  end
+end

data/{src → lib}/command_handlers.rb

@@ -1,26 +1,29 @@
-# Copyright (C) 2007-2008 Annas Al Maleh
-# Licensed under the LGPL. See /COPYING.LGPL for more details.
-
-require File.dirname(__FILE__) + "/command_handler_chain_factory"
-require File.dirname(__FILE__) + "/command_handlers/shell_command_handler"
-require File.dirname(__FILE__) + "/command_handlers/widget_listener_command_handler"
-require File.dirname(__FILE__) + "/command_handlers/bind_command_handler"
-require File.dirname(__FILE__) + "/command_handlers/table_items_data_binding_command_handler"
-require File.dirname(__FILE__) + "/command_handlers/table_column_properties_data_binding_command_handler"
-require File.dirname(__FILE__) + "/command_handlers/data_binding_command_handler"
-require File.dirname(__FILE__) + "/command_handlers/widget_method_command_handler"
-require File.dirname(__FILE__) + "/command_handlers/widget_command_handler"
-require File.dirname(__FILE__) + "/command_handlers/swt_constant_command_handler"
-
-# edit to add more command handlers and extend Glimmer
-CommandHandlerChainFactory.set_command_handlers(
-  ShellCommandHandler.new,
-  WidgetListenerCommandHandler.new,
-  BindCommandHandler.new,
-  TableItemsDataBindingCommandHandler.new,
-  TableColumnPropertiesDataBindingCommandHandler.new,
-  DataBindingCommandHandler.new,
-  WidgetMethodCommandHandler.new,
-  WidgetCommandHandler.new,
-  SwtConstantCommandHandler.new #at the bottom to avoid stealing commands from other command handlers
-)
+require File.dirname(__FILE__) + "/command_handler_chain_factory"
+require File.dirname(__FILE__) + "/command_handlers/shell_command_handler"
+require File.dirname(__FILE__) + "/command_handlers/widget_listener_command_handler"
+require File.dirname(__FILE__) + "/command_handlers/bind_command_handler"
+require File.dirname(__FILE__) + "/command_handlers/tab_item_command_handler"
+require File.dirname(__FILE__) + "/command_handlers/combo_selection_data_binding_command_handler"
+require File.dirname(__FILE__) + "/command_handlers/list_selection_data_binding_command_handler"
+require File.dirname(__FILE__) + "/command_handlers/table_items_data_binding_command_handler"
+require File.dirname(__FILE__) + "/command_handlers/table_column_properties_data_binding_command_handler"
+require File.dirname(__FILE__) + "/command_handlers/data_binding_command_handler"
+require File.dirname(__FILE__) + "/command_handlers/widget_method_command_handler"
+require File.dirname(__FILE__) + "/command_handlers/widget_command_handler"
+require File.dirname(__FILE__) + "/command_handlers/swt_constant_command_handler"
+
+# edit to add more command handlers and extend Glimmer
+CommandHandlerChainFactory.def_dsl(:swt,
+  ShellCommandHandler.new,
+  WidgetListenerCommandHandler.new,
+  BindCommandHandler.new,
+  TabItemCommandHandler.new,
+  ComboSelectionDataBindingCommandHandler.new,
+  ListSelectionDataBindingCommandHandler.new,
+  TableItemsDataBindingCommandHandler.new,
+  TableColumnPropertiesDataBindingCommandHandler.new,
+  DataBindingCommandHandler.new,
+  WidgetMethodCommandHandler.new,
+  WidgetCommandHandler.new,
+  SwtConstantCommandHandler.new #at the bottom to avoid stealing commands from other command handlers
+)

data/{src → lib}/command_handlers/bind_command_handler.rb

@@ -1,29 +1,26 @@
-# Copyright (C) 2007-2008 Annas Al Maleh
-# Licensed under the LGPL. See /COPYING.LGPL for more details.
-
-require File.dirname(__FILE__) + "/../command_handler"
-require File.dirname(__FILE__) + "/models/r_widget"
-require File.dirname(__FILE__) + "/models/model_observer"
-
-class BindCommandHandler
-  include CommandHandler
-  
-  include_package 'org.eclipse.swt.widgets'
-
-  def can_handle?(parent, command_symbol, *args, &block)
-    parent.is_a?(RWidget) and
-    command_symbol.to_s == "bind" and
-    (((args.size == 2) and
-    (args[1].is_a?(Symbol) or args[1].is_a?(String))) or
-    ((args.size == 3) and
-    (args[1].is_a?(Symbol) or args[1].is_a?(String)) and
-    (args[2].is_a?(Symbol) or args[2].is_a?(String)))) and
-    block == nil
-  end
-  
-  def do_handle(parent, command_symbol, *args, &block)
-    property_type = args[2] if (args.size == 3)
-    ModelObserver.new(args[0], args[1].to_s, property_type)
-  end
-  
+require File.dirname(__FILE__) + "/../command_handler"
+require File.dirname(__FILE__) + "/models/r_widget"
+require File.dirname(__FILE__) + "/models/model_observer"
+
+class BindCommandHandler
+  include CommandHandler
+  
+  include_package 'org.eclipse.swt.widgets'
+
+  def can_handle?(parent, command_symbol, *args, &block)
+    parent.is_a?(RWidget) and
+    command_symbol.to_s == "bind" and
+    (((args.size == 2) and
+    (args[1].is_a?(Symbol) or args[1].is_a?(String))) or
+    ((args.size == 3) and
+    (args[1].is_a?(Symbol) or args[1].is_a?(String)) and
+    (args[2].is_a?(Symbol) or args[2].is_a?(String)))) and
+    block == nil
+  end
+  
+  def do_handle(parent, command_symbol, *args, &block)
+    property_type = args[2] if (args.size == 3)
+    ModelObserver.new(args[0], args[1].to_s, property_type)
+  end
+  
 end

data/lib/command_handlers/combo_selection_data_binding_command_handler.rb

@@ -0,0 +1,39 @@
+require File.dirname(__FILE__) + "/../command_handler"
+require File.dirname(__FILE__) + "/models/r_widget"
+
+class ComboSelectionDataBindingCommandHandler
+  include CommandHandler
+  include Glimmer
+  
+  include_package 'org.eclipse.swt.widgets'
+
+  def can_handle?(parent, command_symbol, *args, &block)
+    parent.is_a?(RWidget) and
+    parent.widget.is_a?(Combo) and
+    command_symbol.to_s == "selection" and
+    args.size == 1 and
+    args[0].is_a?(ModelObserver) and
+    args[0].evaluate_options_property.is_a?(Array) and
+    block == nil
+  end
+  
+  def do_handle(parent, command_symbol, *args, &block)
+    model_observer = args[0]
+    widget_observer = WidgetObserver.new(parent, "items")
+    widget_observer.update(model_observer.evaluate_options_property)
+    model = model_observer.model
+    model.extend ObservableModel unless model.is_a?(ObservableModel)
+    model.add_observer(model_observer.options_property_name, widget_observer)
+
+    widget_observer = WidgetObserver.new(parent, "text")
+    widget_observer.update(model_observer.evaluate_property)
+    model.add_observer(model_observer.property_name, widget_observer)
+    
+    add_contents(parent) {
+      on_widget_selected {
+        model_observer.update(widget_observer.evaluate_property)
+      }
+    }    
+  end
+
+end

data/{src → lib}/command_handlers/data_binding_command_handler.rb

@@ -1,64 +1,61 @@
-# Copyright (C) 2007-2008 Annas Al Maleh
-# Licensed under the LGPL. See /COPYING.LGPL for more details.
-
-require File.dirname(__FILE__) + "/../command_handler"
-require File.dirname(__FILE__) + "/models/r_widget"
-require File.dirname(__FILE__) + "/models/observable_model"
-require File.dirname(__FILE__) + "/models/model_observer"
-require File.dirname(__FILE__) + "/models/widget_observer"
-
-class DataBindingCommandHandler 
-  extend Glimmer
-  include CommandHandler
-  
-  include_package 'org.eclipse.swt.widgets'
-  
-  @@widget_data_binders = {
-    Java::OrgEclipseSwtWidgets::Text => {
-      :text => Proc.new do |rwidget, model_observer|
-        add_contents(rwidget) {
-          on_modify_text { |modify_event|
-            model_observer.update(rwidget.widget.getText)
-          }
-        }
-        end,
-      },
-      Java::OrgEclipseSwtWidgets::Button => {
-        :selection => Proc.new do |rwidget, model_observer|
-          add_contents(rwidget) {
-            on_widget_selected { |selection_event|
-              model_observer.update(rwidget.widget.getSelection)
-            }
-          }
-        end
-      },
-      Java::OrgEclipseSwtWidgets::Spinner => {
-        :selection => Proc.new do |rwidget, model_observer|
-          add_contents(rwidget) {
-            on_widget_selected { |selection_event|
-              model_observer.update(rwidget.widget.getSelection)
-            }
-          }
-        end
-      }
-    }    
-    
-    def can_handle?(parent, command_symbol, *args, &block)
-      parent.is_a?(RWidget) and
-       args.size == 1 and
-       args[0].is_a?(ModelObserver)
-    end
-    
-    def do_handle(parent, command_symbol, *args, &block)
-      model_observer = args[0]
-      widget_observer = WidgetObserver.new(parent, command_symbol.to_s)
-      widget_observer.update(model_observer.evaluate_property)
-      model = model_observer.model
-      model.extend ObservableModel unless model.is_a?(ObservableModel)
-      model.add_observer(model_observer.property_name, widget_observer)
-      widget_data_binder_map = @@widget_data_binders[parent.widget.class]
-      widget_data_binder = widget_data_binder_map[command_symbol.to_s.to_sym] if widget_data_binder_map
-      widget_data_binder.call(parent, model_observer) if widget_data_binder
-    end
-    
-  end
+require File.dirname(__FILE__) + "/../command_handler"
+require File.dirname(__FILE__) + "/models/r_widget"
+require File.dirname(__FILE__) + "/models/observable_model"
+require File.dirname(__FILE__) + "/models/model_observer"
+require File.dirname(__FILE__) + "/models/widget_observer"
+
+class DataBindingCommandHandler 
+  extend Glimmer
+  include CommandHandler
+  
+  include_package 'org.eclipse.swt.widgets'
+  
+  @@widget_data_binders = {
+    Java::OrgEclipseSwtWidgets::Text => {
+      :text => Proc.new do |rwidget, model_observer|
+        add_contents(rwidget) {
+          on_modify_text { |modify_event|
+            model_observer.update(rwidget.widget.getText)
+          }
+        }
+        end,
+      },
+      Java::OrgEclipseSwtWidgets::Button => {
+        :selection => Proc.new do |rwidget, model_observer|
+          add_contents(rwidget) {
+            on_widget_selected { |selection_event|
+              model_observer.update(rwidget.widget.getSelection)
+            }
+          }
+        end
+      },
+      Java::OrgEclipseSwtWidgets::Spinner => {
+        :selection => Proc.new do |rwidget, model_observer|
+          add_contents(rwidget) {
+            on_widget_selected { |selection_event|
+              model_observer.update(rwidget.widget.getSelection)
+            }
+          }
+        end
+      }
+    }    
+    
+    def can_handle?(parent, command_symbol, *args, &block)
+      parent.is_a?(RWidget) and
+       args.size == 1 and
+       args[0].is_a?(ModelObserver)
+    end
+    
+    def do_handle(parent, command_symbol, *args, &block)
+      model_observer = args[0]
+      widget_observer = WidgetObserver.new(parent, command_symbol.to_s)
+      widget_observer.update(model_observer.evaluate_property)
+      model = model_observer.model
+      model.extend ObservableModel unless model.is_a?(ObservableModel)
+      model.add_observer(model_observer.property_name, widget_observer)
+      widget_data_binder_map = @@widget_data_binders[parent.widget.class]
+      widget_data_binder = widget_data_binder_map[command_symbol.to_s.to_sym] if widget_data_binder_map
+      widget_data_binder.call(parent, model_observer) if widget_data_binder
+    end
+    
+  end

data/lib/command_handlers/list_selection_data_binding_command_handler.rb

@@ -0,0 +1,42 @@
+require File.dirname(__FILE__) + "/../command_handler"
+require File.dirname(__FILE__) + "/models/r_widget"
+require File.dirname(__FILE__) + "/models/list_observer"
+
+class ListSelectionDataBindingCommandHandler
+  include CommandHandler
+  include Glimmer
+  
+  include_package 'org.eclipse.swt.widgets'
+
+  def can_handle?(parent, command_symbol, *args, &block)
+    parent.is_a?(RWidget) and
+    parent.widget.is_a?(List) and
+    command_symbol.to_s == "selection" and
+    args.size == 1 and
+    args[0].is_a?(ModelObserver) and
+    args[0].evaluate_options_property.is_a?(Array) and
+    block == nil
+  end
+  
+  def do_handle(parent, command_symbol, *args, &block)
+    model_observer = args[0]
+    widget_observer = WidgetObserver.new(parent, "items")
+    widget_observer.update(model_observer.evaluate_options_property)
+    model = model_observer.model
+    model.extend ObservableModel unless model.is_a?(ObservableModel)
+    model.add_observer(model_observer.options_property_name, widget_observer)
+
+    property_type = :string
+    property_type = :array if parent.has_style?(multi)
+    list_observer = ListObserver.new(parent, property_type)
+    list_observer.update(model_observer.evaluate_property)
+    model.add_observer(model_observer.property_name, list_observer)
+    
+    add_contents(parent) {
+      on_widget_selected {
+        model_observer.update(list_observer.evaluate_property)
+      }
+    }
+  end
+
+end

data/lib/command_handlers/models/list_observer.rb

@@ -0,0 +1,31 @@
+class ListObserver
+  attr_reader :widget
+  @@property_type_updaters = {
+    :string => lambda { |widget, value| widget.widget.select(widget.widget.index_of(value.to_s)) }, 
+    :array => lambda { |widget, value| widget.widget.selection=((value or []).to_java :string) }
+  }
+  @@property_evaluators = {
+    :string => lambda do |selection_array|     
+      return nil if selection_array.empty?
+      selection_array[0]
+     end, 
+    :array => lambda do |selection_array| 
+      selection_array
+    end
+  }
+  def initialize(widget, property_type)
+    property_type = :string if property_type.nil? or property_type == :undefined
+    @widget = widget
+    @property_type = property_type
+  end
+  def update(value)
+    raise "hell" if value == ["Canada"]
+    @@property_type_updaters[@property_type].call(@widget, value) unless evaluate_property == value
+  end
+  def evaluate_property
+    selection_array = @widget.widget.send("selection").to_a
+    property_value = @@property_evaluators[@property_type].call(selection_array)
+    return property_value
+  end
+end
+