glimmer-dsl-swt 4.20.13.14 → 4.20.13.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e7f58c70a78eb8867dd0116be71fb75a3a369deeb7f5676c673dde098304d55
-  data.tar.gz: '078a62bf56f74b1e156ef520d39c37e15b2324367bd813d0dd6a2a3f66e52e2d'
+  metadata.gz: b6f16ea275e3ce37889ed445d6cc3ab42bbcb7068eb1e57f51017d1625ac2582
+  data.tar.gz: d5dc4c387caa917f1c20db29cbf27c06148736b52bc7bd4cfb63d75854e866f6
 SHA512:
-  metadata.gz: 4bb4fc88a86497ce00a50735ee2c189d9fdfb1698e8fa568e1ddad2565809d40e8602bf309fd29efc933481fe3f7d142c50ba80ee7d571dd2eb7c6d0e4dba405
-  data.tar.gz: c43f3edbc949886f21029c429229b73b4f5c08a89af9f7ad42a02539de8a8bc842eff606ccd090609fe05802cc9685499390bd1997f813be714e730ba2f8f801
+  metadata.gz: 7e9ab4f42471a424a335d5f39a395639601b88c4694eeb016f4d5b3b2449114eea07e3395058892b22b1c4e5b9b11c1e1b3e24a0fc7b687393cfb8218c548142
+  data.tar.gz: 472f326d596fbcb2e551549bb6bb6411839acb86437ad789e4ecc29841facbd2a27c32a696ac4c2a2c68d8b754517a35fff7570a05441c18db5033f1774c671b

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+### 4.20.13.15
+
+- Battleship elaborate sample
+
 ### 4.20.13.14
 
 - Connect 4 elaborate sample

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.20.13.14
+# [<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.20.13.15
 ## 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)
@@ -15,7 +15,7 @@
 [<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)
 
