swing 0.0.2 → 0.0.3

data/HISTORY

@@ -9,3 +9,7 @@
 == 0.0.2 / 2011-05-21
 
 * Splitting source files
+
+== 0.0.3 / 2011-05-21
+
+* Getting rid of extra namespace

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/swing/action_listener.rb

@@ -1,21 +1,18 @@
 include Java
 
-module Clients
+module Swing
+  # Class that implements ActionListener interface around a given block
+  class ActionListener
+    java_implements java.awt.event.ActionListener
 
-  module Swing
-    # Class that implements ActionListener interface around a given block
-    class ActionListener
-      java_implements java.awt.event.ActionListener
-
-      def initialize &block
-        @action_block = block
-      end
+    def initialize &block
+      @action_block = block
+    end
 
-      java_signature 'public void actionPerformed(ActionEvent event)'
-      # from ActionListener interface: Invoked when an action event occurs.
-      def actionPerformed event
-        @action_block.call event
-      end
+    java_signature 'public void actionPerformed(ActionEvent event)'
+    # from ActionListener interface: Invoked when an action event occurs.
+    def actionPerformed event
+      @action_block.call event
     end
   end
 end

data/lib/swing/button.rb

@@ -1,22 +1,19 @@
 require 'swing/action_listener'
 require 'swing/attr_setter'
 
-module Clients
-  module Swing
+module Swing
 
-    class Button < javax.swing.JButton
-      include AttrSetter
+  class Button < javax.swing.JButton
+    include AttrSetter
 
-      attr_setter :enabled
+    attr_setter :enabled
 
-      def initialize text, opts = {}, &block
-        set_attributes(opts) { super(text) }
+    def initialize text, opts = {}, &block
+      set_attributes(opts) { super(text) }
 
-        self.addActionListener ActionListener.new &block
+      self.addActionListener ActionListener.new &block
 
-        opts[:parent].add self if opts[:parent]
-      end
-    end # class Button
-
-  end
+      opts[:parent].add self if opts[:parent]
+    end
+  end # class Button
 end

data/lib/swing/check_box.rb

@@ -1,23 +1,19 @@
 require 'swing/action_listener'
 require 'swing/attr_setter'
 
-module Clients
-  module Swing
+module Swing
+  class CheckBox < javax.swing.JCheckBox
+    include AttrSetter
 
-    class CheckBox < javax.swing.JCheckBox
-      include AttrSetter
+    attr_setter :selected
 
-      attr_setter :selected
+    def initialize text, opts = {}, &block
+      set_attributes(opts) { super(text) }
 
-      def initialize text, opts = {}, &block
-        set_attributes(opts) { super(text) }
+      # TODO: Probably need to implement ItemListener as well?
+      self.addActionListener ActionListener.new &block
 
-        # TODO: Probably need to implement ItemListener as well?
-        self.addActionListener ActionListener.new &block
-
-        opts[:parent].add self if opts[:parent]
-      end
-    end # class CheckBox
-
-  end
+      opts[:parent].add self if opts[:parent]
+    end
+  end # class CheckBox
 end

data/lib/swing/frame.rb

@@ -2,32 +2,27 @@ require 'swing/attr_setter'
 
 import javax.swing.JFrame
 
-module Clients
+module Swing
 
-  # Swing-based GUI controls
-  module Swing
+  class Frame < JFrame
+    include AttrSetter
 
-    class Frame < JFrame
-      include AttrSetter
+    attr_setter :layout, :background, :size, :title,
+                :default_close_operation => JFrame::EXIT_ON_CLOSE #DISPOSE_ON_CLOSE, HIDE_ON_CLOSE
 
-      attr_setter :layout, :background, :size, :title,
-                  :default_close_operation => JFrame::EXIT_ON_CLOSE #DISPOSE_ON_CLOSE, HIDE_ON_CLOSE
+    def initialize name, opts = {}
 
-      def initialize name, opts = {}
+      set_attributes(opts) { super(name) }
 
-        set_attributes(opts) { super(name) }
+      setup opts
 
-        setup opts
-
-        self.location_relative_to = nil
-        self.visible = true
-      end
+      self.location_relative_to = nil
+      self.visible = true
+    end
 
-      # Method that subclasses should override to set up their contents before
-      # Frame is made visible
-      def setup opts
-      end
+    # Method that subclasses should override to set up their contents before
+    # Frame is made visible
+    def setup opts
     end
   end
 end
