glimmer-dsl-swt 4.17.9.0 → 4.17.10.4

data/lib/glimmer/swt/widget_proxy.rb

@@ -234,7 +234,6 @@ module Glimmer
         elsif @swt_widget.respond_to?(attribute_getter(attribute_name))
           @swt_widget.send(attribute_getter(attribute_name))
         else
-          pd attribute_name
           send(attribute_name)
         end
       end
@@ -282,6 +281,17 @@ module Glimmer
               }
             end,
           },
+          Java::OrgEclipseSwtWidgets::Table => {
+            :selection => lambda do |observer|
+              on_widget_selected { |selection_event|
+                if has_style?(:multi)
+                  observer.call(@swt_widget.getSelection.map(&:get_data))
+                else
+                  observer.call(@swt_widget.getSelection.first&.get_data)
+                end
+              }
+            end,
+          },
           Java::OrgEclipseSwtWidgets::Text => {
             :text => lambda do |observer|
               on_modify_text { |modify_event|
@@ -347,35 +357,52 @@ module Glimmer
               }
             end,
             :caret_position => lambda do |observer|
+              on_caret_moved { |event|
+                observer.call(@swt_widget.getSelection.x) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
+              }
               on_swt_keyup { |event|
-                observer.call(@swt_widget.getCaretOffset)
+                observer.call(@swt_widget.getSelection.x) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
               }
               on_swt_mouseup { |event|
-                observer.call(@swt_widget.getCaretOffset)
+                observer.call(@swt_widget.getSelection.x) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
               }
             end,
             :caret_offset => lambda do |observer|
+              on_caret_moved { |event|
+                observer.call(@swt_widget.getCaretOffset) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
+              }
+            end,
+            :selection => lambda do |observer|
+              on_widget_selected { |event|
+                observer.call(@swt_widget.getSelection) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
+              }
               on_swt_keyup { |event|
-                observer.call(@swt_widget.getCaretOffset)
+                observer.call(@swt_widget.getSelection) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
               }
               on_swt_mouseup { |event|
-                observer.call(@swt_widget.getCaretOffset)
+                observer.call(@swt_widget.getSelection) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
               }
             end,
-            :selection => lambda do |observer|
+            :selection_count => lambda do |observer|
+              on_widget_selected { |event|
+                observer.call(@swt_widget.getSelectionCount) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
+              }
               on_swt_keyup { |event|
-                observer.call(@swt_widget.getSelection) unless @swt_widget.getSelection.x == 0 && @swt_widget.getSelection.y == 0
+                observer.call(@swt_widget.getSelectionCount) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
               }
               on_swt_mouseup { |event|
-                observer.call(@swt_widget.getSelection) unless @swt_widget.getSelection.x == 0 && @swt_widget.getSelection.y == 0
+                observer.call(@swt_widget.getSelectionCount) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
               }
             end,
-            :selection_count => lambda do |observer|
+            :selection_range => lambda do |observer|
+              on_widget_selected { |event|
+                observer.call(@swt_widget.getSelectionRange) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
+              }
               on_swt_keyup { |event|
-                observer.call(@swt_widget.getSelectionCount)
+                observer.call(@swt_widget.getSelectionRange) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
               }
               on_swt_mouseup { |event|
-                observer.call(@swt_widget.getSelectionCount)
+                observer.call(@swt_widget.getSelectionRange) unless @swt_widget.getCaretOffset == 0 && @last_modify_text != text
               }
             end,
             :top_index => lambda do |observer|
@@ -447,6 +474,7 @@ module Glimmer
         underscored_widget_name = KEYWORD_ALIASES[underscored_widget_name] if KEYWORD_ALIASES[underscored_widget_name]
         swt_widget_name = underscored_widget_name.camelcase(:upper)
         swt_widget_class = eval(swt_widget_name)
+        # TODO fix issue with not detecting DateTime because it's conflicting with the Ruby DateTime
         unless swt_widget_class.ancestors.include?(org.eclipse.swt.widgets.Widget)
           swt_widget_class = swt_widget_class_manual_entries[underscored_widget_name]
           if swt_widget_class.nil?
@@ -703,14 +731,17 @@ module Glimmer
             setter: {name: 'setFocus', invoker: lambda { |widget, args| @swt_widget.setFocus if args.first }},
           },
           'caret_position' => {
-            getter: {name: 'getCaretPosition', invoker: lambda { |widget, args| @swt_widget.respond_to?(:getCaretPosition) ? @swt_widget.getCaretPosition : @swt_widget.getCaretOffset}},
-            setter: {name: 'setSelection', invoker: lambda { |widget, args| @swt_widget.setSelection(args.first) if args.first }},
+            getter: {name: 'getCaretPosition', invoker: lambda { |widget, args| @swt_widget.respond_to?(:getCaretPosition) ? @swt_widget.getCaretPosition : @swt_widget.getSelection.x}},
+            setter: {name: 'setSelection', invoker: lambda { |widget, args| @swt_widget.setSelection(args.first, args.first + @swt_widget.getSelectionCount) if args.first }},
           },
           'selection_count' => {
             getter: {name: 'getSelectionCount'},
             setter: {name: 'setSelection', invoker: lambda { |widget, args|
-              caret_position = @swt_widget.respond_to?(:getCaretPosition) ? @swt_widget.getCaretPosition : @swt_widget.getCaretOffset
-              @swt_widget.setSelection(caret_position, caret_position + args.first) if args.first
+              if args.first
+                caret_position = @swt_widget.respond_to?(:getCaretPosition) ? @swt_widget.getCaretPosition : @swt_widget.getSelection.x
+                # TODO handle negative length
+                @swt_widget.setSelection(caret_position, caret_position + args.first)
+              end
             }},
           },
         }
