glimmer 0.1.0.0 → 0.1.2

data/{src → lib}/command_handlers/models/model_observer.rb

@@ -1,25 +1,28 @@
-# Copyright (C) 2007-2008 Annas Al Maleh
-# Licensed under the LGPL. See /COPYING.LGPL for more details.
-
-class ModelObserver
-  attr_reader :model, :property_name, :property_type
-  @@property_type_converters = {
-    :undefined => Proc.new { |value| value }, 
-    :fixnum => Proc.new { |string_value| string_value.to_i }
-    #TODO check what other types are needed
-  }
-  def initialize(model, property_name, property_type)
-    property_type = :undefined unless property_type
-    @model = model
-    @property_name = property_name
-    @property_type = property_type
-  end
-  def update(value)
-    converted_value = @@property_type_converters[@property_type].call(value)
-    @model.send(@property_name + "=", converted_value) unless evaluate_property == converted_value
-  end
-  def evaluate_property
-    @model.send(@property_name)
-  end
-end
-  
+class ModelObserver
+  attr_reader :model, :property_name, :property_type
+  @@property_type_converters = {
+    :undefined => lambda { |value| value }, 
+    :fixnum => lambda { |value| value.to_i },
+    :array => lambda { |value| value.to_a }
+  }
+  def initialize(model, property_name, property_type = :undefined)
+    property_type = :undefined if property_type.nil?
+    @model = model
+    @property_name = property_name
+    @property_type = property_type
+  end
+  def update(value)
+    converted_value = @@property_type_converters[@property_type].call(value)
+    @model.send(@property_name + "=", converted_value) unless evaluate_property == converted_value
+  end
+  def evaluate_property
+    @model.send(@property_name)
+  end
+  def evaluate_options_property
+    @model.send(@property_name + "_options")
+  end
+  def options_property_name
+    self.property_name + "_options"    
+  end
+end
+  

data/{src → lib}/command_handlers/models/observable_array.rb

@@ -1,46 +1,53 @@
-# Copyright (C) 2007-2008 Annas Al Maleh
-# Licensed under the LGPL. See /COPYING.LGPL for more details.
-
-module ObservableArray
-  
-  def add_observer(element_properties, observer)
-    property_observer_list << observer
-    each do |element|
-      element_properties.each do |property|
-        element.extend(ObservableModel) unless element.is_a?(ObservableModel)
-        element.add_observer(property, observer)
-      end
-    end
-  end
-
-  def property_observer_list
-    @property_observer_list = [] unless @property_observer_list
-    @property_observer_list
-  end
-  
-  def notify_observers
-    property_observer_list.each {|observer| observer.update}
-  end
-  
-  def self.extend_object(array)
-    array.instance_eval("alias original_add <<")
-    array.instance_eval "def <<(value) \n self.original_add(value); notify_observers; \nend"
-    
-    notify_observers_on_invokation(array, "delete", 1)
-    notify_observers_on_invokation(array, "delete_at", 1)
-    notify_observers_on_invokation(array, "clear")
-    
-    super
-  end
-  
-  def self.notify_observers_on_invokation(model, method, argument_count=0)
-    model.instance_eval "alias original_#{method} #{method}\n"
-    arguments = ""
-    for index in 1..argument_count
-      arguments += "argument" + index.to_s + ","
-    end
-    arguments = arguments[0..-2]
-    model.instance_eval "def #{method}(#{arguments}) \n self.original_#{method}(#{arguments}); notify_observers; \nend"
-  end
-
-end
+module ObservableArray
+  
+  def add_observer(element_properties, observer)
+    property_observer_list << observer
+    each do |element|
+      element_properties.each do |property|
+        element.extend(ObservableModel) unless element.is_a?(ObservableModel)
+        element.add_observer(property, observer)
+      end
+    end
+  end
+
+  def property_observer_list
+    @property_observer_list = [] unless @property_observer_list
+    @property_observer_list
+  end
+  
+  def notify_observers
+    property_observer_list.each {|observer| observer.update}
+  end
+  
+  def self.extend_object(array)
+    array.instance_eval("alias original_add <<")
+    array.instance_eval <<-end_eval, __FILE__, __LINE__
+      def <<(value) 
+        self.original_add(value) 
+        notify_observers 
+      end
+    end_eval
+    
+    notify_observers_on_invokation(array, "delete", 1)
+    notify_observers_on_invokation(array, "delete_at", 1)
+    notify_observers_on_invokation(array, "clear")
+    
+    super
+  end
+  
+  def self.notify_observers_on_invokation(model, method, argument_count=0)
+    model.instance_eval "alias original_#{method} #{method}\n"
+    arguments = ""
+    for index in 1..argument_count
+      arguments += "argument" + index.to_s + ","
+    end
+    arguments = arguments[0..-2]
+    model.instance_eval <<-end_eval, __FILE__, __LINE__
+      def #{method}(#{arguments})
+        self.original_#{method}(#{arguments}) 
+        notify_observers 
+      end
+    end_eval
+  end
+
+end

