swing 0.1.2 → 0.1.3

data/HISTORY

@@ -33,3 +33,7 @@
 == 0.1.2 / 2011-05-25
 
 * JFrame fixed
+
+== 0.1.3 / 2011-05-26
+
+* Upgrade Awt::Component

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/awt/component.rb

@@ -8,4 +8,28 @@ class Awt::Component
 
   include SwingSupport::Extensions::Attributes
 
+  #    background       Color � �
+  #    cursor           Cursor � � Cursor.DEFAULT_CURSOR
+  #    enabled          boolean � � true
+  #    font             Font � �
+  #    foreground       Color � �
+  #    layout           LayoutManager � � BorderLayout( )
+  #    locale           Locale � �
+  #    location         Point � �
+  #    locationOnScreen Point � �
+  #    name             String � � ""
+  #    parent           Container � � null
+  #    size             Dimension � �
+  #    visible          boolean � � true
+  #    ----Getters only - NO Setters!
+  #    colorModel       ColorModel �
+  #    component        (i) Component �
+  #    componentCount   int �
+  #    components       Component[] �
+  #    insets           Insets � Insets(0,0,0,0)
+  #    showing          boolean � true
+  #    valid            boolean �
+
+  attr_setter :background, :cursor, :enabled, :font, :foreground, :layout, :locale,
+              :location, :location_on_screen, :name, :parent, :size, :visible
 end

data/lib/swing/j_button.rb

@@ -2,7 +2,7 @@ require 'swing'
 
 class Swing::JButton
 
-  attr_setter :enabled
+  attr_setter :tool_tip_text
 
   def initialize *args, &block
     super *args

data/lib/swing/j_check_box.rb

@@ -3,6 +3,7 @@ require 'swing'
 class Swing::JCheckBox
 
   attr_setter :selected
+  attr_setter :tool_tip_text
 
   def initialize *args, &block
     super *args

data/lib/swing/j_frame.rb

@@ -1,11 +1,16 @@
 require 'swing'
 
 class Swing::JFrame
-#    include AttrSetter
 
   attr_setter :layout, :background, :size, :title,
               :default_close_operation => EXIT_ON_CLOSE #DISPOSE_ON_CLOSE, HIDE_ON_CLOSE
 
+  def attributes
+    a = super
+    a.delete :tool_tip_text
+    a
+  end
+
   def initialize *args
 
     super *args

data/lib/swing/j_label.rb

@@ -2,5 +2,7 @@ require 'swing'
 
 class Swing::JLabel
 
+  attr_setter :tool_tip_text
+
 end # class Label
 

data/lib/swing/j_list.rb

@@ -1,6 +1,7 @@
 require 'swing'
 
 class Swing::JList
+  attr_setter :tool_tip_text
 
 end # class List
 

data/lib/swing/j_menu.rb

@@ -1,5 +1,6 @@
 require 'swing'
 
 class Swing::JMenu
+  attr_setter :tool_tip_text
 
 end

data/lib/swing/j_menu_bar.rb

@@ -4,6 +4,8 @@ require 'swing/j_menu_item'
 
 class Swing::JMenuBar
 
+  attr_setter :tool_tip_text
+
   def initialize opts = {}
     super opts
 

data/lib/swing/j_menu_item.rb

@@ -1,6 +1,7 @@
 require 'swing'
 
 class Swing::JMenuItem
+  attr_setter :tool_tip_text
 
   def initialize text, opts = {}, &block
     super text

data/lib/swing/j_panel.rb

@@ -2,5 +2,5 @@ require 'swing'
 
 class Swing::JPanel
 
-  attr_setter :layout, :background
+  attr_setter :tool_tip_text
 end # class Panel

data/lib/swing/j_scroll_pane.rb

@@ -3,6 +3,7 @@ require 'swing'
 # Scroll Pane around given scrollable component
 class Swing::JScrollPane
 
+  attr_setter :tool_tip_text
   attr_setter :horizontal_scroll_bar_policy, :vertical_scroll_bar_policy
 
 end # class JScrollPane

