clevic 0.13.0.b3 → 0.13.0.b5

data/lib/clevic/swing/action_builder.rb

@@ -24,9 +24,7 @@ module ActionBuilder
     # connect the action to some code
     if options.has_key?( :method )
       action.handler do |event|
-        puts "#{__FILE__}:#{__LINE__}:action.name: #{action.name.inspect}"
         action_triggered do
-          # active is from Qt checkbox-menu-items
           send_args = [ options[:method], options.has_key?( :checkable ) ? action.menu_item.selected? : nil ].compact
           send( *send_args )
         end

data/lib/clevic/swing/browser.rb

@@ -9,8 +9,6 @@ The main application class. Display one tabs for each descendant of Clevic::View
 in Clevic::View.order. DefaultView classes created by Clevic::Record are included.
 =end
 class Browser < javax.swing.JFrame
-  #~ slots *%w{dump() refresh_table() filter_by_current(bool) next_tab() previous_tab()}
-  
   attr_reader :menu_edit, :menu_search, :menu_table
   
   def initialize
@@ -104,8 +102,6 @@ class Browser < javax.swing.JFrame
     
       # tab navigation
       tables_tab.add_change_listener do |change_event|
-        puts "change_event: #{change_event.source.inspect}"
-        puts "change_event.source.selected_index: #{change_event.source.selected_index.inspect}"
         current_changed
         # TODO tell exiting tab to save currently editing row/cell
       end
@@ -247,12 +243,7 @@ class Browser < javax.swing.JFrame
       # update the tab, so there's a visual indication of filtering
       filter_title = ( tab.filtered? ? '| ' : '' ) + tab.title
       tables_tab.set_title_at( tables_tab.selected_index, filter_title )
-      
-      if tab.filtered?
-        tables_tab.set_tool_tip_text_at( tables_tab.selected_index, tab.filtered.status_message )
-      else
-        tables_tab.set_tool_tip_text_at( tables_tab.selected_index, nil )
-      end
+      tables_tab.set_tool_tip_text_at( tables_tab.selected_index, tab.filter_message )
     end
   end
   

data/lib/clevic/swing/combo_delegate.rb

@@ -6,11 +6,19 @@ module Clevic
 # all this just to format a display item...
 # .... and work around various other Swing stupidities
 class ComboBox < javax.swing.JComboBox
+  attr_accessor :delegate
+  
   def initialize( field )
     super()
     @field = field
   end
   
+  # For Clevic::ComboDelegate to call
+  def no_insert=( bool )
+    # Swing doesn't have combo policies like Qt.
+    # From what I can see, anyway.
+  end
+  
   # set to true by processKeyBinding when a character
   # key is pressed. Used by the autocomplete code.
   attr_reader :typing
@@ -52,11 +60,6 @@ class ComboDelegate < Delegate
     @autocompleting = false
   end
   
-  # Return the GUI component / widget that is displayed when editing.
-  # Usually this will be a combo box widget, but it can be a text editor
-  # in some cases.
-  attr_reader :editor
-  
   def combo_class
     ComboBox
   end
@@ -66,7 +69,7 @@ class ComboDelegate < Delegate
     true
   end
   
-  def create_combo_box
+  def create_combo_box( *args )
     # create a new combo class each time, otherwise
     # we have to get into managing cleaning out the model
     # and so on
@@ -88,12 +91,6 @@ class ComboDelegate < Delegate
     @original_renderer.getListCellRendererComponent(jlist, display_for( value ), index, selected, cell_has_focus)
   end
   
-  # Return a string to be shown to the user.
-  # model_value is an item stored in the combo box model.
-  def display_for( model_value )
-    field.transform_attribute( model_value )
-  end
-  
   # return a new text editor. This is for distinct_delegate when there
   # are no other values to choose from.
   # TODO move into distinct_delegate then?
@@ -105,79 +102,44 @@ class ComboDelegate < Delegate
   
   # Some GUIs (Qt) can just set this. Swing can't.
   def configure_prefix
-  end
-  
-  # TODO kinda redundant because all combos must be editable
-  # to support prefix matching
-  def configure_editable
-    editor.editable = true
-  end
-  
-  # Create a GUI widget and fill it with the possible values.
-  def init_component( cell_editor = nil )
-    if needs_combo?
-      @editor = create_combo_box
-      
-      # add all entries from population
-      population.each do |item|
-        editor << item
-      end
-      
-      # create a nil entry
-      add_nil_item if allow_null?
-      
-      # allow prefix matching from the keyboard
-      configure_prefix
-      
-      # don't allow text editing if restricted
-      configure_editable
-      
-      # set the correct value in the list
-      select_current
-      
-      # pick up events from editor
-      # but only after all the other config, otherwise we get
-      # events triggered by the setup, which isn't helpful.
-      editor.editor.editor_component.document.add_document_listener do |event|
-        # don't do anything if autocomplete manipulations are in progress
-        unless @autocompleting || !editor.typing
-          if event.type == javax.swing.event.DocumentEvent::EventType::REMOVE
-            invoke_later do
-              repopulate
-            end
-          else
-            # only suggest on inserts and updates. Not on deletes.
-            filter_prefix( editor.editor.item )
+    # pick up events from editor
+    # but only after all the other config, otherwise we get
+    # events triggered by the setup, which isn't helpful.
+    editor.editor.editor_component.document.add_document_listener do |event|
+      # don't do anything if autocomplete manipulations are in progress
+      unless @autocompleting || !editor.typing
+        if event.type == javax.swing.event.DocumentEvent::EventType::REMOVE
+          invoke_later do
+            repopulate
           end
