glimmer-dsl-swt 4.24.2.3 → 4.24.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 774fc1f559ec5f11db66bdb42369c85e7df2a50f9f7f361e293a16c173ca394b
-  data.tar.gz: 5f45c3421a272bd377d3d8cb2457008e5ff2c5533ff3dcd0d25ae540cb549520
+  metadata.gz: 90fac650eedadc1e677e27563bda759e5aa1ea7b2d5b6627129f906516c21a82
+  data.tar.gz: 4098c6d271799034a18747154236426cde6c7b83eca4030d5d1292f8bc0f52e2
 SHA512:
-  metadata.gz: 31ad8918c664072c497d08183dfc9662dda92548cd2afe876d962219e364dbb9bde7efa75ea509e03df84fd2f91561d2d753d15d54e1f405502097b3c1036b0b
-  data.tar.gz: 9c14b3e9a70f70c63e95858eec0ee229ed46ff89b1217f715ac93b9388108f70ea9b428da127ad63eee0d356762e1fa7fe07c3481a819e698629703a37f3b735
+  metadata.gz: 97d0b7a8a715410c6772b4cbb8cd45052c5d0db5e3c7b6f78a62fd9d8f23536dc467727b4441e0585f339674e63d4f9c3e622cdaea04a968e80ffde5ea6ea5f6
+  data.tar.gz: 159d537c854c56d6502a8ed248f5b54fe76590a411d5013d5f40844dd816c1212e49692e42b882c7262267de859580491ce4c9f015972f4b0baaea5169a0dddd

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Change Log
 
+## 4.24.3.0
+
+- Support `table` `items` data-binding of table row cell `background`, `foreground`, `font`, `image` to model attributes by convention based on specified `column_properties` (e.g. for `column_properties` model `name` attribute, automatically assume model `name_background` provides `[r, g, b]` array of color)
+- Update Hello, Table! sample to demonstrate data-binding `table` `items` `background`, `foreground`, `font`, `image` to model attributes by convention, and to add `booked` attribute on `BaseballGame` to disable Book button when already booked
+- Update Hello, Table! sample to add `booked` attribute to `BaseballGame` to disable Book button when already booked
+- Update Hello, Table! sample to enable booking by hitting the ENTER keyboard button
+- Optimize `table` data-binding performance by not recreating table-items when the table grows or stays at the same size, and by not updating a table item (row) when no changes have occurred (detect through diffing)
+- Update `font` keyword and `FontProxy` to support lightweight creation/caching/sharing following Flyweight Design Pattern
+
 ## 4.24.2.3
 
 - Default `code_text` font name in Mac is changed back to `'Courier'`

data/README.md

