bakkdoor-rswing 0.1.5 → 0.2.0

data/README

@@ -38,7 +38,7 @@ Some examples:
     end
 
     # accessing components of frame via :name attribute given to button:
-    puts "text property of : #{frame[:okButton].text}"
+    puts "text property of okButton: #{frame[:okButton].text}"
 
     # options-dialog
     options = ["Yes", "No", "Cancel"]

data/Rakefile

@@ -1,8 +1,23 @@
-# 
-# To change this template, choose Tools | Templates
-# and open the template in the editor.
+require "rake"
+require "rake/testtask"
+require "rake/rdoctask"
+require "rake/clean"
+require "rake/gempackagetask"
  
+task :default => [ :test ]
+task :test    => [ :test_units ]
+  
+desc "run unit tests in test/unit"
+rt = Rake::TestTask.new("test_units") do |t|
+  t.libs << "test/unit"
+  t.pattern = "test/test_*.rb"
+  t.verbose = true
+end
 
-require 'rake'
-require 'rake/testtask'
-require 'rake/rdoctask'
+desc "create rdoc in /doc"
+rd = Rake::RDocTask.new("doc") do |rd|
+  rd.main = "README"
+  rd.rdoc_files.include("README", "lib/*.rb")
+  rd.options << "--all"
+  rd.rdoc_dir = "rdoc"
+end

data/lib/rswing/components/button.rb

@@ -11,7 +11,7 @@
 # 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 General Public License for more details.                                #
+# 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/>.             #

data/lib/rswing/components/component.rb

@@ -0,0 +1,36 @@
+###############################################################################
+# 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
+    module Component
+    
+    include Events::ComponentEvents
+    include Events::MouseEvents
+    include Events::MouseMotionEvents
+    include Events::MouseWheelEvents
+    include Events::KeyEvents
+    include Events::HierarchyBoundsEvents
+    include Events::InputMethodEvents
+    include Events::PropertyChanged
+    include Events::FocusEvents
+    
+    end 
+  end
+end

data/lib/rswing/components/container.rb

@@ -11,7 +11,7 @@
 # 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 General Public License for more details.                                #
+# 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/>.             #
@@ -21,12 +21,15 @@ module RSwing
   module Components
     module Container
       
+      include Component
+      
+      include Events::ContainerEvents
+      
       # Adds a component with a set of options to this container.
       def add(component, options = {})
         if(self.respond_to?(:getContentPane))
           self.add_to_content_pane(component, options)
         else
-#          this should be handled somehow later on:
           if(layout = Options.value_for(options => :layout))
             super(component, layout)
           else
@@ -46,7 +49,7 @@ module RSwing
       # Raises an exception if name already taken.
       def add_with_name(component, name_symbol)
         if self.component_hash.has_key?(name_symbol)
-          raise "Name in Component bereits vergeben!"
+          raise "Name in component already taken!"
         else
           self.component_hash[name_symbol] = component
         end
@@ -55,7 +58,7 @@ module RSwing
       # Removes a component from this container. 
       # Also removes it from the component_hash
       def remove(component)
-        super.remove(component)
+        super(component)
         # delete all entries with component as value in component_hash
         self.component_hash.delete_if { |key,value| value == component }
       end
@@ -70,6 +73,16 @@ module RSwing
         end
       end
       
+      # Returns the components of a container.
+      # If the container uses a content_pane, its components are returned.
+      def components
+        if self.respond_to?(:getContentPane)
+          self.content_pane.components
+        else
+          super
+        end
+      end
+      
       # Adds a component to a container, if specified via :belongs_to in options.
       def self.add_if_requested(component, options)
         if(container = Options.value_for(options => :belongs_to))

data/lib/rswing/components/dialog.rb

@@ -11,7 +11,7 @@
 # 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 General Public License for more details.                                #
+# 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/>.             #
@@ -28,7 +28,6 @@ module RSwing
     # Can also be used to create custom dialogs by extending from this class.
     class Dialog < JDialog
       include Window
-      include Container
       
       def initialize(title, options = {}, &block)
         super(Options.value_for(options => :belongs_to), title, Options.value_for(options => :modal))

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

