clevic 0.13.0.b9 → 0.13.0.b10

data/lib/clevic/swing/combo_delegate.rb

@@ -7,22 +7,22 @@ module Clevic
 # .... 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
-  
+
   def configureEditor( combo_box_editor, item )
     value =
     if @field.related_class && item.is_a?( @field.related_class )
@@ -30,7 +30,7 @@ class ComboBox < javax.swing.JComboBox
     else
       item
     end
-    
+
     combo_box_editor.item = value
   end
 
@@ -59,38 +59,38 @@ class ComboDelegate < Delegate
     super
     @autocompleting = false
   end
-  
+
   def combo_class
     ComboBox
   end
-  
+
   # the cell must be selected before the edit can be clicked
   def needs_pre_selection?
     true
   end
-  
+
   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
     combo_class.new( field ).tap do |combo|
       combo.font = Clevic.tahoma
-      
+
       # allow for transform of objects to their requested display values
       @original_renderer = combo.renderer
       combo.renderer = self
     end
   end
-  
+
   include javax.swing.ListCellRenderer
-  
+
   # return the component to render the values in the list
   # we just transform the value, and pass it to the
   # pre-existing renderer for the combo.
   def getListCellRendererComponent(jlist, value, index, selected, cell_has_focus)
     @original_renderer.getListCellRendererComponent(jlist, display_for( value ), index, selected, cell_has_focus)
   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?
@@ -99,7 +99,7 @@ class ComboDelegate < Delegate
       line.font = Clevic.tahoma
     end
   end
-  
+
   # Some GUIs (Qt) can just set this. Swing can't.
   def configure_prefix
     # pick up events from editor
@@ -119,17 +119,17 @@ class ComboDelegate < Delegate
       end
     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?
@@ -141,7 +141,7 @@ class ComboDelegate < Delegate
       end
     end
   end
-  
+
   # Recreate the model and fill it with anything in population that
   # matches the prefix first, followed by anything in the population that
   # doesn't match the prefix.
@@ -154,7 +154,7 @@ class ComboDelegate < Delegate
       # save text and popup
       save_item = editor.editor.item
       dropdown_visible = editor.popup_visible?
-      
+
       # repopulate based on the prefix
       prefix ||= editor.editor.item
       editor.model = editor.model.class.new
