clevic 0.12.0 → 0.13.0.b1

data/lib/clevic/swing/ui/src/TagEditor.java

@@ -0,0 +1,108 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+/*
+ * TagEditor.java
+ *
+ * Created on Oct 8, 2010, 11:28:47 AM
+ */
+
+/**
+ *
+ * @author panic
+ */
+public class TagEditor extends javax.swing.JPanel {
+
+    /** Creates new form TagEditor */
+    public TagEditor() {
+        initComponents();
+    }
+
+    /** This method is called from within the constructor to
+     * initialize the form.
+     * WARNING: Do NOT modify this code. The content of this method is
+     * always regenerated by the Form Editor.
+     */
+    @SuppressWarnings("unchecked")
+    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
+    private void initComponents() {
+
+        text_field = new javax.swing.JTextField();
+        item_list = new javax.swing.JList();
+        ok_button = new javax.swing.JButton();
+        cancel_button = new javax.swing.JButton();
+        add_button = new javax.swing.JButton();
+        remove_button = new javax.swing.JButton();
+
+        text_field.setName("text_field"); // NOI18N
+
+        item_list.setName("item_list"); // NOI18N
+
+        ok_button.setText("OK"); // NOI18N
+        ok_button.setToolTipText("Accept selection"); // NOI18N
+        ok_button.setName("ok_button"); // NOI18N
+
+        cancel_button.setText("Cancel"); // NOI18N
+        cancel_button.setName("cancel_button"); // NOI18N
+
+        add_button.setText("+"); // NOI18N
+        add_button.setToolTipText("Add a new item"); // NOI18N
+        add_button.setBorder(null);
+        add_button.setName("add_button"); // NOI18N
+
+        remove_button.setText("-"); // NOI18N
+        remove_button.setToolTipText("Remove selected item"); // NOI18N
+        remove_button.setBorder(null);
+        remove_button.setName("remove_button"); // NOI18N
+
+        org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
+        this.setLayout(layout);
+        layout.setHorizontalGroup(
+            layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+            .add(layout.createSequentialGroup()
+                .addContainerGap()
+                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+                    .add(text_field, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 210, Short.MAX_VALUE)
+                    .add(layout.createSequentialGroup()
+                        .add(ok_button)
+                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 82, Short.MAX_VALUE)
+                        .add(cancel_button))
+                    .add(layout.createSequentialGroup()
+                        .add(add_button, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 27, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
+                        .add(remove_button, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 27, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+                    .add(item_list, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 207, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+                .addContainerGap())
+        );
+        layout.setVerticalGroup(
+            layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
+            .add(layout.createSequentialGroup()
+                .addContainerGap()
+                .add(text_field, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
+                .add(item_list, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 199, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                .add(15, 15, 15)
+                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+                    .add(add_button, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 20, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
+                    .add(remove_button, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 19, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
+                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED, 30, Short.MAX_VALUE)
+                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
+                    .add(ok_button)
+                    .add(cancel_button))
+                .addContainerGap())
+        );
+    }// </editor-fold>//GEN-END:initComponents
+
+
+    // Variables declaration - do not modify//GEN-BEGIN:variables
+    public javax.swing.JButton add_button;
+    public javax.swing.JButton cancel_button;
+    public javax.swing.JList item_list;
+    public javax.swing.JButton ok_button;
+    public javax.swing.JButton remove_button;
+    public javax.swing.JTextField text_field;
+    // End of variables declaration//GEN-END:variables
+
+}

data/lib/clevic/table_index.rb

@@ -0,0 +1,100 @@
+require 'clevic/field_valuer.rb'
+
+module Clevic
+  # to be included in something that responds to model, row, column
+  module TableIndex
+    include FieldValuer
+    
+    # return the Clevic::Field for this index
+    def field
+      @field ||= model.field_for_index( self )
+    end
+    
+    def dump
+      if valid?
+      <<-EOF
+      field: #{field_name} => #{field_value}
+      attribute: #{attribute.inspect} => #{attribute_value.inspect}
+      meta: #{meta.inspect}
+      EOF
+      else
+        'invalid'
+      end
+    end
+    
+    def prev
+      choppy( :row => row - 1 )
+    end
+    
+    # return the attribute of the underlying entity corresponding
+    # to the column of this index
+    def attribute
+      model.attributes[column]
+    end
+    
+    # returns the list of ModelColumn metadata
+    def meta
+      # use the optimised version
+      # TODO just use the model version instead?
+      field.meta
+    end
+    
+    # return the table's field name. For associations, this would
+    # be suffixed with _id
+    def field_name
+      meta.name
+    end
+    
+    # return the value of the field, it may be the _id value
+    def field_value
+      entity.send( field_name )
+    end
+    
+    # the underlying entity
+    # TODO caching doesn't help with Qt because ModelIndex objects are
+    # extremely short-lived. Not sure about swing.
+    def entity
+      return nil if model.nil?
+      model.collection[row]
+    end
+    
+    attr_writer :entity
+    
+    # return true if validation failed for this indexes field
+    def has_errors?
+      # virtual fields don't have metadata
+      if meta.nil?
+        false
+      else
+        entity.errors.invalid?( field_name.to_sym )
+      end
+    end
+    
+    # return a collection of errors. Unlike AR, this
+    # will always return an array that will have zero, one
+    # or many elements.
+    def errors
+      [ entity.errors[field_name.to_sym] ].flatten
+    end
+    
+    # sort by row, then column
+    def <=>( other )
+      row_comp = self.row <=> other.row
+      if row_comp == 0
+        self.column <=> other.column
+      else
+        row_comp
+      end
+    end
+    
+    def inspect
+      "#<TableIndex (#{row},#{column}) '#{raw_value rescue "no raw value: #{$!.message}"}'>"
+    end
+    
+    # return a string (row,column)
+    # suitable for displaying to users, ie 1-based not 0-based
+    def rc
+      "(#{row+1},#{column+1})"
+    end
+  end
+end

data/lib/clevic/table_model.rb

@@ -1,9 +1,5 @@
-require 'Qt4'
 require 'date'
 
-require 'qtext/flags.rb'
-require 'qtext/extensions.rb'
-
 require 'clevic/extensions.rb'
 require 'clevic/model_column'
 
@@ -12,12 +8,10 @@ module Clevic
 =begin rdoc
 An instance of Clevic::TableModel is constructed by Clevic::ModelBuilder from the
 UI definition in a Clevic::View, or from the default Clevic::View created by
-including the Clevic::Record module in a ActiveRecord::Base subclass.
+including the Clevic::Record module in a Sequel::Model subclass.
 =end
-class TableModel < Qt::AbstractTableModel
-  include QtFlags
-  
-  # the CacheTable of Clevic::Record or ActiveRecord::Base objects
+class TableModel
+  # the CacheTable of Clevic::Record or Sequel::Model objects
   attr_reader :collection
   alias_method :cache_table, :collection
   
@@ -35,25 +29,19 @@ class TableModel < Qt::AbstractTableModel
   attr_accessor :entity_view
   attr_accessor :builder
   
+  # If somre or all the entities in the collection is related to a single entity
+  # somewhere else, this is it. Not sure if this is the right
+  # way to do it, but try anyway.
+  attr_accessor :one
+  
   def entity_class
     entity_view.entity_class
   end
   
-  signals(
-    # index where error occurred, value, message
-    'data_error(QModelIndex,QVariant,QString)'
-  )
-  
-  def initialize( parent = nil )
-    super
-    @metadatas = []
-  end
-  
   def fields=( arr )
     @fields = arr
     
     # reset these
-    @metadatas = []
     @labels = nil
     @attributes = nil
   end
@@ -79,87 +67,53 @@ class TableModel < Qt::AbstractTableModel
   def collection=( arr )
     @collection = arr
     # fill in an empty record for data entry
-    if collection.size == 0 && auto_new?
-      collection << entity_class.new
-    end
-  end
-  
-  def sort( col, order )
-    puts 'sort'
-    puts "col: #{col.inspect}"
-    #~ Qt::AscendingOrder
-    #~ Qt::DescendingOrder
-    puts "order: #{order.inspect}"
-    super
-  end
-  
-  # this is called for read-only tables.
-  def match( start_index, role, search_value, hits, match_flags )
-    #~ Qt::MatchExactly	0	Performs QVariant-based matching.
-    #~ Qt::MatchFixedString	8	Performs string-based matching. String-based comparisons are case-insensitive unless the MatchCaseSensitive flag is also specified.
-    #~ Qt::MatchContains	1	The search term is contained in the item.
-    #~ Qt::MatchStartsWith	2	The search term matches the start of the item.
-    #~ Qt::MatchEndsWith	3	The search term matches the end of the item.
-    #~ Qt::MatchCaseSensitive	16	The search is case sensitive.
-    #~ Qt::MatchRegExp	4	Performs string-based matching using a regular expression as the search term.
-    #~ Qt::MatchWildcard	5	Performs string-based matching using a string with wildcards as the search term.
-    #~ Qt::MatchWrap	32	Perform a search that wraps around, so that when the search reaches the last item in the model, it begins again at the first item and continues until all items have been examined.
-    #~ super
-    []
-  end
-  
-  # cache metadata (ActiveRecord#column_for_attribute) because it's not going
-  # to change over the lifetime of the table
-  # if the column is an attribute, create a ModelColumn
-  # TODO use ActiveRecord::Base.reflections instead
-  def metadata( column )
-    if @metadatas[column].nil?
-      meta = entity_class.columns_hash[attributes[column].to_s]
-      if meta.nil?
-        meta = entity_class.columns_hash[ "#{attributes[column]}_id" ]
-        if meta.nil?
-          return nil
-        else
-          @metadatas[column] = ModelColumn.new( attributes[column], :association, meta )
-        end
-      else
-        @metadatas[column] = meta
-      end
-    end
-    @metadatas[column]
+    add_new_item if collection.empty? && auto_new?
   end
   
   # add a new item, and set defaults from the Clevic::View
+  # add_new_item_start and add_new_item_end are provided by
+  # the GUI framework-specific class
   def add_new_item
-    begin_insert_rows( Qt::ModelIndex.invalid, row_count, row_count )
-    # set default values without triggering changed
+    add_new_item_start
+    
     entity = entity_class.new
+    
+    # set default values without triggering changed
     fields.each do |f|
-      unless f.default.nil?
-        f.set_default_for( entity )
-      end
+      f.set_default_for( entity ) unless f.default.nil?
     end
     
     collection << entity
     
-    end_insert_rows
+    add_new_item_end
   end
   
   # rows is a collection of integers specifying row indices to remove
   def remove_rows( rows )
-    # delete from the end to avoid holes affecting the indexing
-    rows.uniq.sort.reverse.each do |index|
-      # remove the item from the collection
-      # NOTE call this within each iteration because
-      # the rows array may be non-contiguous
-      begin_remove_rows( Qt::ModelIndex.invalid, index, index )
-      removed = collection.delete_at( index )
-      end_remove_rows
-      # destroy the db object, and its associated table row
-      removed.destroy
+    # don't delete rows twice
+    # put the entities to be removed in a separate collection
+    # I can't figure out why the collection fails when they're
+    # removed directly
+    rows_in_order = rows.uniq.sort
+    removals = rows_in_order.map do |index|
+      collection[index]
+    end
+    
+    remove_notify( rows_in_order ) do
+      removals.each do |to_remove, index|
+        # destroy the db object, and its associated table row
+        to_remove.destroy unless to_remove.nil? || to_remove.new?
+      end
     end
     
+    # because it's too bloody complicated to figure out which items
+    # were deleted and then remove them from the collection. And there
+    # most likely isn't a big hit for doing this, unless there's a lot
+    # of cached calcuation in the entities.
+    self.collection = collection.renew
+    
     # create a new row if auto_new is on
+    # should really be in a signal handler
     add_new_item if collection.empty? && auto_new?
   end
   
@@ -170,7 +124,7 @@ class TableModel < Qt::AbstractTableModel
     if item.changed?
       if item.valid?
         retval = item.save
-        emit headerDataChanged( Qt::Vertical, index.row, index.row )
+        data_changed( index )
         retval
       else
         false
@@ -179,322 +133,30 @@ class TableModel < Qt::AbstractTableModel
       # AR model not changed
       true
     end
-  end
-  
-  def rowCount( parent = nil )
-    collection.size
-  end
-
-  # Not looked up or aliased properly by Qt bindings
-  def row_count
-    collection.size
-  end
-  
-  def columnCount( parent = nil )
-    fields.size
-  end
-  
-  # Not looked up or aliased properly by Qt bindings
-  def column_count
-    fields.size
-  end
-  
-  def flags( model_index )
-    retval = super
-    
-    # sometimes this actually happens. 
-    # TODO probably a bug in the combo editor exit code
-    return retval if model_index.column >= columnCount
-    
-    # TODO don't return IsEditable if the model is read-only
-    if model_index.metadata.type == :boolean
-      retval = item_boolean_flags
-    end
-    
-    unless model_index.field.read_only? || model_index.entity.readonly? || read_only?
-      retval |= qt_item_is_editable.to_i 
-    end
-    retval
+  rescue
+    puts $!.message
+    puts $!.backtrace
+    emit_data_error( index, nil, $!.message )
   end
   
   def reload_data( options = nil )
     # renew cache. All records will be dropped and reloaded.
-    self.collection = self.collection.renew( options )
+    self.collection = self.cache_table.renew( options )
     # tell the UI we had a major data change
     reset
   end
 
-  # values for horizontal and vertical headers
-  def headerData( section, orientation, role )
-    value = 
-    case role
-      when qt_display_role
-        case orientation
-          when Qt::Horizontal
-            labels[section]
-          when Qt::Vertical
-            # don't force a fetch from the db
-            if collection.cached_at?( section )
-              collection[section].id
-            else
-              section
-            end
-        end
-        
-      when qt_text_alignment_role
-        case orientation
-          when Qt::Vertical
-            Qt::AlignRight | Qt::AlignVCenter
-        end
-          
-      when Qt::SizeHintRole
-        # anything other than nil here makes the headers disappear.
-        nil
-        
-      when qt_tooltip_role
-        case orientation
-          when Qt::Horizontal
-            fields[section].tooltip
-            
-          when Qt::Vertical
-            case
-              when !collection[section].errors.empty?
-                'Invalid data'
-              when collection[section].changed?
-                'Unsaved changes'
-            end
-        end
-        
-      when qt_background_role
-        if orientation == Qt::Vertical
-          item = collection[section]
-          case
-            when !item.errors.empty?
-              Qt::Color.new( 'orange' )
-            when item.changed?
-              Qt::Color.new( 'yellow' )
-          end
-        end
-        
-      else
-        #~ puts "headerData section: #{section}, role: #{const_as_string(role)}" if $options[:debug]
-        nil
-    end
-    
-    return value.to_variant
-  end
-  
-  # Provide data to UI.
-  def data( index, role = qt_display_role )
-    #~ puts "data for index: #{index.inspect}, field #{index.field.attribute.inspect} and role: #{const_as_string role}"
-    begin
-      retval =
-      case role
-        when qt_display_role
-          # boolean values generally don't have text next to them in this context
-          # check this explicitly to avoid fetching the entity from
-          # the model's collection (and maybe db) when we
-          # definitely don't need to
-          unless index.metadata.type == :boolean
-            value = index.gui_value
-            index.field.do_format( value ) unless value.nil?
-          end
-          
-        when qt_edit_role
-          # see comment for qt_display_role
-          unless index.metadata.type == :boolean
-            value = index.gui_value
-            index.field.do_edit_format( value ) unless value.nil?
-          end
-          
-        when qt_checkstate_role
-          if index.metadata.type == :boolean
-            index.gui_value ? qt_checked : qt_unchecked
-          end
-          
-        when qt_text_alignment_role
-          case index.field.alignment
-            when :left; qt_alignleft
-            when :right; qt_alignright
-            when :centre; qt_aligncenter
-            when :justified; qt_alignjustified
-          end
-        
-        # just here to make debug output quieter
-        when qt_size_hint_role;
-        
-        # show field with a red background if there's an error
-        when qt_background_role
-          index.field.background_for( index.entity ) || Qt::Color.new( 'red' ) if index.has_errors?
-        
-        when qt_font_role;
-        
-        when qt_foreground_role
-          index.field.foreground_for( index.entity ) ||
-          if index.field.read_only? || index.entity.readonly? || read_only?
-            Qt::Color.new( 'dimgray' )
-          end
-        
-        when qt_decoration_role;
-          index.field.decoration_for( index.entity )
-        
-        when qt_tooltip_role
-          case
-            # show ActiveRecord validation errors
-            when index.has_errors?
-              index.errors.join("\n")
-              
-            # provide a tooltip when an empty relational field is encountered
-            # TODO should be part of field definition
-            when index.metadata.type == :association
-              index.field.delegate.if_empty_message
-            
-            # read-only field
-            when index.field.read_only?
-              'Read-only'
-              
-            else
-              index.field.tooltip_for( index.entity )
-          end    
-        else
-          puts "data index: #{index}, role: #{const_as_string(role)}" if $options[:debug]
-          nil
-      end
-      
-      # return a variant
-      #~ puts "retval: #{retval.inspect}"
-      retval.to_variant
-    rescue Exception => e
-      puts "#{index.inspect} #{value.inspect} #{index.entity.inspect} for and role: #{const_as_string role}"
-      puts e.message
-      puts e.backtrace
-      nil.to_variant
-    end
-  end
-
-  # data sent from UI
-  # return true if conversion from variant was successful,
-  # or false if something went wrong.
-  def setData( index, variant, role = qt_edit_role )
-    if index.valid?
-      case role
-      when qt_edit_role
-        # Don't allow the primary key to be changed
-        return false if index.attribute == entity_class.primary_key.to_sym
-        
-        if ( index.column < 0 || index.column >= column_count )
-          raise "invalid column #{index.column}" 
-        end
-        
-        type = index.metadata.type
-        value = variant.value
-        #~ puts "#{type.inspect} is #{value}"
-        
-        # translate the value from the ui to something that
-        # the AR model will understand
-        begin
-          index.attribute_value =
-          case
-            when value.class.name == 'Qt::Date'
-              Date.new( value.year, value.month, value.day )
-              
-            when value.class.name == 'Qt::Time'
-              Time.new( value.hour, value.min, value.sec )
-              
-            # allow flexibility in entering dates. For example
-            # 16jun, 16-jun, 16 jun, 16 jun 2007 would be accepted here
-            # TODO need to be cleverer about which year to use
-            # for when you're entering 16dec and you're in the next
-            # year
-            when [:date,:datetime].include?( type ) && value =~ %r{^(\d{1,2})[ /-]?(\w{3})$}
-              Date.parse( "#$1 #$2 #{Time.now.year.to_s}" )
-            
-            # if a digit only is entered, fetch month and year from
-            # previous row
-            when [:date,:datetime].include?( type ) && value =~ %r{^(\d{1,2})$}
-              previous_entity = collection[index.row - 1]
-              # year,month,day
-              Date.new( previous_entity.date.year, previous_entity.date.month, $1.to_i )
-            
-            # this one is mostly to fix date strings that have come
-            # out of the db and been formatted
-            when [:date,:datetime].include?( type ) && value =~ %r{^(\d{2})[ /-](\w{3})[ /-](\d{2})$}
-              Date.parse( "#$1 #$2 20#$3" )
-            
-            # allow lots of flexibility in entering times
-            # 01:17, 0117, 117, 1 17, are all accepted
-            when type == :time && value =~ %r{^(\d{1,2}).?(\d{2})$}
-              Time.parse( "#$1:#$2" )
-            
-            # remove thousand separators, allow for space and comma
-            # instead of . as a decimal separator
-            when type == :decimal
-              # do various transforms
-              value = 
-              case
-                # accept a space or a comma instead of a . for floats
-                when value =~ /(.*?)(\d)[ ,](\d{2})$/
-                  "#$1#$2.#$3"
-                else
-                  value
-              end
-              
-              # strip remaining commas
-              value.gsub( ',', '' )
-            
-            else
-              value
-          end
-          
-          data_changed( index )
-          # value conversion was successful
-          true
-        rescue Exception => e
-          puts e.backtrace.join( "\n" )
-          puts e.message
-          emit data_error( index, variant, e.message )
-          # value conversion was not successful
-          false
-        end
-        
-      when qt_checkstate_role
-        if index.metadata.type == :boolean
-          index.entity.toggle( index.attribute )
-          true
-        else
-          false
-        end
-      
-      # user-defined role
-      # TODO this only works with single-dotted paths
-      when qt_paste_role
-        if index.metadata.type == :association
-          field = index.field
-          association_class = field.class_name.constantize
-          candidates = association_class.find( :all, :conditions => [ "#{field.attribute_path[1]} = ?", variant.value ] )
-          case candidates.size
-            when 0; puts "No match for #{variant.value}"
-            when 1; index.attribute_value = candidates[0]
-            else; puts "Too many for #{variant.value}"
-          end
-        else
-          index.attribute_value = variant.value
-        end
-        true
-        
-      else
-        puts "role: #{role.inspect}"
-        true
-        
-      end
-    else
-      false
-    end
-  end
-  
-  # return a set of indexes that match the search criteria
+  # return a collection of indexes that match the search criteria
+  # at the moment this only returns the first index found
+  # TODO could handle dataset creation better
   def search( start_index, search_criteria )
-    entity = collection.search( start_index.field, search_criteria, start_index.entity )
+    ordered_dataset = entity_class.dataset.order( *cache_table.order_attributes.map{|oa| oa.attribute.to_sym.send( oa.direction ) } )
+    searcher = Clevic::TableSearcher.new(
+      ordered_dataset,
+      search_criteria,
+      start_index.field
+    )
+    entity = searcher.search( start_index.entity )
     
     # return matched indexes
     if entity != nil
@@ -536,39 +198,6 @@ class TableModel < Qt::AbstractTableModel
     end
   end
 
-  # A rubyish way of doing dataChanged
-  # - if args has one element, it's either a single ModelIndex
-  #   or something that understands top_left and bottom_right. These
-  #   will be turned into a ModelIndex by calling create_index
-  # - if args has two element, assume it's a two ModelIndex instances
-  # - otherwise create a new DataChange and pass it to the block.
-  def data_changed( *args, &block )
-    case args.size
-      when 1
-        arg = args.first
-        if ( arg.respond_to?( :top_left ) && arg.respond_to?( :bottom_right ) ) || arg.is_a?( Qt::ItemSelectionRange )
-          # object is a DataChange, or a SelectionRange
-          top_left_index = create_index( arg.top_left.row, arg.top_left.column )
-          bottom_right_index = create_index( arg.bottom_right.row, arg.bottom_right.column )
-          emit dataChanged( top_left_index, bottom_right_index )
-        else
-          # assume it's a ModelIndex
-          emit dataChanged( arg, arg )
-        end
-      
-      when 2
-        emit dataChanged( args.first, args.last )
-      
-      else
-        unless block.nil?
-          change = DataChange.new
-          block.call( change )
-          # recursive call
-          data_changed( change )
-        end
-    end
-  end
-  
 end
 
 end #module