@@ -822,6 +853,9 @@ module Glimmer
             end
             cursor_proxy ? cursor_proxy.swt_cursor : value
           end,
+          :enabled => lambda do |value|
+            !!value
+          end,
           :foreground => color_converter,
           :font => lambda do |value|
             if value.is_a?(Hash)

data/samples/elaborate/meta_sample.rb

@@ -8,7 +8,7 @@ class Sample
   
   def name
     if @name.nil?
-      @name = File.basename(file, '.rb').split('_').map(&:capitalize).join(' ')    
+      @name = File.basename(file, '.rb').split('_').map(&:capitalize).join(' ')
       if @name.start_with?('Hello')
         name_parts = @name.split
         name_parts[0] = name_parts.first + ','
@@ -38,11 +38,11 @@ class SampleDirectory
             select { |file| File.directory?(file) }.
             map { |file| SampleDirectory.new(file) }
         glimmer_gems = Gem.find_latest_files("glimmer-*-*")
-        sample_directories = glimmer_gems.map do |lib| 
+        sample_directories = glimmer_gems.map do |lib|
           File.dirname(File.dirname(lib))
-        end.select do |gem| 
+        end.select do |gem|
           Dir.exist?(File.join(gem, 'samples'))
-        end.map do |gem| 
+        end.map do |gem|
           Dir.glob(File.join(gem, 'samples', '*')).select {|file_or_dir| Dir.exist?(file_or_dir)}
         end.flatten.uniq.reverse
         if Dir.exist?('samples')
@@ -51,14 +51,14 @@ class SampleDirectory
           end
         end
         sample_directories = sample_directories.uniq {|dir| File.basename(dir)}
-        @sample_directories = sample_directories.map { |file| SampleDirectory.new(file) }            
+        @sample_directories = sample_directories.map { |file| SampleDirectory.new(file) }
       end
       @sample_directories
     end
     
     def all_samples
       @all_samples ||= sample_directories.map(&:samples).reduce(:+)
-    end    
+    end
   end
   
   include Glimmer # used for observe syntax
@@ -117,7 +117,7 @@ class MetaSampleApplication
       text 'Glimmer Meta-Sample (The Sample of Samples)'
       
       on_swt_show {
-        SampleDirectory.selected_sample = SampleDirectory.all_samples.first        
+        SampleDirectory.selected_sample = SampleDirectory.all_samples.first
       }
       
       sash_form {
@@ -153,7 +153,7 @@ class MetaSampleApplication
             on_widget_selected {
               SampleDirectory.selected_sample.launch
             }
-          }        
+          }
         }
             
         code_text {
@@ -163,7 +163,7 @@ class MetaSampleApplication
         }
         
         weights 4, 9
