bakkdoor-rswing 0.2.1 → 0.2.2

data/LICENSE

@@ -1,5 +1,5 @@
 RSwing is licensed under the GNU LGPL v3.
-Copyright (C) 2008 Christopher Bertels, Waldemar Smirnow.
+Copyright (C) 2008 Christopher Bertels.
  
 =============================================================================================
        

data/lib/rswing.rb

@@ -53,6 +53,7 @@ require "container"
 require "window"
 
 require "button"
+require "combo_box"
 require "dialog"
 require "frame"
 require "listener"

data/lib/rswing/components/combo_box.rb

@@ -0,0 +1,67 @@
+###############################################################################
+# This file is part of RSwing.                                                #
+# RSwing - Swing wrapper for JRuby                                            #
+# (C) 2008 Christopher Bertels (bakkdoor@flasht.de)                           #
+#                                                                             #
+# RSwing is free software: you can redistribute it and/or modify              #
+# it under the terms of the GNU Lesser General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# RSwing is distributed in the hope that it will be useful,                   #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU Lesser General Public License for more details.                         #
+#                                                                             #
+# You should have received a copy of the GNU Lesser General Public License    #
+# along with RSwing.  If not, see <http://www.gnu.org/licenses/>.             #
+###############################################################################
+
+module RSwing
+  module Components
+    JComboBox = javax.swing.JComboBox
+    
+    class ComboBox < JComboBox
+      include Component
+      
+      # Valid items are either an array or a ComboBoxModel object.
+      # e.g.: <tt>["First item", "Second item"]</tt> (default: nil)
+      #
+      # Valid options are:
+      # 1. <tt>:belongs_to => container</tt> (default: nil)
+      # 2. <tt>:name => :text_field</tt> (default: nil)
+      def initialize(items = nil, options = {})
+        if(items.kind_of? javax.swing.ComboBoxModel)
+          super(items)
+        elsif(items.kind_of? Array)
+          super(items.to_java(:Object))
+        else
+          super()
+        end
+        
+        unless options.empty?
+          Container.add_if_requested(self, options)
+        end
+      end
+      
+      # Returns an item at a given index.
+      # Equivalent to ComboBox#item_at
+      def [](item_index)
+        self.item_at(item_index)
+      end
+      
+      # Returns the items of this ComboBox as an Array.
+      def items
+        @items = []
+        
+        self.item_count.times do |i|
+          @items << self[i]
+        end
+        
+        @items
+      end
+      
+    end
+  
+  end
+end

data/lib/rswing/components/events/component_events.rb

@@ -23,10 +23,17 @@ module RSwing
       module ComponentEvents
         ComponentListener = java.awt.event.ComponentListener
         
-        event_for self => :on_component_hidden, ComponentListener => :componentHidden
-        event_for self => :on_component_moved, ComponentListener => :componentMoved
-        event_for self => :on_component_resized, ComponentListener => :componentResized
-        event_for self => :on_component_shown, ComponentListener => :componentShown
+        def ComponentEvents.event_mappings
+          {
+            :on_component_hidden => :componentHidden,
+            :on_component_moved => :componentMoved,
+            :on_component_resized => :componentResized,
+            :on_component_shown => :componentShown
+          }
+        end
+        
+        Events.map self, ComponentListener, event_mappings
+        
       end
     end
   end

data/lib/rswing/components/events/container_events.rb

@@ -23,8 +23,15 @@ module RSwing
       module ContainerEvents
         ContainerListener = java.awt.event.ContainerListener
         
-        event_for self => :on_component_added, ContainerListener => :componentAdded
-        event_for self => :on_component_removed, ContainerListener => :componentRemoved
+        def ContainerEvents.event_mappings
+          {
+            :on_component_added => :componentAdded,
+            :on_component_removed => :componentRemoved
+          }
+        end
+        
+        Events.map self, ContainerListener, event_mappings
+        
       end
     end
   end

data/lib/rswing/components/events/event.rb

@@ -47,6 +47,15 @@ module RSwing
           end
         end
       end
