clevic 0.13.0.b9 → 0.13.0.b10

data/lib/clevic/swing/action_builder.rb

@@ -14,11 +14,11 @@ module ActionBuilder
       collect_actions << action
     end
   end
-  
+
   def create_action( &block )
     Action.new( self ).tap( &block )
   end
-  
+
   # set up the code to be executed when an action is triggered,
   def action_method_or_block( action, options, &block )
     # connect the action to some code

data/lib/clevic/swing/boolean_delegate.rb

@@ -6,18 +6,18 @@ module Clevic
     def init_component( cell_editor )
       editor.selected = attribute_value
     end
-    
+
     def editor
       @editor ||= javax.swing.JCheckBox.new.tap do |e|
         # TODO this is common to all delegates
         e.horizontal_alignment = field.swing_alignment
       end
     end
-    
+
     def value
       editor.selected
     end
-    
+
     def native
       java.lang.Boolean
     end

data/lib/clevic/swing/browser.rb

@@ -10,31 +10,31 @@ in Clevic::View.order. DefaultView classes created by Clevic::Record are include
 =end
 class Browser < javax.swing.JFrame
   attr_reader :menu_edit, :menu_search, :menu_table
-  
+
   def initialize
     super
-    
+
     # set OSX application title
     java.lang.System.setProperty( "com.apple.mrj.application.apple.menu.about.name", title_string )
 
     self.jmenu_bar = menu_bar
     self.icon_image = icon
-    
+
     # add the tables tab
     add( tables_tab, java.awt.BorderLayout::CENTER )
-    
+
     # add the status bar
     add( status_bar, java.awt.BorderLayout::SOUTH )
-    
+
     load_views
     update_menus
     self.title = title_string
   end
-  
+
   def title_string
     [database_name, 'Clevic'].compact.join ' '
   end
-  
+
   def menu_bar
     javax.swing.JMenuBar.new.tap do |menu_bar|
       menu_bar << javax.swing.JMenu.new( 'File' ).tap do |menu|
@@ -42,13 +42,13 @@ class Browser < javax.swing.JFrame
         menu << "Open"
         menu << "Close"
       end
-      
+
       @menu_edit = javax.swing.JMenu.new( 'Edit' ).tap {|m| m.mnemonic = java.awt.event.KeyEvent::VK_E}
       menu_bar << menu_edit
-      
+
       @menu_search = javax.swing.JMenu.new( 'Search' ).tap {|m| m.mnemonic = java.awt.event.KeyEvent::VK_S}
       menu_bar << menu_search
-      
+
       @menu_table = javax.swing.JMenu.new( 'Table' ).tap do |menu|
         menu.mnemonic = java.awt.event.KeyEvent::VK_T
         menu << Action.new( self ) do |action|
@@ -60,7 +60,7 @@ class Browser < javax.swing.JFrame
             next_tab
           end
         end
-        
+
         menu << Action.new( self ) do |action|
           action.name = :previous_tab
           action.text = "&Previous"
@@ -70,7 +70,7 @@ class Browser < javax.swing.JFrame
             previous_tab
           end
         end
-        
+
         if $options[:debug]
           menu << Action.new( self ) do |action|
             action.name = :dump
@@ -85,7 +85,7 @@ class Browser < javax.swing.JFrame
       menu_bar << @menu_table
     end
   end
-  
+
   def icon
     @icon ||=
     begin
@@ -94,12 +94,12 @@ class Browser < javax.swing.JFrame
       javax.swing.ImageIcon.new( icon_path.realpath.to_s ).image
     end
   end
-  
+
   def tables_tab
     @tables_tab ||= javax.swing.JTabbedPane.new.tap do |tables_tab|
       # tell tab to not take focus
       tables_tab.focusable = false
-    
+
       # tab navigation
       tables_tab.add_change_listener do |change_event|
         current_changed
@@ -107,7 +107,7 @@ class Browser < javax.swing.JFrame
       end
     end
   end
-  
+
   def status_bar
     @status_bar ||= javax.swing.JLabel.new.tap do |status_bar|
       status_bar.horizontal_alignment = javax.swing.SwingConstants::RIGHT
@@ -115,7 +115,7 @@ class Browser < javax.swing.JFrame
       status_bar.text = "Welcome to Clevic"
     end
   end
-  
+
   def status_bar_timer
     @status_bar_timer ||= javax.swing.Timer.new( 15000, nil ).tap do |timer|
       timer.repeats = false
@@ -127,46 +127,46 @@ class Browser < javax.swing.JFrame
       end
     end
   end
-  
+
   # Set the main window title to the name of the database, if we can find it.
   def database_name
     table_view.model.entity_class.db.url rescue ''
   end
-  
+
   # called by current_changed to update the Edit menu to the menus
   # defined by the currently selected view
   def update_menus
     # update edit menu
     menu_edit.remove_all