data/lib/swing/j_split_pane.rb

@@ -2,6 +2,7 @@ require 'swing'
 
 class Swing::JSplitPane
 
+  attr_setter :tool_tip_text
   attr_setter :one_touch_expandable, :orientation, :continuous_layout,
               :divider_size, :divider_location, :resize_weight
 

data/lib/swing/j_table.rb

@@ -37,6 +37,7 @@ class Swing::JTable
   #    scrollableTracksViewportHeighto boolean � false
   #    scrollableTracksViewportWidtho boolean � false
 
+  attr_setter :tool_tip_text
   attr_setter :auto_create_columns_from_model, :auto_resize_mode, :row_height,
               :model, :column_model, :selection_model,
               :drag_enabled, :cell_editor, :grid_color, :intercell_spacing,

data/lib/swing.rb

@@ -7,8 +7,21 @@ require 'version'
 require 'swing_support'
 require 'awt'
 
-#
+require 'swing/j_button'
+require 'swing/j_check_box'
+require 'swing/j_frame'
+require 'swing/j_label'
+require 'swing/j_list'
+require 'swing/j_menu'
+require 'swing/j_menu_bar'
+require 'swing/j_menu_item'
+require 'swing/j_panel'
+require 'swing/j_scroll_pane'
+require 'swing/j_split_pane'
+require 'swing/j_table'
+
 #module Swing
+#  TODO: Impossible to auto-load, this is Swing package, not a Ruby module :(
 #  autoload :JButton, "swing/j_button"
 #  autoload :JCheckBox, "swing/j_check_box"
 #  autoload :JButton, "swing/j_button"

data/lib/swing_support/extensions/attributes.rb

@@ -8,7 +8,7 @@ module SwingSupport
       def self.included host
         host.send :extend, ClassMethods
         host.instance_eval do
-          attr_setter :font, :tool_tip_text, :enabled
+#          attr_setter :font, :tool_tip_text, :enabled
           alias :new_without_attributes :new
           alias :new :new_with_attributes
         end

data/lib/swing_support.rb

@@ -2,3 +2,4 @@ module SwingSupport
 end
 
 require 'swing_support/extensions/attributes'
+require 'swing_support/action_listener'

data/spec/awt/component_spec.rb

@@ -4,14 +4,13 @@ require 'awt/component'
 describe 'java.awt.Component' do
   context 'defining new methods' do
     it 'changes derived Ruby subclases' do
-      button = Swing::JButton.new 'Disconnect', :enabled => false
-      button.should_not be_enabled
+      button = Swing::JButton.new 'Disconnect'
       button.should respond_to :blah
       button.blah
     end
 
     it 'changes derived pure Java subclases' do
-      button = javax.swing.JButton.new 'Disconnect' #, :enabled => false
+      button = javax.swing.JButton.new 'Disconnect'
       button.should respond_to :blah
       button.blah
     end

data/spec/swing/j_button_spec.rb

@@ -1,8 +1,21 @@
 require 'spec_helper'
+require 'swing/shared'
 
 describe Swing::JButton do
-  it 'is possible to set :enabled attribute to false' do
-    button = Swing::JButton.new 'Disconnect', :enabled => false
-    button.should_not be_enabled
+
+  context 'creation' do
+    let(:new_args) { ['Text'] }
+
+    it_behaves_like 'enhanced awt component'
+
+    it 'is possible to set :enabled attribute to false' do
+      button = Swing::JButton.new 'Disconnect', :enabled => false
+      button.should_not be_enabled
+    end
+
+    it 'is possible to set :tool_tip_text attribute' do
+      button = Swing::JButton.new 'Disconnect', :tool_tip_text => 'Blah'
+      button.tool_tip_text.should == 'Blah'
+    end
   end
 end