-

data/lib/swing/label.rb

@@ -1,16 +1,14 @@
 require 'swing/action_listener'
 require 'swing/attr_setter'
 
-module Clients
-  module Swing
+module Swing
 
-    class Label < javax.swing.JLabel
-      include AttrSetter
+  class Label < javax.swing.JLabel
+    include AttrSetter
 
-      def initialize text, opts = {}, &block
-        set_attributes(opts) { super(text) }
-        opts[:parent].add self if opts[:parent]
-      end
-    end # class Label
-  end
+    def initialize text, opts = {}, &block
+      set_attributes(opts) { super(text) }
+      opts[:parent].add self if opts[:parent]
+    end
+  end # class Label
 end

data/lib/swing/list.rb

@@ -1,19 +1,16 @@
 require 'swing/attr_setter'
 
-module Clients
+# Swing-based GUI controls
+module Swing
 
-  # Swing-based GUI controls
-  module Swing
+  class List < javax.swing.JList
+    include AttrSetter
 
-    class List < javax.swing.JList
-      include AttrSetter
+    def initialize model, opts = {}
+      set_attributes(opts) { super(model) }
 
-      def initialize model, opts = {}
-        set_attributes(opts) {super(model)}
+      opts[:parent].add self if opts[:parent]
+    end
+  end # class List
 
-        opts[:parent].add self if opts[:parent]
-      end
-    end # class List
-
-  end
 end

data/lib/swing/menu.rb

@@ -1,19 +1,14 @@
 require 'swing/attr_setter'
 
-module Clients
+module Swing
 
-  # Swing-based Menu elements
-  module Swing
+  class Menu < javax.swing.JMenu
+    include AttrSetter
 
-    class Menu < javax.swing.JMenu
-      include AttrSetter
-
-      def initialize text, opts = {}
-        set_attributes(opts) { super text }
-        opts[:parent].add self if opts[:parent]
-      end
+    def initialize text, opts = {}
+      set_attributes(opts) { super text }
+      opts[:parent].add self if opts[:parent]
     end
-
   end
-end
 
+end

data/lib/swing/menu_bar.rb

@@ -2,34 +2,31 @@ require 'swing/menu'
 require 'swing/menu_item'
 require 'swing/attr_setter'
 
-module Clients
-  module Swing
+module Swing
 
-    class MenuBar < javax.swing.JMenuBar
-      include AttrSetter
+  class MenuBar < javax.swing.JMenuBar
+    include AttrSetter
 
-      def initialize opts = {}
-        set_attributes(opts) { super() }
+    def initialize opts = {}
+      set_attributes(opts) { super() }
 
-        if opts[:structure]
-          [opts[:structure]].flatten.each do |element|
-            case element
-              when Hash # Hash defines menu structure
-                element.each do |menu_name, menu_structure|
-                  menu = Menu.new menu_name.to_s, :parent => self
-                  menu_structure.each do |item_name, item_action|
-                    MenuItem.new item_name.to_s, :parent => menu, &item_action
-                  end
+      if opts[:structure]
+        [opts[:structure]].flatten.each do |element|
+          case element
+            when Hash # Hash defines menu structure
+              element.each do |menu_name, menu_structure|
+                menu = Menu.new menu_name.to_s, :parent => self
+                menu_structure.each do |item_name, item_action|
+                  MenuItem.new item_name.to_s, :parent => menu, &item_action
                 end
-              else
-                self.add element
-            end
+              end
+            else
+              self.add element
           end
         end
-        opts[:parent].setJMenuBar self if opts[:parent]
       end
+      opts[:parent].setJMenuBar self if opts[:parent]
     end
-
   end
-end
 
+end

data/lib/swing/menu_item.rb

@@ -1,19 +1,17 @@
 require 'swing/action_listener'
 require 'swing/attr_setter'
 
-module Clients
-  module Swing
+module Swing
 
-    class MenuItem < javax.swing.JMenuItem
-      include AttrSetter
+  class MenuItem < javax.swing.JMenuItem
+    include AttrSetter
 
-      def initialize text, opts = {}, &block
-        set_attributes(opts) { super text }
-        self.addActionListener ActionListener.new &block
-        opts[:parent].add self if opts[:parent]
-      end
+    def initialize text, opts = {}, &block
+      set_attributes(opts) { super text }
+      self.addActionListener ActionListener.new &block
+      opts[:parent].add self if opts[:parent]
     end
