clevic 0.13.0.b9 → 0.13.0.b10

data/lib/clevic/swing/search_dialog.rb

@@ -10,140 +10,140 @@ module Clevic
       else
         super()
       end
-      
+
       init_controls
       init_layout
-      
+
       self.default_close_operation = javax.swing.WindowConstants::HIDE_ON_CLOSE
       self.name = "SearchDialog"
       self.modal = modal
       self.title = "Search"
-      
+
       # Enter triggers Ok button
       root_pane.default_button = ok_button
-      
+
       # TODO finish this for Esc key to close dialog
       #~ esc = javax.swing.KeyStroke.getKeyStroke( KeyEvent.VK_ESCAPE, 0 )
       #~ root_pane.registerKeyboardAction( actionListener, stroke, javax.swing.JComponent.WHEN_IN_FOCUSED_WINDOW )
     end
-    
+
     # after the dialog, this will be either accepted or rejected
     attr_reader :status
-    
+
     def from_start?
       from_start.selected
     end
-    
+
     def from_start=( value )
       from_start.selected = value
     end
-    
+
     def regex?
       regex.selected
     end
-    
+
     def whole_words?
       whole_words.selected
     end
-    
+
     def forwards?
       forwards.selected
     end
-    
+
     def backwards?
       backwards.selected
     end
-    
+
     # return either :backwards or :forwards
     def direction
       return :forwards if forwards?
       return :backwards if backwards?
       raise "direction not known"
     end
-    
+
     # show the dialog, wait for close,
     # return an object that understands rejected? and accepted?
     def exec( text = '' )
       self.search_text = text
       search_combo.request_focus
       search_combo.editor.select_all
-      
+
       # modal dialog, so this will wait
       show
-      
+
       # remember previous searches
       unless search_combo.include?( search_text )
         search_combo << search_text
       end
-      
+
       self
     end
-    
+
     def search_text=( value )
       search_combo.editor.item = value.to_s
     end
-    
+
     def search_text
       search_combo.editor.item
     end
-    
+
     def accepted?
       status == :accept
     end
-    
+
     def accept!
       @status = :accept
     end
-    
+
     def rejected?
       status == :reject
     end
-    
+
     def reject!
       @status = :reject
     end
-    
+
     attr_reader :search_label, :search_combo
     attr_reader :from_start, :whole_words, :regex
     attr_reader :forwards, :backwards
     attr_reader :ok_button, :cancel_button
-    
+
     def init_controls
       @search_label = javax.swing.JLabel.new( "Search" ).tap do |search_label|
         search_label.text = "Search"
         search_label.name = "search_label"
       end
-      
+
       @search_combo = javax.swing.JComboBox.new.tap do |search_combo|
         search_combo.editable = true
         search_combo.name = "search_combo"
       end
-      
+
       @from_start = javax.swing.JCheckBox.new.tap do |from_start|
         from_start.mnemonic = 'S'
         from_start.text = "From Start"
         from_start.name = "from_start"
       end
-      
+
       @regex = javax.swing.JCheckBox.new.tap do |regex|
         regex.mnemonic = 'R'
         regex.text = "Regular Expression"
         regex.name = "regex"
       end
-      
+
       @whole_words = javax.swing.JCheckBox.new.tap do |whole_words|
         whole_words.mnemonic = 'W'
         whole_words.text = "Whole words"
         whole_words.name = "whole_words"
       end
-      
+
       @forwards = javax.swing.JRadioButton.new.tap do |forwards|
         forwards.mnemonic = 'F'
         forwards.text = "Forwards"
         forwards.name = "forwards"
         forwards.selected = true
       end
-      
+
       @backwards = javax.swing.JRadioButton.new.tap do |backwards|
         backwards.mnemonic = 'B'
         backwards.text = "Backwards"
@@ -170,7 +170,7 @@ module Clevic
         end
       end
     end
-    
+
     # this was originally Java from NetBeans, so it's really ugly.
     # Note that for 1.5 compatibility, we have to use org.jdesktop.layout.GroupLayout
     # and include swing-layout-1.0.3.jar

data/lib/clevic/swing/selection_model.rb

@@ -14,19 +14,19 @@ class SelectionRange
     @row_range = row_range
     @column_range = column_range
   end
-  
+
   def height
     @row_range.distance
   end
-  
+
   def width
     @column_range.distance
   end
-  
+
   def top_left
     SwingTableIndex.new( nil, @row_range.first, @column_range.first )
   end
-  
+
   def bottom_right
     SwingTableIndex.new( nil, @row_range.last, @column_range.last )
   end
@@ -36,13 +36,13 @@ class SelectionModel
   def initialize( table_view )
     @table_view = table_view 
   end
-  
+
   attr_reader :table_view
-  
+
   def jtable
     @table_view.jtable
   end
-  
+
   # return a collection of selection ranges
   def ranges
     rv = []
@@ -53,27 +53,27 @@ class SelectionModel
     end
     rv
   end
-  
+
   def single_cell?
     jtable.selected_row_count == 1 && jtable.selected_column_count == 1
   end
-  
+
   def selected?( row, column )
     selected_indexes.first.with do |index|
       index.row == row &&
       index.column == column
     end
   end
-  
+
   # return an array of integer indexes for currently selected rows
   def row_indexes
     jtable.selected_rows.to_a
   end
-  
+
   def clear
     jtable.clear_selection
   end
-  
+
   # return the full set of selected indexes, ordered
   # by row then column
   def selected_indexes

data/lib/clevic/swing/swing_table_index.rb