data/spec/swing/j_check_box_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+require 'swing/shared'
+
+describe Swing::JCheckBox do
+
+  context 'creation' do
+    let(:new_args) { ['Text'] }
+
+    it_behaves_like 'enhanced awt component'
+
+    it 'is possible to set :selected attribute' do
+      box = Swing::JCheckBox.new 'Disconnect', :selected => true
+      box.should be_selected
+    end
+
+    it 'is possible to set :tool_tip_text attribute' do
+      box = Swing::JCheckBox.new 'Disconnect', :tool_tip_text => 'Blah'
+      box.tool_tip_text.should == 'Blah'
+    end
+  end
+end

data/spec/swing/j_label_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+require 'swing/shared'
+
+describe Swing::JLabel do
+
+  context 'creation' do
+    let(:new_args) { ['Text'] }
+
+    it_behaves_like 'enhanced awt component'
+
+    it 'is possible to set :tool_tip_text attribute' do
+      label = Swing::JLabel.new 'Disconnect', :tool_tip_text => 'Blah'
+      label.tool_tip_text.should == 'Blah'
+    end
+  end
+end

data/spec/swing/shared.rb

@@ -0,0 +1,40 @@
+shared_examples_for 'enhanced awt component' do
+
+  context 'new with common options' do
+    it 'is possible to create components with settable attribute' do
+      p described_class.attributes
+      background = Awt::Color.new(1, 2, 3)
+      cursor = Awt::Cursor.new Awt::Cursor::HAND_CURSOR #DEFAULT_CURSOR
+      enabled = false
+      font = Awt::Font.new("Trebuchet", Awt::Font::PLAIN, 11)
+      new_args.push :background => background, :cursor => cursor, :enabled => enabled,
+                    :font => font, :name => 'Blah'
+      component = described_class.new *new_args
+      component.background.should == background
+      component.cursor.should == cursor
+      component.enabled?.should == false
+      component.font.should == font
+      component.name.should == 'Blah'
+      component.parent.should == nil
+    end
+  end
+
+#  context 'new with options (without parent)' do
+#    {Swing::JLabel => 'Text', Swing::JButton => 'Text', Swing::JCheckBox => 'Text',
+#     Swing::JFrame => 'Text', Swing::JList => [], Swing::JMenu => [], Swing::JMenuBar=> [],
+#     Swing::JMenuItem => [], Swing::JPanel => [], Swing::JScrollPane => [],
+#     Swing::JSplitPane => [], Swing::JTable => [2, 2]}.each do |klass, args|
+#      it 'is possible to create components with settable attribute' do
+#        p klass.attributes
+#        constructor_args.push constructor_options
+#        component = klass.new(*args, :name => 'Blah')
+#        component.name.should == 'Blah'
+#        component.parent.should == nil
+#      end
+#    end
+#  end
+end
+#{Swing::JLabel => 'Text', Swing::JButton => 'Text', Swing::JCheckBox => 'Text',
+# Swing::JFrame => 'Text', Swing::JList => [], Swing::JMenu => [], Swing::JMenuBar=> [],
+# Swing::JMenuItem => [], Swing::JPanel => [], Swing::JScrollPane => [],
+# Swing::JSplitPane => [], Swing::JTable => [2, 2]}.each do |klass, args|

metadata

@@ -2,7 +2,7 @@
 name: swing
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
   - arvicco
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-25 00:00:00 +04:00
+date: 2011-05-26 00:00:00 +04:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -87,6 +87,9 @@ files:
   - spec/swing_spec.rb
   - spec/awt/component_spec.rb
   - spec/swing/j_button_spec.rb
+  - spec/swing/j_check_box_spec.rb
+  - spec/swing/j_label_spec.rb
+  - spec/swing/shared.rb
   - features/swing.feature
   - features/step_definitions/swing_steps.rb
   - features/support/env.rb
@@ -141,3 +144,6 @@ test_files:
   - spec/swing_spec.rb
   - spec/awt/component_spec.rb
   - spec/swing/j_button_spec.rb
+  - spec/swing/j_check_box_spec.rb
+  - spec/swing/j_label_spec.rb
+  - spec/swing/shared.rb