clevic 0.13.0.b9 → 0.13.0.b10

data/lib/clevic/swing/table_view.rb

@@ -19,7 +19,7 @@ module Clevic
 # TODO make sure Delegates use the correct copy routines.
 class ClevicTable < javax.swing.JTable
   attr_accessor :table_view
-  
+
   def processKeyBinding( key_stroke, key_event, condition, pressed )
     # don't auto-start if it's a Ctrl, or Alt-modified key
     # or a function key. Hopefully this doesn't get checked
@@ -28,7 +28,7 @@ class ClevicTable < javax.swing.JTable
     if key_event.alt? || key_event.ctrl? || key_event.meta? || key_event.fx? || key_event.del? || key_event.esc?
       put_client_property( "JTable.autoStartsEdit", false )
     end
-    
+
     # do what JTable normally does with keys
     super
   rescue Exception => e
@@ -42,7 +42,7 @@ class ClevicTable < javax.swing.JTable
   # override to make things simpler
   def getCellEditor( row_index, column_index )
     index = table_view.model.create_index( row_index, column_index )
-    
+
     # Basically, this is for boolean editing. Number of mouse
     # clicks and so on is horribly complicated, so just let the
     # code in javax.swing.whatever handle it.
@@ -79,7 +79,7 @@ class ClevicTable < javax.swing.JTable
       else
         true
       end
-      
+
       # must call superclass here to do the edit rather than
       # just returning whether it should be edited. Java. tsk tsk.
       if edit_ok
@@ -102,69 +102,69 @@ class TableView < javax.swing.JScrollPane
   def initialize( arg, &block )
     super( @jtable = ClevicTable.new )
     @jtable.table_view = self
-    
+
     # seems like this MUST go after the super call (or maybe the
     # ClevicTable constructor), otherwise Swing throws an error
     # somewhere deep inside something. It's not clear right now.
-    
+
     # This should theoretically close editors when focus is lost
     # saving whatever values are in there
     jtable.put_client_property( "terminateEditOnFocusLost", true )
-    
+
     # cell editors get focus immediately on editor start
     jtable.surrendersFocusOnKeystroke = true
-    
+
     # no auto-resizing of columns
     jtable.auto_resize_mode = javax.swing.JTable::AUTO_RESIZE_OFF
-    
+
     # selection of all kinds allowed
     jtable.selection_mode = javax.swing.ListSelectionModel::MULTIPLE_INTERVAL_SELECTION
     jtable.row_selection_allowed = true
     jtable.column_selection_allowed = true
     jtable.cell_selection_enabled = true
-    
+
     # appearance
     jtable.font = Clevic.tahoma
     self.font = Clevic.tahoma
-    
+
     # make sure grid shows, even on mac
     jtable.show_grid = true
     # because OSX sets this to the same color as the foreground. Duh.
     jtable.grid_color = java.awt.SystemColor.controlHighlight
-    
+
     jtable.setDefaultRenderer( java.lang.Object, CellRenderer.new( self ) )
-    
+
     fix_input_map
-    
+
     framework_init( arg, &block )
-    
+
     # this must go after framework_init, because it needs the actions
     # which are set up in there
     jtable.component_popup_menu = popup_menu
-    
+
     # add the row header
     RowHeader.new( self )
-    
+
     # make sure focus goes to the right place
     self.focus_traversal_policy = TableViewFocus.new( self )
   end
-  
+
   class EmptyAction < javax.swing.AbstractAction
     def actionPerformed( action_event ); end
   end
-  
+
   def empty_action
     @empty_action ||= EmptyAction.new
   end
-  
+
   def add_map( key_string, action = empty_action )
     map.put( javax.swing.KeyStroke.getKeyStroke( key_string ), action )
   end
-  
+
   def map
     @map ||= jtable.getInputMap( javax.swing.JComponent::WHEN_ANCESTOR_OF_FOCUSED_COMPONENT )
   end
-  
+
   # This puts empty actions in the local keyboard map so that the
   # generic keyboard map doesn't catch them and prevent our menu actions
   # from being triggered