-
   end
+
 end
 

data/lib/swing/panel.rb

@@ -1,21 +1,17 @@
 require 'swing/attr_setter'
 
-module Clients
+module Swing
 
-  # Swing-based GUI controls
-  module Swing
+  class Panel < javax.swing.JPanel
+    include AttrSetter
 
-    class Panel < javax.swing.JPanel
-      include AttrSetter
+    attr_setter :layout, :background
 
-      attr_setter :layout, :background
+    def initialize opts = {}
+      set_attributes(opts) { super() }
 
-      def initialize opts = {}
-        set_attributes(opts) {super()}
+      opts[:parent].add self if opts[:parent]
+    end
+  end # class Panel
 
-        opts[:parent].add self if opts[:parent]
-      end
-    end # class Panel
-
-  end
 end

data/lib/swing/scroll_pane.rb

@@ -1,22 +1,18 @@
 require 'swing/attr_setter'
 
-module Clients
+module Swing
 
-  # Swing-based GUI controls
-  module Swing
+  # Scroll Pane around given scrollable component
+  class ScrollPane < javax.swing.JScrollPane
+    include AttrSetter
 
-    # Scroll Pane around given scrollable component
-    class ScrollPane < javax.swing.JScrollPane
-      include AttrSetter
+    attr_setter :horizontal_scroll_bar_policy, :vertical_scroll_bar_policy
 
-      attr_setter :horizontal_scroll_bar_policy, :vertical_scroll_bar_policy
+    def initialize component, opts = {}
+      set_attributes(opts) { super(component) }
 
-      def initialize component, opts = {}
-        set_attributes(opts) { super(component) }
+      opts[:parent].add self if opts[:parent]
+    end
+  end # class Panel
 
-        opts[:parent].add self if opts[:parent]
-      end
-    end # class Panel
-
-  end
 end

data/lib/swing/split_pane.rb

@@ -1,23 +1,20 @@
 require 'swing/attr_setter'
-import javax.swing.JSplitPane
 
-module Clients
+import javax.swing.JSplitPane
 
-  # Swing-based GUI controls
-  module Swing
+module Swing
 
-    class SplitPane < JSplitPane
-      include AttrSetter
+  class SplitPane < JSplitPane
+    include AttrSetter
 
-      attr_setter :one_touch_expandable, :orientation, :continuous_layout,
-                  :divider_size, :divider_location, :resize_weight
+    attr_setter :one_touch_expandable, :orientation, :continuous_layout,
+                :divider_size, :divider_location, :resize_weight
 
-      def initialize first, second, opts = {}
-        set_attributes(opts) { super(JSplitPane::HORIZONTAL_SPLIT, first, second) }
+    def initialize first, second, opts = {}
+      set_attributes(opts) { super(JSplitPane::HORIZONTAL_SPLIT, first, second) }
 
-        opts[:parent].add self if opts[:parent]
-      end
-    end # class Panel
+      opts[:parent].add self if opts[:parent]
+    end
+  end # class Panel
 
-  end
 end

data/lib/swing/table.rb

@@ -1,65 +1,62 @@
 require 'swing/attr_setter'
 