@@ -5,17 +5,17 @@ module Clevic
   class SwingTableIndex
     include TableIndex
     include Gather
-    
+
     def initialize( model, row, column )
       @model, @row, @column = model, row.to_i, column.to_i
     end
     attr_accessor :model
     property :row, :column
-    
+
     def valid?
       row != -1 && column != -1 && model != nil
     end
-    
+
     def self.invalid
       new( nil, -1, -1 )
     end
@@ -23,14 +23,14 @@ module Clevic
     def choppy( *args, &block  )
       return self unless self.valid?
       copied = clone.gather( *args, &block )
-      
+
       # TODO this is mostly shared with Qt
-      
+
       # convert a column name to a column index
       unless copied.column.is_a?( Numeric )
         copied.column = model.field_column( copied.column )
       end
-      
+
       # return an invalid index if it's out of bounds,
       # or the copied index if it's OK.
       if copied.row >= model.row_count || copied.column >= model.column_count

data/lib/clevic/swing/table_model.rb

@@ -19,45 +19,45 @@ including the Clevic::Record module in a Sequel::Model subclass.
 =end
 class TableModel < javax.swing.table.AbstractTableModel
   include Emitter
-  
+
   # index, value, message
   emitter :data_error
-  
+
   def initialize
     super()
   end
-  
+
   def create_index( row, column )
     SwingTableIndex.new( self, row, column )
   end
-  
+
   # add a new item, and set defaults from the Clevic::View
   def add_new_item_start
     # don't need to do anything
   end
-  
+
   def add_new_item_end
     fireTableRowsInserted( collection.size, collection.size ) 
   end
-  
+
   def remove_notify( rows, &block )
     # no need to do anything before removing rows
     yield
     # tell the views
     fireTableRowsDeleted( rows.first, rows.last )
   end
-  
+
   # Tell the UI we had a major data change
   def reset
     # could also use fireTableStructureChanged(), but it doesn't seem necessary
     fireTableDataChanged
   end
-  
+
   # override TableModel method
   def getRowCount
     collection.size
   end
-  
+
   # make it ruby-nice
   alias_method :row_count, :getRowCount
 
@@ -65,15 +65,15 @@ class TableModel < javax.swing.table.AbstractTableModel
   def getColumnCount
     fields.size
   end
-  
+
   # make it ruby-nice
   alias_method :column_count, :getColumnCount
-  
+
   # override TableModel method
   def getColumnName( column_index )
     fields[column_index].label
   end
-  
+
   # override TableModel method
   def getColumnClass( column_index )
     if fields[column_index].meta.type == :boolean || fields[column_index].delegate.is_a?( BooleanDelegate )
@@ -84,35 +84,35 @@ class TableModel < javax.swing.table.AbstractTableModel
       java.lang.Object
     end
   end
-  
+
   def isCellEditable( row_index, column_index )
     index = create_index( row_index, column_index )
     !( index.field.read_only? || index.entity.andand.readonly? || read_only? )
   end
-  
+
   def valuer_for( index )
     case 
     # pull values from entity at index
     when index.field.entity_class == entity_class
       index
-    
+
     # pull values from the Clevic::View class
     when entity_view.class.ancestors.include?( Clevic::View )
       #~ entity_view.entity = index.entity
       FieldValuer.valuer( index.field, entity_view )
-    
+
     else
       raise "No valuer for #{index.inspect}"
     end
   end
-  
+
   # Provide raw value to renderers
   def getValueAt( row_index, column_index )
     index = create_index( row_index, column_index )
-    
+
     #~ valuer = valuer_for( index )
     valuer = index
-    
+
     if index.field.delegate.native
       valuer.display_value
     else
@@ -124,16 +124,16 @@ class TableModel < javax.swing.table.AbstractTableModel
     puts $!.backtrace
     nil
   end
-  
+
   def setValueAt( value, row_index, column_index )
     index = create_index( row_index, column_index )
     #~ puts "setting index: #{index.inspect} to #{value.inspect}"
     #~ valuer = valuer_for( index )
     valuer = index
-    
+
     # Don't allow the primary key to be changed
     return if index.attribute == entity_class.primary_key.to_sym
-    
+
     # translate the value from the ui to something that
     # the DB entity will understand
     begin
@@ -143,19 +143,19 @@ class TableModel < javax.swing.table.AbstractTableModel
         # more specific descendant first
         when java.util.Time
           Time.new( value.hour, value.min, value.sec )
-          
+
         when java.util.Date
           Date.new( value.year, value.month, value.day )
-        
+
         else
           raise "don't know how to convert a #{value.class.name}:#{value.inspect}"
         end
       else
         valuer.edit_value = value
       end
-      
+
       valuer.entity.save
-      
+
       data_changed( index )
     rescue Exception => e
       puts "#{__FILE__}:#{__LINE__}:e.message: #{e.message}"
@@ -163,7 +163,7 @@ class TableModel < javax.swing.table.AbstractTableModel
       emit_data_error( index, value, e.message )
     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
@@ -181,10 +181,10 @@ class TableModel < javax.swing.table.AbstractTableModel
           # assume it's a ModelIndex, so one cell was updated
           fireTableCellUpdated( arg.row, arg.column )
         end
-      
+
       when 2
         fireTableRowsUpdated( args.first.row, args.last.row )
-      
+
       else
         unless block.nil?
           change = DataChange.new
@@ -194,7 +194,7 @@ class TableModel < javax.swing.table.AbstractTableModel
         end
     end
   end
-  
+
 end
 
 end #module