data/lib/command_handlers/models/observable_model.rb

@@ -0,0 +1,61 @@
+module ObservableModel
+  
+  def add_observer(property_name, observer)
+    property_observer_list(property_name) << observer
+  end
+
+  def property_observer_hash
+    @property_observers = Hash.new unless @property_observers
+    @property_observers
+  end
+  
+  def property_observer_list(property_name)
+    property_observer_hash[property_name.to_sym] = [] unless property_observer_hash[property_name.to_sym]
+    property_observer_hash[property_name.to_sym]
+  end
+  
+  def notify_observers(property_name)
+    property_observer_list(property_name).each {|observer| observer.update(send(property_name))}
+  end
+  
+  class Updater
+    def initialize(property_name, observable_model)
+      @property_name = property_name
+      @observable_model = observable_model
+    end
+    def update
+      @observable_model.notify_observers(@property_name)
+    end
+  end
+  
+  def self.extend_object(model)
+    super
+    model.methods.each do |method|
+      self.add_method_observers(model, method)
+    end
+  end
+  
+  def self.add_method_observers(model, method)
+    setter_method_pattern = /^(\w+=)$/
+    if (method.match(setter_method_pattern))
+      getter_method = method[0, method.length - 1]
+      getter_value = model.send(getter_method)
+      if (getter_value.is_a?(Array) and 
+          !getter_value.is_a?(ObservableArray))
+        getter_value.extend(ObservableArray)
+        getter_value.add_observer([], Updater.new(getter_method, model))
+      end
+      model.instance_eval "alias original_#{method} #{method}\n"
+      model.instance_eval <<-end_eval, __FILE__, __LINE__
+        def #{method}(value) 
+          self.original_#{method}(value)
+          notify_observers('#{getter_method}')
+          if (value.is_a?(Array) and !value.is_a?(ObservableArray))
+            value.extend(ObservableArray)
+            value.add_observer([], ObservableModel::Updater.new('#{getter_method}', self))
+          end  
+        end
+      end_eval
+    end
+  end
+end

data/{src → lib}/command_handlers/models/r_runnable.rb

@@ -1,14 +1,11 @@
-# Copyright (C) 2007-2008 Annas Al Maleh
-# Licensed under the LGPL. See /COPYING.LGPL for more details.
-
-class RRunnable
-  include java.lang.Runnable
-  
-  def initialize(&block)
-    @block = block
-  end
-  
-  def run
-    @block.call
-  end
-end
+class RRunnable
+  include java.lang.Runnable
+  
+  def initialize(&block)
+    @block = block
+  end
+  
+  def run
+    @block.call
+  end
+end

data/{src → lib}/command_handlers/models/r_shell.rb

@@ -1,27 +1,24 @@
-# Copyright (C) 2007-2008 Annas Al Maleh
-# Licensed under the LGPL. See /COPYING.LGPL for more details.
-
-require File.dirname(__FILE__) + "/r_widget"
-
-class RShell < RWidget
-  include_package 'org.eclipse.swt.layout'
-  include_package 'org.eclipse.swt.widgets'
-  
-  attr_reader :display
-  
-  def initialize(display = Display.new)
-    @display = display
-    @widget = Shell.new(@display)
-    @widget.setLayout(FillLayout.new)
-  end
-  
-  def open
-    @widget.pack
-    @widget.open
-    until @widget.isDisposed
-      @display.sleep unless @display.readAndDispatch
-    end
-    @display.dispose
-  end
-  
+require File.dirname(__FILE__) + "/r_widget"
+
+class RShell < RWidget
+  include_package 'org.eclipse.swt.layout'
+  include_package 'org.eclipse.swt.widgets'
+  
+  attr_reader :display
+  
+  def initialize(display = Display.new)
+    @display = display
+    @widget = Shell.new(@display)
+    @widget.setLayout(FillLayout.new)
+  end
+  
+  def open
+    @widget.pack
+    @widget.open
+    until @widget.isDisposed
+      @display.sleep unless @display.readAndDispatch
+    end
+    @display.dispose
+  end
+  
 end

data/lib/command_handlers/models/r_tab_item_composite.rb

@@ -0,0 +1,25 @@
+require File.dirname(__FILE__) + "/r_widget_listener"
+require File.dirname(__FILE__) + "/r_runnable"
+
+class RTabItemComposite < RWidget
+  include_package 'org.eclipse.swt.widgets'
+  
+  attr_reader :tab_item
+  def initialize(tab_item, parent, style, &contents)
+    super("composite", parent, style, &contents)
+    @tab_item = tab_item
+    @tab_item.widget.control = self.widget
+  end
+  
+  def respond_to?(method_symbol, *args)
+    if method_symbol.to_s == "text"
+      true
+    else
+      super(method_symbol, *args)
+    end
+  end
+
+  def text(text_value)
+    @tab_item.widget.text=text_value
+  end
+end

data/{src → lib}/command_handlers/models/r_widget.rb

@@ -1,6 +1,3 @@
-# Copyright (C) 2007-2008 Annas Al Maleh
-# Licensed under the LGPL. See /COPYING.LGPL for more details.
-
 require File.dirname(__FILE__) + "/r_widget_listener"
 require File.dirname(__FILE__) + "/r_runnable"
 
@@ -16,6 +13,7 @@ class RWidget
     "text" => SWT::BORDER,
     "table" => SWT::BORDER,
     "spinner" => SWT::BORDER,
+    "list" => SWT::BORDER | SWT::V_SCROLL,
     "button" => SWT::PUSH,
   }
   
@@ -32,7 +30,7 @@ class RWidget
   
   def initialize(underscored_widget_name, parent, style, &contents)
     style = default_style(underscored_widget_name) unless style
-    @widget = eval underscored_widget_name.to_s.camelcase(true) + '.new(parent, style)'
+    @widget = eval underscored_widget_name.to_s.camelcase + '.new(parent, style)'
     @@default_initializers[underscored_widget_name].call(@widget) if @@default_initializers[underscored_widget_name]
   end
   
@@ -43,11 +41,11 @@ class RWidget
   end
   
   def respond_to?(method_symbol, *args)
-    @widget.respond_to?("set" + method_symbol.to_s.camelcase(true), args)
+    @widget.respond_to?("set#{method_symbol.to_s.camelcase(:upper)}", args)
   end
   
   def method_missing(method_symbol, *args)
-    statement_to_eval = "@widget.send('set' + method_symbol.to_s.camelcase(true)"
+    statement_to_eval = "@widget.send('set' + method_symbol.to_s.camelcase(:upper)"
     statement_to_eval << expand_arguments(args)
     statement_to_eval << ")"
     eval statement_to_eval
@@ -65,7 +63,7 @@ class RWidget
   
   def self.widget_exists?(underscored_widget_name)
     begin
-      eval underscored_widget_name.camelcase(true)
+      eval underscored_widget_name.camelcase
       true
     rescue NameError        
       false
@@ -73,12 +71,12 @@ class RWidget
   end
   
   def widget_listener_exists?(underscored_listener_name)
-    listener_method_name = underscored_listener_name.camelcase()
+    listener_method_name = underscored_listener_name.listener_method_name(:lower)
     @widget.getClass.getMethods.each do |widget_method| 
       if widget_method.getName.match(/add.*Listener/)
         widget_method.getParameterTypes.each do |listener_type|
           listener_type.getMethods.each do |listener_method|
-            if (listener_method.getName.match(listener_method_name))
+            if (listener_method.getName == listener_method_name)
               return true
             end
           end
@@ -89,12 +87,12 @@ class RWidget
   end
   
   def can_add_listener?(underscored_listener_name)
-    listener_method_name = underscored_listener_name.camelcase()
+    listener_method_name = underscored_listener_name.camelcase(:lower)
     @widget.getClass.getMethods.each do |widget_method| 
       if widget_method.getName.match(/add.*Listener/)
         widget_method.getParameterTypes.each do |listener_type|
           listener_type.getMethods.each do |listener_method|
-            if (listener_method.getName.match(listener_method_name))
+            if (listener_method.getName == listener_method_name)
               return true
             end
           end
@@ -105,14 +103,14 @@ class RWidget
   end
   
   def add_listener(underscored_listener_name, &block) 
-    listener_method_name = underscored_listener_name.camelcase()
+    listener_method_name = underscored_listener_name.camelcase(:lower)
     @widget.getClass.getMethods.each do |widget_method| 
       if widget_method.getName.match(/add.*Listener/)
         widget_method.getParameterTypes.each do |listener_type|
           listener_type.getMethods.each do |listener_method|
-            if (listener_method.getName.match(listener_method_name))
+            if (listener_method.getName == listener_method_name)
               listener_class = Class.new(Object)
-              listener_class.send :include, (eval listener_type.to_s)
+              listener_class.send :include, (eval listener_type.to_s.sub("interface", ""))
               listener = listener_class.new
               listener_type.getMethods.each do |t_method|
                 eval "def listener.#{t_method.getName}(event) end"
@@ -143,4 +141,8 @@ class RWidget
     @widget.getDisplay.syncExec(RRunnable.new(&block))
   end
   
+  def has_style?(style)
+    (widget.style & style) == style
+  end
+  
 end

data/lib/command_handlers/models/r_widget_listener.rb

@@ -0,0 +1,9 @@
+class RWidgetListener
+  
+  attr_reader :listener
+  
+  def initialize(listener)
+    @listener = listener
+  end
+  
+end

data/{src → lib}/command_handlers/models/r_widget_packages.rb

@@ -1,9 +1,6 @@
-# Copyright (C) 2007-2008 Annas Al Maleh
-# Licensed under the LGPL. See /COPYING.LGPL for more details.
-
-# edit to add more packages and support custom widgets
-class RWidget
-  include_package 'org.eclipse.swt'
-  include_package 'org.eclipse.swt.layout'
-  include_package 'org.eclipse.swt.widgets'
+# edit to add more packages and support custom widgets
+class RWidget
+  include_package 'org.eclipse.swt'
+  include_package 'org.eclipse.swt.layout'
+  include_package 'org.eclipse.swt.widgets'
 end

data/{src → lib}/command_handlers/models/table_items_updater.rb

@@ -1,39 +1,38 @@
-# Copyright (C) 2007-2008 Annas Al Maleh
-# Licensed under the LGPL. See /COPYING.LGPL for more details.
-
-require File.dirname(__FILE__) + "/observable_array"
-require File.dirname(__FILE__) + "/observable_model"
-
-class TableItemsUpdater
-  include_package 'org.eclipse.swt'
-  include_package 'org.eclipse.swt.widgets'
-  
-  def initialize(parent, model_observer, column_properties)
-    @table = parent
-    @model_observer = model_observer
-    @column_properties = column_properties
-    update(@model_observer.evaluate_property)
-    model = model_observer.model
-    model.extend(ObservableModel) unless model.is_a?(ObservableModel)
-    model.add_observer(model_observer.property_name, self)
-  end
-  def update(model_collection=nil)
-    if (model_collection and model_collection.is_a?(Array))
-      model_collection.extend(ObservableArray)
-      model_collection.add_observer(@column_properties, self)
-      @model_collection = model_collection
-    end
-    populate_table(@model_collection, @table, @column_properties)
-  end
-  def populate_table(model_collection, parent, column_properties)
-    parent.widget.removeAll
-    model_collection.each do |model|
-      table_item = TableItem.new(parent.widget, SWT::NONE)
-      for index in 0..(column_properties.size-1)
-        table_item.setText(index, model.send(column_properties[index]).to_s)
-      end
-    end
-  end
-  
-end
-  
+require File.dirname(__FILE__) + "/observable_array"
+require File.dirname(__FILE__) + "/observable_model"
+
+class TableItemsUpdater
+  include_package 'org.eclipse.swt'
+  include_package 'org.eclipse.swt.widgets'
+  
+  def initialize(parent, model_observer, column_properties)
+    @table = parent
+    @model_observer = model_observer
+    @column_properties = column_properties
+    update(@model_observer.evaluate_property)
+    model = model_observer.model
+    model.extend(ObservableModel) unless model.is_a?(ObservableModel)
+    model.add_observer(model_observer.property_name, self)
+  end
+  def update(model_collection=nil)
+    if (model_collection and 
+        model_collection.is_a?(Array) and 
+        !model_collection.is_a?(ObservableArray))
+      model_collection.extend(ObservableArray)
+      model_collection.add_observer(@column_properties, self)
+      @model_collection = model_collection
+    end
+    populate_table(@model_collection, @table, @column_properties)
+  end
+  def populate_table(model_collection, parent, column_properties)
+    parent.widget.removeAll
+    model_collection.each do |model|
+      table_item = TableItem.new(parent.widget, SWT::NONE)
+      for index in 0..(column_properties.size-1)
+        table_item.setText(index, model.send(column_properties[index]).to_s)
+      end
+    end
+  end
+  
+end
+