-[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.20.13.14 includes [SWT 4.20](https://download.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/), which was released on June 11, 2021. 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. Note that SWT now supports AARCH64 on Mac and Linux, but it is not fully tested in Glimmer DSL for SWT yet, so deem its support experimental for the time being without guarantees for functionality until declared otherwise (report any issues you may encounter).
+[Glimmer DSL for SWT](https://rubygems.org/gems/glimmer-dsl-swt) 4.20.13.15 includes [SWT 4.20](https://download.eclipse.org/eclipse/downloads/drops4/R-4.20-202106111600/), which was released on June 11, 2021. 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. Note that SWT now supports AARCH64 on Mac and Linux, but it is not fully tested in Glimmer DSL for SWT yet, so deem its support experimental for the time being without guarantees for functionality until declared otherwise (report any issues you may encounter).
 
 **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 (keep in mind that it is still a beta, so default back to `bind` whenever needed).
 
@@ -326,7 +326,7 @@ jgem install glimmer-dsl-swt
 
 Or this command if you want a specific version:
 ```
-jgem install glimmer-dsl-swt -v 4.20.13.14
+jgem install glimmer-dsl-swt -v 4.20.13.15
 ```
 
 `jgem` is JRuby's version of `gem` command.
@@ -354,7 +354,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.20.13.14'
+gem 'glimmer-dsl-swt', '~> 4.20.13.15'
 ```
 
 And, then run:
@@ -375,7 +375,7 @@ glimmer
 ```
 
 ```
-Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.13.14
+Glimmer (JRuby Desktop Development GUI Framework) - JRuby Gem: glimmer-dsl-swt v4.20.13.15
       
 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.20.13.14
+4.20.13.15

data/docs/reference/GLIMMER_SAMPLES.md

@@ -65,6 +65,7 @@
     - [Game of Life](#game-of-life)
     - [Glimmer Tetris](#glimmer-tetris)
     - [Klondike Solitaire](#klondike-solitaire)
+    - [Battleship](#battleship)
     - [Mandelbrot Fractal](#mandelbrot-fractal)
     - [Parking](#parking)
     - [Stock Ticker](#stock-ticker)
@@ -74,6 +75,7 @@
     - [Glimmer Calculator](#glimmer-calculator)
     - [Gladiator](#gladiator)
     - [Timer](#timer)
+    - [Glimmer Klondike Solitaire](#glimmer-klondike-solitaire)
 - [License](#license)
 
 ## Samples
@@ -1066,7 +1068,7 @@ Connect 4 - Dropped Coin
 
 ![Connect 4 Dropped Coin](/images/glimmer-connect4-dropped-coin.png)
 
-Connect 4 - Player 1 Wins
+Connect 4 - Player 1 Wins (keeps the coin about to drop visual cue)
 
 ![Connect 4 Player 1 Wins](/images/glimmer-connect4-player1-wins.png)
 
@@ -1142,7 +1144,7 @@ Code:
 
 #### Klondike Solitaire
 
-This sample demonstrates how to build an interactive card game with MVC architecture, canvas, custom-shapes, data-binding, observers, and drag & drop.
+This sample demonstrates how to build an interactive card game with MVC architecture, canvas, custom-shapes, data-binding, observers, and canvas shape drag & drop.
 
 Code:
 
@@ -1152,6 +1154,26 @@ Code:
 
 ![Klondike Solitaire Played](/images/glimmer-klondike-solitaire-played.png)
 
+Check out a souped up large-card-size packaged version of the game in the [Glimmer Klondike Solitaire](#glimmer-klondike-solitaire) external sample.
+
+#### Battleship
+
+This sample demonstrates how to build an interactive board game with A.I., MVC architecture, hybrid canvas widget/shape approach, custom-widgets, data-binding, observers, and widget drag & drop.
+
+Code:
+
+[samples/elaborate/battleship.rb](/samples/elaborate/battleship.rb)
+
+![Battleship](/images/glimmer-battleship.png)
+
+![Battleship Placement](/images/glimmer-battleship-placement.png)
+
+![Battleship Ready for Battle](/images/glimmer-battleship-ready-for-battle.png)
+
+![Battleship Won](/images/glimmer-battleship-won.png)
+
+![Battleship Game Over](/images/glimmer-battleship-game-over.png)
+
 #### Mandelbrot Fractal
 
 This sample demonstrates how to render canvas graphics with multi-threaded processing taking advantage of all CPU cores and doing background processing of images.
@@ -1275,6 +1297,14 @@ Gladiator is a good demonstration of:
 
 [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-timer/master/glimmer-timer-screenshot.png" />](https://github.com/AndyObtiva/glimmer-cs-timer)
 
+#### Glimmer Klondike Solitaire
+
+This is a souped up version of the Klondike Solitaire elaborate sample, which is built as an external application to enable packaging as a native executable installer. Enjoy!
+
+[<img alt="Glimmer Klondike Solitaire Icon" src="https://raw.githubusercontent.com/AndyObtiva/glimmer_klondike_solitaire/master/package/linux/Glimmer%20Klondike%20Solitaire.png" height=40 /> Glimmer Klondike Solitaire](https://github.com/AndyObtiva/glimmer_klondike_solitaire)
+
+![Glimmer Klondike Solitaire](https://raw.githubusercontent.com/AndyObtiva/glimmer_klondike_solitaire/master/images/glimmer-klondike-solitaire.png)
+
 ## License
 
 [MIT](LICENSE.txt)

data/samples/elaborate/battleship.rb

@@ -0,0 +1,79 @@
+# Copyright (c) 2007-2021 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.
+
+require 'glimmer-dsl-swt'
+require 'facets/string/titlecase'
+require 'facets/string/underscore'
+
+require_relative 'battleship/model/game'
+
+require_relative 'battleship/view/grid'
+require_relative 'battleship/view/ship_collection'
+require_relative 'battleship/view/action_panel'
+
+class Battleship
+  include Glimmer::UI::CustomShell
+
+  COLOR_WATER = rgb(156, 211, 219)
+  COLOR_SHIP = :dark_gray
+  
+  before_body do
+    @game = Model::Game.new
+  end
+    
+  after_body do
+    observe(@game, :over) do |game_over_value|
+      if game_over_value
+        game_over_message = if game_over_value == :you
+          "Game over!\nYou Won!"
+        else
+          "Game over!\nYou Lost!"
+        end
+        
+        message_box {
+          text 'Game Over!'
+          message game_over_message
+        }.open
+      end
+    end
+  end
+  
+  body {
+    shell(:no_resize) {
+      grid_layout(2, false) {
+        horizontal_spacing 15
+        vertical_spacing 15
+      }
+      
+      text 'Glimmer Battleship'
+
+      @enemy_grid = grid(game: @game, player: :enemy)
+      @enemy_ship_collection = ship_collection(game: @game, player: :enemy)
+      
+      @player_grid = grid(game: @game, player: :you)
+      @player_ship_collection = ship_collection(game: @game, player: :you)
+
+      action_panel(game: @game)
+    }
+  }
+end
+
+Battleship.launch

data/samples/elaborate/battleship/model/cell.rb

@@ -0,0 +1,84 @@
+# Copyright (c) 2007-2021 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 Battleship
+  module Model
+    class Cell
+      attr_reader :grid, :row_index, :column_index
+      attr_accessor :hit, :ship, :ship_index
+      alias hit? hit
+            
+      def initialize(grid, row_index, column_index)
+        @grid = grid
+        @row_index = row_index
+        @column_index = column_index
+      end
+      
+      def reset!
+        self.hit = nil
+        self.ship = nil
+        self.ship_index = nil
+      end
+      
+      # Places ship horizontally so that its top left cell is self,
+      # automatically figuring out the rest of the cells
+      def place_ship!(ship)
+        begin
+          old_ship_top_left_cell = ship.top_left_cell
+          old_ship_orientation = ship.orientation
+          ship.top_left_cell = self
+          if old_ship_top_left_cell
+            ship.cells(old_ship_orientation).each(&:reset!)
+            ship.length.times do |index|
+              if ship.orientation == :horizontal
+                old_cell = grid.cell_rows[old_ship_top_left_cell.row_index][old_ship_top_left_cell.column_index + index]
+              else
+                old_cell = grid.cell_rows[old_ship_top_left_cell.row_index + index][old_ship_top_left_cell.column_index]
+              end
+              old_cell.reset!
+            end
+          end
+          ship.length.times do |index|
+            if ship.orientation == :horizontal
+              cell = grid.cell_rows[row_index][column_index + index]
+            else
+              cell = grid.cell_rows[row_index + index][column_index]
+            end
+            cell.ship = ship
+            cell.ship_index = index
+          end
+        rescue => e
+          Glimmer::Config.logger.debug(e.full_message)
+        end
+      end
+      
+      def hit=(value)
+        @hit = value
+        ship&.sunk = true if ship&.all_cells_hit?
+        grid.game.over = grid.game.opposite_player(grid.player) if grid.game.started? && grid.game.ship_collections[grid.player].ships.values.map(&:sunk).all?
+      end
+      
+      def to_s
+        "#{(Grid::ROW_ALPHABETS[row_index])}#{(column_index + 1)}"
+      end
+    end
+  end
+end

data/samples/elaborate/battleship/model/game.rb

@@ -0,0 +1,143 @@
+# Copyright (c) 2007-2021 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.
+
+require_relative 'grid'
+require_relative 'ship'
+
+class Battleship
+  module Model
+    class Game
+      BATTLESHIPS = {
+        aircraft_carrier: 5,
+        battleship: 4,
+        submarine: 3,
+        cruiser: 3,
+        destroyer: 2
+      }
+      PLAYERS = [:enemy, :you]
+      
+      attr_reader :grids, :ship_collections
+      attr_accessor :started, :current_player, :over
+      alias started? started
+      alias over? over
+            
+      def initialize
+        @grids = PLAYERS.reduce({}) { |hash, player| hash.merge(player => Grid.new(self, player)) }
+        @ship_collections = PLAYERS.reduce({}) { |hash, player| hash.merge(player => ShipCollection.new(self, player)) }
+        @started = false
+        @current_player = :enemy
+        @enemy_moves = []
+      end
+      
+      def battle!
+        self.started = true
+        place_enemy_ships!
+        enemy_attack!
+      end
+      
+      def reset!
+        self.started = false
+        self.over = false
+        self.current_player = :enemy
+        @grids.values.each(&:reset!)
+        @ship_collections.values.each(&:reset!)
+        @enemy_moves = []
+      end
+      
+      def attack!(row_index, column_index)
+        return unless started?
+        cell = opposite_grid.cell_rows[row_index][column_index]
+        return unless cell.hit.nil?
+        cell.hit = !!cell.ship
+        switch_player!
+        enemy_attack! if current_player == :enemy
+      end
+      
+      # Enemy attack artificial intelligence
+      def enemy_attack!
+        begin
+          cell = nil
+          if @enemy_moves.any? && @enemy_moves.last.hit? && !@enemy_moves.last.ship.sunk?
+            if @enemy_moves[-2].nil? || !@enemy_moves[-2].hit?
+              orientation = Ship::ORIENTATIONS[(rand * 2).to_i]
+            else
+              orientation = @enemy_moves.last.row_index == @enemy_moves[-2].row_index ? :horizontal : :vertical
+            end
+            offset = 1 * ((rand * 2).to_i == 1 ? 1 : -1)
+            if orientation == :horizontal
+              offset *= -1 if [-1, Grid::WIDTH].include?(@enemy_moves.last.column_index + offset)
+              cell = opposite_grid.cell_rows[@enemy_moves.last.row_index][@enemy_moves.last.column_index + offset]
+            else
+              offset *= -1 if [-1, Grid::HEIGHT].include?(@enemy_moves.last.row_index + offset)
+              cell = opposite_grid.cell_rows[@enemy_moves.last.row_index + offset][@enemy_moves.last.column_index]
+            end
+            cell = nil if cell.hit?
+          end
+          if cell.nil?
+            random_row_index = (rand * Grid::HEIGHT).to_i
+            random_column_index = (rand * Grid::WIDTH).to_i
+            cell = opposite_grid.cell_rows[random_row_index][random_column_index]
+          end
+        end until cell.hit.nil?
+        attack!(cell.row_index, cell.column_index)
+        @enemy_moves << cell
+      end
+      
+      def opposite_grid
+        grids[opposite_player]
+      end
+      
+      def opposite_player(player = nil)
+        player ||= current_player
+        PLAYERS[(PLAYERS.index(player) + 1) % PLAYERS.size]
+      end
+      
+      def switch_player!
+        self.current_player = opposite_player
+      end
+      
+      def over=(value)
+        @over = value
+        self.started = false
+      end
+      
+      private
+      
+      def place_enemy_ships!
+        ship_collection = @ship_collections[:enemy]
+        ship_collection.ships.values.each do |ship|
+          until ship.top_left_cell
+            random_row_index = (rand * Grid::HEIGHT).to_i
+            random_column_index = (rand * Grid::WIDTH).to_i
+            enemy_grid = @grids[:enemy]
+            top_left_cell = enemy_grid.cell_rows[random_row_index][random_column_index]
+            top_left_cell.place_ship!(ship)
+            begin
+              ship.toggle_orientation! if (rand * 2).to_i == 1
+            rescue => e
+              Glimmer::Config.logger.debug(e.full_message)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/samples/elaborate/battleship/model/grid.rb

@@ -0,0 +1,54 @@
+# Copyright (c) 2007-2021 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.
+
+require_relative 'cell'
+
+class Battleship
+  module Model
+    class Grid
+      HEIGHT = 10
+      WIDTH = 10
+      ROW_ALPHABETS = %w[A B C D E F G H I J]
+      
+      attr_reader :game, :player, :cell_rows
+            
+      def initialize(game, player)
+        @game = game
+        @player = player
+        build
+      end
+      
+      def reset!
+        @cell_rows.flatten.each(&:reset!)
+      end
+
+      private
+            
+      def build
+        @cell_rows = HEIGHT.times.map do |row_index|
+          WIDTH.times.map do |column_index|
+            Cell.new(self, row_index, column_index)
+          end
+        end
+      end
+    end
+  end
+end

data/samples/elaborate/battleship/model/ship.rb

@@ -0,0 +1,114 @@
+# Copyright (c) 2007-2021 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.
+
+require_relative 'cell'
+
+class Battleship
+  module Model
+    class Ship
+      ORIENTATIONS = [:horizontal, :vertical]
+      
+      attr_reader :ship_collection, :name, :length
+      attr_accessor :orientation, :top_left_cell, :sunk
+      alias sunk? sunk
+            
+      def initialize(ship_collection, name, length)
+        @ship_collection = ship_collection
+        @name = name
+        @length = length
+        @orientation = :horizontal
+      end
+      
+      def to_s
+        "#{name.titlecase} (#{length} cells)"
+      end
+      
+      def top_left_cell=(a_cell)
+        if a_cell
+          raise "Top left cell #{a_cell} already occupied by ship #{a_cell.ship.name}" if a_cell.ship && a_cell.ship != self
+          raise "Top left cell #{a_cell} cannot fit ship #{name}" if a_cell.column_index + length > Grid::WIDTH
+          grid = ship_collection.game.grids[ship_collection.player]
+          1.upto(length - 1).each do |index|
+            if orientation == :horizontal
+              other_cell = grid.cell_rows[a_cell.row_index][a_cell.column_index + index]
+            else
+              other_cell = grid.cell_rows[a_cell.row_index + index][a_cell.column_index]
+            end
+            raise "Cell #{other_cell} already occupied by ship #{other_cell.ship.name}" if other_cell.ship && other_cell.ship != self
+          end
+        end
+        @top_left_cell = a_cell
+      end
+      
+      def orientation=(value)
+        if top_left_cell
+          if value == :horizontal
+            if top_left_cell.column_index + length > Grid::WIDTH
+              raise "Top left cell #{top_left_cell} cannot fit ship #{name}"
+            end
+          else
+            if top_left_cell.row_index + length > Grid::HEIGHT
+              raise "Top left cell #{top_left_cell} cannot fit ship #{name}"
+            end
+          end
+          if cells(value)[1..-1].map(&:ship).reject {|s| s == self}.any?
+            raise 'Orientation #{value} cells occupied by another ship'
+          end
+          if value != @orientation
+            cells.each(&:reset!)
+            @orientation = value
+            cells.each_with_index do |cell, index|
+              cell.ship = self
+              cell.ship_index = index
+            end
+          end
+        end
+      end
+        
+      def cells(for_orientation = nil)
+        for_orientation ||= orientation
+        if top_left_cell
+          length.times.map do |index|
+            if for_orientation == :horizontal
+              top_left_cell.grid.cell_rows[top_left_cell.row_index][top_left_cell.column_index + index]
+            else
+              top_left_cell.grid.cell_rows[top_left_cell.row_index + index][top_left_cell.column_index]
+            end
+          end
+        end
+      end
+      
+      def all_cells_hit?
+        cells&.map(&:hit)&.all? {|h| h == true}
+      end
+      
+      def reset!
+        self.sunk = nil
+        self.top_left_cell = nil
+        self.orientation = :horizontal
+      end
+      
+      def toggle_orientation!
+        self.orientation = ORIENTATIONS[(ORIENTATIONS.index(orientation) + 1) % ORIENTATIONS.length]
+      end
+    end
+  end
+end

data/samples/elaborate/battleship/model/ship_collection.rb

@@ -0,0 +1,56 @@
+# Copyright (c) 2007-2021 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.
+
+require_relative 'ship'
+
+class Battleship
+  module Model
+    class ShipCollection
+      BATTLESHIPS = {
+        aircraft_carrier: 5,
+        battleship: 4,
+        submarine: 3,
+        cruiser: 3,
+        destroyer: 2
+      }
+      
+      attr_reader :game, :player, :ships
+      attr_accessor :placed_count
+            
+      def initialize(game, player)
+        @game = game
+        @player = player
+        @ships = BATTLESHIPS.reduce({}) do |hash, pair|
+          name, width = pair
+          ship = Ship.new(self, name, width)
+          Glimmer::DataBinding::Observer.proc do |cell_value|
+            self.placed_count = ships.values.map(&:top_left_cell).compact.size
+          end.observe(ship, :top_left_cell)
+          hash.merge(name => ship)
+        end
+      end
+      
+      def reset!
+        ships.values.each(&:reset!)
+      end
+    end
+  end
+end

data/samples/elaborate/battleship/view/action_panel.rb

@@ -0,0 +1,59 @@
+# Copyright (c) 2007-2021 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 Battleship
+  module View
+    class ActionPanel
+      include Glimmer::UI::CustomWidget
+      
+      options :game
+      
+      body {
+        composite {
+          row_layout(:horizontal) {
+            margin_width 0
+            margin_height 0
+          }
+          
+          layout_data(:center, :center, true, false)
+                  
+          @battle_button = button {
+            text 'Battle!'
+            enabled <= [game.ship_collections[:you], :placed_count, on_read: ->(c) {c == 5}]
+            
+            on_widget_selected do
+              game.battle!
+              @battle_button.enabled = false
+            end
+          }
+                  
+          button {
+            text 'Restart'
+            
+            on_widget_selected do
+              game.reset!
+            end
+          }
+        }
+      }
+    end
+  end
+end

data/samples/elaborate/battleship/view/cell.rb

@@ -0,0 +1,163 @@
+# Copyright (c) 2007-2021 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 Battleship
+  module View
+    class Cell
+      include Glimmer::UI::CustomWidget
+      
+      class << self
+        attr_accessor :dragging
+        alias dragging? dragging
+      end
+      
+      COLOR_WATER = rgb(156, 211, 219)
+      COLOR_SHIP = :gray
+      COLOR_PLACED = :white
+      COLOR_EMPTY = :black
+      COLOR_NO_HIT = :white
+      COLOR_HIT = :red
+      
+      options :game, :player, :row_index, :column_index, :ship
+      option :type, default: :grid # other type is :ship
+      
+      body {
+        canvas {
+          if type == :grid
+            if player == :you
+              background <= [model, :ship, on_read: ->(s) {s ? COLOR_SHIP : COLOR_WATER}]
+            else
+              background COLOR_WATER
+            end
+          else
+            background <= [ship, :sunk, on_read: ->(s) {s ? COLOR_HIT : COLOR_PLACED}]
+            background <= [ship, :top_left_cell, on_read: ->(c) {c ? COLOR_PLACED : COLOR_SHIP}]
+          end
+          
+          rectangle(0, 0, [:max, -1], [:max, -1])
+          oval(:default, :default, 10, 10) {
+            foreground <= [model, :hit, on_read: ->(h) {h == nil ? COLOR_EMPTY : (h ? COLOR_HIT : COLOR_NO_HIT)}]
+          }
+          oval(:default, :default, 5, 5) {
+            background <= [model, :hit, on_read: ->(h) {h == nil ? COLOR_EMPTY : (h ? COLOR_HIT : COLOR_NO_HIT)}]
+          }
+          
+          on_mouse_move do |event|
+            if game.started?
+              if type == :grid
+                if player == :enemy
+                  body_root.cursor = :cross
+                else
+                  body_root.cursor = :arrow
+                end
+              else
+                body_root.cursor = :arrow
+              end
+            end
+          end
+                    
+          if player == :enemy
+            on_mouse_up do
+              game.attack!(row_index, column_index)
+            end
+          end
+          
+          if player == :you
+            on_drag_detected do |event|
+              unless game.started? || game.over?
+                Cell.dragging = true
+                body_root.cursor = :hand if type == :grid
+              end
+            end
+          
+            on_drag_set_data do |event|
+              the_ship = ship || model&.ship
+              if the_ship && !game.started? && !game.over? && !(type == :ship && the_ship.top_left_cell)
+                event.data = the_ship.name.to_s
+              else
+                event.doit = false
+                Cell.dragging = false
+              end
+            end
+            
+            on_mouse_up do
+              unless game.started? || game.over?
+                Cell.dragging = false
+                change_cursor
+              end
+            end
+                        
+            if type == :grid
+              on_mouse_move do |event|
+                unless game.started? || game.over?
+                  change_cursor
+                end
+              end
+              
+              on_mouse_hover do |event|
+                unless game.started? || game.over?
+                  change_cursor
+                end
+              end
+              
+              on_mouse_up do |event|
+                unless game.started? || game.over?
+                  begin
+                    model.ship&.toggle_orientation!
+                  rescue => e
+                    Glimmer::Config.logger.debug e.full_message
+                  end
+                  change_cursor
+                end
+              end
+              
+              on_drop do |event|
+                unless game.started? || game.over?
+                  ship_name = event.data
+                  place_ship(ship_name.to_s.to_sym) if ship_name
+                  Cell.dragging = false
+                  change_cursor
+                end
+              end
+            end
+          end
+        }
+      }
+      
+      def model
+        game.grids[player].cell_rows[row_index][column_index] if type == :grid
+      end
+      
+      def place_ship(ship_name)
+        ship = game.ship_collections[player].ships[ship_name]
+        model.place_ship!(ship)
+      end
+      
+      def change_cursor
+        if type == :grid && model.ship && !Cell.dragging?
+          body_root.cursor = model.ship.orientation == :horizontal ? :sizens : :sizewe
+        elsif !Cell.dragging?
+          body_root.cursor = :arrow
+        end
+      end
+    end
+  end
+end

data/samples/elaborate/battleship/view/grid.rb

@@ -0,0 +1,77 @@
+# Copyright (c) 2007-2021 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.
+
+require_relative '../model/grid'
+
+require_relative 'cell'
+
+class Battleship
+  module View
+    class Grid
+      include Glimmer::UI::CustomWidget
+      
+      options :game, :player
+      
+      body {
+        composite {
+          grid_layout(Model::Grid::WIDTH + 1, true) {
+            margin_width 0
+            margin_height 0
+            horizontal_spacing 0
+            vertical_spacing 0
+          }
+    
+          label(:center) {
+            layout_data(:fill, :center, true, false) {
+              horizontal_span (Model::Grid::WIDTH + 1)
+            }
+            
+            text player.to_s.capitalize
+            font height: 20, style: :bold
+          }
+          
+          label # filler
+          Model::Grid::WIDTH.times do |column_index|
+            label {
+              text (column_index + 1).to_s
+              font height: 16
+            }
+          end
+          
+          Model::Grid::HEIGHT.times do |row_index|
+            label {
+              text Model::Grid::ROW_ALPHABETS[row_index]
+              font height: 16
+            }
+            Model::Grid::WIDTH.times do |column_index|
+              cell(game: game, player: player, row_index: row_index, column_index: column_index) {
+                layout_data {
+                  width_hint 25
+                  height_hint 25
+                }
+              }
+            end
+          end
+        }
+      }
+    end
+  end
+end

data/samples/elaborate/battleship/view/ship.rb

@@ -0,0 +1,65 @@
+# Copyright (c) 2007-2021 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.
+
+require_relative 'cell'
+
+class Battleship
+  module View
+    class Ship
+      include Glimmer::UI::CustomWidget
+      
+      options :game, :player, :ship_name, :ship_length
+      
+      body {
+        composite {
+          row_layout(:vertical) {
+            fill true
+            margin_width 0
+            margin_height 0
+          }
+      
+          label {
+            text ship_name.to_s.titlecase
+            font height: 16
+          }
+        
+          composite {
+            grid_layout(ship_length, true) {
+              margin_width 0
+              margin_height 0
+              horizontal_spacing 0
+              vertical_spacing 0
+            }
+            
+            ship_length.times do |column_index|
+              cell(game: game, player: player, type: :ship, column_index: column_index, ship: game.ship_collections[player].ships[ship_name]) {
+                layout_data {
+                  width_hint 25
+                  height_hint 25
+                }
+              }
+            end
+          }
+        }
+      }
+    end
+  end
+end

data/samples/elaborate/battleship/view/ship_collection.rb

@@ -0,0 +1,49 @@
+# Copyright (c) 2007-2021 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.
+
+require_relative '../model/game'
+require_relative '../model/ship_collection'
+
+require_relative 'ship'
+
+class Battleship
+  module View
+    class ShipCollection
+      include Glimmer::UI::CustomWidget
+      
+      options :game, :player
+      
+      body {
+        composite {
+          row_layout(:vertical) {
+            fill true
+            margin_width 0
+            margin_height 0
+          }
+          
+          Model::ShipCollection::BATTLESHIPS.each do |ship_name, ship_length|
+            ship(game: game, player: player, ship_name: ship_name, ship_length: ship_length)
+          end
+        }
+      }
+    end
+  end
+end

data/samples/elaborate/connect4.rb

@@ -26,8 +26,6 @@ require_relative 'connect4/model/grid'
 class Connect4
   include Glimmer::UI::CustomShell
   
-  WIDTH = 7
-  HEIGHT = 6
   COLOR_BACKGROUND = rgb(63, 104, 212)
   COLOR_EMPTY_SLOT = :white
   COLOR_COIN1 = rgb(236, 223, 56)
@@ -36,7 +34,7 @@ class Connect4
   attr_accessor :current_player_color
   
   before_body do
-    @grid = Model::Grid.new(WIDTH, HEIGHT)
+    @grid = Model::Grid.new
     select_player_color
   end
     
@@ -68,13 +66,13 @@ class Connect4
   
   body {
     shell(:no_resize) {
-      grid_layout(7, true)
+      grid_layout(Model::Grid::WIDTH, true)
 
       text 'Glimmer Connect 4'
       background COLOR_BACKGROUND
       
-      HEIGHT.times do |row_index|
-        WIDTH.times do |column_index|
+      Model::Grid::HEIGHT.times do |row_index|
+        Model::Grid::WIDTH.times do |column_index|
           canvas {
             layout_data {
               width_hint 50

data/samples/elaborate/connect4/model/grid.rb

@@ -24,12 +24,13 @@ require_relative 'slot'
 class Connect4
   module Model
     class Grid
-      attr_reader :width, :height, :slot_rows
+      WIDTH = 7
+      HEIGHT = 6
+    
+      attr_reader :slot_rows
       attr_accessor :current_player, :game_over
     
-      def initialize(width, height)
-        @width = width
-        @height = height
+      def initialize
         build_slots
         start!
       end
@@ -60,8 +61,8 @@ class Connect4
       private
       
       def build_slots
-        @slot_rows = height.times.map do |row_index|
-          width.times.map do |column_index|
+        @slot_rows = HEIGHT.times.map do |row_index|
+          WIDTH.times.map do |column_index|
             Slot.new(self)
           end
         end
@@ -82,10 +83,10 @@ class Connect4
       def evaluate_horizontal_win
         connections = nil
         last_slot_value = nil
-        height.times do |row_index|
+        HEIGHT.times do |row_index|
           connections = nil
           last_slot_value = nil
-          width.times do |column_index|
+          WIDTH.times do |column_index|
             slot = @slot_rows[row_index][column_index]
             if slot.value.to_i > 0 && slot.value == last_slot_value
               connections += 1
@@ -103,10 +104,10 @@ class Connect4
       def evaluate_vertical_win
         connections = nil
         last_slot_value = nil
-        width.times do |column_index|
+        WIDTH.times do |column_index|
           connections = nil
           last_slot_value = nil
-          height.times do |row_index|
+          HEIGHT.times do |row_index|
             slot = @slot_rows[row_index][column_index]
             if slot.value.to_i > 0 && slot.value == last_slot_value
               connections += 1

data/samples/elaborate/klondike_solitaire/view/column_pile.rb

@@ -43,7 +43,6 @@ class KlondikeSolitaire
               end
               drop_event.dragged_shape.dispose
             rescue => e
-#               pd e
               drop_event.doit = false
             end
           end

data/samples/elaborate/klondike_solitaire/view/foundation_pile.rb

@@ -36,7 +36,6 @@ class KlondikeSolitaire
           
           on_drop do |drop_event|
             begin
-              # TODO make sure one cannot drag a column pile of cards here
               card_shape = drop_event.dragged_shape.get_data('custom_shape')
               card = card_shape.model
               card_parent_pile = card_shape.parent_pile
@@ -46,7 +45,6 @@ class KlondikeSolitaire
               card_source_model.remove!(card)
               drop_event.dragged_shape.dispose
             rescue => e
-#               pd e
               drop_event.doit = false
             end
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-dsl-swt
 version: !ruby/object:Gem::Version
-  version: 4.20.13.14
+  version: 4.20.13.15
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-03 00:00:00.000000000 Z
+date: 2021-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -528,6 +528,17 @@ files:
 - lib/glimmer/ui/custom_shell.rb
 - lib/glimmer/ui/custom_widget.rb
 - lib/glimmer/util/proc_tracker.rb
+- samples/elaborate/battleship.rb
+- samples/elaborate/battleship/model/cell.rb
+- samples/elaborate/battleship/model/game.rb
+- samples/elaborate/battleship/model/grid.rb
+- samples/elaborate/battleship/model/ship.rb
+- samples/elaborate/battleship/model/ship_collection.rb
+- samples/elaborate/battleship/view/action_panel.rb
+- samples/elaborate/battleship/view/cell.rb
+- samples/elaborate/battleship/view/grid.rb
+- samples/elaborate/battleship/view/ship.rb
+- samples/elaborate/battleship/view/ship_collection.rb
 - samples/elaborate/calculator.rb
 - samples/elaborate/calculator/model/command.rb
 - samples/elaborate/calculator/model/command/all_clear.rb