glimmer-cs-gladiator 0.1.5 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62cc5d4c7f27c15b95f6eaad4637a379a8729455532b8d924ce29a21be2c91c9
-  data.tar.gz: 43f501030aeca54b6a0339182ee0c064e81b0415a9cd440464950f89b6d83c6f
+  metadata.gz: 46513e411ce6bac81dafe471f6f8bc7834df2c82c0309f0f1db03c98abf709d7
+  data.tar.gz: 54321b16f31848472e812d12b43a461bb4e45fb45dd3c400dc943c68ff0669ac
 SHA512:
-  metadata.gz: 87353d484e3ab966ef765520ef4463831d37393fc66b5aa88f8dce389b001ef245f83af59e220d54f5fb18cd882f11e919cafda32db94ffc927cbbc086c33d35
-  data.tar.gz: 190d7ad3c6305a07763fc34187e12fc5c2bc6a1606f0a6ec8bef546eda63af1f6c38933c792e2f23fee9512948ddfef344ee352504d1d283ae2b1b8ba09be1c7
+  metadata.gz: a807b9c57b441c9f9aa06c5a4662ae436c5ae2409e8343c3fba5b220bf933b29965fc4b205c5fc5479d42d4fdb5796505cf9f33d56da0419193d684e2def2f60
+  data.tar.gz: 4b37d08afb361322aabcf54a046dd9bb2e5db7d1b557409fc28d124918a8687e1079bd9927dd83fb149f4428ef3c5b9daf7903c17e5c896d07f150d3191b5333

data/README.md

@@ -1,51 +1,91 @@
-# Gladiator (Glimmer Editor) 0.1.5 - Glimmer Custom Shell
+# <img src='https://raw.githubusercontent.com/AndyObtiva/glimmer-cs-gladiator/master/images/glimmer-cs-gladiator-logo.svg' height=85 /> Gladiator (Glimmer Editor) 0.2.1
+## [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
-- File lookup by name ignoring slashes, underscores, and dots to ease lookup
+## 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
-- Find & Replace
+- Find & Replace (CMD+F)
 - Show Line Numbers
-- Jump to Line
-- Multiple tab support
+- Jump to Line (CMD+L)
+- Multiple tab support (CMD+SHIFT+[ & CMD+SHIFT+] for tab navigation. CMD+1-9 to jump to a specific tab)
 - Remember opened tabs, caret position, top line, window size, and window location
-- Autosave on focus out/quit/open new file
-- Duplicate Line(s)/selection
-- Kill Line(s)/selection
-- Move line/selection up
-- Move line/selection down
-- Comment/Uncomment line/selection
-- Indent/Unindent line/selection
+- Autosave on focus out/quit/open new file 
+- Duplicate Line(s)/selection (CMD+D)
+- Kill Line(s)/selection (CMD+K)
+- Move line/selection up (CMD+UP)
+- Move line/selection down (CMD+DOWN)
+- 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)
 
 ## 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
 