-    
+
     # do the model-specific menu items first
     table_view.model_actions.each do |action|
       menu_edit << action
     end
-    
+
     # now do the generic edit items
     table_view.edit_actions.each do |action|
       menu_edit << action
     end
-    
+
     # update search menu
     menu_search.remove_all
     table_view.search_actions.each do |action|
       menu_search << action
     end
   end
-  
+
   # activated by Ctrl-Shift-D for debugging
   def dump
     puts "table_view.model: #{table_view.model.inspect}"
     puts "table_view.model.entity_class: #{table_view.model.entity_class.inspect}"
   end
-  
+
   # return the Clevic::TableView object in the currently displayed tab
   def table_view
     tables_tab.selected_component
   end
-  
+
   # slot to handle Ctrl-Tab and move to next tab, or wrap around
   def next_tab
     tables_tab.selected_index = 
@@ -186,20 +186,20 @@ class Browser < javax.swing.JFrame
       tables_tab.selected_index - 1
     end
   end
-  
+
   # slot to handle the currentChanged signal from tables_tab, and
   # set focus on the grid
   def current_changed
     update_menus
     table_view.request_focus
   end
-  
+
   # Create the tabs, each with a collection for a particular entity class.
   # views come from Clevic::View.order
   def load_views
     views = Clevic::View.views
     Kernel.raise "no views to display" if views.empty?
-    
+
     # Add all existing model objects as tabs, one each
     views.each do |view_class|
       begin
@@ -208,13 +208,13 @@ class Browser < javax.swing.JFrame
           puts "Browser::load_views: No table for #{view.entity_class.inspect}"
           next
         end
-          
+
         # create the the table_view and the table_model for the entity_class
         tab = Clevic::TableView.new( view )
-        
+
         # add a new tab
         tables_tab.add( tab.title, tab )
-        
+
         # add the table to the Table menu
         menu_table << Action.new( self ) do |action|
           action.text = tab.title
@@ -222,7 +222,7 @@ class Browser < javax.swing.JFrame
             tables_tab.current = tab
           end
         end
-        
+
         init_connections( tab )
       rescue Exception => e
         puts "UI from #{view} will not be available: #{e.message}"
@@ -230,14 +230,14 @@ class Browser < javax.swing.JFrame
       end
     end
   end
-  
+
   def init_connections( tab )
     tab.emit_status_text do |msg|
       status_bar.text = msg
       # hide the message after a while.
       status_bar_timer.start
     end
-    
+
     # handle filter status changed, so we can provide a visual indication
     tab.emit_filter_status do |status|
       # update the tab, so there's a visual indication of filtering
@@ -246,12 +246,12 @@ class Browser < javax.swing.JFrame
       tables_tab.set_tool_tip_text_at( tables_tab.selected_index, tab.filter_message )
     end
   end
-  
+
   # make sure all outstanding records are saved
   def save_all
     tables_tab.each {|x| x.save_row( x.current_index ) }
   end
-  
+
   def self.run( args )
     # make it more appley
     java.lang.System.setProperty( "apple.laf.useScreenMenuBar", "true" )
@@ -261,7 +261,7 @@ class Browser < javax.swing.JFrame
     args.each do |arg|
       load_models( Pathname.new( arg ) )
     end
-    
+
     # make top-level UI
     browser = Browser.new
     browser.default_close_operation = javax.swing.JFrame::EXIT_ON_CLOSE

data/lib/clevic/swing/cell_editor.rb

@@ -7,20 +7,20 @@ module Clevic
 # when the editing starts
 class CellEditor < javax.swing.JComponent
   include javax.swing.table.TableCellEditor
-  
+
   def initialize( table_view )
     super()
     @table_view = table_view
     @listeners = []
   end
-  
+
   attr_accessor :listeners
   attr_reader :index
-  
+
   def delegate
     index.field.delegate
   end
-  
+
   # override TableCellEditor methods
   # basically, initialize a component to send back to the JTable, and store
   # a bunch of state information
@@ -28,7 +28,7 @@ class CellEditor < javax.swing.JComponent
     # remember index for later. The delegate and the editor and the value
     # all come from it.
     @index = @table_view.model.create_index( row_index, column_index )
-    
+
     # use the delegate's component. It actually comes from the index, which
     # is a bit weird. But anyway.
     delegate.entity = @index.entity
@@ -41,46 +41,46 @@ class CellEditor < javax.swing.JComponent
   def addCellEditorListener(cell_editor_listener)
     listeners << cell_editor_listener
   end
-  
+
   def change_event
     @change_event ||= javax.swing.event.ChangeEvent.new( self )
   end
-  
+
   # Tells the editor to cancel editing and not accept any partially edited value.
   def cancelCellEditing
     listeners.each do |listener|
       listener.editingCancelled( change_event )
     end
   end
