glimmer-cs-gladiator 0.1.7 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18bd05231ab3815f4432ee79395284dbe6e5cd34244b1642b7bff4f7a3921c29
-  data.tar.gz: f2b2a7d6faf0154d878a3c25944a9b3a59c256a45feaf5b2b975379b357f598b
+  metadata.gz: d8a4a941695d12f14347c9892758f974e5909455a73020eee8d635c4c38e86a3
+  data.tar.gz: 929ff0b362ca29394e80f918b65fbdb911892449d9876a4eca14a7ec4c01b8df
 SHA512:
-  metadata.gz: e82f4d0a5306bb03d767fa3dd1f7b23b970ba5fc5fbc87010c3388d2fcaec010134d3780d0fcc7d29b0c85113bb9f5c8daf8ef6284d4fc6b561064ccdd6ba88d
-  data.tar.gz: fb7a4b16181113d96478f0458a6abebe7c85c6be6d1b3568b39f412d56e278641a58d61e6aea1c977246aa21433f6084da7787db38ae3ee322d1ff5b1f1109f9
+  metadata.gz: 993c7ae4684351d97b8b583cf5f59aef4a6d2aec5a68d8c121b6a95bc4e2ee035d6d21f677c8cd79febd5b4379e81808f4b0b977a1aadb388ddba4ab74694b4b
+  data.tar.gz: 32d823df2493950f822fdcfceb28fc5d2b6998152ab233dd0e8668f013d0bd5301dd6ec220d4719bd88683f53bbbd33ddbdceac03bb8d1f02fa77bee2cc432b6

data/README.md