@@ -53,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.5'
+gem 'glimmer-cs-gladiator', '~> 0.2.1'
 ```
 
 Run:
@@ -62,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
 
@@ -85,6 +125,7 @@ It currently remembers:
 - Last opened file
 - Caret position
 - Top line position
+- Opened tabs
 
 ## Gotcha
 
@@ -113,3 +154,5 @@ The signal TERM is in use by the JVM and will not work correctly on this platfor
 
 Copyright (c) 2020 Andy Maleh. See LICENSE.txt for
 further details.
+
+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.1

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

@@ -117,7 +117,7 @@ module Glimmer
           begin
             unless new_child.dirty_content.nil?
               self.selected_child&.stop_filewatcher
-              selected_child_path_history << self.selected_child.path if self.selected_child
+              selected_child_path_history << new_child.path if new_child && !selected_child_path_history.include?(new_child.path)
               self.selected_child = new_child
               self.selected_child.start_filewatcher
             end
@@ -140,6 +140,14 @@ module Glimmer
       def to_s
         path
       end
+      
+      def eql?(other)
+        self.path.eql?(other&.path)
+      end
+      
+      def hash
+        self.path.hash
+      end
     end  
   end
 end

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

@@ -5,16 +5,18 @@ module Glimmer
     class File
       include Glimmer
   
-      attr_accessor :line_numbers_content, :caret_position, :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)
-        @caret_position = 0
-        @line_number = 1
+        @top_index = 0
+        @selection_count = 0
+        @selection = Point.new(0, 0 + @selection_count)
         read_dirty_content = ::File.read(path)
         begin
           # test read dirty content
@@ -23,8 +25,9 @@ module Glimmer
             lines_text_size = lines.size.to_s.size
             self.line_numbers_content = lines.size.times.map {|n| (' ' * (lines_text_size - (n+1).to_s.size)) + (n+1).to_s }.join("\n")
           end
+          @line_number = 1
           self.dirty_content = read_dirty_content
-          observe(self, :caret_position) do
+          observe(self, :selection) do
             self.line_number = line_index_for_caret_position(caret_position) + 1
           end
           observe(self, :line_number) do
@@ -38,7 +41,30 @@ 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)
+        if OS.linux?
+          async_exec do
+            self.top_index = line_index_for_caret_position(value)
+          end
+        end
+      end
+      
+      def caret_position
+        selection.x
+      end
+      
       def name=(the_name)
         self.display_path = display_path.sub(/#{Regexp.escape(@name)}$/, the_name)
         @name = the_name
@@ -49,6 +75,7 @@ module Glimmer
       
       def dirty_content=(the_content)
         @dirty_content = the_content if ::File.exist?(path)
+        notify_observers(:content)
       end
   
       def start_filewatcher
@@ -134,6 +161,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
@@ -192,10 +220,10 @@ module Glimmer
         delta = 0
         line_indices_for_selection(caret_position, selection_count).each do |the_line_index|
           the_line = old_lines[the_line_index]
-          if the_line.start_with?('  ')
+          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
@@ -249,7 +277,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)
@@ -260,8 +288,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
@@ -315,18 +343,22 @@ module Glimmer
       end
   
       def page_up
+        self.selection_count = 0
         self.line_number = [(self.line_number - 15), 1].max
       end
   
       def page_down
+        self.selection_count = 0
         self.line_number = [(self.line_number + 15), lines.size].min
       end
   
       def home
+        self.selection_count = 0
         self.line_number = 1
       end
   
       def end
+        self.selection_count = 0
         self.line_number = lines.size
       end
   
@@ -430,6 +462,14 @@ module Glimmer
       def to_s
         path
       end
+      
+      def eql?(other)
+        self.path.eql?(other&.path)
+      end
+      
+      def hash
+        self.path.hash
+      end
     end  
   end
 end

data/lib/views/glimmer/gladiator.rb

@@ -1,17 +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
 
@@ -19,13 +14,20 @@ module Glimmer
   # Gladiator (Glimmer Editor)
   class Gladiator
     include Glimmer::UI::CustomShell
+    
+    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
     #
     #
@@ -33,89 +35,113 @@ module Glimmer
       Display.setAppName('Gladiator')
       @display = display {
         on_event_keydown { |key_event|
-          if key_event.stateMask == swt(:command) && key_event.character.chr == 'f'
-            if @text_editor.text_widget.getSelectionText && @text_editor.text_widget.getSelectionText.size > 0
+          if key_event.stateMask == swt(COMMAND_KEY) && extract_char(key_event) == 'f'
+            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, :shift) && key_event.character.chr == 'c'
-            Clipboard.copy(Gladiator::Dir.local_dir.selected_child.path)
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command, :shift) && key_event.character.chr == 'g'
-            Gladiator::Dir.local_dir.selected_child.find_previous
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command, :shift) && key_event.character.chr == 'w'
+          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == 'c'
+            Clipboard.copy(Dir.local_dir.selected_child.path)
+          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY, :shift) && extract_char(key_event) == 'g'
+            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_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_event.character.chr == 'w'
+          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
-              end              
+                @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) 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) % @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, :shift) && key_event.character.chr == ']'
-            @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
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command, :shift) && key_event.character.chr == '['
-            @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
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr == '1'
+          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
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr == '2'
+            @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
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr == '3'
+            @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
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr == '4'
+            @text_editor&.text_widget&.setFocus
             @tab_folder.swt_widget.setSelection(3) if @tab_folder.swt_widget.getItemCount >= 4
-            @text_editor.text_widget.setFocus
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr == '5'
+            @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
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr == '6'
+            @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
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr == '7'
+            @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
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr == '8'
+            @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
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr == '9'
+            @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
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr == 'g'
-            Gladiator::Dir.local_dir.selected_child.find_next
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr == 'l'
+            @text_editor&.text_widget&.setFocus
+          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && extract_char(key_event) == 'g'
+            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
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr == 'r'
+          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && extract_char(key_event) == 'r'
             @filter_text.swt_widget.selectAll
             @filter_text.swt_widget.setFocus
-          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, :command) && key_event.character.chr == 't'
+          elsif Glimmer::SWT::SWTProxy.include?(key_event.stateMask, COMMAND_KEY) && extract_char(key_event) == 't'
             select_tree_item unless @rename_in_progress
             @tree.swt_widget.setFocus
           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
         }
@@ -124,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_event_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
@@ -179,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
+          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
@@ -205,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) || 
@@ -217,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)
@@ -259,7 +326,7 @@ module Glimmer
                 menu_item {
                   text 'Refresh'
                   on_widget_selected {
-                    Gladiator::Dir.local_dir.refresh
+                    Dir.local_dir.refresh
                   }
                 }
                 menu_item {
@@ -286,12 +353,16 @@ module Glimmer
                 @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
               }
@@ -314,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
               }
@@ -330,6 +404,9 @@ module Glimmer
                 @file_path_label.swt_widget.setSelection(0, 0)
               }
             }
+            
+            # row 2
+            
             label {
               text 'Line:'
             }
@@ -337,13 +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:'
             }
@@ -351,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:'
             }
@@ -365,46 +470,71 @@ 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]
+        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_event_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
         }
+      else
+        @loaded_config = true
       end
     end
   
     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,
@@ -422,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)
@@ -440,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)
@@ -457,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
@@ -469,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)
@@ -512,5 +665,11 @@ module Glimmer
         }
       )
     end
+
+    def extract_char(event)
+      event.keyCode.chr
+    rescue => e
+      nil
+    end
   end
-end
+end