@@ -1,4 +1,4 @@
-# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 4.24.2.3
+# [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=85 />](https://github.com/AndyObtiva/glimmer) Glimmer DSL for SWT 4.24.3.0
 ## JRuby Desktop Development GUI Framework
 [![Gem Version](https://badge.fury.io/rb/glimmer-dsl-swt.svg)](http://badge.fury.io/rb/glimmer-dsl-swt)
 [![Travis CI](https://travis-ci.com/AndyObtiva/glimmer-dsl-swt.svg?branch=master)](https://travis-ci.com/github/AndyObtiva/glimmer-dsl-swt)
@@ -12,7 +12,7 @@
 
 ![Glimmer DSL for SWT Demo of Hello, World!](/images/glimmer-dsl-swt-demo-hello-world.gif)
 
-[Glimmer](https://github.com/AndyObtiva/glimmer) DSL for [SWT](https://www.eclipse.org/swt/) is a native GUI (Graphical User Interface) cross-platform desktop development library written in [JRuby](https://www.jruby.org/), an OS-threaded faster [JVM](https://www.java.com/en/download/help/whatis_java.html) version of [Ruby](https://www.ruby-lang.org/en/). [Glimmer](https://github.com/AndyObtiva/glimmer)'s main innovation is a declarative [Ruby DSL](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#glimmer-dsl-syntax) (Domain Specific Language) that enables productive and efficient authoring of desktop application user-interfaces by relying on the robust [Eclipse SWT library](https://www.eclipse.org/swt/). [Glimmer](https://rubygems.org/gems/glimmer) additionally innovates by having built-in [data-binding](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#data-binding) support, which greatly facilitates synchronizing the GUI with domain models, thus achieving true decoupling of object oriented components and enabling developers to solve business problems (test-first) without worrying about GUI concerns, or alternatively drive development GUI-first, and then write clean business models afterwards. Not only does Glimmer provide a large set of GUI [widgets](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#widgets), but it also supports drawing Canvas Graphics like [Shapes](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#canvas-shape-dsl) and [Animations](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#canvas-animation-dsl). To get started quickly, [Glimmer](https://rubygems.org/gems/glimmer) offers [scaffolding](docs/reference/GLIMMER_COMMAND.md#scaffolding) options for [Apps](#in-production), [Gems](docs/reference/GLIMMER_COMMAND.md#custom-shell-gem), and [Custom Widgets](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#custom-widgets). [Glimmer](https://rubygems.org/gems/glimmer) also includes native-executable [packaging](docs/reference/GLIMMER_PACKAGING_AND_DISTRIBUTION.md) support, sorely lacking in other libraries, thus enabling the delivery of desktop apps written in [Ruby](https://www.ruby-lang.org/en/) as truly native DMG/PKG/APP files on the [Mac](https://www.apple.com/ca/macos), MSI/EXE files on [Windows](https://www.microsoft.com/en-ca/windows), and DEB/RPM files on [Linux](https://www.linux.org/). [Glimmer](https://github.com/AndyObtiva/glimmer) was the [first Ruby gem](https://rubygems.org/gems/glimmer) to bring [SWT](https://www.eclipse.org/swt/) (Standard Widget Toolkit) to [Ruby](https://www.ruby-lang.org/en/), thanks to creator [Andy Maleh](https://andymaleh.blogspot.com/), EclipseCon/EclipseWorld/RubyConf speaker.
+[Glimmer](https://github.com/AndyObtiva/glimmer) DSL for [SWT](https://www.eclipse.org/swt/) (formerly [Glimmer](https://github.com/AndyObtiva/glimmer)) is a native GUI (Graphical User Interface) cross-platform desktop development library written in [JRuby](https://www.jruby.org/), an OS-threaded faster [JVM](https://www.java.com/en/download/help/whatis_java.html) version of [Ruby](https://www.ruby-lang.org/en/). [Glimmer](https://github.com/AndyObtiva/glimmer)'s main innovation is a declarative [Ruby DSL](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#glimmer-dsl-syntax) (Domain Specific Language) that enables productive and efficient authoring of desktop application user-interfaces by relying on the robust [Eclipse SWT library](https://www.eclipse.org/swt/). [Glimmer](https://rubygems.org/gems/glimmer) additionally innovates by having built-in [data-binding](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#data-binding) support, which greatly facilitates synchronizing the GUI with domain models, thus achieving true decoupling of object oriented components and enabling developers to solve business problems (test-first) without worrying about GUI concerns, or alternatively drive development GUI-first, and then write clean business models afterwards. Not only does Glimmer provide a large set of GUI [widgets](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#widgets), but it also supports drawing Canvas Graphics like [Shapes](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#canvas-shape-dsl) and [Animations](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#canvas-animation-dsl). To get started quickly, [Glimmer](https://rubygems.org/gems/glimmer) offers [scaffolding](docs/reference/GLIMMER_COMMAND.md#scaffolding) options for [Apps](#in-production), [Gems](docs/reference/GLIMMER_COMMAND.md#custom-shell-gem), and [Custom Widgets](docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#custom-widgets). [Glimmer](https://rubygems.org/gems/glimmer) also includes native-executable [packaging](docs/reference/GLIMMER_PACKAGING_AND_DISTRIBUTION.md) support, sorely lacking in other libraries, thus enabling the delivery of desktop apps written in [Ruby](https://www.ruby-lang.org/en/) as truly native DMG/PKG/APP files on the [Mac](https://www.apple.com/ca/macos), MSI/EXE files on [Windows](https://www.microsoft.com/en-ca/windows), and DEB/RPM files on [Linux](https://www.linux.org/). [Glimmer](https://github.com/AndyObtiva/glimmer) was the [first Ruby gem](https://rubygems.org/gems/glimmer) to bring [SWT](https://www.eclipse.org/swt/) (Standard Widget Toolkit) to [Ruby](https://www.ruby-lang.org/en/), thanks to creator [Andy Maleh](https://andymaleh.blogspot.com/), EclipseCon/EclipseWorld/RubyConf speaker.
 
 [<img src="https://covers.oreillystatic.com/images/9780596519650/lrg.jpg" width=105 /><br />
 Featured in JRuby Cookbook](http://shop.oreilly.com/product/9780596519650.do) and [Chalmers/Gothenburg University Software Engineering Master's Lecture Material](http://www.cse.chalmers.se/~bergert/slides/guest_lecture_DSLs.pdf)
@@ -21,7 +21,7 @@ Featured in JRuby Cookbook](http://shop.oreilly.com/product/9780596519650.do) an
 
 ![Eclipse SWT RCP NASA Mars Rover](/images/glimmer-eclipse-swt-rcp-nasa-mars-rover.png)
 
-[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.24.2.3 includes [SWT 4.24](https://download.eclipse.org/eclipse/downloads/drops4/R-4.24-202206070700/), which was released on June 7, 2022. Gem version numbers are in sync with the SWT library versions. The first two digits represent the SWT version number. The last two digits represent the minor and patch versions of Glimmer DSL for SWT.
+[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.24.3.0 includes [SWT 4.24](https://download.eclipse.org/eclipse/downloads/drops4/R-4.24-202206070700/), which was released on June 7, 2022. Gem version numbers are in sync with the SWT library versions. The first two digits represent the SWT version number. The last two digits represent the minor and patch versions of Glimmer DSL for SWT.
 
 **Starting in version 4.20.0.0, [Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) comes with the new [***Shine***](/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md#shine) syntax** for highly intuitive and visually expressive View/Model Attribute Mapping, relying on `<=>` for bidirectional (two-way) data-binding and `<=` for unidirectional (one-way) data-binding, providing an alternative to the `bind` keyword. That was [originally conceived back in 2007](https://andymaleh.blogspot.com/2007/12/data-shining-in-glimmer.html).
 
@@ -338,7 +338,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.24.2.3
+jgem install glimmer-dsl-swt -v 4.24.3.0
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -366,7 +366,7 @@ Note: if you're using activerecord or activesupport, keep in mind that Glimmer u
 
 Add the following to `Gemfile`:
 ```
-gem 'glimmer-dsl-swt', '~> 4.24.2.3'
+gem 'glimmer-dsl-swt', '~> 4.24.3.0'
 ```
 
 And, then run:
@@ -389,7 +389,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.24.2.3
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.24.3.0
       
 Usage: glimmer [--bundler] [--pd] [--quiet] [--debug] [--log-level=VALUE] [[ENV_VAR=VALUE]...] [[-jruby-option]...] (application.rb or task[task_args]) [[application2.rb]...]
 

data/VERSION

@@ -1 +1 @@
-4.24.2.3
+4.24.3.0

data/docs/reference/GLIMMER_GUI_DSL_SYNTAX.md

@@ -4019,8 +4019,8 @@ shell {
       text "Adult"
       width 120
     }
-    items bind(group, :people), column_properties(:name, :age, :adult)
-    selection bind(group, :selected_person)
+    items <=> [group, :people, column_properties: [:name, :age, :adult]]
+    selection <=> [group, :selected_person]
     on_mouse_up do |event|
       @table.edit_table_item(event.table_item, event.column_index)
     end
@@ -4051,6 +4051,24 @@ This automatically leverages the SWT TableEditor custom class behind the scenes,
 passed table item text into something else.
 It automatically persists the change to `items` data-bound model on ENTER/FOCUS-OUT or cancels on ESC/NO-CHANGE.
 
+##### Table Item Properties
+
+When data-binding a `table`'s `items`, extra [`TableItem` properties](https://help.eclipse.org/latest/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/widgets/TableItem.html) are data-bound automatically by convention for `background` color, `foreground` color, `font`, and `image` if corresponding properties (attributes) are available on the model.
+
+That means that if `column_properties` were `[:name, :age, :adult]`, then the following [`TableItem` properties](https://help.eclipse.org/latest/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/widgets/TableItem.html) are also data-bound by convention:
+- `background` to `:name_background, :age_background, :adult_background` model attributes
+- `foreground` to `:name_foreground, :age_foreground, :adult_foreground` model attributes
+- `font` to `:name_font, :age_font, :adult_font` model attributes
+- `image` to `:name_image, :age_image, :adult_image` model attributes
+
+Here are the expected values for each [`TableItem` property](https://help.eclipse.org/latest/topic/org.eclipse.platform.doc.isv/reference/api/org/eclipse/swt/widgets/TableItem.html):
+- `background`: Standard color symbol/string (e.g. `:red`), rgb array (e.g. `[24, 21, 239]`), or rgba array (e.g. `[128, 0, 128, 50]`)
+- `foreground`: Standard color symbol/string (e.g. `:red`), rgb array (e.g. `[24, 21, 239]`), or rgba array (e.g. `[128, 0, 128, 50]`)
+- `font`: font data hash having `:name`, `:height`, and/or `:style` keys (e.g. `{name: 'Courier New', height: 25, style: [:bold, :italic]}`)
+- `image`: image URL with or without image options (e.g. `'/usr/image1.png'` or `['/usr/image1.png', width: 20, height: 20]`)
+
+![Hello Table game booked rows](/images/glimmer-hello-table-game-booked-rows.png)
+
 ##### Table Selection
 
 Table Selection data-binding is simply done via the `selection` property.

data/docs/reference/GLIMMER_SAMPLES.md

@@ -768,13 +768,17 @@ Hello, Table! Playoff Type Changed
 
 ![Hello Table](/images/glimmer-hello-table-playoff-type-changed.png)
 
+Hello, Table! Context Menu
+
+![Hello Table](/images/glimmer-hello-table-context-menu.png)
+
 Hello, Table! Game Booked
 
 ![Hello Table](/images/glimmer-hello-table-game-booked.png)
 
-Hello, Table! Context Menu
+Hello, Table! Game Booked Rows
 
-![Hello Table](/images/glimmer-hello-table-context-menu.png)
+![Hello Table game booked rows](/images/glimmer-hello-table-game-booked-rows.png)
 
 #### Hello, Link!
 

data/lib/glimmer/data_binding/table_items_binding.rb

@@ -19,6 +19,8 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+require 'set'
+
 require 'glimmer/data_binding/observable_array'
 require 'glimmer/data_binding/observable_model'
 require 'glimmer/data_binding/observable'
@@ -33,6 +35,8 @@ module Glimmer
       include DataBinding::Observer
       include_package 'org.eclipse.swt'
       include_package 'org.eclipse.swt.widgets'
+      
+      TABLE_ITEM_PROPERTIES = %w[background foreground font image]
 
       def initialize(parent, model_binding, column_properties = nil)
         @table = parent
@@ -56,40 +60,161 @@ module Glimmer
         end
       end
 
-      def call(new_model_collection=nil, internal_sort: false)
+      def call(*args)
+        options = args.last.is_a?(Hash) ? args.pop : {}
+        internal_sort = options[:internal_sort] || false
+        new_model_collection = args.first
         Glimmer::SWT::DisplayProxy.instance.auto_exec(override_sync_exec: @model_binding.binding_options[:sync_exec], override_async_exec: @model_binding.binding_options[:async_exec]) do
           new_model_collection = model_binding_evaluated_property = @model_binding.evaluate_property unless internal_sort # this ensures applying converters (e.g. :on_read)
-          table_cells = @table.swt_widget.items.map {|item| @table.column_properties.size.times.map {|i| item.get_text(i)} }
-          model_cells = new_model_collection.to_a.map {|m| @table.cells_for(m)}
-          return if table_cells == model_cells
-          if new_model_collection and new_model_collection.is_a?(Array)
-            @table_items_observer_registration&.unobserve
-            @table_items_observer_registration = observe(new_model_collection, @column_properties)
-            add_dependent(@table_observer_registration => @table_items_observer_registration)
-            @model_collection = new_model_collection
+          return if same_table_data?(new_model_collection)
+          if same_model_collection?(new_model_collection)
+            new_model_collection_attribute_values = model_collection_attribute_values(new_model_collection)
+            @table.swt_widget.items.each_with_index do |table_item, row_index|
+              next if new_model_collection_attribute_values[row_index] == @last_model_collection_attribute_values[row_index]
+              model = table_item.get_data
+              (0..(@column_properties.size-1)).each do |column_index|
+                new_model_attribute_values_for_index = model_attribute_values_for_index(new_model_collection_attribute_values[row_index], column_index)
+                last_model_attribute_values_for_index = model_attribute_values_for_index(@last_model_collection_attribute_values[row_index], column_index)
+                next if new_model_attribute_values_for_index == last_model_attribute_values_for_index
+                model_attribute = @column_properties[column_index]
+                update_table_item_properties_from_model(table_item, row_index, column_index, model, model_attribute)
+              end
+            end
+            @last_model_collection_attribute_values = new_model_collection_attribute_values
+          else
+            if new_model_collection and new_model_collection.is_a?(Array)
+              remove_dependent(@table_observer_registration => @table_items_observer_registration) if @table_items_observer_registration
+              @table_items_observer_registration&.unobserve
+              # TODO observe and update table items piecemeal per model instead of passing @column_properties
+              # TODO ensure unobserving models when they are no longer part of the table
+              @table_items_observer_registration = observe(new_model_collection, @column_properties)
+              add_dependent(@table_observer_registration => @table_items_observer_registration)
+              @table_items_property_observer_registration ||= {}
+              if !same_model_collection_with_different_sort?(new_model_collection)
+                TABLE_ITEM_PROPERTIES.each do |table_item_property|
+                  remove_dependent(@table_observer_registration => @table_items_property_observer_registration[table_item_property]) if @table_items_property_observer_registration[table_item_property]
+                  @table_items_property_observer_registration[table_item_property]&.unobserve
+                  property_properties = @column_properties.map {|property| "#{property}_#{table_item_property}" }
+                  @table_items_property_observer_registration[table_item_property] = observe(new_model_collection, property_properties)
+                  add_dependent(@table_observer_registration => @table_items_property_observer_registration[table_item_property])
+                end
+              end
+              @model_collection = new_model_collection
+            end
+            populate_table(@model_collection, @table, @column_properties, internal_sort: internal_sort)
           end
-          populate_table(@model_collection, @table, @column_properties, internal_sort: internal_sort)
         end
       end
       
       def populate_table(model_collection, parent, column_properties, internal_sort: false)
         selected_table_item_models = parent.swt_widget.getSelection.map(&:get_data)
         parent.finish_edit!
-        parent.swt_widget.items.each(&:dispose)
-        parent.swt_widget.removeAll
-        model_collection.each do |model|
-          table_item = TableItem.new(parent.swt_widget, SWT::SWTProxy[:none])
-          for index in 0..(column_properties.size-1)
-            table_item.setText(index, model.send(column_properties[index]).to_s)
+        dispose_start_index = @last_model_collection_attribute_values &&
+                              (model_collection.count < @last_model_collection_attribute_values.count) &&
+                              (@last_model_collection_attribute_values.count - (@last_model_collection_attribute_values.count - model_collection.count))
+        if dispose_start_index
+          table_items_to_dispose = parent.swt_widget.items[dispose_start_index..-1]
+          parent.swt_widget.remove(dispose_start_index, (@last_model_collection_attribute_values.count-1))
+          table_items_to_dispose.each(&:dispose)
+        end
+        model_collection.each_with_index do |model, row_index|
+          table_item_exists = @last_model_collection_attribute_values &&
+                              @last_model_collection_attribute_values.count > 0 &&
+                              row_index < @last_model_collection_attribute_values.count
+          table_item = table_item_exists ? parent.swt_widget.items[row_index] : TableItem.new(parent.swt_widget, SWT::SWTProxy[:none])
+          (0..(column_properties.size-1)).each do |column_index|
+            model_attribute = column_properties[column_index]
+            update_table_item_properties_from_model(table_item, row_index, column_index, model, model_attribute)
           end
           table_item.set_data(model)
         end
+        @last_model_collection_attribute_values = model_collection_attribute_values(model_collection)
         selected_table_items = parent.search {|item| selected_table_item_models.include?(item.get_data) }
         parent.swt_widget.setSelection(selected_table_items)
         sorted_model_collection = parent.sort!(internal_sort: internal_sort)
         call(sorted_model_collection, internal_sort: true) if @read_only_sort && !internal_sort && !sorted_model_collection.nil?
         parent.swt_widget.redraw if parent&.swt_widget&.respond_to?(:redraw)
       end
+      
+      def update_table_item_properties_from_model(table_item, row_index, column_index, model, model_attribute)
+        Glimmer::SWT::DisplayProxy.instance.sync_exec do
+          old_table_item_values = @last_model_collection_attribute_values &&
+            @last_model_collection_attribute_values[row_index] &&
+            model_attribute_values_for_index(@last_model_collection_attribute_values[row_index], column_index)
+          text_value = model.send(model_attribute).to_s
+          old_table_item_value = old_table_item_values && old_table_item_values[0]
+          table_item.set_text(column_index, text_value) if old_table_item_value.nil? || text_value != old_table_item_value
+          TABLE_ITEM_PROPERTIES.each do |table_item_property|
+            if model.respond_to?("#{model_attribute}_#{table_item_property}")
+              table_item_value = model.send("#{model_attribute}_#{table_item_property}")
+              old_table_item_value = old_table_item_values && old_table_item_values[1 + TABLE_ITEM_PROPERTIES.index(table_item_property)]
+              if old_table_item_value.nil? || (table_item_value != old_table_item_value)
+                table_item_value = Glimmer::SWT::ColorProxy.create(*table_item_value).swt_color if table_item_value && %w[background foreground].include?(table_item_property.to_s)
+                table_item_value = Glimmer::SWT::FontProxy.create(table_item_value).swt_font if table_item_value && table_item_property.to_s == 'font'
+                table_item_value = Glimmer::SWT::ImageProxy.create(*table_item_value).swt_image if table_item_value && table_item_property.to_s == 'image'
+                table_item.send("set_#{table_item_property}", column_index, table_item_value)
+              end
+            end
+          end
+        end
+      end
+      
+      def same_table_data?(new_model_collection)
+        (["text"] + TABLE_ITEM_PROPERTIES).all? do |table_item_property|
+          table_cells = @table.swt_widget.items.map do |item|
+            model = item.get_data
+            @table.column_properties.each_with_index.map do |column_property, i|
+              model_attribute = "#{column_property}"
+              model_attribute = "#{model_attribute}_#{table_item_property}" if TABLE_ITEM_PROPERTIES.include?(table_item_property)
+              item.send("get_#{table_item_property}", i) if model.respond_to?(model_attribute)
+            end
+          end
+          model_cells = new_model_collection.to_a.map do |m|
+            @table.cells_for(m, table_item_property: table_item_property)
+          end
+          model_cells = model_cells.map do |row|
+            row.map do |model_cell|
+              if model_cell
+                if %w[background foreground].include?(table_item_property.to_s)
+                  Glimmer::SWT::ColorProxy.create(*model_cell).swt_color
+                elsif table_item_property.to_s == 'font'
+                  Glimmer::SWT::FontProxy.create(model_cell).swt_font
+                elsif table_item_property.to_s == 'image'
+                  Glimmer::SWT::ImageProxy.create(*model_cell).swt_image
+                else
+                  model_cell
+                end
+              end
+            end
+          end
+          table_cells == model_cells
+        end
+      end
+      
+      def same_model_collection?(new_model_collection)
+        new_model_collection == table_item_model_collection
+      end
+      
+      def same_model_collection_with_different_sort?(new_model_collection)
+        Set.new(new_model_collection) == Set.new(table_item_model_collection)
+      end
+      
+      def table_item_model_collection
+        @table.swt_widget.items.map(&:get_data)
+      end
+      
+      def model_collection_attribute_values(model_collection)
+        model_collection.map do |model|
+          (["text"] + TABLE_ITEM_PROPERTIES).map do |table_item_property|
+            @table.cells_for(model, table_item_property: table_item_property)
+          end
+        end
+      end
+      
+      def model_attribute_values_for_index(model_attribute_values, index)
+        model_attribute_values.map {|attribute_values| attribute_values[index]}
+      end
+      
     end
   end
 end

data/lib/glimmer/dsl/swt/font_expression.rb

@@ -41,7 +41,7 @@ module Glimmer
         end
   
         def interpret(parent, keyword, *args, &block)
-          Glimmer::SWT::FontProxy.new(*args)
+          Glimmer::SWT::FontProxy.create(*args)
         end
       end
     end

data/lib/glimmer/swt/font_proxy.rb

@@ -36,14 +36,24 @@ module Glimmer
     #
     # Follows the Proxy Design Pattern
     class FontProxy
-      ERROR_INVALID_FONT_STYLE = " is an invalid font style! Valid values are :normal, :bold, and :italic"
-      FONT_STYLES = [:normal, :bold, :italic]
+      class << self
+        def create(*args)
+          flyweight_font_proxies[args] ||= new(*args)
+        end
+        
+        # Flyweight Design Pattern memoization cache. Can be cleared if memory is needed.
+        def flyweight_font_proxies
+          @flyweight_font_proxies ||= {}
+        end
+      end
 
       include_package 'org.eclipse.swt.graphics'
+      
+      ERROR_INVALID_FONT_STYLE = " is an invalid font style! Valid values are :normal, :bold, and :italic"
+      FONT_STYLES = [:normal, :bold, :italic]
 
       attr_reader :widget_proxy, :swt_font, :font_properties
 
-
       # Builds a new font proxy from passed in widget_proxy and font_properties hash,
       #
       # It begins with existing SWT widget font and amends it with font properties.

data/lib/glimmer/swt/table_proxy.rb

@@ -419,8 +419,14 @@ module Glimmer
         @editor = args
       end
       
-      def cells_for(model)
-        column_properties.map {|property| model.send(property)}
+      def cells_for(model, table_item_property: :text)
+        if table_item_property.to_s == 'text'
+          column_properties.map {|column_property| model.send(column_property)}
+        else
+          column_properties.map do |column_property|
+            model.send("#{column_property}_#{table_item_property}") if model.respond_to?("#{column_property}_#{table_item_property}")
+          end
+        end
       end
       
       def cells

data/samples/elaborate/meta_sample/tutorials.yml

@@ -28,3 +28,4 @@ Hello, Canvas Transform!: ePIAF5EMsE0
 Parking: kw-6icVgDR4
 Hello, Custom Widget!: aJHLo5yLDZc
 Hello, Custom Shell!: c8Eb8GWM_XQ
+Hello, Custom Shape!: H3J8ecp30Ak

data/samples/hello/hello_custom_shape.rb

@@ -25,17 +25,17 @@ require 'glimmer-dsl-swt'
 class StickFigure
   include Glimmer::UI::CustomShape
   
-  options :x, :y, :width, :height
+  options :figure_x, :figure_y, :figure_width, :figure_height
   
   before_body do
-    @head_width = width*0.2
-    @head_height = height*0.2
-    @trunk_height = height*0.4
-    @extremity_length = height*0.4
+    @head_width = figure_width*0.2
+    @head_height = figure_height*0.2
+    @trunk_height = figure_height*0.4
+    @extremity_length = figure_height*0.4
   end
   
   body {
-    shape(x + @head_width/2.0 + @extremity_length, y) {
+    shape(figure_x + @head_width/2.0 + @extremity_length, figure_y) {
       oval(0, 0, @head_width, @head_height)
       line(@head_width/2.0, @head_height, @head_width/2.0, @head_height + @trunk_height)
       line(@head_width/2.0, @head_height + @trunk_height, @head_width/2.0 + @extremity_length, @head_height + @trunk_height + @extremity_length)
@@ -47,7 +47,7 @@ class StickFigure
 end
 
 class HelloCustomShape
-  include Glimmer::UI::CustomShell
+  include Glimmer::UI::Application
   
   WIDTH = 220
   HEIGHT = 235
@@ -60,12 +60,12 @@ class HelloCustomShape
       @canvas = canvas {
         background :white
         
-        15.times { |n|
+        15.times do |n|
           x_location = (rand*WIDTH/2).to_i%WIDTH + (rand*15).to_i
           y_location = (rand*HEIGHT/2).to_i%HEIGHT + (rand*15).to_i
           foreground_color = rgb(rand*255, rand*255, rand*255)
           
-          a_stick_figure = stick_figure(x: x_location, y: y_location, width: 35+n*2, height: 35+n*2) {
+          a_stick_figure = stick_figure(figure_x: x_location, figure_y: y_location, figure_width: 35+n*2, figure_height: 35+n*2) {
             foreground foreground_color
             drag_and_move true
             
@@ -74,7 +74,7 @@ class HelloCustomShape
               a_stick_figure.foreground = rgb(rand*255, rand*255, rand*255)
             end
           }
-        }
+        end
       }
     }
   }

data/samples/hello/hello_table.rb

@@ -89,6 +89,7 @@ class HelloTable
       def playoff_type=(new_playoff_type)
         @playoff_type = new_playoff_type
         self.schedule=(all_playoff_games[@playoff_type])
+        self.selected_game = schedule.first unless selected_game.nil?
       end
       
       def playoff_type_options
@@ -118,15 +119,24 @@ class HelloTable
       'St Louis Cardinals' => 'Busch Stadium',
     }
     
-    attr_accessor :date_time, :home_team, :away_team, :ballpark, :promotion
+    ATTRIBUTES = [:game_date, :game_time, :home_team, :away_team, :ballpark, :promotion]
+    ATTRIBUTES_BACKGROUND = ATTRIBUTES.map {|attribute| "#{attribute}_background"}
+    ATTRIBUTES_FOREGROUND = ATTRIBUTES.map {|attribute| "#{attribute}_foreground"}
+    ATTRIBUTES_FONT = ATTRIBUTES.map {|attribute| "#{attribute}_font"}
+    ATTRIBUTES_IMAGE = ATTRIBUTES.map {|attribute| "#{attribute}_image"}
     
+    attr_accessor *([:booked, :date_time] + ATTRIBUTES + ATTRIBUTES_BACKGROUND + ATTRIBUTES_FOREGROUND + ATTRIBUTES_FONT + ATTRIBUTES_IMAGE)
+    alias booked? booked
+                  
     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.promotion = promotion
+      self.ballpark_image = [File.expand_path('hello_table/baseball_park.png', __dir__), width: 20, height: 20]
+      self.booked = false
+      
       observe(self, :date_time) do |new_value|
-        notify_observers(:game_date)
         notify_observers(:game_time)
       end
     end
@@ -177,8 +187,42 @@ class HelloTable
     end
     
     def book!
+      self.booked = true
+      self.background = :dark_green
+      self.foreground = :white
+      self.font = {style: :italic}
       "Thank you for booking #{to_s}"
     end
+    
+    # Sets background for all attributes
+    def background=(color)
+      self.game_date_background = color
+      self.game_time_background = color
+      self.home_team_background = color
+      self.away_team_background = color
+      self.ballpark_background = color
+      self.promotion_background = color
+    end
+    
+    # Sets foreground for all attributes
+    def foreground=(color)
+      self.game_date_foreground = color
+      self.game_time_foreground = color
+      self.home_team_foreground = color
+      self.away_team_foreground = color
+      self.ballpark_foreground = color
+      self.promotion_foreground = color
+    end
+    
+    # Sets font for all attributes
+    def font=(font_properties)
+      self.game_date_font = font_properties
+      self.game_time_font = font_properties
+      self.home_team_font = font_properties
+      self.away_team_font = font_properties
+      self.ballpark_font = font_properties
+      self.promotion_font = font_properties
+    end
   end
 
   include Glimmer::UI::CustomShell
@@ -246,8 +290,27 @@ class HelloTable
           # default text editor is used here
         }
         
-        # Data-bind table items (rows) to a model collection property, specifying column properties ordering per nested model
-        items <=> [BaseballGame, :schedule, column_properties: [:game_date, :game_time, :ballpark, :home_team, :away_team, :promotion]]
+        # This is a contextual pop up menu that shows up when right-clicking table rows
+        menu {
+          menu_item {
+            text 'Book'
+            
+            on_widget_selected do
+              book_selected_game
+            end
+          }
+        }
+        
+        # Data-bind table items (rows) to a model collection (BaseballGame.schedule),
+        # mapping columns in declaration order to row model properties (attributes)
+        # By convention, every column property can be accompanied by extra properties
+        # with the following suffixes: `_background`, `_foreground`, `_font`, and `_image`
+        # For example, for `game_date`, model could also implement these related properties:
+        # `game_date_background`, `game_date_foreground`, `game_date_font`, `game_date_image`
+        # That is done in order to let the table widget set extra properties if needed.
+        items <=> [BaseballGame, :schedule,
+                    column_properties: [:game_date, :game_time, :ballpark, :home_team, :away_team, :promotion]
+                  ]
         
         # Data-bind table selection
         selection <=> [BaseballGame, :selected_game]
@@ -258,22 +321,16 @@ class HelloTable
         # 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 do
-              book_selected_game
-            end
-          }
-        }
+        on_key_pressed do |key_event|
+          book_selected_game if key_event.keyCode == swt(:cr)
+        end
       }
       
       button {
         text 'Book Selected Game'
         layout_data :center, :center, true, false
         font height: 14
-        enabled <= [BaseballGame, :selected_game]
+        enabled <= [BaseballGame, 'selected_game.booked', on_read: ->(value) { value == false }]
         
         on_widget_selected do
           book_selected_game
@@ -283,6 +340,8 @@ class HelloTable
   }
   
   def book_selected_game
+    return if BaseballGame.selected_game.booked?
+    
     message_box {
       text 'Baseball Game Booked!'
       message BaseballGame.selected_game.book!

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.24.2.3
+  version: 4.24.3.0
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-26 00:00:00.000000000 Z
+date: 2022-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement