glimmer 0.1.0.0 → 0.1.2

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

@@ -1,10 +1,8 @@
-# Copyright (C) 2007-2008 Annas Al Maleh
-# Licensed under the LGPL. See /COPYING.LGPL for more details.
-
 class WidgetObserver
   attr_reader :widget, :property
   @@property_type_converters = {
-    :text => Proc.new { |value| value.to_s }
+    :text => Proc.new { |value| value.to_s },
+    :items => Proc.new { |value| value.to_java :string}
   }
   def initialize model, property
     @widget = model
@@ -14,10 +12,10 @@ class WidgetObserver
     converted_value = value
     converter = @@property_type_converters[@property.to_sym]
     converted_value = converter.call(value) if converter
-    @widget.widget.send "set" + @property.camelcase(true), converted_value unless evaluate_property == converted_value
+    @widget.widget.send("set#{@property.camelcase(:upper)}", converted_value) unless evaluate_property == converted_value
   end
   def evaluate_property
-    @widget.widget.send("get" + @property.camelcase(true))
+    @widget.widget.send(@property)
   end
 end
   

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

@@ -1,18 +1,15 @@
-# 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_shell"
-
-class ShellCommandHandler
-  include CommandHandler
-  
-  def can_handle?(parent, command_symbol, *args, &block)
-    command_symbol.to_s == "shell"
-  end
-  
-  def do_handle(parent, command_symbol, *args, &block) 
-    RShell.send(:new, *args)
-  end
-  
+require File.dirname(__FILE__) + "/../command_handler"
+require File.dirname(__FILE__) + "/models/r_shell"
+
+class ShellCommandHandler
+  include CommandHandler
+  
+  def can_handle?(parent, command_symbol, *args, &block)
+    command_symbol.to_s == "shell"
+  end
+  
+  def do_handle(parent, command_symbol, *args, &block) 
+    RShell.send(:new, *args)
+  end
+  
 end

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

@@ -1,22 +1,19 @@
-# 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"
-
-class SwtConstantCommandHandler
-  include CommandHandler
-  
-  include_package 'org.eclipse.swt'
-
-  def can_handle?(parent, command_symbol, *args, &block)
-      args.size == 0 and
-      block == nil
-  end
-  
-  def do_handle(parent, command_symbol, *args, &block)
-    puts 'org.eclipse.swt.SWT::' + command_symbol.to_s.upcase
-    eval 'org.eclipse.swt.SWT::' + command_symbol.to_s.upcase
-  end
-  
+require File.dirname(__FILE__) + "/../command_handler"
+require File.dirname(__FILE__) + "/models/r_widget"
+
+class SwtConstantCommandHandler
+  include CommandHandler
+  
+  include_package 'org.eclipse.swt'
+
+  def can_handle?(parent, command_symbol, *args, &block)
+      args.size == 0 and
+      block == nil
+  end
+  
+  def do_handle(parent, command_symbol, *args, &block)
+    puts 'org.eclipse.swt.SWT::' + command_symbol.to_s.upcase
+    eval 'org.eclipse.swt.SWT::' + command_symbol.to_s.upcase
+  end
+  
 end

data/lib/command_handlers/tab_item_command_handler.rb

@@ -0,0 +1,22 @@
+require File.dirname(__FILE__) + "/../command_handler"
+require File.dirname(__FILE__) + "/models/r_shell"
+require File.dirname(__FILE__) + "/models/r_tab_item_composite"
+
+class TabItemCommandHandler
+  include CommandHandler
+  include Glimmer
+  
+  def can_handle?(parent, command_symbol, *args, &block)
+    parent.is_a?(RWidget) and 
+      command_symbol.to_s == "tab_item" and
+      (args.size == 0 or 
+        (args.size == 1 and args[0].is_a?(Fixnum)))
+  end
+  
+  def do_handle(parent, command_symbol, *args, &block) 
+    style = args[0] if args.size == 1
+    tab_item = RWidget.new(command_symbol.to_s, parent.widget, style)
+    RTabItemComposite.new(tab_item, parent.widget, style)
+  end
+  
+end

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

@@ -1,24 +1,21 @@
-# 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"
-
-class TableColumnPropertiesDataBindingCommandHandler
-  include CommandHandler
-  
-  include_package 'org.eclipse.swt'
-  include_package 'org.eclipse.swt.widgets'
-
-  def can_handle?(parent, command_symbol, *args, &block)
-    parent.is_a?(RWidget) and
-    parent.widget.is_a?(Table) and
-    command_symbol.to_s == "column_properties" and
-    block == nil
-  end
-  
-  def do_handle(parent, command_symbol, *args, &block)
-    args
-  end
-  
+require File.dirname(__FILE__) + "/../command_handler"
+require File.dirname(__FILE__) + "/models/r_widget"
+
+class TableColumnPropertiesDataBindingCommandHandler
+  include CommandHandler
+  
+  include_package 'org.eclipse.swt'
+  include_package 'org.eclipse.swt.widgets'
+
+  def can_handle?(parent, command_symbol, *args, &block)
+    parent.is_a?(RWidget) and
+    parent.widget.is_a?(Table) and
+    command_symbol.to_s == "column_properties" and
+    block == nil
+  end
+  
+  def do_handle(parent, command_symbol, *args, &block)
+    args
+  end
+  
 end

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