+      
+      # maps the events of a listener_class to a module, specified in a event_mappings_hash
+      # e.g. (in FocusEvents-Module): <tt>Events.map self, FocusListener, FocusEvents.event_mappings</tt>
+      def Events.map(module_to_map, listener_class_to_map, event_mappings_hash)
+        event_mappings_hash.each_pair do |ruby_event, java_method|
+          event_for module_to_map => ruby_event, listener_class_to_map => java_method
+        end
+      end
+      
     end
   end
 end

data/lib/rswing/components/events/focus_events.rb

@@ -23,13 +23,15 @@ module RSwing
       module FocusEvents
         FocusListener = java.awt.event.FocusListener
         
-        # Eventhandler for on_focus (focusGained) event.
-        # Takes a block, which will get executed, when this event is fired.
-        event_for self => :on_focus, FocusListener => :focusGained
+        def FocusEvents.event_mappings
+          {
+            :on_focus => :focusGained,
+            :on_focus_lost => :focusLost
+          }
+        end
+        
+        Events.map self, FocusListener, event_mappings
         
-        # Eventhandler for focus_lost (focusLost) event.
-        # Takes a block, which will get executed, when this event is fired.
-        event_for self => :on_focus_lost, FocusListener => :focusLost
       end
     end
   end

data/lib/rswing/components/events/hierarchy_bounds_events.rb

@@ -23,8 +23,15 @@ module RSwing
       module HierarchyBoundsEvents
         HierarchyBoundsListener = java.awt.event.HierarchyBoundsListener
         
-        event_for self => :on_ancestor_moved, HierarchyBoundsListener => :ancestorMoved
-        event_for self => :on_ancestor_resized, HierarchyBoundsListener => :ancestorResized
+        def HierarchyBoundsEvents.event_mappings
+          {
+            :on_ancestor_moved => :ancestorMoved,
+            :on_ancestor_resized => :ancestorResized
+          }
+        end
+        
+        Events.map self, HierarchyBoundsListener, event_mappings
+        
       end
     end
   end

data/lib/rswing/components/events/input_method_events.rb

@@ -23,8 +23,15 @@ module RSwing
       module InputMethodEvents
         InputMethodListener = java.awt.event.InputMethodListener
         
-        event_for self => :on_input_method_text_changed, InputMethodListener => :inputMethodTextChanged
-        event_for self => :on_caret_position_changed, InputMethodListener => :caretPositionChanged
+        def InputMethodEvents.event_mappings
+          {
+            :on_input_method_text_changed => :inputMethodTextChanged,
+            :on_caret_position_changed => :caretPositionChanged
+          }
+        end
+        
+        Events.map self, InputMethodListener, event_mappings
+        
       end
     end
   end

data/lib/rswing/components/events/key_events.rb

@@ -23,9 +23,16 @@ module RSwing
       module KeyEvents
         KeyListener = java.awt.event.KeyListener
         
-        event_for self => :on_key_pressed, KeyListener => :keyPressed
-        event_for self => :on_key_released, KeyListener => :keyReleased
-        event_for self => :on_key_typed, KeyListener => :keyTyped
+        def KeyEvents.event_mappings
+          {
+            :on_key_pressed => :keyPressed,
+            :on_key_released => :keyReleased,
+            :on_key_typed => :keyTyped
+          }
+        end
+        
+        Events.map self, KeyListener, event_mappings
+        
       end
     end
   end

data/lib/rswing/components/events/mouse_events.rb

@@ -23,11 +23,18 @@ module RSwing
       module MouseEvents
         MouseListener = java.awt.event.MouseListener
         
-        event_for self => :on_mouse_clicked, MouseListener => :mouseClicked
-        event_for self => :on_mouse_entered, MouseListener => :mouseEntered
-        event_for self => :on_mouse_exited, MouseListener => :mouseExited
-        event_for self => :on_mouse_pressed, MouseListener => :mousePressed
-        event_for self => :on_mouse_released, MouseListener => :mouseReleased
+        def MouseEvents.event_mappings
+          {
+            :on_mouse_clicked => :mouseClicked,
+            :on_mouse_entered => :mouseEntered,
+            :on_mouse_exited => :mouseExited,
+            :on_mouse_pressed => :mousePressed,
+            :on_mouse_released => :mouseReleased
+          }
+        end
+        
+        Events.map self, MouseListener, event_mappings
+        
       end
     end
   end