@@ -176,40 +176,40 @@ class TableView < javax.swing.JScrollPane
     add_map 'ctrl pressed X'
     add_map 'pressed DEL'
   end
-  
+
   def popup_menu
     @popup_menu ||= javax.swing.JPopupMenu.new.tap do |menu|
       model_actions.each do |action|
         menu << action.clone.tap{|a| a.shortcut = nil}
       end
-      
+
       # now do the generic edit items
       edit_actions.each do |action|
         menu << action.clone.tap{|a| a.shortcut = nil}
       end
-      
+
       menu.pack
     end
   end
-  
+
   attr_reader :jtable
-  
+
   def connect_view_signals( entity_view )
     # pick up model changes and pass them to the Clevic::View object
     model.addTableModelListener do |table_model_event|
       begin
         # pass changed events to view definitions
         return unless table_model_event.updated?
-        
+
         # unlikely to be useful to models, and in fact causes a very very long
         # calculation. So don't pass it on.
         return if table_model_event.all_rows?
-          
+
         top_left = model.create_index( table_model_event.first_row, table_model_event.column )
         bottom_right = model.create_index( table_model_event.last_row, table_model_event.column )
-        
+
         entity_view.notify_data_changed( self, top_left, bottom_right )
-        
+
         to_next_index
       rescue Exception => e
         show_error e.message
@@ -217,13 +217,13 @@ class TableView < javax.swing.JScrollPane
       end
     end
   end
-  
+
   # kind-of override of requestFocus, but it will probably only
   # work from Ruby
   def request_focus
     @jtable.request_focus
   end
-  
+
   # return a collection of collections of SwingTableIndex objects
   # indicating the indices of the current selection
   def selected_rows
@@ -233,18 +233,18 @@ class TableView < javax.swing.JScrollPane
       end
     end
   end
-  
+
   # called from the framework-independent part to edit a cell
   def edit( table_index )
     # TODO keyboard focus doesn't seem to be reassigned to combo
     # when editing is started this way.
     @jtable.editCellAt( table_index.row, table_index.column )
   end
-  
+
   def status_text_listeners
     @status_text_listeners ||= Set.new
   end
-  
+
   # If msg is provided, yield to stored block.
   # If block is provided, store it for later.
   def emit_status_text( msg = nil, &notifier_block )
@@ -256,11 +256,11 @@ class TableView < javax.swing.JScrollPane
       end
     end
   end
-  
+
   def filter_status_listeners
     @filter_status_listeners ||= Set.new
   end
-  
+
   # emit whether the view is filtered or not
   def emit_filter_status( bool = nil, &notifier_block )
     if block_given?
@@ -271,7 +271,7 @@ class TableView < javax.swing.JScrollPane
       end
     end
   end
-  
+
   def confirm_dialog( question, title )
     cd = ConfirmDialog.new do |dialog|
       dialog.parent = self
@@ -282,7 +282,7 @@ class TableView < javax.swing.JScrollPane
     end
     cd.show
   end
-  
+
   # set the size of the column from the sample
   def auto_size_column( col, sample )
     @jtable.column_model.column( col ).preferred_width = column_width( col, sample )
@@ -292,7 +292,7 @@ class TableView < javax.swing.JScrollPane
   def column_width( col, data )
     @jtable.getFontMetrics( @jtable.font ).stringWidth( data.to_s ) + 5
   end
-  
+
   def trim_middle( value, max = 40 )
     if value && value.length > max
       "#{value[0..(max/2-2)]}...#{value[-(max/2-2)..-1]}"
@@ -300,7 +300,7 @@ class TableView < javax.swing.JScrollPane
       value
     end
   end
-  
+
   # forward to @jtable
   # also handle model#emit_data_error
   def model=( model )
@@ -312,11 +312,11 @@ class TableView < javax.swing.JScrollPane
     @jtable.model.emit_data_error( &emitter_block ) if @jtable.model.respond_to? :emit_data_error
     resize_columns
   end
-  
+
   def model
     @jtable.model
   end