@@ -1,30 +1,27 @@
-# 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/table_items_updater"
-
-class TableItemsDataBindingCommandHandler
-  include CommandHandler
-  
-  include_package 'org.eclipse.swt.widgets'
-
-  def can_handle?(parent, command_symbol, *args, &block)
-    parent.is_a?(RWidget) and
-    parent.widget.is_a?(Table) and
-    command_symbol.to_s == "items" and
-    args.size == 2 and
-    args[0].is_a?(ModelObserver) and
-    args[0].evaluate_property.is_a?(Array) and
-    args[1].is_a?(Array) and
-    block == nil
-  end
-  
-  def do_handle(parent, command_symbol, *args, &block)
-    model_observer = args[0]
-    column_properties = args[1]
-    TableItemsUpdater.new(parent, model_observer, column_properties)
-  end
-
+require File.dirname(__FILE__) + "/../command_handler"
+require File.dirname(__FILE__) + "/models/r_widget"
+require File.dirname(__FILE__) + "/models/table_items_updater"
+
+class TableItemsDataBindingCommandHandler
+  include CommandHandler
+  
+  include_package 'org.eclipse.swt.widgets'
+
+  def can_handle?(parent, command_symbol, *args, &block)
+    parent.is_a?(RWidget) and
+    parent.widget.is_a?(Table) and
+    command_symbol.to_s == "items" and
+    args.size == 2 and
+    args[0].is_a?(ModelObserver) and
+    args[0].evaluate_property.is_a?(Array) and
+    args[1].is_a?(Array) and
+    block == nil
+  end
+  
+  def do_handle(parent, command_symbol, *args, &block)
+    model_observer = args[0]
+    column_properties = args[1]
+    TableItemsUpdater.new(parent, model_observer, column_properties)
+  end
+
 end

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

@@ -1,26 +1,23 @@
-# 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"
-
-class WidgetCommandHandler
-  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 != "shell" and
-      (args.size == 0 or 
-        (args.size == 1 and args[0].is_a?(Fixnum))) and
-      RWidget.widget_exists?(command_symbol.to_s)
-  end
-  
-  def do_handle(parent, command_symbol, *args, &block)
-    style = args[0] if args.size == 1
-    puts "style argument is: " + style.to_s
-    RWidget.new(command_symbol.to_s, parent.widget, style)
-  end
-  
+require File.dirname(__FILE__) + "/../command_handler"
+require File.dirname(__FILE__) + "/models/r_widget"
+
+class WidgetCommandHandler
+  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 != "shell" and
+      (args.size == 0 or 
+        (args.size == 1 and args[0].is_a?(Fixnum))) and
+      RWidget.widget_exists?(command_symbol.to_s)
+  end
+  
+  def do_handle(parent, command_symbol, *args, &block)
+    style = args[0] if args.size == 1
+    puts "style argument is: " + style.to_s
+    RWidget.new(command_symbol.to_s, parent.widget, style)
+  end
+  
 end

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

@@ -1,35 +1,37 @@
-# 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"
-
-class WidgetListenerCommandHandler
-  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[0,3] == "on_" and
-      command_symbol.to_s.length > 3 and
-      args.size == 0 and
-      parent.can_add_listener?(command_symbol.to_s[3, command_symbol.to_s.length])
-  end
-  
-  def do_handle(parent, command_symbol, *args, &block)
-    parent.add_listener(command_symbol.to_s[3, command_symbol.to_s.length], &block)
-    ListenerParent.new #TODO refactor and move to models
-  end
-  
-  #TODO refactor and move to separate file
-  class ListenerParent
-      include Parent
-      
-    def process_block(block)
-      #NOOP
-    end
-    
-  end
-  
+require File.dirname(__FILE__) + "/../command_handler"
+require File.dirname(__FILE__) + "/models/r_widget"
+
+class WidgetListenerCommandHandler
+  include CommandHandler
+  
+  include_package 'org.eclipse.swt.widgets'
+
+  def can_handle?(parent, command_symbol, *args, &block)
+    puts "parent is a widget: " + (parent.is_a?(RWidget)).to_s
+    return unless parent.is_a?(RWidget)
+    puts "on listener?: " + (command_symbol.to_s[0,3] == "on_").to_s
+    return unless command_symbol.to_s[0,3] == "on_"
+    puts "command symbol is longer than 3: " + (command_symbol.to_s.length > 3).to_s
+    return unless command_symbol.to_s.length > 3
+    puts "args are 0?: " + (args.size == 0).to_s
+    return unless args.size == 0
+    puts "can add listener? " + (parent.can_add_listener?(command_symbol.to_s[3, command_symbol.to_s.length])).to_s
+    parent.can_add_listener?(command_symbol.to_s[3, command_symbol.to_s.length])
+  end
+  
+  def do_handle(parent, command_symbol, *args, &block)
+    parent.add_listener(command_symbol.to_s[3, command_symbol.to_s.length], &block)
+    ListenerParent.new #TODO refactor and move to models
+  end
+  
+  #TODO refactor and move to separate file
+  class ListenerParent
+      include Parent
+      
+    def process_block(block)
+      #NOOP
+    end
+    
+  end
+  
 end

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