@@ -162,13 +162,13 @@ class ComboDelegate < Delegate
       matching, non_matching = population.partition{ |item| display_for( item ) =~ /^#{prefix}/i }
       matching.each {|item| editor << item}
       non_matching.each {|item| editor << item}
-      
+
       # restore text and popup
       editor.editor.item = text || save_item
       editor.popup_visible = dropdown_visible
     end
   end
-    
+
   # make sure we don't react to document change events
   # while we're doing autocompletion. Reentrant
   def autocomplete( &block )
@@ -177,7 +177,7 @@ class ComboDelegate < Delegate
   ensure
     @autocompleting = false
   end
-  
+
   # http://www.drdobbs.com/184404457 for autocompletion steps
   def filter_prefix( prefix )
     # search for matching item in the UI display_for for the items in the combo model
@@ -188,7 +188,7 @@ class ComboDelegate < Delegate
         autocomplete do
           # set the shortlist, and the text editor value
           repopulate prefix, candidate
-          
+
           # set the suggestion selection
           editor.editor.editor_component.with do |text_edit|
             # highlight the suggested match, and leave caret
@@ -200,7 +200,7 @@ class ComboDelegate < Delegate
       end
     end
   end
-  
+
   # open the combo box, just like if F4 was pressed
   # big trouble here with JComboBox firing an comboEdited action
   # (probably) on focusGained
@@ -216,18 +216,18 @@ class ComboDelegate < Delegate
       end
     end
   end
-  
+
   # open the combo box, just like if f4 was pressed
   def minimal_edit
     editor.hide_popup if is_combo?
   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
-  
+
   def value
     # editor could be either a combo or a line (DistinctDelegate with no values yet)
     if is_combo?

data/lib/clevic/swing/confirm_dialog.rb

@@ -7,17 +7,17 @@ module Clevic
       @results = []
       yield self if block_given?
     end
-    
+
     attr_accessor :names, :results, :question, :title, :dialog_result, :parent
-    
+
     def to_java( arg )
       @options.keys.to_java( arg )
     end
-    
+
     def canonical_results
       @canonical_results ||= [:accept, :reject]
     end
-    
+
     # To create a an Ok button that has the focus, and causes
     # the class to return true from accepted?
     #  dialog['Ok'] = :accept, true
@@ -31,15 +31,15 @@ module Clevic
       results << result.to_sym
       @default = name.to_s if default
     end
-    
+
     def accepted?
       results[dialog_result] == :accept
     end
-    
+
     def rejected?
       results[dialog_result] == :reject
     end
-    
+
     def show
       self.dialog_result = javax.swing.JOptionPane.showOptionDialog(
         parent,

data/lib/clevic/swing/delegate.rb

@@ -7,7 +7,7 @@ module Clevic
       @field = field
       @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 )
@@ -19,12 +19,12 @@ module Clevic
         end
       end
     end
-    
+
     # workaround for broken JTable editing starts
     def needs_pre_selection?
       false
     end
-    
+
     # Return something useful if this should use the default GUI framework
     # mechanism for table editing. Default is false, so native framework
     # won't be used. For Java/Swing, this would return the a class object
@@ -33,7 +33,7 @@ module Clevic
     def native
       false
     end
-    
+
     def inspect
       "<#{self.class.name} native=#{native} needs_pre_selection=#{needs_pre_selection?}>"
     end

data/lib/clevic/swing/extensions.rb

@@ -4,7 +4,7 @@ class BlockRunner < java.lang.Thread
   def initialize(&proc)
     @p = proc
   end
-  
+
   def run
     @p.call
   end
@@ -55,13 +55,13 @@ unless defined? Component
       case obj
       when Clevic::Separator
         add_separator
-      
+
       when Clevic::Action
         add obj.menu_item
-      
+
       when String
         add obj.to_java_string
-      
+
       else
         add obj
       end
@@ -88,13 +88,13 @@ unless defined? JComboBox
     def << ( value )
       model.addElement( value )
     end
-    
+
     def each
       (0...model.size).each do |i|
         yield model.getElementAt( i )
       end
     end
-    
+
     include Enumerable
   end
 end
@@ -103,17 +103,17 @@ unless defined? JTabbedPane
   JTabbedPane = javax.swing.JTabbedPane
   class JTabbedPane
     include Enumerable
-    
+
     def each
       (0...count).each do |index|
         yield getComponentAt( index )
       end
     end
-    
+
     def count
       getTabCount
     end
-    
+
     def current=( component )
       self.selected_component = component
     end
@@ -147,44 +147,44 @@ unless defined? KeyEvent
     def alt?
       modifiers & self.class::ALT_MASK != 0
     end
-    
+
     def ctrl?
       modifiers & self.class::CTRL_MASK != 0
     end
-    
+
     def meta?
       modifiers & self.class::META_MASK != 0
     end
-    
+
     def self.function_keys
       @function_keys ||= (1..24).map{|i| eval( "VK_F#{i}" ) }
     end
-    
+
     def fx?
       self.class.function_keys.include?( key_code )
     end
-    
+
     def del?
       key_code == VK_DELETE
     end
-    
+
     def shift?
       modifiers & self.class::SHIFT_MASK != 0
     end
-    
+
     def plain?
       modifiers == 0
     end
-    
+
     def esc?
       key_code == VK_ESCAPE
     end
-    
+
     # a KEY_TYPED event
     def typed?
       getID == self.class::KEY_TYPED
     end
-    
+
     def inspect
       "<KeyEvent id=#{getID} #{self.class.getKeyText(key_code)} '#{key_char}'>"
     end
@@ -206,15 +206,15 @@ unless defined? MouseEvent
     def pressed?
       getID == MOUSE_PRESSED
     end
-    
+
     def released?
       getID == MOUSE_RELEASED
     end
-    
+
     def clicked?
       getID == MOUSE_CLICKED
     end
-    
+
     #~ def inspect
       #~ <<EOF
 
@@ -233,7 +233,7 @@ unless defined? TableModelEvent
     def inspect
       "#<#{first_row..last_row}, #{column}, #{const_lookup( type )} >"
     end
-    
+
     def updated?
       type == self.class::UPDATE
     end
@@ -245,7 +245,7 @@ unless defined? TableModelEvent
     def inserted?
       type == self.class::INSERT
     end
-    
+
     # returns true if this is a notification to update all
     # rows, ie a fireTableDataChanged() was called
     def all_rows?

data/lib/clevic/swing/field.rb

@@ -21,7 +21,7 @@ class Field
       end
     end
   end
-  
+
   def swing_alignment
     case alignment
     when :left; javax.swing.SwingConstants::LEFT

data/lib/clevic/swing/relational_delegate.rb

@@ -12,13 +12,13 @@ class RelationalDelegate < ComboDelegate
   def initialize( field )
     super
   end
-  
+
   # use the Clevic::ComboBox class because JCombobox is remarkably stupid
   # about far too many things.
   def combo_class
     ComboBox
   end
-  
+
   # don't allow new values
   def restricted?
     true

data/lib/clevic/swing/row_header.rb

@@ -11,18 +11,18 @@ module Clevic
     def initialize( table_model )
       super()
       @table_model = table_model
-      
+
       # re-fire events
       table_model.add_table_model_listener do |event|
         fireTableChanged( event )
       end
     end
-    
+
     # override TableModel method
     def getRowCount
       @table_model.getRowCount
     end
-    
+
     # override TableModel method
     def getColumnCount
       1
@@ -32,7 +32,7 @@ module Clevic
     def getColumnName( column_index )
       "row"
     end
-    
+
     def getColumnClass( column_index )
       java.lang.Object
     end
@@ -40,11 +40,11 @@ module Clevic
     def isCellEditable( row_index, column_index )
       false
     end
-    
+
     def getValueAt( row_index, column_index )
       row_index+1
     end
-    
+
     def id_value( row_index, column_index )
       if @table_model.collection.cached_at?( row_index )
         "#{row_index+1} [id=#{@table_model.collection[row_index].id}]"
@@ -52,7 +52,7 @@ module Clevic
         row_index+1
       end
     end
-    
+
     def setValueAt( value, row_index, column_index )
       raise "Can't set values in the row header"
     end
@@ -68,24 +68,24 @@ module Clevic
     unless ancestors.include?( javax.swing.table.TableCellRenderer )
       include javax.swing.table.TableCellRenderer
     end
-    
+
     # The Clevic::TableView instance
     attr_reader :table_view
-    
+
     # this will add a row header to the passed table_view
     def initialize( table_view )
       @table_view = table_view
       super( RowHeaderModel.new( table_view.model ) )
       self.font = table_view.font
       self.grid_color = java.awt.Color::white
-      
+
       # user header renderer for all cells
       set_default_renderer( java.lang.Object, table_header.default_renderer )
-      
+
       # set the width
       column_width = table_view.column_width( 0, "  #{row_count}" )
       column_model.column( 0 ).preferred_width = column_width
-      
+
       # This is a workaround either for OSX, or java-1.5.0_19-b02-306
       self.minimum_size = java.awt.Dimension.new( column_width, minimum_size.height )
 
@@ -94,23 +94,23 @@ module Clevic
         count_label.font = self.font
         count_label.horizontal_alignment = javax.swing.JComponent::CENTER_ALIGNMENT
         table_view.set_corner( javax.swing.ScrollPaneConstants::UPPER_LEFT_CORNER, count_label )
-        
+
         # make sure count label is updated when the model changes
         model.add_table_model_listener do |event|
           count_label.text = row_count.to_s
         end
       end
-      
+
       # insert into the row header side of the scrollpane
       table_view.row_header = javax.swing.JViewport.new.tap do |vp|
         vp.view = self
         # make sure size is passed along to viewport
         vp.preferred_size = preferred_size
       end
-      
+
       row_selection_handlers
     end
-    
+
     # Transfer row header selection to full row selections in the main
     # table. Also clear the row header selection if a main table
     # selection happens.
@@ -119,14 +119,14 @@ module Clevic
       selection_model.addListSelectionListener do |list_event|
         process_list_selection( list_event )
       end
-      
+
       # selections in the main table must clear any selections
       # in the row header, ie self
       table_view.jtable.selection_model.addListSelectionListener do |event|
         selection_model.clear_selection unless row_header_selecting
       end
     end
-    
+
     # guard to make sure changes to main table selection don't feed back.
     def row_header_selecting( &block )
       if block_given?
@@ -140,68 +140,68 @@ module Clevic
         @row_header_selecting
       end
     end
-    
+
     def process_list_selection( event )
       # tell the main table handler we're busy
       row_header_selecting do
         # clear main table selection and start again
         table_view.jtable.selection_model.clear_selection
-        
+
         # select the whole row in main table. Subsequent row selections will also
         # select the whole row. What a broken API.
         table_view.jtable.setColumnSelectionInterval( table_view.model.fields.size-1, 0 )
-        
+
         selected_rows.each do |row|
           table_view.jtable.selection_model.addSelectionInterval( row, row )
         end
-        
+
         # make sure the keyboard focus is on the latest selected row
         table_view.jtable.selection_model.addSelectionInterval( selection_model.lead_selection_index, selection_model.lead_selection_index )
-        
+
         # make sure main table gets focus again
         table_view.request_focus
       end
     end
-    
+
     # return self so that getTableCellRendererComponent is called
     def getCellRenderer( row, column )
       self
     end
-    
+
     # Implementation of TableCellRenderer
     # return renderer Component
     def getTableCellRendererComponent(jtable, value,is_selected,has_focus,row,column)
       item = table_view.model.collection[row]
       renderer = get_default_renderer( java.lang.Object ).getTableCellRendererComponent(jtable,value,is_selected,has_focus,row,column)
-      
+
       case
       # no highlighting for an empty item
       when item.nil?
         renderer.background = java.awt.Color::yellow
         renderer.opaque = true
         renderer.tool_tip_text = "deleted elsewhere"
-        
+
       # there's a validation error
       when item.errors && !item.errors.empty?
         renderer.background = java.awt.Color::orange
         renderer.opaque = true
         renderer.tool_tip_text = "validation errors"
-      
+
       # record isn't saved yet
       when item.changed?
         renderer.background = java.awt.Color::yellow
         renderer.opaque = true
         renderer.tool_tip_text = "row not saved"
-      
+
       when is_selected
         renderer.background = javax.swing.UIManager.get 'Table.selectionBackground'
         renderer.tool_tip_text = "id=#{item.id}"
-      
+
       else
         renderer.tool_tip_text = "id=#{item.id}"
-        
+
       end
-      
+
       renderer
     end