@@ -0,0 +1,33 @@
+###############################################################################
+# 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
+    module Events
+      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
+      end
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+###############################################################################
+# 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
+    module Events
+      module ContainerEvents
+        ContainerListener = java.awt.event.ContainerListener
+        
+        event_for self => :on_component_added, ContainerListener => :componentAdded
+        event_for self => :on_component_removed, ContainerListener => :componentRemoved
+      end
+    end
+  end
+end

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

@@ -11,7 +11,7 @@
 # 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 General Public License for more details.                                #
+# 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/>.             #

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

@@ -11,7 +11,7 @@
 # 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 General Public License for more details.                                #
+# 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/>.             #

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

@@ -0,0 +1,31 @@
+###############################################################################
+# 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
+    module Events
+      module HierarchyBoundsEvents
+        HierarchyBoundsListener = java.awt.event.HierarchyBoundsListener
+        
+        event_for self => :on_ancestor_moved, HierarchyBoundsListener => :ancestorMoved
+        event_for self => :on_ancestor_resized, HierarchyBoundsListener => :ancestorResized
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+###############################################################################
+# 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
+    module Events
+      module HierarchyChanged
+        HierarchyListener = java.awt.event.HierarchyListener
+        
+        event_for self => :on_hierarchy_changed, HierarchyListener => :hierarchyChanged
+      end
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+###############################################################################
+# 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
+    module Events
+      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
+      end
+    end
+  end
+end

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

@@ -11,7 +11,7 @@
 # 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 General Public License for more details.                                #
+# 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/>.             #

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

@@ -11,7 +11,7 @@
 # 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 General Public License for more details.                                #
+# 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/>.             #

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

@@ -0,0 +1,31 @@
+###############################################################################
+# 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
+    module Events
+      module MouseMotionEvents
+        MouseMotionListener = java.awt.event.MouseMotionListener
+        
+        event_for self => :on_mouse_dragged, MouseMotionListener => :mouseDragged
+        event_for self => :on_mouse_moved, MouseMotionListener => :mouseMoved
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+###############################################################################
+# 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
+    module Events
+      module MouseWheelEvents
+        MouseWheelListener = java.awt.event.MouseWheelListener
+        
+        event_for self => :on_mouse_wheel_moved, MouseWheelListener => :mouseWheelMoved
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+###############################################################################
+# 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
+    module Events
+      module PropertyChanged
+        PropertyChangeListener = java.beans.PropertyChangeListener
+        
+        event_for self => :on_property_changed, PropertyChangeListener => :propertyChange
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+###############################################################################
+# 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
+    module Events
+      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
+      end
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+###############################################################################
+# 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
+    module Events
+      module WindowFocus
+        WindowFocusListener = java.awt.event.WindowFocusListener
+        
+        event_for self => :on_window_focus, WindowFocusListener => :windowGainedFocus
+        event_for self => :on_window_focus_lost, WindowFocusListener => :windowLostFocus
+      end
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+###############################################################################
+# 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
+    module Events
+      module WindowState
+        WindowStateListener = java.awt.event.WindowStateListener
+        
+        event_for self => :on_window_state_changed, WindowStateListener => :windowStateChanged
+      end
+    end
+  end
+end

data/lib/rswing/components/frame.rb

@@ -11,7 +11,7 @@
 # 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 General Public License for more details.                                #
+# 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/>.             #
@@ -23,7 +23,6 @@ module RSwing
     
     class Frame < JFrame
       include Window
-      include Container
       
       # valid options are:
       # 1. <tt>:size => [800, 600]</tt> 800x600 pixels (default: nil)

data/lib/rswing/components/listener.rb

@@ -11,7 +11,7 @@
 # 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 General Public License for more details.                                #
+# 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/>.             #
@@ -20,11 +20,10 @@
 module RSwing
   module Components
     class Listener