@@ -1,22 +1,19 @@
-# 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"
-
-class WidgetMethodCommandHandler
-  include CommandHandler
-  
-  def can_handle?(parent, command_symbol, *args, &block)
-    parent.is_a?(RWidget) and 
-      args.size > 0 and
-      block == nil and
-      parent.respond_to?(command_symbol, *args)
-  end
-  
-  def do_handle(parent, command_symbol, *args, &block) 
-    parent.send(command_symbol, *args)
-    nil
-  end
-  
+require File.dirname(__FILE__) + "/../command_handler"
+require File.dirname(__FILE__) + "/models/r_widget"
+
+class WidgetMethodCommandHandler
+  include CommandHandler
+  
+  def can_handle?(parent, command_symbol, *args, &block)
+    parent.is_a?(RWidget) and 
+      args.size > 0 and
+      block == nil and
+      parent.respond_to?(command_symbol, *args)
+  end
+  
+  def do_handle(parent, command_symbol, *args, &block) 
+    parent.send(command_symbol, *args)
+    nil
+  end
+  
 end

data/{src → lib}/glimmer.rb

@@ -1,45 +1,52 @@
-# Glimmer - a JRuby DSL that enables easy and efficient authoring of user-interfaces 
-# using the robust platform-independent Eclipse SWT library. Glimmer comes with built-in 
-# data-binding support to greatly facilitate synchronizing UI with domain models.
-#
-# Copyright (C) 2007-2008 Annas Al Maleh
-# Licensed under the LGPL. See /COPYING.LGPL for more details.
-
-require "rubygems"
-require "facets"
-require "java"
-require File.dirname(__FILE__) + "/parent"
-
-module Glimmer
-  
-  include_package 'org.eclipse.swt'
-  
-  @@parent_stack = []
-
-  def self.method_missing(method_symbol, *args, &block)
-    puts "method: " + method_symbol.to_s + " and args: " + args.to_s
-    command_handler_chain = CommandHandlerChainFactory.chain
-    return_value = command_handler_chain.handle(@@parent_stack.last, method_symbol, *args, &block)
-    add_contents(return_value, &block)
-    return return_value
-  end
-
-  def self.add_contents(parent, &block)
-    @@parent_stack.push(parent) if parent.is_a?(Parent)
-    @@parent_stack.last.process_block(block) if block and @@parent_stack.last
-    @@parent_stack.pop if parent.is_a?(Parent)
-  end
-
-  #added for convenience
-  
-  def method_missing(method_symbol, *args, &block)
-    Glimmer.method_missing(method_symbol, *args, &block)
-  end
-
-  def add_contents(parent, &block)
-    Glimmer.add_contents(parent, &block)
-  end
-end
-
-# Command handlers may rely on Glimmer, so this is put here to avoid an infinite loop.
-#require File.dirname(__FILE__) + "/command_handlers"
+# Glimmer - a JRuby DSL that enables easy and efficient authoring of user
+# interfaces using the robust platform-independent Eclipse SWT library. Glimmer 
+# comes with built-in data-binding support to greatly facilitate synchronizing 
+# UI with domain models.
+
+require "rubygems"
+require "facets"
+require "java"
+require File.dirname(__FILE__) + "/parent"
+
+module Glimmer
+  
+  include_package 'org.eclipse.swt'
+  
+  @@parent_stack = []
+
+  def self.method_missing(method_symbol, *args, &block)
+    puts "method: " + method_symbol.to_s + " and args: " + args.to_s
+    command_handler_chain = CommandHandlerChainFactory.chain
+    return_value = command_handler_chain.handle(@@parent_stack.last, method_symbol, *args, &block)
+    add_contents(return_value, &block)
+    return return_value
+  end
+
+  def self.add_contents(parent, &block)
+    @@parent_stack.push(parent) if parent.is_a?(Parent)
+    @@parent_stack.last.process_block(block) if block and @@parent_stack.last
+    @@parent_stack.pop if parent.is_a?(Parent)
+  end
+
+  def self.dsl(dsl)
+    CommandHandlerChainFactory.select_dsl(dsl)
+  end
+
+  #added for convenience
+  
+  def method_missing(method_symbol, *args, &block)
+    Glimmer.method_missing(method_symbol, *args, &block)
+  end
+
+  def add_contents(parent, &block)
+    Glimmer.add_contents(parent, &block)
+  end
+
+  def dsl(dsl)
+    CommandHandlerChainFactory.select_dsl(dsl)
+  end
+end
+
+# Command handlers may rely on Glimmer, so this is put here to avoid an infinite loop.
+require File.dirname(__FILE__) + "/command_handlers"
+require File.dirname(__FILE__) + "/xml_command_handlers"