@@ -1,15 +1,18 @@
-# Gladiator (Glimmer Editor) 0.1.7 - Glimmer Custom Shell
+# <img src='https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-gladiator/master/images/glimmer-cs-gladiator-logo.svg' height=85 /> Gladiator 0.2.3 - [Ugliest Text Editor Ever](https://www.reddit.com/r/ruby/comments/hgve8k/gladiator_glimmer_editor_ugliest_text_editor_ever/)
+## [<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=40 /> Glimmer Custom Shell](https://github.com/AndyObtiva/glimmer#custom-shell-gem)
 [![Gem Version](https://badge.fury.io/rb/glimmer-cs-gladiator.svg)](http://badge.fury.io/rb/glimmer-cs-gladiator)
 
 ![Gladiator](images/glimmer-gladiator.png)
 
-Gladiator (short for Glimmer Editor) is a Glimmer sample project under on-going development.
-It is not intended to be a full-fledged editor by any means, yet mostly a fun educational exercise in using Glimmer to build a text editor.
-Gladiator is also a personal tool for shaping an editor exactly the way I like. 
-I leave building truly professional text editors to software tooling experts who would hopefully use Glimmer one day.
+Gladiator (short for Glimmer Editor) is a [Glimmer](https://github.com/AndyObtiva/glimmer) sample project under on-going development that demonstrates how to build a text editor in [Glimmer](https://github.com/AndyObtiva/glimmer) (Ruby Desktop Development GUI Library).
+It is not intended to be a full-fledged editor by any means, yet mostly a fun educational exercise in using [Glimmer](https://github.com/AndyObtiva/glimmer).
+Gladiator is also a personal tool for shaping an editor exactly the way I like, with all the keyboard shortcuts I prefer. 
+I leave building truly professional text editors to software tooling experts who would hopefully use [Glimmer](https://github.com/AndyObtiva/glimmer) one day. Otherwise, I have been happily using Gladiator to develop all my [open-source projects](https://github.com/AndyObtiva) since May 2020.
 
-Gladiator currently supports the following text editing features:
-- File explorer navigation to open file, rename, delete, add new file, add new directory, or refresh tree (CMD+T)
+## Features
+
+Gladiator currently supports the following text editing features (including keyboard shortcuts with Mac CMD=CTRL on Windows/Linux):
+- File explorer navigation with context menu to open file, rename, delete, add new file, add new directory, or refresh tree (CMD+T)
 - File lookup by name ignoring slashes, underscores, and dots to ease lookup (CMD+R)
 - Watch open file for external changes to automatically refresh in editor
 - Watch project subdirectories for changes to automatically refresh in file explorer/file lookup
@@ -26,33 +29,63 @@ Gladiator currently supports the following text editing features:
 - Comment/Uncomment line/selection (CMD+/)
 - Indent/Unindent line/selection (CMD+] & CMD+[)
 - Insert/Prefix New Line (CMD+ENTER & CMD+SHIFT+ENTER)
+- Drag and Drop Text Editor Split Screen (drag a file from File Tree or File Lookup List, and it splits the screen)
 
 ## Platforms
 
 - Mac: Gladiator works best on the Mac.
+- Windows: Gladiator works well on Windows.
 - Linux: Gladiator works with handicaps on Linux (performing text editing operations causes scroll jitter)
-- Windows: Not tested on Windows yet, but should theoretically work there too.
 
 ## Pre-requisites
 
-- JRuby 9.2.11.1 (supporting Ruby 2.5.x syntax) (find at https://www.jruby.org/download)
-- Java SE Runtime Environment 7 or higher (find at https://www.oracle.com/java/technologies/javase-downloads.html)
+- [Glimmer DSL for SWT](https://github.com/AndyObtiva/glimmer) (Ruby Desktop Development GUI Library): '>= 0.1.0', '< 2.0.0' (dependency included in Ruby gem).
+- [JRuby](https://www.jruby.org/download): Same version required by [Glimmer](https://github.com/AndyObtiva/glimmer)
+- [JDK](https://www.oracle.com/java/technologies/javase-downloads.html): Same version required by [Glimmer](https://github.com/AndyObtiva/glimmer)
 
 ## Setup Instructions
 
-Install Gladiator gem by running (`jgem`, `jruby -S gem`, or `gem` directly if you have RVM):
+Install Gladiator gem by running (`jgem`, `jruby -S gem`, or `gem` directly if you have [RVM](https://rvm.io/)):
 
 ```
 jgem install glimmer-cs-gladiator
 ```
 
-Afterwards, you may run `gladiator` to bring up the text editor:
+Or add to a JRuby project Bundler `Gemfile` under the `:developement` group:
+
+```
+group :development do
+  gem 'glimmer-cs-gladiator'
+end
+```
+
+Run (`jruby -S bundle` or `bundle` directly if you have [RVM](https://rvm.io/)):
+
+```
+jruby -S bundle
+```
+
+## Usage
+
+You may run the `gladiator` command to bring up the text editor in the project directory you would like to edit:
 
 ```
 gladiator
 ```
 
-Note: If you cloned this project and bundle installed, you may invoke via `bin/gladiator` instead. 
+If you are in a different directory from the project you would like to edit, then pass its path as an argument:
+
+```
+gladiator relative-or-absolute-path/to/project
+```
+
+Note: If you cloned this project and bundle installed, you may invoke via `bin/gladiator` instead.
+
+If your project is not a JRuby project, then you cannot install [glimmer-cs-gladiator](https://rubygems.org/gems/glimmer-cs-gladiator), so you must install in a separate JRuby environment and invoke by passing the project path as per command above. Alternatively, you may clone this project, and invoke gladiator via `bin/gladiator` (that's how I use Gladiator for most of my projects):
+
+```
+bin/gladiator relative-or-absolute-path/to/project
+```
 
 ### Glimmer Custom Shell Reuse
 
@@ -60,7 +93,7 @@ To reuse Gladiator as a Glimmer Custom Shell inside another Glimmer application,
 following to the application's `Gemfile`:
 
 ```
-gem 'glimmer-cs-gladiator', '0.1.7'
+gem 'glimmer-cs-gladiator', '~> 0.2.3'
 ```
 
 Run:
@@ -69,7 +102,7 @@ Run:
 jruby -S bundle
 ```
 
-And, then instantiate the Gladiator custom shell in your Glimmer application via the `gladiator` keyword.
+And, then instantiate the Gladiator [custom shell](https://github.com/AndyObtiva/glimmer#custom-shells) in your [Glimmer](https://github.com/AndyObtiva/glimmer) application via the `gladiator` keyword assuming you already have `include Glimmer` in your class, module, or main object.
 
 ## Env Var Options
 
@@ -92,6 +125,7 @@ It currently remembers:
 - Last opened file
 - Caret position
 - Top line position
+- Opened tabs
 
 ## Gotcha
 
@@ -118,5 +152,12 @@ The signal TERM is in use by the JVM and will not work correctly on this platfor
 
 ## Copyright
 
-Copyright (c) 2020 Andy Maleh. See LICENSE.txt for
-further details.
+[MIT](https://opensource.org/licenses/MIT)
+
+Copyright (c) 2020 Andy Maleh. See [LICENSE.txt](LICENSE.txt) for further details.
+
+--
+
+[<img src="https://raw.githubusercontent.com/AndyObtiva/glimmer/master/images/glimmer-logo-hi-res.png" height=40 />](https://github.com/AndyObtiva/glimmer) Built with [Glimmer](https://github.com/AndyObtiva/glimmer) (Ruby Desktop Development GUI Library)
+
+Gladiator icon made by <a href="https://www.flaticon.com/authors/freepik" title="Freepik">Freepik</a> from <a href="https://www.flaticon.com/" title="Flaticon">www.flaticon.com</a>

data/VERSION

@@ -0,0 +1 @@
+0.2.3

data/lib/glimmer-cs-gladiator.rb

@@ -2,4 +2,5 @@ $LOAD_PATH.unshift(File.expand_path('..', __FILE__))
 
 require 'filewatcher'
 require 'clipboard'
+require 'puts_debuggerer'
 require 'views/glimmer/gladiator'

data/lib/models/glimmer/gladiator/command.rb

@@ -0,0 +1,75 @@
+module Glimmer
+  class Gladiator
+    class Command
+      class << self
+        def command_history
+          @command_history ||= {}
+        end
+        
+        def command_history_for(file)
+          # keeping a first command to make redo support work by remembering next command after undoing all
+          command_history[file] ||= [Command.new(file)] 
+        end
+        
+        def do(file, method = nil, command: nil)
+          command ||= Command.new(file, method)
+          command_history_for(file)&.last&.next_command = command
+          command.do
+          command_history_for(file) << command
+        end
+        
+        def undo(file)
+          return if command_history_for(file).size <= 1        
+          command_history_for(file).pop.undo
+        end
+        
+        def redo(file)
+          command_history_for(file).last&.redo
+        end
+      end
+    
+      attr_accessor :file, :method, :next_command, :previous_file_content, :previous_file_caret_position, :previous_file_selection_count
+    
+      def initialize(file, method = nil)
+        @file = file
+        @method = method
+      end
+      
+      def native?
+        @method.nil?
+      end
+      
+      def do
+        return if native?
+        backup
+        execute
+      end
+      
+      def undo
+        return if native?
+        restore
+      end
+      
+      def redo
+        return if next_command.nil?# || next_command.native?
+        Command.do(next_command.file, command: next_command)
+      end
+      
+      def backup
+        @previous_file_dirty_content = @file.dirty_content.clone
+        @previous_file_caret_position = @file.caret_position
+        @previous_file_selection_count = @file.selection_count
+      end
+      
+      def restore
+        @file.dirty_content = @previous_file_dirty_content.clone
+        @file.caret_position = @previous_file_caret_position
+        @file.selection_count = @previous_file_selection_count
+      end
+      
+      def execute
+        @file.send(@method)
+      end
+    end
+  end
+end

data/lib/models/glimmer/gladiator/dir.rb

@@ -9,29 +9,32 @@ module Glimmer
   
       class << self
         def local_dir
-          @local_dir ||= new(ENV['LOCAL_DIR'] || '.').tap do |dir|
-            dir.refresh
-            @filewatcher = Filewatcher.new(dir.path)
+          unless @local_dir
+            @local_dir = new(ENV['LOCAL_DIR'] || '.', true)
+            @local_dir.refresh
+            @filewatcher = Filewatcher.new(@local_dir.path)
             @thread = Thread.new(@filewatcher) do |fw| 
               fw.watch do |filename, event|
                 if @last_update.nil? || (Time.now.to_f - @last_update) > REFRESH_DELAY
-                  dir.refresh if !filename.include?('new_file') && !dir.selected_child_path_history.include?(filename) && filename != dir.selected_child_path
+                  @local_dir.refresh if !filename.include?('new_file') && !@local_dir.selected_child_path_history.include?(filename) && filename != @local_dir.selected_child_path
                 end
                 @last_update = Time.now.to_f
               end
             end
           end
+          @local_dir
         end        
       end
   
       attr_accessor :selected_child, :filter, :children, :filtered_path_options, :filtered_path, :path, :display_path
       attr_reader :name, :parent
-      attr_writer :all_children, :children
+      attr_writer :all_children
   
-      def initialize(path)
+      def initialize(path, is_local_dir = false)
         @display_path = path
         @path = ::File.expand_path(@display_path)
         @name = ::File.basename(::File.expand_path(path))
+        @display_path = @path.sub(Dir.local_dir.path, '').sub(/^\//, '') unless is_local_dir
         self.filtered_path_options = []
       end
 
@@ -48,7 +51,15 @@ module Glimmer
       end
 
       def retrieve_children
-        ::Dir.glob(::File.join(@display_path, '*')).map {|p| ::File.file?(p) ? Gladiator::File.new(p) : Gladiator::Dir.new(p)}.sort_by {|c| c.path.to_s.downcase }.sort_by {|c| c.class.name }
+        @children = ::Dir.glob(::File.join(@path, '*')).map do |p| 
+          ::File.file?(p) ? Gladiator::File.new(p) : Gladiator::Dir.new(p)
+        end.sort_by do |c| 
+          c.path.to_s.downcase 
+        end.sort_by do |c| 
+          c.class.name
+        end.each do |child|
+          child.retrieve_children if child.is_a?(Dir)
+        end
       end
   
       def selected_child_path_history
@@ -65,11 +76,11 @@ module Glimmer
 
       def refresh(async: true, force: false)
         return if @refresh_paused && !force
-        new_all_children = retrieve_all_children
-        new_children = retrieve_children        
+        retrieve_children
+        collect_all_children
         refresh_operation = lambda do
-          self.all_children = new_all_children
-          self.children = new_children
+          notify_observers(:children)
+          notify_observers(:all_children)
         end
         if async
           async_exec(&refresh_operation)
@@ -84,23 +95,31 @@ module Glimmer
         else
           @filter = value
         end
-        self.filtered_path_options = filtered.to_a.map(&:display_path)
+        @last_filtered = filtered.to_a
+        self.filtered_path_options = @last_filtered.map(&:display_path)
+        @last_filter = @filter
       end
   
       def filtered
         return if filter.nil?
-        all_children_files.select do |child| 
-          child.path.downcase.include?(filter.downcase) ||
-            child.path.downcase.gsub(/[_\/\.]/, '').include?(filter.downcase)
+        children_files = !@last_filter.to_s.empty? && filter.downcase.start_with?(@last_filter.downcase) ? @last_filtered : all_children_files
+        children_files.select do |child| 
+          child_path = child.path.to_s.sub(Dir.local_dir.path, '')
+          child_path.downcase.include?(filter.downcase) ||
+            child_path.downcase.gsub(/[_\/.-]/, '').include?(filter.downcase.gsub(/[_\/.-]/, ''))
         end.sort_by {|c| c.path.to_s.downcase}
       end
   
       def all_children
-        @all_children ||= retrieve_all_children
+        @all_children ||= collect_all_children
       end
   
-      def retrieve_all_children
-        ::Dir.glob(::File.join(@display_path, '**', '*')).map {|p| ::File.file?(p) ? Gladiator::File.new(p) : Gladiator::Dir.new(p)}
+      def collect_all_children
+        @all_children = children.reduce([]) do |output, child|
+          addition = [child]
+          addition += child.collect_all_children if child.is_a?(Dir)
+          output + addition
+        end
       end
   
       def all_children_files
@@ -108,9 +127,11 @@ module Glimmer
       end
   
       def selected_child_path=(selected_path)
+        full_selected_path = selected_path.include?(Dir.local_dir.path) ? selected_path : ::File.join(Dir.local_dir.path, selected_path)
         return if selected_path.nil? || 
-                  ::Dir.exist?(selected_path) || 
-                  (selected_child && ::File.expand_path(selected_child.path) == ::File.expand_path(selected_path))
+                  ::Dir.exist?(full_selected_path) || 
+                  (selected_child && selected_child.path == full_selected_path)
+        selected_path = full_selected_path
         if ::File.file?(selected_path)
           @selected_child&.write_dirty_content
           new_child = Gladiator::File.new(selected_path)

data/lib/models/glimmer/gladiator/file.rb

@@ -5,14 +5,16 @@ module Glimmer
     class File
       include Glimmer
   
-      attr_accessor :line_numbers_content, :selection, :selection_count, :line_number, :find_text, :replace_text, :top_index, :path, :display_path
-      attr_reader :name, :dirty_content
+      attr_accessor :dirty_content, :line_numbers_content, :selection, :selection_count, :line_number, :find_text, :replace_text, :top_index, :path, :display_path, :case_sensitive
+      attr_reader :name
   
       def initialize(path)
         raise "Not a file path: #{path}" unless ::File.file?(path)
+        @command_history = []
         @display_path = path
         @name = ::File.basename(path)
         @path = ::File.expand_path(path)
+        @display_path = @path.sub(Dir.local_dir.path, '').sub(/^\//, '')
         @top_index = 0
         @selection_count = 0
         @selection = Point.new(0, 0 + @selection_count)
@@ -40,6 +42,16 @@ module Glimmer
           # no op in case of a binary file
         end
       end
+      
+      # to use for widget data-binding
+      def content=(value)
+        Command.do(self) # record a native (OS-widget) operation
+        self.dirty_content = value
+      end
+
+      def content
+        dirty_content
+      end
 
       def caret_position=(value)
         self.selection = Point.new(value, value + selection_count.to_i)
@@ -64,6 +76,7 @@ module Glimmer
       
       def dirty_content=(the_content)
         @dirty_content = the_content if ::File.exist?(path)
+        notify_observers(:content)
       end
   
       def start_filewatcher
@@ -149,6 +162,7 @@ module Glimmer
         line_indices_for_selection(caret_position, selection_count).reverse.each do | the_line_index |
           delta = 0
           the_line = old_lines[the_line_index]
+          return if the_line.nil?
           if the_line.strip.start_with?('# ')
             new_lines[the_line_index] = the_line.sub(/# /, '')
             delta -= 2
@@ -210,7 +224,7 @@ module Glimmer
           if the_line.to_s.start_with?('  ')
             new_lines[the_line_index] = the_line.sub(/  /, '')
             delta = -2
-          elsif the_line.start_with?(' ')
+          elsif the_line&.start_with?(' ')
             new_lines[the_line_index] = the_line.sub(/ /, '')
             delta = -1
           end
@@ -264,7 +278,7 @@ module Glimmer
       end
   
       def find_next
-        return if find_text.to_s.empty?
+        return if find_text.to_s.empty?        
         all_lines = lines
         the_line_index = line_index_for_caret_position(caret_position)
         line_position = line_position_for_caret_position(caret_position)
@@ -275,8 +289,8 @@ module Glimmer
             the_index = (the_index + rotation)%all_lines.size
             start_position = 0
             start_position = line_position + find_text.to_s.size if i == 0 && the_index == the_line_index && found_text?(caret_position)
-            text_to_find_in = the_line.downcase[start_position..-1]
-            occurrence_index = text_to_find_in&.index(find_text.to_s.downcase)
+            text_to_find_in = the_line[start_position..-1]
+            occurrence_index = case_sensitive ? text_to_find_in&.index(find_text.to_s) : text_to_find_in&.downcase&.index(find_text.to_s.downcase)
             if occurrence_index
               self.caret_position = caret_position_for_line_index(the_index) + start_position + occurrence_index
               self.selection_count = find_text.to_s.size
@@ -340,10 +354,12 @@ module Glimmer
       end
   
       def home
+        self.selection_count = 0
         self.line_number = 1
       end
   
       def end
+        self.selection_count = 0
         self.line_number = lines.size
       end
   

data/lib/views/glimmer/gladiator.rb

@@ -1,18 +1,12 @@
-begin
-  require 'puts_debuggerer' if ENV['puts_debuggerer'].to_s.downcase == 'true'
-rescue LoadError
-  # no op
-end
 require 'fileutils'
 require 'os'
 
 require 'models/glimmer/gladiator/dir'
 require 'models/glimmer/gladiator/file'
+require 'models/glimmer/gladiator/command'
 
 require 'views/glimmer/gladiator/text_editor'
 
-java_import 'org.eclipse.swt.custom.TreeEditor'
-
 Clipboard.implementation = Clipboard::Java
 Clipboard.copy(Clipboard.paste) # pre-initialize library to avoid slowdown during use
 
@@ -23,89 +17,118 @@ module Glimmer
     
     COMMAND_KEY = OS.mac? ? :command : :ctrl
 
+    class << self
+      attr_accessor :drag_and_drop
+      attr_accessor :drag
+    end
+
     ## Add options like the following to configure CustomShell by outside consumers
     #
     # options :title, :background_color
     # option :width, 320
     # option :height, 240
-
+    
     ## Uncomment before_body block to pre-initialize variables to use in body
     #
     #
     before_body {
       Display.setAppName('Gladiator')
       @display = display {
-        on_event_keydown { |key_event|
+        on_swt_keydown { |key_event|
           if key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'f'
-            if @text_editor.text_widget.getSelectionText && @text_editor.text_widget.getSelectionText.size > 0
+            if @text_editor&.text_widget&.getSelectionText && @text_editor&.text_widget&.getSelectionText&.size.to_i > 0
               @find_text.swt_widget.setText @text_editor.text_widget.getSelectionText
             end
             @find_text.swt_widget.selectAll
             @find_text.swt_widget.setFocus
           elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == 'c'
-            Clipboard.copy(Gladiator::Dir.local_dir.selected_child.path)
+            Clipboard.copy(Dir.local_dir.selected_child.path)
           elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == 'g'
-            Gladiator::Dir.local_dir.selected_child.find_previous
+            Dir.local_dir.selected_child.find_previous
           elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == 'w'
             @tab_folder.swt_widget.getItems.each do |tab_item|
               Dir.local_dir.selected_child_path_history.delete(tab_item.getData('file_path'))
-              tab_item.getData('proxy').dispose
+              tab_item.getData('proxy')&.dispose
             end
+            close_tab_folder
             @tab_item = @text_editor = Dir.local_dir.selected_child = nil 
             @filter_text.swt_widget.selectAll     
             @filter_text.swt_widget.setFocus            
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && key_event.character == 8721
+          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :alt) && extract_char(key_event) == 'w'
             other_tab_items.each do |tab_item|
               Dir.local_dir.selected_child_path_history.delete(tab_item.getData('file_path'))
-              tab_item.getData('proxy').dispose
+              tab_item.getData('proxy')&.dispose
             end
           elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'w'
             if selected_tab_item
               Dir.local_dir.selected_child_path_history.delete(Dir.local_dir.selected_child.path)
-              selected_tab_item.getData('proxy').dispose
+              selected_tab_item.getData('proxy')&.dispose
+              close_tab_folder
               if selected_tab_item.nil?
                 @tab_item = @text_editor = Dir.local_dir.selected_child = nil 
                 @filter_text.swt_widget.selectAll     
                 @filter_text.swt_widget.setFocus
               else
-                @text_editor.text_widget.setFocus
+                @text_editor&.text_widget&.setFocus
               end
             end
           elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == ']'
-            @tab_folder.swt_widget.setSelection([@tab_folder.swt_widget.getSelectionIndex() + 1, @tab_folder.swt_widget.getItemCount - 1].min) if @tab_folder.swt_widget.getItemCount > 0
-            @text_editor.text_widget.setFocus
+            @tab_folder.swt_widget.setSelection((@tab_folder.swt_widget.getSelectionIndex() + 1) % @tab_folder.swt_widget.getItemCount) if @tab_folder.swt_widget.getItemCount > 0
+            @text_editor&.text_widget&.setFocus
           elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == '['
-            @tab_folder.swt_widget.setSelection([@tab_folder.swt_widget.getSelectionIndex() - 1, 0].max) if @tab_folder.swt_widget.getItemCount > 0
-            @text_editor.text_widget.setFocus
+            @tab_folder.swt_widget.setSelection((@tab_folder.swt_widget.getSelectionIndex() - 1) % @tab_folder.swt_widget.getItemCount) if @tab_folder.swt_widget.getItemCount > 0
+            @text_editor&.text_widget&.setFocus
+          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :ctrl) && extract_char(key_event) == ']'
+            if @tab_folder2
+              if @tab_folder == @tab_folder1              
+                @tab_folder = @tab_folder2
+              else
+                @tab_folder = @tab_folder1
+              end
+              @tab_item = @tab_folder.swt_widget.getData('selected_tab_item')
+              Dir.local_dir.selected_child = @tab_item&.swt_tab_item&.getData('file')
+              @tab_item&.swt_tab_item&.getData('text_editor')&.text_widget&.setFocus
+            end
+          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :ctrl) && extract_char(key_event) == '['
+            if @tab_folder2
+              if @tab_folder == @tab_folder2
+                @tab_folder = @tab_folder1
+              else
+                @tab_folder = @tab_folder2
+              end
+              @tab_item = @tab_folder.swt_widget.getData('selected_tab_item')
+              Dir.local_dir.selected_child = @tab_item&.swt_tab_item&.getData('file')
+              @tab_item&.swt_tab_item&.getData('text_editor')&.text_widget&.setFocus
+            end
           elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && extract_char(key_event) == '1'
             @tab_folder.swt_widget.setSelection(0) if @tab_folder.swt_widget.getItemCount >= 1
-            @text_editor.text_widget.setFocus
+            @text_editor&.text_widget&.setFocus
           elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && extract_char(key_event) == '2'
             @tab_folder.swt_widget.setSelection(1) if @tab_folder.swt_widget.getItemCount >= 2
-            @text_editor.text_widget.setFocus
+            @text_editor&.text_widget&.setFocus
           elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && extract_char(key_event) == '3'
             @tab_folder.swt_widget.setSelection(2) if @tab_folder.swt_widget.getItemCount >= 3
-            @text_editor.text_widget.setFocus
+            @text_editor&.text_widget&.setFocus
             @tab_folder.swt_widget.setSelection(3) if @tab_folder.swt_widget.getItemCount >= 4
-            @text_editor.text_widget.setFocus
+            @text_editor&.text_widget&.setFocus
           elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && extract_char(key_event) == '5'
             @tab_folder.swt_widget.setSelection(4) if @tab_folder.swt_widget.getItemCount >= 5
-            @text_editor.text_widget.setFocus
+            @text_editor&.text_widget&.setFocus
           elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && extract_char(key_event) == '4'
           elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && extract_char(key_event) == '6'
             @tab_folder.swt_widget.setSelection(5) if @tab_folder.swt_widget.getItemCount >= 6
-            @text_editor.text_widget.setFocus
+            @text_editor&.text_widget&.setFocus
           elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && extract_char(key_event) == '7'
             @tab_folder.swt_widget.setSelection(6) if @tab_folder.swt_widget.getItemCount >= 7
-            @text_editor.text_widget.setFocus
+            @text_editor&.text_widget&.setFocus
           elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && extract_char(key_event) == '8'
             @tab_folder.swt_widget.setSelection(7) if @tab_folder.swt_widget.getItemCount >= 8
-            @text_editor.text_widget.setFocus
+            @text_editor&.text_widget&.setFocus
           elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && extract_char(key_event) == '9'
             @tab_folder.swt_widget.setSelection(@tab_folder.swt_widget.getItemCount - 1) if @tab_folder.swt_widget.getItemCount > 0
-            @text_editor.text_widget.setFocus
+            @text_editor&.text_widget&.setFocus
           elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && extract_char(key_event) == 'g'
-            Gladiator::Dir.local_dir.selected_child.find_next
+            Dir.local_dir.selected_child.find_next
           elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && extract_char(key_event) == 'l'
             @line_number_text.swt_widget.selectAll
             @line_number_text.swt_widget.setFocus
@@ -118,7 +141,7 @@ module Glimmer
           elsif key_event.keyCode == swt(:esc)
             if @text_editor
               Dir.local_dir.selected_child_path = @text_editor.file.path
-              @text_editor.text_widget.setFocus
+              @text_editor&.text_widget&.setFocus
             end
           end
         }
@@ -127,51 +150,79 @@ module Glimmer
       local_dir = ENV['LOCAL_DIR'] || '.'
       @config_file_path = ::File.join(local_dir, '.gladiator')
       @config = {}
-      Gladiator::Dir.local_dir.all_children # pre-caches children
+      Dir.local_dir.all_children # pre-caches children
     }
 
     ## Uncomment after_body block to setup observers for widgets in body
     #
     after_body {
-      observe(Gladiator::Dir.local_dir, 'children') do
+      observe(Dir.local_dir, 'children') do
         select_tree_item unless @rename_in_progress
       end
-      observe(Gladiator::Dir.local_dir, 'selected_child') do
-        select_tree_item unless @rename_in_progress
-        selected_file = Gladiator::Dir.local_dir.selected_child
-        found_tab_item = selected_tab_item
-        if found_tab_item
-          @tab_folder.swt_widget.setSelection(found_tab_item)
-          @tab_item = found_tab_item.getData('tab_item')
-          @text_editor = found_tab_item.getData('text_editor')
-        elsif selected_file
-          @tab_folder.content {
-            @tab_item = tab_item { |the_tab_item|
-              text selected_file.name
-              fill_layout :horizontal
-              @text_editor = the_text_editor = text_editor(file: selected_file)
-              on_event_show {
-                Gladiator::Dir.local_dir.selected_child = selected_file
-                @tab_item = the_tab_item
-                @text_editor = the_text_editor
-              }
+      observe(Dir.local_dir, 'selected_child') do |selected_file|
+        if selected_file
+          if Gladiator.drag && !@tab_folder2
+            @tab_folder1 = @tab_folder
+            @tab_folder_sash_form.content {
+              @tab_folder = @tab_folder2 = tab_folder
+              @tab_folder.swt_widget.setData('proxy', @tab_folder)
             }
-            @tab_item.swt_tab_item.setData('file_path', selected_file.path)
-            @tab_item.swt_tab_item.setData('tab_item', @tab_item)
-            @tab_item.swt_tab_item.setData('text_editor', @text_editor)
-            @tab_item.swt_tab_item.setData('proxy', @tab_item)
-          }                  
-          @tab_folder.swt_widget.setSelection(@tab_item.swt_tab_item)
-          body_root.pack_same_size
+          end
+          select_tree_item unless @rename_in_progress
+          found_tab_item = selected_tab_item
+          if found_tab_item
+            @tab_folder.swt_widget.setSelection(found_tab_item)
+            @tab_item = found_tab_item.getData('proxy')
+            @text_editor = found_tab_item.getData('text_editor')
+            @tab_folder.swt_widget.setData('selected_tab_item', @tab_item)
+          elsif selected_file
+            @tab_folder.content {
+              @tab_item = tab_item { |the_tab_item|
+                text selected_file.name
+                fill_layout :horizontal
+                @text_editor = the_text_editor = text_editor(file: selected_file)
+                @tab_folder.swt_widget.setData('selected_tab_item', @tab_item)
+                @text_editor.text_proxy.content {
+                  on_focus_gained {
+                    tab_folder = the_text_editor.swt_widget.getParent.getParent
+                    @tab_folder = tab_folder.getData('proxy')
+                    @tab_item = the_tab_item
+                    @text_editor = the_text_editor
+                    @tab_folder.swt_widget.setData('selected_tab_item', @tab_item)
+                    @tab_folder.swt_widget.setSelection(@tab_item.swt_tab_item)
+                    Dir.local_dir.selected_child = @tab_item.swt_tab_item.getData('file')
+                  }
+                }
+                on_swt_show {
+                  @tab_item = the_tab_item
+                  @text_editor = the_text_editor
+                  @tab_folder = @tab_item.swt_widget.getParent.getData('proxy')
+                  @tab_folder.swt_widget.setData('selected_tab_item', @tab_item)
+                  @tab_folder.swt_widget.setSelection(@tab_item.swt_tab_item)
+                  Dir.local_dir.selected_child = selected_file
+                  async_exec {
+                    @text_editor&.text_widget&.setFocus
+                  }
+                }
+              }
+              @tab_item.swt_tab_item.setData('file_path', selected_file.path)
+              @tab_item.swt_tab_item.setData('file', selected_file)
+              @tab_item.swt_tab_item.setData('text_editor', @text_editor)
+              @tab_item.swt_tab_item.setData('proxy', @tab_item)
+            }                  
+            @tab_folder.swt_widget.setSelection(@tab_item.swt_tab_item)
+            body_root.pack_same_size
+          end
+          @text_editor&.text_widget&.setFocus
         end
       end
-      observe(Gladiator::Dir.local_dir, 'selected_child') do
+      observe(Dir.local_dir, 'selected_child') do
         save_config
       end
-      observe(Gladiator::Dir.local_dir, 'selected_child.caret_position') do
+      observe(Dir.local_dir, 'selected_child.caret_position') do
         save_config
       end
-      observe(Gladiator::Dir.local_dir, 'selected_child.top_index') do
+      observe(Dir.local_dir, 'selected_child.top_index') do
         save_config
       end
       load_config
@@ -182,15 +233,15 @@ module Glimmer
     #
     body {
       shell {
-        text "Gladiator - #{::File.expand_path(Gladiator::Dir.local_dir.path)}"
-        minimum_size 720, 450
+        text "Gladiator - #{::File.expand_path(Dir.local_dir.path)}"
+        minimum_size 520, 250
         size 1440, 900 
         grid_layout 2, false
-        on_event_close {
-          Gladiator::Dir.local_dir.selected_child&.write_dirty_content
+        on_swt_close {
+          Dir.local_dir.selected_child&.write_dirty_content
         }
         on_widget_disposed {
-          Gladiator::Dir.local_dir.selected_child&.write_dirty_content
+          Dir.local_dir.selected_child&.write_dirty_content
         }
         on_control_resized {
           save_config
@@ -208,7 +259,7 @@ module Glimmer
           }
           @filter_text = text {
             layout_data :fill, :center, true, false
-            text bind(Gladiator::Dir.local_dir, 'filter')
+            text bind(Dir.local_dir, 'filter')
             on_key_pressed { |key_event|
               if key_event.keyCode == swt(:tab) || 
                   key_event.keyCode == swt(:cr) || 
@@ -220,35 +271,48 @@ module Glimmer
             }    
           }
           composite {
+            fill_layout(:vertical) {
+              spacing 5
+            }
             layout_data(:fill, :fill, true, true)
             @list = list(:border, :h_scroll, :v_scroll) {
-              layout_data(:fill, :fill, true, true) {
-                #exclude bind(Gladiator::Dir.local_dir, :filter) {|f| !f}
-                minimum_height 400
-              }
-              #visible bind(Gladiator::Dir, 'local_dir.filter') {|f| !!f}
-              selection bind(Gladiator::Dir.local_dir, :filtered_path)
+              #visible bind(Dir, 'local_dir.filter') {|f| !!f}
+              selection bind(Dir.local_dir, :filtered_path)
               on_mouse_up {
-                Gladiator::Dir.local_dir.selected_child_path = @list.swt_widget.getSelection.first
+                Dir.local_dir.selected_child_path = @list.swt_widget.getSelection.first
               }
               on_key_pressed { |key_event|
                 if Glimmer::SWT::SWTProxy.include?(key_event.keyCode, :cr)
-                  Gladiator::Dir.local_dir.selected_child_path = @list.swt_widget.getSelection.first
-                  @text_editor.text_widget.setFocus
+                  Dir.local_dir.selected_child_path = @list.swt_widget.getSelection.first
+                  @text_editor&.text_widget&.setFocus
                 end
               }
+              drag_source(DND::DROP_COPY) {
+                transfer [TextTransfer.getInstance].to_java(Transfer)
+                on_drag_set_data { |event|
+                  Gladiator.drag = true
+                  list = event.widget.getControl
+                  event.data = list.getSelection.first
+                }
+              }              
             }
             @tree = tree(:virtual, :border, :h_scroll, :v_scroll) {
-              layout_data(:fill, :fill, true, true) {
-                #exclude bind(Gladiator::Dir.local_dir, :filter) {|f| !!f}
+              #visible bind(Dir, 'local_dir.filter') {|f| !f}
+              items bind(Dir, :local_dir), tree_properties(children: :children, text: :name)
+              drag_source(DND::DROP_COPY) {
+                transfer [TextTransfer.getInstance].to_java(Transfer)
+                on_drag_set_data { |event|
+                  Gladiator.drag = true
+                  tree = event.widget.getControl
+                  tree_item = tree.getSelection.first
+                  event.data = tree_item.getData.path
+                }
               }
-              #visible bind(Gladiator::Dir, 'local_dir.filter') {|f| !f}
-              items bind(Gladiator::Dir, :local_dir), tree_properties(children: :children, text: :name)
               menu {
                 @open_menu_item = menu_item {
                   text 'Open'
                   on_widget_selected {
-                    Gladiator::Dir.local_dir.selected_child_path = extract_tree_item_path(@tree.swt_widget.getSelection.first)
+                    Dir.local_dir.selected_child_path = extract_tree_item_path(@tree.swt_widget.getSelection.first)
                   }
                 }
                 menu_item(:separator)
@@ -262,7 +326,7 @@ module Glimmer
                 menu_item {
                   text 'Refresh'
                   on_widget_selected {
-                    Gladiator::Dir.local_dir.refresh
+                    Dir.local_dir.refresh
                   }
                 }
                 menu_item {
@@ -284,17 +348,21 @@ module Glimmer
                   }
                 }
               }
-              on_event_menudetect { |event|
+              on_swt_menudetect { |event|
                 path = extract_tree_item_path(@tree.swt_widget.getSelection.first)
                 @open_menu_item.swt_widget.setEnabled(!::Dir.exist?(path)) if path
               }
               on_mouse_up {
-                Gladiator::Dir.local_dir.selected_child_path = extract_tree_item_path(@tree.swt_widget.getSelection&.first)
-                @text_editor&.text_widget&.setFocus
+                if Gladiator.drag_and_drop
+                  Gladiator.drag_and_drop = false
+                else
+                  Dir.local_dir.selected_child_path = extract_tree_item_path(@tree.swt_widget.getSelection&.first)
+                  @text_editor&.text_widget&.setFocus
+                end
               }
               on_key_pressed { |key_event|
                 if Glimmer::SWT::SWTProxy.include?(key_event.keyCode, :cr)
-                  Gladiator::Dir.local_dir.selected_child_path = extract_tree_item_path(@tree.swt_widget.getSelection&.first)
+                  Dir.local_dir.selected_child_path = extract_tree_item_path(@tree.swt_widget.getSelection&.first)
                   @text_editor&.text_widget&.setFocus
                 end
               }
@@ -317,15 +385,18 @@ module Glimmer
           grid_layout 1, false
           layout_data :fill, :fill, true, true
           composite {
-            grid_layout 2, false
+            grid_layout 3, false
+            
+            # row 1
+            
             @file_path_label = styled_text(:none) {
               layout_data(:fill, :fill, true, false) {
-                horizontal_span 2
+                horizontal_span 3
               }
               background color(:widget_background)
               editable false
               caret nil
-              text bind(Gladiator::Dir.local_dir, 'selected_child.path')
+              text bind(Dir.local_dir, 'selected_child.path')
               on_mouse_up {
                 @file_path_label.swt_widget.selectAll
               }
@@ -333,6 +404,9 @@ module Glimmer
                 @file_path_label.swt_widget.setSelection(0, 0)
               }
             }
+            
+            # row 2
+            
             label {
               text 'Line:'
             }
@@ -340,16 +414,20 @@ module Glimmer
               layout_data(:fill, :fill, true, false) {
                 minimum_width 400
               }
-              text bind(Gladiator::Dir.local_dir, 'selected_child.line_number', on_read: :to_s, on_write: :to_i)
+              text bind(Dir.local_dir, 'selected_child.line_number', on_read: :to_s, on_write: :to_i)
               on_key_pressed { |key_event|
                 if key_event.keyCode == swt(:cr)
-                  @text_editor.text_widget.setFocus
+                  @text_editor&.text_widget&.setFocus
                 end
               }
               on_verify_text { |event|
                 event.doit = !event.text.match(/^\d*$/).to_a.empty? 
               }
             }
+            label
+            
+            # row 3
+
             label {
               text 'Find:'
             }
@@ -357,13 +435,34 @@ module Glimmer
               layout_data(:fill, :fill, true, false) {
                 minimum_width 400
               }
-              text bind(Gladiator::Dir.local_dir, 'selected_child.find_text')
+              text bind(Dir.local_dir, 'selected_child.find_text')
               on_key_pressed { |key_event|
+                if key_event.stateMask == swt(COMMAND_KEY) && key_event.keyCode == swt(:cr)
+                  Dir.local_dir.selected_child.case_sensitive = !Dir.local_dir.selected_child.case_sensitive
+                  Dir.local_dir.selected_child&.find_next
+                end
                 if key_event.keyCode == swt(:cr)
-                  Gladiator::Dir.local_dir.selected_child.find_next
+                  Dir.local_dir.selected_child&.find_next
                 end
               }
             }
+            composite {
+              row_layout
+              button(:check) {
+                selection bind(Dir.local_dir, 'selected_child.case_sensitive')
+                on_key_pressed { |key_event|
+                  if key_event.keyCode == swt(:cr)
+                    Dir.local_dir.selected_child&.find_next
+                  end
+                }                
+              }
+              label {
+                text 'Case-sensitive'
+              }
+            }
+            
+            # row 4
+            
             label {
               text 'Replace:'
             }
@@ -371,36 +470,59 @@ module Glimmer
               layout_data(:fill, :fill, true, false) {
                 minimum_width 300
               }
-              text bind(Gladiator::Dir.local_dir, 'selected_child.replace_text')
+              text bind(Dir.local_dir, 'selected_child.replace_text')
               on_focus_gained {              
-                Gladiator::Dir.local_dir.selected_child.ensure_find_next
+                Dir.local_dir.selected_child&.ensure_find_next
               }
               on_key_pressed { |key_event|
                 if key_event.keyCode == swt(:cr)
-                  Gladiator::Dir.local_dir.selected_child.replace_next!
+                  if Dir.local_dir.selected_child
+                    Command.do(Dir.local_dir.selected_child, :replace_next!)
+                  end
                 end
               }
             }
+            label
           }
-          @tab_folder = tab_folder {
-            layout_data(:fill, :fill, true, true) 
+          @tab_folder_sash_form = sash_form {
+            layout_data(:fill, :fill, true, true) {
+              width_hint 640
+              height_hint 480
+            }
+            sash_width 10
+            @tab_folder = tab_folder {
+              drag_source(DND::DROP_COPY) {
+                transfer [TextTransfer.getInstance].to_java(Transfer)
+                event_data = nil
+                on_drag_start {|event|
+                  Gladiator.drag = true
+                  tab_folder = event.widget.getControl
+                  tab_item = tab_folder.getItem(Point.new(event.x, event.y))
+                  event_data = tab_item.getData('file_path')
+                }
+                on_drag_set_data { |event|
+                  event.data = event_data
+                }
+              }
+            }
+            @tab_folder.swt_widget.setData('proxy', @tab_folder)            
           }
         }
       }
     }
-  
+    
     def load_config
       if ::File.exists?(@config_file_path)
         config_yaml = ::File.read(@config_file_path)
         return if config_yaml.to_s.strip.empty?
         @config = YAML.load(config_yaml)
         @config[:open_file_paths].to_a.each do |file_path|
-          Gladiator::Dir.local_dir.selected_child_path = file_path
+          Dir.local_dir.selected_child_path = file_path
         end
-        Gladiator::Dir.local_dir.selected_child_path = @config[:selected_child_path] if @config[:selected_child_path]
-        Gladiator::Dir.local_dir.selected_child&.caret_position  = Gladiator::Dir.local_dir.selected_child&.caret_position_for_caret_position_start_of_line(@config[:caret_position].to_i) if @config[:caret_position]
-        Gladiator::Dir.local_dir.selected_child&.top_index = @config[:top_index].to_i if @config[:top_index]
-        body_root.on_event_show {
+        Dir.local_dir.selected_child_path = @config[:selected_child_path] if @config[:selected_child_path]
+        Dir.local_dir.selected_child&.caret_position  = Dir.local_dir.selected_child&.caret_position_for_caret_position_start_of_line(@config[:caret_position].to_i) if @config[:caret_position]
+        Dir.local_dir.selected_child&.top_index = @config[:top_index].to_i if @config[:top_index]
+        body_root.on_swt_show {
           swt_widget.setSize(@config[:shell_width], @config[:shell_height]) if @config[:shell_width] && @config[:shell_height]
           swt_widget.setLocation(@config[:shell_x], @config[:shell_y]) if @config[:shell_x] && @config[:shell_y]          
           @loaded_config = true
@@ -412,7 +534,7 @@ module Glimmer
   
     def save_config
       return unless @loaded_config
-      child = Gladiator::Dir.local_dir.selected_child
+      child = Dir.local_dir.selected_child
       return if child.nil?
       @config = {
         selected_child_path: child.path,
@@ -430,12 +552,31 @@ module Glimmer
       puts e.full_message
     end
     
+    def close_tab_folder
+      if @tab_folder2 && !selected_tab_item
+        if @tab_folder == @tab_folder2
+          @tab_folder2.swt_widget.dispose
+          @tab_folder = @tab_folder1
+        else
+          @tab_folder1.swt_widget.dispose
+          @tab_folder = @tab_folder1 = @tab_folder2
+        end
+        @tab_folder2 = nil 
+        
+        @tab_item = @tab_folder.swt_widget.getData('selected_tab_item')
+        @text_editor = @tab_item.swt_tab_item.getData('text_editor')
+        Dir.local_dir.selected_child = @tab_item.swt_tab_item.getData('file')
+       
+        body_root.pack_same_size
+      end
+    end
+    
     def selected_tab_item
-      @tab_folder.swt_widget.getItems.detect { |ti| ti.getData('file_path') == Gladiator::Dir.local_dir.selected_child&.path }
+      @tab_folder.swt_widget.getItems.detect { |ti| ti.getData('file_path') == Dir.local_dir.selected_child&.path }
     end
 
     def other_tab_items
-      @tab_folder.swt_widget.getItems.reject { |ti| ti.getData('file_path') == Gladiator::Dir.local_dir.selected_child&.path }
+      @tab_folder.swt_widget.getItems.reject { |ti| ti.getData('file_path') == Dir.local_dir.selected_child&.path }
     end
 
     def extract_tree_item_path(tree_item)
@@ -448,15 +589,16 @@ module Glimmer
     end
     
     def select_tree_item
-      return unless Gladiator::Dir.local_dir.selected_child&.name
-      tree_items_to_select = @tree.depth_first_search { |ti| ti.getData.path == Gladiator::Dir.local_dir.selected_child.path }
+      return unless Dir.local_dir.selected_child&.name
+      tree_items_to_select = @tree.depth_first_search { |ti| ti.getData.path == Dir.local_dir.selected_child.path }
       @tree.swt_widget.setSelection(tree_items_to_select)
     end
 
     def delete_tree_item(tree_item)
+      return if tree_item.nil?
       file = tree_item.getData
       parent_path = ::File.dirname(file.path)
-      file.delete!
+      file.delete! # TODO consider supporting command undo/redo
       Dir.local_dir.refresh(async: false)
       parent_tree_item = @tree.depth_first_search {|ti| ti.getData.path == parent_path}.first
       @tree.swt_widget.showItem(parent_tree_item)
@@ -465,6 +607,8 @@ module Glimmer
 #       if file.is_a?(::File)
         # close tab
 #       end
+    rescue => e
+      puts e.full_message      
     end
     
     def rename_selected_tree_item
@@ -477,6 +621,7 @@ module Glimmer
       Dir.local_dir.pause_refresh
       tree_item = @tree.swt_widget.getSelection.first
       directory_path = extract_tree_item_path(tree_item)
+      return if directory_path.nil?
       if !::Dir.exist?(directory_path)
         tree_item = tree_item.getParentItem
         directory_path = ::File.dirname(directory_path)

data/lib/views/glimmer/gladiator/text_editor.rb

@@ -5,10 +5,11 @@ module Glimmer
 
       options :file
 
-      attr_reader :text_widget
+      attr_reader :text_proxy, :text_widget
 
       after_body {
         @text_widget = @text.swt_widget
+        @text_proxy = @text
       }
       
       body {
@@ -36,35 +37,52 @@ module Glimmer
             layout_data :fill, :fill, true, true
             font name: 'Consolas', height: OS.mac? ? 15 : 12
             foreground rgb(75, 75, 75)
-            text bind(file, 'dirty_content')
+            text bind(file, :content)
             focus true
             selection bind(file, 'selection')
             selection_count bind(file, 'selection_count')
             top_index bind(file, 'top_index')
+            drop_target(DND::DROP_COPY) {
+              transfer [TextTransfer.getInstance].to_java(Transfer)
+              on_drag_enter { |event|
+                event.detail = DND::DROP_COPY
+              }
+              on_drop { |event|
+                Gladiator.drag_and_drop = true
+                Dir.local_dir.selected_child = nil
+                Dir.local_dir.selected_child_path = event.data
+                Gladiator.drag = false
+              }
+            }                  
+            
             on_focus_lost {
               file&.write_dirty_content
             }
       	     on_key_pressed { |key_event|
-              if key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == '/'
-                file.comment_line!
-        	key_event.doit = false
+              if (Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == 'z') || (key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'y')                
+                key_event.doit = !Command.redo(file)
+              elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'z'
+                key_event.doit = !Command.undo(file)
+              elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == '/'
+                Command.do(file, :comment_line!)
+                key_event.doit = false
               elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'k'
-                file.kill_line!
+                Command.do(file, :kill_line!)
                 key_event.doit = false
               elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'd'
-                file.duplicate_line!
+                Command.do(file, :duplicate_line!)
                 key_event.doit = false
               elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == '['
-                file.outdent!
+                Command.do(file, :outdent!)
                 key_event.doit = false
               elsif key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == ']'
-                file.indent!
+                Command.do(file, :indent!)
                 key_event.doit = false
               elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && key_event.keyCode == swt(:cr)
-                file.prefix_new_line!
+                Command.do(file, :prefix_new_line!)
                 key_event.doit = false
               elsif key_event.stateMask == swt(COMMAND_KEY) && key_event.keyCode == swt(:cr)
-                file.insert_new_line!
+                Command.do(file, :insert_new_line!)
                 key_event.doit = false
               elsif key_event.keyCode == swt(:page_up)
                 file.page_up
@@ -79,10 +97,10 @@ module Glimmer
                 file.end
                 key_event.doit = false
               elsif key_event.stateMask == swt(COMMAND_KEY) && key_event.keyCode == swt(:arrow_up)
-                file.move_up!
+                Command.do(file, :move_up!)
                 key_event.doit = false
               elsif key_event.stateMask == swt(COMMAND_KEY) && key_event.keyCode == swt(:arrow_down)
-                file.move_down!
+                Command.do(file, :move_down!)
                 key_event.doit = false
               end
             }
@@ -95,7 +113,7 @@ module Glimmer
                 end
               when swt(:tab)
                 if file.selection_count.to_i > 0
-                  file.indent!
+                  Command.do(file, :indent!)
                   verify_event.doit = false
                 else
                   verify_event.text = '  '

metadata

@@ -1,32 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: glimmer-cs-gladiator
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.3
 platform: ruby
 authors:
 - Andy Maleh
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-06-02 00:00:00.000000000 Z
+date: 2020-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.4.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
-  name: glimmer
+  name: glimmer-dsl-swt
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.4.1
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.0.0
@@ -100,20 +100,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.1
-  name: puts_debuggerer
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.1
 description: Gladiator (short for Glimmer Editor) is a Glimmer sample project under
   on-going development. It is not intended to be a full-fledged editor by any means,
   yet mostly a fun educational exercise in using Glimmer to build a text editor. Gladiator
@@ -130,9 +116,11 @@ extra_rdoc_files:
 files:
 - LICENSE.txt
 - README.md
+- VERSION
 - bin/gladiator
 - bin/gladiator_runner.rb
 - lib/glimmer-cs-gladiator.rb
+- lib/models/glimmer/gladiator/command.rb
 - lib/models/glimmer/gladiator/dir.rb
 - lib/models/glimmer/gladiator/file.rb
 - lib/views/glimmer/gladiator.rb