-      # Erstellt eine Listener-Klasse des angegebenen listener_interfaces 
-      # (Java Listener Interface), die alle Interface-Methoden leer haelt
-      # ausser derjenigen, die mit <tt>methodname</tt> angegeben wurde
-      # (und deren Inhalt mit dem angegebenen <tt>block</tt> gefüllt wird).
-      # Gibt anschließend eine neue Instanz dieser Listener-Klasse zurück
+      # Creates a Listener-Class of the given listener_interface (Java Listener Interface)
+      # which has all interface methods implemented empty exceptt the one
+      # specified by <tt>methodname</tt>. Its method-body gets filled by the given <tt>block</tt>.
+      # Finally returns a new instance of this dynamically created Listener-Class.
       def self.create(listener_interface, methodname, &block)
         listener_class = Class.new() do
           include listener_interface
@@ -35,7 +34,7 @@ module RSwing
             end
           end
         end
-        # neue instanz zurückgeben
+        # return new instance of listener_class
         listener_class.new(methodname, &block)
       end
     end

data/lib/rswing/components/options.rb

@@ -11,7 +11,7 @@
 # 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 General Public License for more details.                                #
+# 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/>.             #
@@ -56,8 +56,8 @@ module RSwing
       def self.value_for(hash)
         raise "Value must be a hash!" unless hash.kind_of? Hash
         hash.each_pair do |options_hash, option_key|
-          # es sollte nur ein paar angegeben werden, sodass wir einfach nur das erste nehmen
-          # und den entsprechenden wert zurückgeben
+          # it should only be one pair specified,
+          # so we can simply take the first and return the appropriate value
           return options_hash[option_key].nil? ? gui_options[option_key] : options_hash[option_key]
         end
       end

data/lib/rswing/components/panel.rb

@@ -11,7 +11,7 @@
 # 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 General Public License for more details.                                #
+# 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/>.             #
@@ -23,9 +23,6 @@ module RSwing
     
     class Panel < JPanel
       include Container
-      include Events::KeyEvents
-      include Events::MouseEvents
-      include Events::FocusEvents
       
       def initialize(options = {}, &block)
         super(Options.value_for(options => :layout_manager), Options.value_for(options => :double_buffer))
@@ -36,7 +33,7 @@ module RSwing
           self.border = border
         end      
         
-        # block aufrufen mit aktuellem objekt, falls vorhanden
+        # call block with current object, if given
         if block_given?
           yield self
         end

data/lib/rswing/components/text_field.rb

@@ -11,7 +11,7 @@
 # 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 General Public License for more details.                                #
+# 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/>.             #

data/lib/rswing/components/window.rb

@@ -11,7 +11,7 @@
 # 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 General Public License for more details.                                #
+# 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/>.             #
@@ -20,6 +20,13 @@
 module RSwing
   module Components
     module Window
+      
+      include Container
+      
+      include Events::PropertyChanged
+      include Events::WindowState
+      include Events::WindowFocus
+      
       # Initializes a given Window object with some options.
       # Valid options include:
       # 1. <tt>:size => [100,200] # 100x200 pixels</tt> (default: nil)

data/lib/rswing.rb

@@ -11,7 +11,7 @@
 # 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 General Public License for more details.                                #
+# 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/>.             #
@@ -31,12 +31,24 @@ class Module
 end
 
 # event-modules
+require "events/component_events"
+require "events/container_events"
 require "events/focus_events"
+require "events/hierarchy_bounds_events"
+require "events/hierarchy_changed"
+require "events/input_method_events"
 require "events/key_events"
 require "events/mouse_events"
+require "events/mouse_motion_events"
+require "events/mouse_wheel_events"
+require "events/property_changed"
+require "events/window_events"
+require "events/window_focus"
+require "events/window_state"
 
 
 # containers
+require "component"
 require "container"
 require "window"
 

data/test/test_button.rb

@@ -0,0 +1,17 @@
+require "test/unit"
+
+require "rswing"
+require "test/test_helper"
+
+class TestButton < Test::Unit::TestCase
+  include RSwing::Components
+  include TestHelper
+  
+  def setup
+    @button = Button.new "hello world"
+  end
+  
+  def test_events
+    should_have_events @button => [:on_click, :on_focus, :on_focus_lost]
+  end
+end