-  
+
   def show_error( msg, title = "Error" )
     @pane ||= javax.swing.JOptionPane.new(
       '',
@@ -326,38 +326,38 @@ class TableView < javax.swing.JScrollPane
     @pane.message = msg
     @pane.create_dialog( self, title ).show
   end
-  
+
   def selection_model
     SelectionModel.new( self )
   end
-  
+
   # move the cursor & selection to the specified table_index
   def current_index=( table_index )
     @jtable.selection_model.clear_selection
     @jtable.setColumnSelectionInterval( table_index.column, table_index.column )
     @jtable.setRowSelectionInterval( table_index.row, table_index.row )
-    
+
     # x position. Should be sum of widths of all columns up to the beginning of this one
     # ie not including this one, hence the -1
     xpos = (0..table_index.column-1).inject(0) do |sum,column_index|
       sum + @jtable.column_model.getColumn( column_index ).width
     end
-    
+
     rect = java.awt.Rectangle.new(
       xpos,
-      
+
       # y position
       @jtable.row_height * table_index.row,
-      
+
       # width of this column
       @jtable.column_model.getColumn( table_index.column ).width,
-      
+
       # height
       @jtable.row_height
     )
     @jtable.scrollRectToVisible( rect )
   end
-  
+
   # return a SwingTableIndex for the current cursor position
   # TODO optimise so we don't keep creating a new index, only if a selection
   # changed event has occurred
@@ -368,7 +368,7 @@ class TableView < javax.swing.JScrollPane
   def wait_cursor
     @wait_cursor ||= java.awt.Cursor.new( java.awt.Cursor::WAIT_CURSOR )
   end
-  
+
   # show a busy cursor, do the block, back to normal cursor
   # return value of block
   def busy_cursor( &block )
@@ -379,7 +379,7 @@ class TableView < javax.swing.JScrollPane
     self.cursor = save_cursor
     rv
   end
-  
+
   # collect actions for the popup menu
   def add_action( action )
     ( @context_actions ||= [] ) << action

data/lib/clevic/swing/table_view_focus.rb

@@ -6,7 +6,7 @@ module Clevic
       @table_view = table_view
       @table_view.focus_cycle_root = true
     end
-    
+
     # Returns the Component that should receive the focus after aComponent.
     # def getComponentAfter(Container aContainer, Component aComponent)
     def getComponentAfter(container, component)
@@ -30,18 +30,18 @@ module Clevic
     def getFirstComponent(container)
       @table_view.jtable
     end
-    
+
     # Returns the Component that should receive the focus when a Window is made visible for the first time.
     # Component 	getInitialComponent(Window window)
     def getInitialComponent(window)
       @table_view.jtable
     end
-    
+
     # Returns the last Component in the traversal cycle.
     # def getLastComponent(Container aContainer)
     def getLastComponent(container)
       @table_view.jtable
     end
   end
-  
+
 end

data/lib/clevic/swing/tag_delegate.rb

@@ -13,33 +13,33 @@ class TagDelegate < Delegate
     # This should be a collection of entities from the related table
     @items = attribute_value
   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
-  
+
   # the cell must be selected before the edit can be clicked
   def needs_pre_selection?
     true
   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
-  
+
   def line_editor( value = nil )
     @line_editor ||= javax.swing.JTextField.new( value ).tap do |line|
       line.font = Clevic.tahoma
     end
   end
-  
+
   def editor
     line_editor
   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.
@@ -52,7 +52,7 @@ class TagDelegate < 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
@@ -60,13 +60,13 @@ class TagDelegate < 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 )
@@ -75,7 +75,7 @@ class TagDelegate < 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
@@ -86,7 +86,7 @@ class TagDelegate < 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
@@ -98,7 +98,7 @@ class TagDelegate < 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
@@ -112,11 +112,11 @@ class TagDelegate < Delegate
       editor.show_popup
     end
   end
-  
+
   # open the text editor component
   #~ def minimal_edit
   #~ end
-  
+
   # return an array of related entity objects, to be
   # passed into the attribute setter
   def value