+        else
+          # only suggest on inserts and updates. Not on deletes.
+          filter_prefix( editor.editor.item )
         end
       end
-      
-      # catch the enter key action event
-      editor.editor.editor_component.add_action_listener do |event|
-        cell_editor.andand.stopCellEditing
-      end
-      
-      # set initial focus and selection in edit part of combo
-      editor.editor.editor_component.with do |text_edit|
-        unless text_edit.text.nil?
-          # highlight the suggested match, and leave caret
-          # at the end of the selected text
-          text_edit.caret_position = 0
-          text_edit.move_caret_position( text_edit.text.length )
-          text_edit.request_focus_in_window
-        end
-      end
-
-    else
-      @editor =
-      if restricted?
-        show_message( empty_set_message )
-        nil
-      else
-        line_editor( edit_value )
+    end
+  end
+  
+  def framework_setup( *args )
+    # turn on typing the the text field of the combo
+    # otherwise prefix matching doesn't work
+    editor.editable = true
+    
+    # catch the enter key action event
+    editor.editor.editor_component.add_action_listener do |event|
+      cell_editor.andand.stopCellEditing
+    end
+    
+    # set initial focus and selection in edit part of combo
+    editor.editor.editor_component.with do |text_edit|
+      unless text_edit.text.nil?
+        # highlight the suggested match, and leave caret
+        # at the end of the selected text
+        text_edit.caret_position = 0
+        text_edit.move_caret_position( text_edit.text.length )
+        text_edit.request_focus_in_window
       end
     end
-    editor
   end
   
   # Recreate the model and fill it with anything in population that
@@ -260,77 +222,27 @@ class ComboDelegate < Delegate
     editor.hide_popup if is_combo?
   end
   
-  # returns true if the editor allows values outside of a predefined
-  # range, false otherwise.
-  def restricted?
-    false
-  end
-  
-  # TODO fetch this from the model definition
-  def allow_null?
-    true
-  end
-  
-  # Subclasses should override this to fill the combo box
-  # list with values.
-  # TODO resolve whether the current item is included, even
-  # if it isn't in the population already, ie it's excluded
-  # by date or something like that.
-  def population
-    raise "subclass responsibility"
-  end
-  
-  # return true if this delegate needs a combo, false otherwise
-  def needs_combo?
-    raise "subclass responsibility"
-  end
-
   def is_combo?
     # Assume we're a combo if we don't have an editor yet, otherwise
     # check
     editor.nil? || editor.is_a?( javax.swing.JComboBox )
   end
   
-  # return true if this field has no data (needs_combo? is false)
-  # and is at the same time restricted (ie needs data from somewhere else)
-  def empty_set?
-    !needs_combo? && restricted?
-  end
-  
-  # the message to display if the set is empty, and
-  # the delegate is restricted to a predefined set.
-  def empty_set_message
-    raise "subclass responsibility"
-  end
-  
-  # if this delegate has an empty set, return the message, otherwise
-  # return nil.
-  def if_empty_message
-    empty_set_message if empty_set?
-  end
-  
-  def add_nil_item
-    editor << nil unless editor.include?( nil )
-  end
-  
-  def select_current
-    editor.selected_item = attribute_value
-  end
-  
   def value
     # editor could be either a combo or a line (DistinctDelegate with no values yet)
     if is_combo?
       if restricted?
         editor.selected_item
       else
-        puts "#{__FILE__}:#{__LINE__}:get the editor's text field value. Take away this output when we know it works. Ie when this gets printed."
         editor.editor.item
       end
     else
-      puts "#{__FILE__}:#{__LINE__}:line item value: #{editor.text}"
+      puts "#{__FILE__}:#{__LINE__}:line item value: #{editor.text}. Take this away when it's printed."
       editor.text
     end
   end
 end
 
 end
+
+require 'clevic/delegates/combo_delegate.rb'

data/lib/clevic/swing/delegate.rb

@@ -8,6 +8,8 @@ module Clevic
       @message_receivers = Set.new
     end
     
+    # FIXME this must actually show a message, and 
+    # the Qt code must use it too
     def show_message( msg, &block )
       if block_given?
         @message_receivers << block

data/lib/clevic/swing/distinct_delegate.rb

@@ -7,24 +7,12 @@ module Clevic
 # :frequency can be set as an option. Boolean. If it's true
 # the options are sorted in order of most frequently used first.
 class DistinctDelegate < ComboDelegate
-  def needs_combo?
-    # works except when there is a '' in the column
-    entity_class.adaptor.count( attribute.to_s, find_options ) > 0
-  end
-  
   # strings are stored in the model
   def display_for( model_value )
     model_value
   end
-
-  def population
-    # we only use the first column, so use the second
-    # column to sort by, since SQL requires the order by clause
-    # to be in the select list where distinct is involved
-    entity_class.adaptor.attribute_list( attribute, attribute_value, field.description, field.frequency, find_options ) do |row|
-      row[attribute]
-    end
-  end
 end
 
 end
+
+require 'clevic/delegates/distinct_delegate'

data/lib/clevic/swing/relational_delegate.rb

@@ -11,10 +11,6 @@ module Clevic
 class RelationalDelegate < ComboDelegate
   def initialize( field )
     super
-    unless find_options[:conditions].nil?
-      find_options[:conditions].gsub!( /true/, field.related_class.adaptor.quoted_true )
-      find_options[:conditions].gsub!( /false/, field.related_class.adaptor.quoted_false )
-    end
   end
   
   # use the Clevic::ComboBox class because JCombobox is remarkably stupid
@@ -23,22 +19,6 @@ class RelationalDelegate < ComboDelegate
     ComboBox
   end
   
-  def needs_combo?
-    field.related_class.adaptor.count( :conditions => find_options[:conditions] ) > 0
-  end
-  
-  def empty_set_message
-    "There must be records in #{field.related_class.name.humanize} for this field to be editable."
-  end
-  
-  def population
-    # add set of all possible related entities,
-    # including the currently selected entity
-    ary = field.related_class.adaptor.find( :all, find_options )
-    ary << attribute_value unless ary.include?( attribute_value )
-    ary
-  end
-  
   # don't allow new values
   def restricted?
     true
@@ -46,3 +26,5 @@ class RelationalDelegate < ComboDelegate
 end
 
 end
+
+require 'clevic/delegates/relational_delegate.rb'

data/lib/clevic/swing/set_delegate.rb

@@ -5,37 +5,22 @@ module Clevic
 # A Combo box which allows a set of values. May or may not
 # be restricted to the set.
 class SetDelegate < ComboDelegate
-  # options must contain a :set => [ ... ] to specify the set of values.
-  def initialize( field )
-    raise "SetDelegate must have a :set in options" if field.set.nil?
-    super
-  end
-  
-  def needs_combo?
-    true
-  end
-  
-  def restricted?
-    field.restricted || false
-  end
-  
-  def population
-    field.set_for( entity ).map do |item|
-      if item.is_a?( Array )
-        puts "#{__FILE__}:#{__LINE__}:probably can't deal with item: #{item.inspect}"
-        # this is a hash-like set, so use key as db value
-        # and value as display value
-        class << item
-          def toString; last; end
-        end
-      else
-        class << item
-          def toString; self; end
-        end
+  def item_to_editor( item )
+    if item.is_a?( Array )
+      puts "#{__FILE__}:#{__LINE__}:probably can't deal with item: #{item.inspect}"
+      # this is a hash-like set, so use key as db value
+      # and value as display value
+      class << item
+        def toString; last; end
+      end
+    else
+      class << item
+        def toString; self; end
       end
-      item
     end
   end
 end
 
 end
+
+require 'clevic/delegates/set_delegate.rb'

data/lib/clevic/swing/table_view.rb

@@ -286,7 +286,7 @@ class TableView < javax.swing.JScrollPane
 
   # calculate the size of the column from the string value of the data
   def column_width( col, data )
-    @jtable.getFontMetrics( @jtable.font).stringWidth( data ) + 5
+    @jtable.getFontMetrics( @jtable.font ).stringWidth( data.to_s ) + 5
   end
   
   def trim_middle( value, max = 40 )

data/lib/clevic/table_model.rb

@@ -140,9 +140,9 @@ class TableModel
     emit_data_error( index, nil, $!.message )
   end
   
-  def reload_data( options = nil )
+  def reload_data( dataset = nil, &dataset_block )
     # renew cache. All records will be dropped and reloaded.
-    self.collection = self.cache_table.renew( options )
+    self.collection = self.cache_table.renew( dataset, &dataset_block )
     # tell the UI we had a major data change
     reset
   end
@@ -151,9 +151,8 @@ class TableModel
   # at the moment this only returns the first index found
   # TODO could handle dataset creation better
   def search( start_index, search_criteria )
-    ordered_dataset = entity_class.dataset.order( *cache_table.order_attributes.map{|oa| oa.attribute.to_sym.send( oa.direction ) } )
     searcher = TableSearcher.new(
-      ordered_dataset,
+      cache_table.dataset,
       search_criteria,
       start_index.field
     )