data/lib/rswing/components/events/mouse_motion_events.rb

@@ -23,8 +23,15 @@ module RSwing
       module MouseMotionEvents
         MouseMotionListener = java.awt.event.MouseMotionListener
         
-        event_for self => :on_mouse_dragged, MouseMotionListener => :mouseDragged
-        event_for self => :on_mouse_moved, MouseMotionListener => :mouseMoved
+        def MouseMotionEvents.event_mappings
+          {
+            :on_mouse_dragged => :mouseDragged,
+            :on_mouse_moved => :mouseMoved
+          }
+        end
+        
+        Events.map self, MouseMotionListener, event_mappings
+        
       end
     end
   end

data/lib/rswing/components/events/window_events.rb

@@ -23,13 +23,20 @@ module RSwing
       module WindowEvents
         WindowListener = java.awt.event.WindowListener
         
-        event_for self => :on_window_activated, WindowListener => :windowActivated
-        event_for self => :on_window_closed, WindowListener => :windowClosed
-        event_for self => :on_window_closing, WindowListener => :windowClosing
-        event_for self => :on_window_deactivated, WindowListener => :windowDeactivated
-        event_for self => :on_window_deiconified, WindowListener => :windowDeiconified
-        event_for self => :on_window_iconified, WindowListener => :windowIconified
-        event_for self => :on_window_opened, WindowListener => :windowOpened
+        def WindowEvents.event_mappings
+          {
+            :on_window_activated => :windowActivated,
+            :on_window_closed => :windowClosed,
+            :on_window_closing => :windowClosing,
+            :on_window_deactivated => :windowDeactivated,
+            :on_window_deiconified => :windowDeiconified,
+            :on_window_iconified => :windowIconified,
+            :on_window_opened => :windowOpened
+          }
+        end
+        
+        Events.map self, WindowListener, event_mappings
+        
       end
     end
   end

data/lib/rswing/components/events/window_focus.rb

@@ -23,8 +23,15 @@ module RSwing
       module WindowFocus
         WindowFocusListener = java.awt.event.WindowFocusListener
         
-        event_for self => :on_window_focus, WindowFocusListener => :windowGainedFocus
-        event_for self => :on_window_focus_lost, WindowFocusListener => :windowLostFocus
+        def WindowFocus.event_mappings
+          {
+            :on_window_focus => :windowGainedFocus,
+            :on_window_focus_lost => :windowLostFocus
+          }
+        end
+        
+        Events.map self, WindowFocusListener, event_mappings
+        
       end
     end
   end

data/lib/rswing/components/text_field.rb

@@ -31,6 +31,8 @@ module RSwing
       # 4. <tt>:font => nil</tt> (default nil)
       # 5. <tt>:visible => false</tt> (default: true)
       # 6. <tt>:editable => false</tt> (default: true)
+      # 7. <tt>:belongs_to => container</tt> (default: nil)
+      # 8. <tt>:name => :text_field</tt> (default: nil)
       def initialize(options = {})
         if(options.empty?)
           super()

data/test/test_button.rb

@@ -12,6 +12,6 @@ class TestButton < Test::Unit::TestCase
   end
   
   def test_events
-    should_have_events @button => [:on_click, :on_focus, :on_focus_lost]
+    should_have_events @button => Events::ComponentEvents.event_mappings.keys
   end
 end

data/test/test_container.rb

@@ -50,6 +50,6 @@ class TestContainer < Test::Unit::TestCase
   
   def test_events
     frame = Frame.new "my frame"
-    should_have_events frame => [:on_focus, :on_focus_lost, :on_property_changed]
+    should_have_events frame => Events::ContainerEvents.event_mappings.keys
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bakkdoor-rswing
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
 - Christopher Bertels
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-03 00:00:00 -08:00
+date: 2008-11-04 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -27,6 +27,7 @@ files:
 - Rakefile
 - lib/rswing.rb
 - lib/rswing/components/button.rb
+- lib/rswing/components/combo_box.rb
 - lib/rswing/components/component.rb
 - lib/rswing/components/container.rb
 - lib/rswing/components/dialog.rb