-      }            
+      }
     }.open
   end
 end

data/samples/hello/hello_checkbox_group.rb

@@ -19,6 +19,9 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+# This sample demonstrates the use of a `checkbox_group` (aka `check_group`) in Glimmer, which provides terser syntax
+# than HelloCheckbox for representing multiple checkbox buttons (`button(:check)`) by relying on data-binding to
+# automatically spawn the `checkbox` widgets (`button(:check)`) based on available options on the model.
 class HelloCheckboxGroup
   class Person
     attr_accessor :activities

data/samples/hello/hello_combo.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2007-2020 Andy Maleh
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
@@ -7,10 +7,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -41,9 +41,9 @@ class HelloCombo
     shell {
       row_layout(:vertical) {
         pack false
-      }        
+      }
       
-      text 'Hello, Combo!'      
+      text 'Hello, Combo!'
       
       combo(:read_only) {
         selection bind(person, :country)

data/samples/hello/hello_radio_group.rb

@@ -19,6 +19,9 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+# This sample demonstrates the use of a `radio_group` in Glimmer, which provides terser syntax
+# than HelloRadio for representing multiple radio buttons by relying on data-binding to
+# automatically spawn the `radio` widgets based on available options on the model.
 class HelloRadioGroup
   class Person
     attr_accessor :gender, :age_group

data/samples/hello/hello_sash_form.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2007-2020 Andy Maleh
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
@@ -7,10 +7,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

data/samples/hello/hello_spinner.rb

@@ -0,0 +1,69 @@
+# Copyright (c) 2007-2020 Andy Maleh
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class HelloSpinner
+  class Person
+    attr_accessor :donation
+  end
+  
+  include Glimmer
+  
+  def initialize
+    @person = Person.new
+    @person.donation = 500
+  end
+  
+  def launch
+    shell {
+      grid_layout
+      
+      text 'Hello, Spinner!'
+      
+      label {
+        text 'Please select the amount you would like to donate to the poor:'
+      }
+      
+      composite {
+        grid_layout 3, false
+        
+        label {
+          text 'Amount:'
+          font style: :bold
+        }
+        
+        label {
+          text '$'
+        }
+        
+        spinner {
+          digits 2 # digits after the decimal point
+          minimum 500 # minimum value (including digits after the decimal point)
+          maximum 15000 # maximum value (including digits after the decimal point)
+          increment 500 # increment on up and down (including digits after the decimal point)
+          page_increment 5000 # page increment on page up and page down (including digits after the decimal point)
+          selection bind(@person, :donation) # selection must be set last if other properties are configured to ensure value is within bounds
+        }
+      }
+    }.open
+  end
+end
+
+HelloSpinner.new.launch

data/samples/hello/hello_tab.rb

@@ -1,5 +1,5 @@
 # Copyright (c) 2007-2020 Andy Maleh
-# 
+#
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
@@ -7,10 +7,10 @@
 # distribute, sublicense, and/or sell copies of the Software, and to
 # permit persons to whom the Software is furnished to do so, subject to
 # the following conditions:
-# 
+#
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
-# 
+#
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 # EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND

data/samples/hello/hello_table.rb

@@ -22,19 +22,79 @@
 class HelloTable
   class BaseballGame
     class << self
+      attr_accessor :selected_game
+      
+      def all_playoff_games
+        @all_playoff_games ||= {
+          'NLDS' => [
+            new(Time.new(2037, 10, 6, 12, 0),  'Chicago Cubs', 'Milwaukee Brewers', 'Free Bobblehead'),
+            new(Time.new(2037, 10, 7, 12, 0),  'Chicago Cubs', 'Milwaukee Brewers'),
+            new(Time.new(2037, 10, 8, 12, 0),  'Milwaukee Brewers', 'Chicago Cubs'),
+            new(Time.new(2037, 10, 9, 12, 0),  'Milwaukee Brewers', 'Chicago Cubs'),
+            new(Time.new(2037, 10, 10, 12, 0), 'Milwaukee Brewers', 'Chicago Cubs', 'Free Umbrella'),
+            new(Time.new(2037, 10, 6, 18, 0),  'Cincinnati Reds', 'St Louis Cardinals', 'Free Bobblehead'),
+            new(Time.new(2037, 10, 7, 18, 0),  'Cincinnati Reds', 'St Louis Cardinals'),
+            new(Time.new(2037, 10, 8, 18, 0),  'St Louis Cardinals', 'Cincinnati Reds'),
+            new(Time.new(2037, 10, 9, 18, 0),  'St Louis Cardinals', 'Cincinnati Reds'),
+            new(Time.new(2037, 10, 10, 18, 0), 'St Louis Cardinals', 'Cincinnati Reds', 'Free Umbrella'),
+          ],
+          'ALDS' => [
+            new(Time.new(2037, 10, 6, 12, 0),  'New York Yankees', 'Boston Red Sox', 'Free Bobblehead'),
+            new(Time.new(2037, 10, 7, 12, 0),  'New York Yankees', 'Boston Red Sox'),
+            new(Time.new(2037, 10, 8, 12, 0),  'Boston Red Sox', 'New York Yankees'),
+            new(Time.new(2037, 10, 9, 12, 0),  'Boston Red Sox', 'New York Yankees'),
+            new(Time.new(2037, 10, 10, 12, 0), 'Boston Red Sox', 'New York Yankees', 'Free Umbrella'),
+            new(Time.new(2037, 10, 6, 18, 0),  'Houston Astros', 'Cleveland Indians', 'Free Bobblehead'),
+            new(Time.new(2037, 10, 7, 18, 0),  'Houston Astros', 'Cleveland Indians'),
+            new(Time.new(2037, 10, 8, 18, 0),  'Cleveland Indians', 'Houston Astros'),
+            new(Time.new(2037, 10, 9, 18, 0),  'Cleveland Indians', 'Houston Astros'),
+            new(Time.new(2037, 10, 10, 18, 0), 'Cleveland Indians', 'Houston Astros', 'Free Umbrella'),
+          ],
+          'NLCS' => [
+            new(Time.new(2037, 10, 12, 12, 0), 'Chicago Cubs', 'Cincinnati Reds', 'Free Towel'),
+            new(Time.new(2037, 10, 13, 12, 0), 'Chicago Cubs', 'Cincinnati Reds'),
+            new(Time.new(2037, 10, 14, 12, 0), 'Cincinnati Reds', 'Chicago Cubs'),
+            new(Time.new(2037, 10, 15, 18, 0), 'Cincinnati Reds', 'Chicago Cubs'),
+            new(Time.new(2037, 10, 16, 18, 0), 'Cincinnati Reds', 'Chicago Cubs'),
+            new(Time.new(2037, 10, 17, 18, 0), 'Chicago Cubs', 'Cincinnati Reds'),
+            new(Time.new(2037, 10, 18, 12, 0), 'Chicago Cubs', 'Cincinnati Reds', 'Free Poncho'),
+          ],
+          'ALCS' => [
+            new(Time.new(2037, 10, 12, 12, 0), 'Houston Astros', 'Boston Red Sox', 'Free Towel'),
+            new(Time.new(2037, 10, 13, 12, 0), 'Houston Astros', 'Boston Red Sox'),
+            new(Time.new(2037, 10, 14, 12, 0), 'Boston Red Sox', 'Houston Astros'),
+            new(Time.new(2037, 10, 15, 18, 0), 'Boston Red Sox', 'Houston Astros'),
+            new(Time.new(2037, 10, 16, 18, 0), 'Boston Red Sox', 'Houston Astros'),
+            new(Time.new(2037, 10, 17, 18, 0), 'Houston Astros', 'Boston Red Sox'),
+            new(Time.new(2037, 10, 18, 12, 0), 'Houston Astros', 'Boston Red Sox', 'Free Poncho'),
+          ],
+          'World Series' => [
+            new(Time.new(2037, 10, 20, 18, 0), 'Chicago Cubs', 'Boston Red Sox', 'Free Baseball Cap'),
+            new(Time.new(2037, 10, 21, 18, 0), 'Chicago Cubs', 'Boston Red Sox'),
+            new(Time.new(2037, 10, 22, 18, 0), 'Boston Red Sox', 'Chicago Cubs'),
+            new(Time.new(2037, 10, 23, 18, 0), 'Boston Red Sox', 'Chicago Cubs'),
+            new(Time.new(2037, 10, 24, 18, 0), 'Boston Red Sox', 'Chicago Cubs'),
+            new(Time.new(2037, 10, 25, 18, 0), 'Chicago Cubs', 'Boston Red Sox'),
+            new(Time.new(2037, 10, 26, 18, 0), 'Chicago Cubs', 'Boston Red Sox', 'Free World Series Polo'),
+          ]
+        }
+      end
+    
+      def playoff_type
+        @playoff_type ||= 'World Series'
+      end
+      
+      def playoff_type=(new_playoff_type)
+        @playoff_type = new_playoff_type
+        self.schedule=(all_playoff_games[@playoff_type])
+      end
+      
+      def playoff_type_options
+        all_playoff_games.keys
+      end
+      
       def schedule
-        @schedule ||= [
-          new(Time.new(2037, 10, 6, 12, 0), 'Chicago Cubs', 'Milwaukee Brewers', 5, 7),
-          new(Time.new(2037, 10, 7, 12, 0), 'Chicago Cubs', 'Milwaukee Brewers', 11, 7),
-          new(Time.new(2037, 10, 8, 12, 0), 'Milwaukee Brewers', 'Chicago Cubs', 2, 3),
-          new(Time.new(2037, 10, 9, 12, 0), 'Milwaukee Brewers', 'Chicago Cubs', 1, 0),
-          new(Time.new(2037, 10, 10, 12, 0), 'Milwaukee Brewers', 'Chicago Cubs', 9, 10),
-          new(Time.new(2037, 10, 6, 18, 0), 'Chicago White Sox', 'St Louis Cardinals', 2, 4),
-          new(Time.new(2037, 10, 7, 18, 0), 'Chicago White Sox', 'St Louis Cardinals', 5, 6),
-          new(Time.new(2037, 10, 8, 18, 0), 'St Louis Cardinals', 'Chicago White Sox', 0, 7),
-          new(Time.new(2037, 10, 9, 18, 0), 'St Louis Cardinals', 'Chicago White Sox', 3, 4),
-          new(Time.new(2037, 10, 10, 18, 0), 'St Louis Cardinals', 'Chicago White Sox', 11, 13),
-        ]
+        @schedule ||= all_playoff_games[playoff_type]
       end
       
       def schedule=(new_schedule)
@@ -42,23 +102,31 @@ class HelloTable
       end
     end
     
+    include Glimmer
     include Glimmer::DataBinding::ObservableModel
     
     TEAM_BALLPARKS = {
+      'Boston Red Sox'     => 'Fenway Park',
       'Chicago Cubs'       => 'Wrigley Field',
-      'Chicago White Sox'  => 'Guaranteed Rate Field',
+      'Cincinnati Reds'    => 'Great American Ball Park',
+      'Cleveland Indians'  => 'Progressive Field',
+      'Houston Astros'     => 'Minute Maid Park',
       'Milwaukee Brewers'  => 'Miller Park',
-      'St Louis Cardinals' => 'Busch Stadium'
+      'New York Yankees'   => 'Yankee Stadium',
+      'St Louis Cardinals' => 'Busch Stadium',
     }
     
-    attr_accessor :home_team, :away_team, :date_time, :ballpark, :home_team_runs, :away_team_runs
+    attr_accessor :date_time, :home_team, :away_team, :ballpark, :promotion
     
-    def initialize(date_time, home_team, away_team, home_team_runs, away_team_runs)
+    def initialize(date_time, home_team, away_team, promotion = 'N/A')
       self.date_time = date_time
       self.home_team = home_team
       self.away_team = away_team
-      self.home_team_runs = home_team_runs
-      self.away_team_runs = away_team_runs
+      self.promotion = promotion
+      observe(self, :date_time) do |new_value|
+        notify_observers(:game_date)
+        notify_observers(:game_time)
+      end
     end
     
     def home_team=(home_team_value)
@@ -74,8 +142,20 @@ class HelloTable
       end
     end
     
-    def game_date_time
-      date_time.strftime("%Y-%m-%d %I:%M %p")
+    def date
+      Date.new(date_time.year, date_time.month, date_time.day)
+    end
+    
+    def time
+      Time.new(0, 1, 1, date_time.hour, date_time.min, date_time.sec, '+00:00')
+    end
+    
+    def game_date
+      date_time.strftime("%m/%d/%Y")
+    end
+        
+    def game_time
+      date_time.strftime("%I:%M %p")
     end
         
     def home_team_options
@@ -85,52 +165,117 @@ class HelloTable
     def away_team_options
       TEAM_BALLPARKS.keys
     end
+    
+    def ballpark_options
+      [TEAM_BALLPARKS[@home_team], TEAM_BALLPARKS[@away_team]]
+    end
+    
+    def to_s
+      "#{home_team} vs #{away_team} at #{ballpark} on #{game_date} #{game_time}"
+    end
+    
+    def book!
+      "Thank you for booking #{to_s}"
+    end
   end
 
   include Glimmer
   
   def launch
     shell {
+      grid_layout
+      
       text 'Hello, Table!'
+      
+      label {
+        layout_data :center, :center, true, false
+        
+        text 'Baseball Playoff Schedule'
+        font height: 30, style: :bold
+      }
+      
+      combo(:read_only) {
+        layout_data :center, :center, true, false
+        selection bind(BaseballGame, :playoff_type)
+        font height: 16
+      }
+      
       table(:editable) { |table_proxy|
+        layout_data :fill, :fill, true, true
+      
         table_column {
-          text 'Game Date/Time'
+          text 'Game Date'
           width 150
-          sort_property :date_time # ensure sorting by real date value (not `game_date_time` string specified in items below)
-          editor :none
+          sort_property :date # ensure sorting by real date value (not `game_date` string specified in items below)
+          editor :date_drop_down, property: :date_time
         }
         table_column {
-          text 'Home Team'
+          text 'Game Time'
           width 150
-          editor :combo, :read_only
+          sort_property :time # ensure sorting by real time value (not `game_time` string specified in items below)
+          editor :time, property: :date_time
         }
         table_column {
-          text 'Home Team Runs'
-          width 100
-          editor :spinner
+          text 'Ballpark'
+          width 180
+          editor :none
         }
         table_column {
-          text 'Away Team'
+          text 'Home Team'
           width 150
-          editor :combo, :read_only
+          editor :combo, :read_only # read_only is simply an SWT style passed to combo widget
         }
         table_column {
-          text 'Away Team Runs'
-          width 100
-          editor :spinner
+          text 'Away Team'
+          width 150
+          editor :combo, :read_only # read_only is simply an SWT style passed to combo widget
         }
         table_column {
-          text 'Ballpark'
+          text 'Promotion'
           width 150
-          editor :none
+          # default text editor is used here
         }
         
         # Data-bind table items (rows) to a model collection property, specifying column properties ordering per nested model
-        items bind(BaseballGame, :schedule), column_properties(:game_date_time, :home_team, :home_team_runs, :away_team, :away_team_runs, :ballpark)
+        items bind(BaseballGame, :schedule), column_properties(:game_date, :game_time, :ballpark, :home_team, :away_team, :promotion)
+        
+        # Data-bind table selection
+        selection bind(BaseballGame, :selected_game)
+        
+        # Default initial sort property
+        sort_property :date
         
-        # Sort by these additional properties after handling the main column sort the user selected
-        additional_sort_properties :date_time, :home_team, :away_team, :ballpark, :home_team_runs, :away_team_runs
+        # Sort by these additional properties after handling sort by the column the user clicked
+        additional_sort_properties :date, :time, :home_team, :away_team, :ballpark, :promotion
+        
+        menu {
+          menu_item {
+            text 'Book'
+            
+            on_widget_selected {
+              book_selected_game
+            }
+          }
+        }
       }
+      
+      button {
+        text 'Book Selected Game'
+        layout_data :center, :center, true, false
+        font height: 16
+        enabled bind(BaseballGame, :selected_game)
+        
+        on_widget_selected {
+          book_selected_game
+        }
+      }
+    }.open
+  end
+  
+  def book_selected_game
+    message_box {
+      text 'Baseball Game Booked!'
+      message BaseballGame.selected_game.book!
     }.open
   end
 end