-  
+
   # Returns the value contained in the editor.
   def getCellEditorValue
     delegate.value
   end
-  
+
   # Asks the editor if it can start editing using anEvent.
   def isCellEditable(event_object)
     true
   end
-  
+
   # Removes a listener from the list that's notified
   def removeCellEditorListener(cell_editor_listener)
     listeners.delete cell_editor_listener
   end
-  
+
   # Docs say not used, as of Java-1.2. But it is used. Not sure
   # what to do with it, really.
   def shouldSelectCell(event_object)
     true
   end
-  
+
   # Tells the editor to stop editing and accept any partially edited value as the value of the editor
   # true if editing was stopped, false otherwise
   def stopCellEditing
     listeners.each do |listener|
       listener.editingStopped( change_event )
     end
-    
+
     # can return false here if editing should not stop
     # for some reason, ie validation didn't succeed
     true

data/lib/clevic/swing/cell_renderer.rb

@@ -5,33 +5,33 @@ class CellRenderer < javax.swing.table.DefaultTableCellRenderer
     super()
     @table_view = table_view
   end
-  
+
   def getTableCellRendererComponent( table, value, selected, has_focus, row_index, column_index )
     index = table.model.create_index( row_index, column_index )
     component = super( table, index.display_value, selected, has_focus, row_index, column_index )
-    
+
     # set alignment
     component.horizontal_alignment = index.field.swing_alignment
-    
+
     # set text colour
     component.foreground =
     case
     # read-only
     when index.field.read_only? || index.entity.andand.readonly? || @table_view.model.read_only?
       java.awt.Color.lightGray
-    
+
     # errors
     when index.entity.errors.has_key?( index.field.id )
       java.awt.Color.red
-    
+
     # whatever the view says
     else
       index.field.foreground_for( index.entity )
     end
-    
+
     # set tooltip
     component.tool_tip_text = index.tooltip
-    
+
     component
   rescue
     puts $!.backtrace

data/lib/clevic/swing/clipboard.rb

@@ -7,7 +7,7 @@ module Java
       def inspect
         "#<DataFlavor #{mime_type}>"
       end
-      
+
       def simple_type
         mime_type.split('; ').first
       end
@@ -29,7 +29,7 @@ module Clevic
     def unbuffered_read( length )
       nex = @input_stream.read
       raise EOFError if nex == -1
-      
+
       begin
         (0...length).inject([nex]) do |buf,i|
           nex = @input_stream.read
@@ -44,7 +44,7 @@ module Clevic
       end
     end
   end
-  
+
   # Wrapper for framework-specigfic clipboard code. Used by TableView.
   #
   # could also use a javax.activation.DataHandler
@@ -57,42 +57,42 @@ module Clevic
     def system
       @system ||= java.awt.Toolkit.default_toolkit.system_clipboard
     end
-    
+
     def flavours
       system.available_data_flavors.to_a
     end
-    
+
     def text?
       mime_types.include?( 'text/plain' )
     end
-    
+
     def text; contents('text/plain'); end
-    
+
     def text=( value )
       transferable = java.awt.datatransfer.StringSelection.new( value )
       system.setContents( transferable, transferable )
     end
-    
+
     def html?
       mime_types.include?( 'text/html' )
     end
-    
+
     def html; contents('text/html'); end
-    
+
     def mime_types
       flavours.map( &:simple_type ).sort.uniq
     end
-    
+
     def full_mime_types
       flavours.map( &:mime_type )
     end
-    
+
     # matcher is either a string or a regex, ie something
     # that can be passed to Array#grep
     def has?( matcher )
       !full_mime_types.grep( matcher ).empty?
     end
-    
+
     # try a bunch of encodings for the given mime_type, and give
     # back a String containing the result
     def contents( mime_type )
@@ -100,29 +100,29 @@ module Clevic
         # try UTF-8 first because it seems more robust
         when has?( %r{#{mime_type}.*String.*utf-8}i )
           data "#{mime_type}; class=java.lang.String; charset=UTF-8"
-        
+
         # now string Unicode, just in case
         when has?( %r{#{mime_type}.*String.*unicode}i )
           data "#{mime_type}; class=java.lang.String; charset=unicode"
-          
+
         # This is to handle clevic-clevic pastes
         when has?( %r{#{mime_type}.*Stream.*unicode}i )
           stream( "#{mime_type}; class=java.io.InputStream; charset=unicode" ).read
-        
+
         else
           raise "Don't know how to get #{mime_type}"
       end
     end
-    
+
     def data( full_mime_type )
       flavor = java.awt.datatransfer.DataFlavor.new( full_mime_type )
       system.getData( flavor )
     end
-    
+
     def stream( full_mime_type )
       Stream.new( data( full_mime_type ) )
     end
-    
+
     def []( mime_type )
       contents( mime_type ).unpack('U*').inject([]) do |collect,byte|
         # ignore BOM