-module Clients
+# Swing-based GUI controls
+module Swing
+
+  class Table < javax.swing.JTable
+    include AttrSetter
+
+    #    autoCreateColumnsFromModel boolean � � false
+    #    autoResizeMode             int � � AUTO_RESIZE_ALL_COLUMNS
+    #    columnModel                TableColumnModel � � DefaultTableColumnModel( )
+    #    model                      TableModel � � DefaultTableModel( )
+    #    rowHeight                  int � � 16
+    #    cellSelectionEnabled       boolean � � false
+    #    columnSelectionAllowed     boolean � � false
+    #    rowSelectionAllowed        boolean � � true
+    #    selectionMode              int � MULTIPLE_INTERVAL_SELECTION
+    #    selectionModel             ListSelectionModel � � DefaultListSelectionModel
+    #    cellEditor                 TableCellEditor � � null
+    #    dragEnabled                boolean � � false
+    #    gridColor                  Color � � From L&F
+    #    intercellSpacing           Dimension � � Dimension(1, 1)
+    #    preferredScrollableViewportSize Dimension � � Dimension(450, 400)
+    #    rowMargin                  int � � 1
+    #    selectionBackground       Color � � From L&F
+    #    selectionForeground       Color � � From L&F
+    #    showGrid                   boolean  � true
+    #    showHorizontalLines        boolean � � true
+    #    showVerticalLines          boolean � � true
+    #    tableHeader                JTableHeader � � JTableHeader(column-Model)
+    #    ----Getters only - NO Setters!
+    #    columnCount          int � 0
+    #    rowCount             int � 0
+    #    selectedColumn       int � -1
+    #    selectedColumnCount  int � 0
+    #    selectedColumns      int[] � int[0]
+    #    selectedRow          int � -1
+    #    selectedRowCount     int � 0
+    #    selectedRows         int[] � int[0]
+    #    accessibleContext    AccessibleContext � JTable.AccessibleJTable
+    #    scrollableTracksViewportHeighto boolean � false
+    #    scrollableTracksViewportWidtho boolean � false
+
+    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,
+                :preferred_scrollable_viewport_size, :row_margin,
+                :selection_background, :selection_foreground, :show_grid,
+                :show_horizontal_lines, :show_vertical_lines, :table_header,
+                :selection_mode => javax.swing.ListSelectionModel::SINGLE_SELECTION,
+                :cell_selection_enabled => true,
+                :row_selection_allowed => false,
+                :column_selection_allowed => false
+
+    def initialize rows, columns, opts = {}
+      set_attributes(opts) { super rows, columns }
+
+      opts[:parent].add self if opts[:parent]
+    end
+  end # class Table
 
-  # Swing-based GUI controls
-  module Swing
-
-    class Table < javax.swing.JTable
-      include AttrSetter
-
-      #    autoCreateColumnsFromModel boolean � � false
-      #    autoResizeMode             int � � AUTO_RESIZE_ALL_COLUMNS
-      #    columnModel                TableColumnModel � � DefaultTableColumnModel( )
-      #    model                      TableModel � � DefaultTableModel( )
-      #    rowHeight                  int � � 16
-      #    cellSelectionEnabled       boolean � � false
-      #    columnSelectionAllowed     boolean � � false
-      #    rowSelectionAllowed        boolean � � true
-      #    selectionMode              int � MULTIPLE_INTERVAL_SELECTION
-      #    selectionModel             ListSelectionModel � � DefaultListSelectionModel
-      #    cellEditor                 TableCellEditor � � null
-      #    dragEnabled                boolean � � false
-      #    gridColor                  Color � � From L&F
-      #    intercellSpacing           Dimension � � Dimension(1, 1)
-      #    preferredScrollableViewportSize Dimension � � Dimension(450, 400)
-      #    rowMargin                  int � � 1
-      #    selectionBackground       Color � � From L&F
-      #    selectionForeground       Color � � From L&F
-      #    showGrid                   boolean  � true
-      #    showHorizontalLines        boolean � � true
-      #    showVerticalLines          boolean � � true
-      #    tableHeader                JTableHeader � � JTableHeader(column-Model)
-      #    ----Getters only - NO Setters!
-      #    columnCount          int � 0
-      #    rowCount             int � 0
-      #    selectedColumn       int � -1
-      #    selectedColumnCount  int � 0
-      #    selectedColumns      int[] � int[0]
-      #    selectedRow          int � -1
-      #    selectedRowCount     int � 0
-      #    selectedRows         int[] � int[0]
-      #    accessibleContext    AccessibleContext � JTable.AccessibleJTable
-      #    scrollableTracksViewportHeighto boolean � false
-      #    scrollableTracksViewportWidtho boolean � false
-
-      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,
-                  :preferred_scrollable_viewport_size, :row_margin,
-                  :selection_background, :selection_foreground, :show_grid,
-                  :show_horizontal_lines, :show_vertical_lines, :table_header,
-                  :selection_mode => javax.swing.ListSelectionModel::SINGLE_SELECTION,
-                  :cell_selection_enabled => true,
-                  :row_selection_allowed => false,
-                  :column_selection_allowed => false
-
-      def initialize rows, columns, opts = {}
-        set_attributes(opts) { super rows, columns }
-
-        opts[:parent].add self if opts[:parent]
-      end
-    end # class Table
-
-  end
 end

metadata

@@ -2,7 +2,7 @@
 name: swing
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
   - arvicco