data/test/test_container.rb

@@ -0,0 +1,55 @@
+require "test/unit"
+
+require "rswing"
+require "test/test_helper"
+
+class TestContainer < Test::Unit::TestCase
+  include RSwing::Components
+  include TestHelper
+  
+  def setup
+    @container = Frame.new "my frame"
+    @button = Button.new "by button"
+  end
+  
+  def test_indexer
+    btn = Button.new "my button", :belongs_to => @container, :name => :button
+    assert_equal(@container[:button], btn)
+  end
+  
+  def test_add
+    @container.add @button
+    assert(@container.components.include?(@button), "container should have button!")
+  end
+  
+  def test_remove
+    test_add
+    @container.remove @button
+    assert(! @container.components.include?(@button), "container should not have button!")
+  end
+  
+  def test_add_if_requested
+    Container.add_if_requested @button, {}
+    assert(! @container.components.include?(@button), "container should not have button!")
+    
+    Container.add_if_requested @button, :belongs_to => @container, :name => :new_button
+    assert(@container.components.include?(@button), "container now should have button!")
+    assert_not_nil(@container[:new_button], "container now should have button!")
+  end
+  
+  def test_components
+    frame = Frame.new "my frame"
+    panel = Panel.new
+   
+    frame.add @button
+    assert(frame.components.include?(@button), "frame should have button!")
+    
+    panel.add @button
+    assert(panel.components.include?(@button), "panel should have button!")
+  end
+  
+  def test_events
+    frame = Frame.new "my frame"
+    should_have_events frame => [:on_focus, :on_focus_lost, :on_property_changed]
+  end
+end

data/test/test_helper.rb

@@ -0,0 +1,9 @@
+module TestHelper
+  def should_have_events(component_events_hash)
+    component = component_events_hash.keys.first
+    events = component_events_hash[component]
+    events.each do |event|
+      assert(component.respond_to?(event), "no #{event} event-method available!")
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bakkdoor-rswing
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
+  version: 0.2.0
 platform: ruby
 authors: 
 - Christopher Bertels
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-30 00:00:00 -07:00
+date: 2008-11-03 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -27,18 +27,34 @@ files:
 - Rakefile
 - lib/rswing.rb
 - lib/rswing/components/button.rb
+- lib/rswing/components/component.rb
 - lib/rswing/components/container.rb
 - lib/rswing/components/dialog.rb
+- lib/rswing/components/events
+- lib/rswing/components/events/component_events.rb
+- lib/rswing/components/events/container_events.rb
+- lib/rswing/components/events/event.rb
+- lib/rswing/components/events/focus_events.rb
+- lib/rswing/components/events/hierarchy_bounds_events.rb
+- lib/rswing/components/events/hierarchy_changed.rb
+- lib/rswing/components/events/input_method_events.rb
+- lib/rswing/components/events/key_events.rb
+- lib/rswing/components/events/mouse_events.rb
+- lib/rswing/components/events/mouse_motion_events.rb
+- lib/rswing/components/events/mouse_wheel_events.rb
+- lib/rswing/components/events/property_changed.rb
+- lib/rswing/components/events/window_events.rb
+- lib/rswing/components/events/window_focus.rb
+- lib/rswing/components/events/window_state.rb
 - lib/rswing/components/frame.rb
 - lib/rswing/components/listener.rb
 - lib/rswing/components/options.rb
 - lib/rswing/components/panel.rb
 - lib/rswing/components/text_field.rb
 - lib/rswing/components/window.rb
-- lib/rswing/components/events/event.rb
-- lib/rswing/components/events/focus_events.rb
-- lib/rswing/components/events/key_events.rb
-- lib/rswing/components/events/mouse_events.rb
+- test/test_button.rb
+- test/test_container.rb
+- test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/bakkdoor/rswing
 post_install_message: 
@@ -66,5 +82,7 @@ rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
 summary: RSwing - Ruby-ish wrapper of Swing GUI-Framework for JRuby
-test_files: []
-
+test_files: 
+- test/test_button.rb
+- test/test_container.rb
+- test/test_helper.rb