redcar-dev 0.12.11dev-java → 0.12.12dev-java

data/CHANGES

@@ -15,6 +15,10 @@ Version 0.12 (TBA)
  * Added open line, transpose characters commands (Dan Lucraft)
  * OSX style unified toolbars (Dan Lucraft)
  * Supports OS X Lion fullscreen mode (Dan Lucraft)
+ * Jump back and forward through navigation history (Shinichi Katayama)
+ * Added option to add editable ComboItem widgets to Speedbars (Delisa Mason)
+ * Updated UI Styling (Delisa Mason)
+ * Added option to color tree background color via ApplicationSWT preferences (Delisa Mason)
 
 Version 0.11 (23 March 2011)
 ============================

data/lib/redcar/installer.rb

@@ -25,6 +25,7 @@ module Redcar
       fetch_all_assets
       precache_textmate_bundles
       ensure_user_plugins_directory_exists
+      replace_windows_batch_file
       puts "Success!"
       puts ""
       puts "To open just the editor:       redcar"
@@ -79,6 +80,40 @@ module Redcar
       download_file_to(source, absolute_target)
       unzip_file(absolute_target) if absolute_target =~ /\.zip$/
     end
+    
+    def replace_windows_batch_file
+      if RUBY_PLATFORM.downcase =~ /mswin|mingw|win32/
+        require 'rbconfig'
+        bin_dir = Config::CONFIG["bindir"]
+        ruby_path = File.join(bin_dir,
+                                  "rubyw.exe")
+        script_path = File.join(bin_dir,"redcar.bat")
+        File.open script_path, 'w' do |file|
+          file.puts <<-TEXT
+@Echo Off
+IF NOT "%~f0" == "~f0" GOTO :WinNT
+@"#{ruby_path}" "#{File.join(bin_dir,"redcar")}" %1 %2 %3 %4 %5 %6 %7 %8 %9
+GOTO :EOF
+:WinNT
+SET STARTUP=%*
+SET RUBY="rubyw.exe"
+
+:LOOP
+if "%1"=="--with-windows-console" GOTO USERUBY
+if "%1"=="" GOTO STARTREDCAR
+shift
+GOTO LOOP
+
+:USERUBY
+SET RUBY="ruby.exe"
+
+:STARTREDCAR
+IF NOT "X"%STARTUP% == "X" SET STARTUP=%STARTUP:"="""%
+start "RedCar" %RUBY% "#{File.join(bin_dir,"redcar")}" %STARTUP%
+TEXT
+        end
+      end
+    end
 
     def implicit_target(source)
       URI.parse(source).path.gsub(/^\//, "")
@@ -140,4 +175,4 @@ module Redcar
       end
     end
   end
-end
+end

data/lib/redcar.rb

@@ -57,7 +57,7 @@ end
 #
 # and so on.
 module Redcar
-  VERSION         = '0.12.11dev' # also change in the gemspec!
+  VERSION         = '0.12.12dev' # also change in the gemspec!
   VERSION_MAJOR   = 0
   VERSION_MINOR   = 12
   VERSION_RELEASE = 0

data/plugins/application/features/navigation_history.feature

@@ -0,0 +1,66 @@
+Feature: Navigation History
+
+Background:
+  Given I have opened "plugins/application/spec/application/navigation_history_spec.rb"
+  And I move to line 2
+  And I run the command Redcar::OutlineView::OpenOutlineViewCommand
+  And I select the outline view
+  Then the cursor should be on line 1
+  And I run the command Redcar::OutlineView::OpenOutlineViewCommand
+  When I set the outline filter to "con"
+  And I wait 2 seconds
+  And I select the outline view
+  Then the cursor should be on line 14
+  Given I have opened "plugins/application/lib/application/navigation_history.rb"
+  And I move to line 5
+  And I run the command Redcar::OutlineView::OpenOutlineViewCommand
+  And I select the outline view
+  Then the cursor should be on line 0
+
+Scenario: Backward/forward history
+  When I run the command Redcar::Top::BackwardNavigationCommand
+  Then the focussed document path is "plugins/application/lib/application/navigation_history.rb"
+  And the cursor should be on line 5
+  When I run the command Redcar::Top::BackwardNavigationCommand
+  Then the focussed document path is "plugins/application/spec/application/navigation_history_spec.rb"
+  And the cursor should be on line 14
+  When I run the command Redcar::Top::BackwardNavigationCommand
+  Then the focussed document path is "plugins/application/spec/application/navigation_history_spec.rb"
+  And the cursor should be on line 1
+  When I run the command Redcar::Top::BackwardNavigationCommand
+  Then the focussed document path is "plugins/application/spec/application/navigation_history_spec.rb"
+  And the cursor should be on line 2
+  When I run the command Redcar::Top::ForwardNavigationCommand
+  Then the focussed document path is "plugins/application/spec/application/navigation_history_spec.rb"
+  And the cursor should be on line 1
+  When I run the command Redcar::Top::ForwardNavigationCommand
+  Then the focussed document path is "plugins/application/spec/application/navigation_history_spec.rb"
+  And the cursor should be on line 14
+  When I run the command Redcar::Top::ForwardNavigationCommand
+  Then the focussed document path is "plugins/application/lib/application/navigation_history.rb"
+  And the cursor should be on line 5
+  When I run the command Redcar::Top::ForwardNavigationCommand
+  Then the focussed document path is "plugins/application/lib/application/navigation_history.rb"
+  And the cursor should be on line 0
+
+Scenario: Change middle history
+  When I run the command Redcar::Top::BackwardNavigationCommand
+  Then the focussed document path is "plugins/application/lib/application/navigation_history.rb"
+  And the cursor should be on line 5
+  When I run the command Redcar::Top::ForwardNavigationCommand
+  Then the focussed document path is "plugins/application/lib/application/navigation_history.rb"
+  And the cursor should be on line 0
+  When I run the command Redcar::Top::BackwardNavigationCommand
+  Then the focussed document path is "plugins/application/lib/application/navigation_history.rb"
+  And the cursor should be on line 5
+  And I run the command Redcar::OutlineView::OpenOutlineViewCommand
+  When I set the outline filter to "can"
+  And I wait 2 seconds
+  And I select the outline view
+  Then the cursor should be on line 21
+  When I run the command Redcar::Top::BackwardNavigationCommand
+  Then the focussed document path is "plugins/application/lib/application/navigation_history.rb"
+  And the cursor should be on line 5
+  When I run the command Redcar::Top::ForwardNavigationCommand
+  Then the focussed document path is "plugins/application/lib/application/navigation_history.rb"
+  And the cursor should be on line 21

data/plugins/application/features/step_definitions/navigation_history_steps.rb

@@ -0,0 +1,4 @@
+Then /^the focussed document path is "([^\"]*)"$/ do |path|
+  doc = Redcar.app.focussed_window.focussed_notebook_tab_document
+  doc.path.should == File.expand_path(path)
+end

data/plugins/application/lib/application/navigation_history.rb

@@ -0,0 +1,71 @@
+module Redcar
+  # A class that holds a cursor navigation history. The maximum length
+  # defaults to 100.
+  class NavigationHistory < Array
+    def initialize
+      @max_history_size = 100
+      @current = 0
+    end
+    
+    def save(doc)
+      return if last && last[:path] == doc.path && last[:cursor_offset] == doc.cursor_offset
+      
+      # Invoking this method means new future is about to be created, so remove old one.
+      self.slice!(@current...self.size)
+      
+      ensure_size_less_than_max
+      self << {:path => doc.path, :cursor_offset => doc.cursor_offset}
+      @current += 1
+    end
+    
+    def can_backward?
+      return @current > 0
+    end
+
+    def backward
+      move_current_and_restore(-1) if can_backward?
+    end
+    
+    def can_forward?
+      return @current < self.size - 1
+    end
+
+    def forward
+      move_current_and_restore(1) if can_forward?
+    end
+    
+    private
+    
+    def ensure_size_less_than_max
+      while self.size >= @max_history_size
+        self.delete_at(0)
+        @current -= 1
+      end
+    end
+    
+    def move_current_and_restore(history_size)
+      save_current_doc
+      @current += history_size
+      restore_hisotry
+    end
+    
+    def restore_hisotry
+      Project::Manager.open_file(self[@current][:path])
+      new_doc = Redcar.app.focussed_window.focussed_notebook_tab_document
+      new_doc.cursor_offset = self[@current][:cursor_offset]
+      new_doc.ensure_cursor_visible
+    end
+    
+    def save_current_doc
+      if win = Redcar.app.focussed_window and cur_doc = win.focussed_notebook_tab_document
+        history = {:path => cur_doc.path, :cursor_offset => cur_doc.cursor_offset}
+        if @current < self.size
+          self[@current] = history
+        else
+          save(cur_doc)
+          @current = self.size - 1
+        end
+      end
+    end
+  end
+end

data/plugins/application/lib/application/tab.rb

@@ -3,7 +3,7 @@ module Redcar
     include Redcar::Model
     include Redcar::Observable
 
-    DEFAULT_ICON  = :file
+    DEFAULT_ICON  = :document
     NO_WRITE_ICON = :exclamation_red
     MISSING_ICON  = :exclamation
     CONFIG_ICON   = :hammer_screwdriver

data/plugins/application/lib/application.rb

@@ -24,6 +24,7 @@ require 'application/menu/item'
 require 'application/menu/lazy_menu'
 require 'application/menu/builder'
 require 'application/menu/builder/group'
+require 'application/navigation_history'
 require 'application/notebook'
 require 'application/speedbar'
 require 'application/tab'
@@ -106,7 +107,7 @@ module Redcar
       ]
     end
 
-    attr_reader :clipboard, :keymap, :menu, :toolbar, :history, :task_queue, :show_toolbar
+    attr_reader :clipboard, :keymap, :menu, :toolbar, :history, :task_queue, :show_toolbar, :navigation_history
 
     # Create an application instance with a Redcar::Clipboard and a Redcar::History.
     def initialize
@@ -114,6 +115,7 @@ module Redcar
       @window_handlers = Hash.new {|h,k| h[k] = []}
       create_clipboard
       create_history
+      @navigation_history = NavigationHistory.new
       @event_spewer = EventSpewer.new
       @task_queue   = TaskQueue.new
       @show_toolbar = !!Application.storage['show_toolbar']

data/plugins/application/spec/application/navigation_history_spec.rb

@@ -0,0 +1,96 @@
+describe Redcar::NavigationHistory do
+  module NavigationHistoryTest
+    class TestEditView
+      include Redcar::Observable
+      attr_accessor :title
+      
+      def controller
+        o = Object.new
+        def o.method_missing(*_)
+        end
+        o
+      end
+    end
+      
+    class TestDocumentController
+      attr_accessor :text, :cursor_offset
+  
+      def line_at_offset(_)
+        0
+      end
+      
+      def line_count
+        0
+      end
+    end
+    
+    class TestMirror
+      include Redcar::Observable
+      attr_accessor :path
+      
+      def read
+        "Test content"
+      end
+      
+      def title
+        "foo"
+      end
+    end
+  end  
+  
+  class Redcar::NavigationHistory
+    attr_accessor :current, :max_history_size
+  end
+    
+  before do
+    @controller = NavigationHistoryTest::TestDocumentController.new
+    @controller.cursor_offset = 100
+    @mirror = NavigationHistoryTest::TestMirror.new
+    @mirror.path = "hoge.rb"
+    @doc = Redcar::Document.new(NavigationHistoryTest::TestEditView.new)
+    @doc.controller = @controller
+    @doc.mirror = @mirror
+    @history = Redcar::NavigationHistory.new
+  end
+  
+  it "should save current cursor location" do
+    @doc.cursor_offset.should == 100
+    @history.size.should == 0
+    @history.save(@doc)
+    @history.size.should == 1
+    @history[0][:path].should == "hoge.rb"
+    @history[0][:cursor_offset].should == 100
+  end
+  
+  it "can backward?" do
+    @history.save(@doc)
+    @history.can_backward?.should be_true
+  end
+  
+  it "can forward?" do
+    @history.save(@doc)
+    @controller.cursor_offset = 50
+    @history.save(@doc)
+    @history.size.should == 2
+    @history.current -= 2
+    @history.can_forward?.should be_true
+  end
+  
+  it "should not exceed max history size" do
+    (@history.max_history_size + 10).times do
+      @history.save(@doc)
+      @controller.cursor_offset += 1
+    end
+    @history.size.should == @history.max_history_size
+  end
+  
+  it "should delete old future when forward" do
+    5.times do
+      @history.save(@doc)
+      @controller.cursor_offset += 1
+    end
+    @history.current = 2
+    @history.save(@doc)
+    @history.size.should == 3
+  end
+end

data/plugins/application_swt/lib/application_swt/notebook.rb

@@ -53,10 +53,17 @@ module Redcar
         attach_model_listeners
         attach_view_listeners
       end
-      
+
       def create_tab_folder(sash)
-        folder_style = Swt::SWT::BORDER + Swt::SWT::CLOSE
+        folder_style = Swt::SWT::CLOSE
         @tab_folder = Swt::Custom::CTabFolder.new(sash, folder_style)
+        font_data = @tab_folder.font.font_data.first
+        font = Swt::Graphics::Font.new(
+          ApplicationSWT.display,
+          font_data.name,
+          Redcar::EditView.font_size - 1,
+          Swt::SWT::NORMAL)
+        @tab_folder.font = font
         grid_data = Swt::Layout::GridData.new
         grid_data.grabExcessHorizontalSpace = true
         grid_data.horizontalAlignment = Swt::Layout::GridData::FILL

data/plugins/application_swt/lib/application_swt/treebook.rb

@@ -4,7 +4,7 @@ require 'swt/vtab_item'
 module Redcar
   class ApplicationSWT
     class Treebook
-      attr_reader :tab_folder
+      attr_reader :tab_folder, :font
 
       def initialize(window, model)
         @window, @model = window, model
@@ -38,7 +38,13 @@ module Redcar
 
       def create_tree_view
         @tab_folder = Swt::Widgets::VTabFolder.new(@window.tree_sash, Swt::SWT::NONE)
-
+        font_data = @tab_folder.font.font_data.first
+        font = Swt::Graphics::Font.new(
+          ApplicationSWT.display,
+          font_data.name,
+          Redcar::EditView.font_size - 1,
+          Swt::SWT::NORMAL)
+        @tab_folder.font = font
         selected_tab_background = Redcar::ApplicationSWT.selected_tab_background
         @tab_folder.set_selection_background(selected_tab_background.swt_colors, selected_tab_background.swt_stops, true)
 

data/plugins/application_swt/lib/application_swt.rb

@@ -50,20 +50,25 @@ module Redcar
         Redcar.gui.register_dialog_adapter(ApplicationSWT::DialogAdapter.new)
       end
     end
-    
+
     def self.selected_tab_background
       Gradient.new(Redcar::ApplicationSWT.storage['selected_tab_background'])
     end
-    
+
     def self.unselected_tab_background
       Gradient.new(Redcar::ApplicationSWT.storage['unselected_tab_background'])
     end
-    
+
+    def self.tree_background
+      Gradient.new(Redcar::ApplicationSWT.storage['tree_background'])
+    end
+
     def self.storage
       @storage ||= begin
         storage = Plugin::Storage.new('application_swt')
         storage.set_default('selected_tab_background', {0 => "#FEFEFE", 100 => "#EEEEEE"})
         storage.set_default('unselected_tab_background', {0 => "#E5E5E5", 100 => "#D0D0D0"})
+        storage.set_default('tree_background', "#FFFFFF")
         storage
       end
     end

data/plugins/declarations/lib/declarations.rb

@@ -87,7 +87,7 @@ module Redcar
       @tags_for_path.delete(path)
     end
 
-    def self.go_to_definition(match)
+    def self.go_to_definition(match)      
       path = match[:file]
       Project::Manager.open_file(path)
       regexp = Regexp.new(Regexp.escape(match[:match]))
@@ -127,6 +127,10 @@ module Redcar
           return
         end
         matches = find_tag(tags_path, token).uniq
+        
+        # save current cursor position before jump to another location.
+        Redcar.app.navigation_history.save(doc) if matches.size > 0
+        
         case matches.size
         when 0
           Application::Dialog.message_box("There is no declaration for '#{token}' in the 'tags' file.")
@@ -135,6 +139,8 @@ module Redcar
         else
           open_select_tag_dialog(matches)
         end
+        
+        Redcar.app.navigation_history.save(doc) if matches.size > 0
       end
 
       def find_tag(tags_path, tag)

data/plugins/edit_view/lib/edit_view/edit_tab.rb

@@ -15,7 +15,16 @@ module Redcar
         unless doc.mirror.adapter.is_a?(Redcar::Project::Adapters::Remote)
           if File.exists?(doc.path)
             if File.writable?(doc.path)
-              i = DEFAULT_ICON
+              key = File.basename(doc.path).split('.').last.split(//).first.downcase
+              if key =~ /[a-z]/
+                if key == 'a'
+                  i = :document_attribute
+                else
+                  i = :"document_attribute_#{key}"
+                end
+              else
+                i = DEFAULT_ICON
+              end
             else
               i = NO_WRITE_ICON
             end

data/plugins/outline_view/lib/outline_view.rb

@@ -55,7 +55,9 @@ module Redcar
       
       def selected(match, closing=true)
         if @last_list
+          Redcar.app.navigation_history.save(@document)
           DocumentSearch::FindNextRegex.new(Regexp.new(Regexp.quote(match)), true).run_in_focussed_tab_edit_view
+          Redcar.app.navigation_history.save(@document)
           close if closing
         end
       end

data/plugins/project/lib/project/dir_mirror.rb

@@ -118,12 +118,19 @@ module Redcar
         def icon
           case @type
           when :file
-            :file
+            key = text.split('.').last.split(//).first.downcase
+            if key =~ /[b-z]/
+              :"document_attribute_#{key}"
+            elsif key == 'a'
+              :document_attribute
+            else
+              :document
+            end
           when :dir
-            :directory
+            :blue_folder
           end
         end
-        
+
         def leaf?
           file?
         end

data/plugins/project/lib/project/find_file_dialog.rb

@@ -45,7 +45,12 @@ module Redcar
       def selected(text, ix, closing=false)
         if @last_list
           close
+          if win = Redcar.app.focussed_window and tab = win.focussed_notebook_tab and doc = tab.document
+            Redcar.app.navigation_history.save(doc)
+          end
           OpenFileCommand.new(@last_list[ix]).run
+          cur_doc = Redcar.app.focussed_window.focussed_notebook_tab.document
+          Redcar.app.navigation_history.save(cur_doc) if cur_doc
         end
       end
 

data/plugins/project_search/lib/project_search/word_search_controller.rb

@@ -70,6 +70,7 @@ class ProjectSearch
         doc.set_selection_range(doc.cursor_line_start_offset + index, doc.cursor_line_start_offset + index + length)
       end
       doc.scroll_to_line(line.to_i)
+      Redcar.app.navigation_history.save(doc)
       nil
     end
 

data/plugins/redcar/redcar.rb

@@ -293,6 +293,18 @@ Redcar.environment: #{Redcar.environment}
         end
       end
     end
+    
+    class BackwardNavigationCommand < Command
+      def execute
+        Redcar.app.navigation_history.backward
+      end
+    end
+    
+    class ForwardNavigationCommand < Command
+      def execute
+        Redcar.app.navigation_history.forward
+      end
+    end
 
     class ChangeIndentCommand < DocumentCommand
       def execute
@@ -670,6 +682,9 @@ Redcar.environment: #{Redcar.environment}
         link "Ctrl+O",  OpenLineCommand
         link "Ctrl+D",  DeleteCharCommand
         link "Ctrl+H",  BackspaceCommand
+        
+        link "Ctrl+Alt+Left", BackwardNavigationCommand
+        link "Ctrl+Alt+Right", ForwardNavigationCommand
 
         link "Cmd+[",            DecreaseIndentCommand
         link "Cmd+]",            IncreaseIndentCommand
@@ -759,6 +774,9 @@ Redcar.environment: #{Redcar.environment}
         link "End",        MoveEndCommand
         link "Ctrl+Alt+E", MoveEndCommand
         link "Ctrl+End",   MoveBottomCommand
+        
+        link "Alt+[", BackwardNavigationCommand
+        link "Alt+]", ForwardNavigationCommand
 
         link "Ctrl+[",           DecreaseIndentCommand
         link "Ctrl+]",           IncreaseIndentCommand
@@ -911,6 +929,11 @@ Redcar.environment: #{Redcar.environment}
               item "Delete Character",   DeleteCharCommand
               item "Backspace",          BackspaceCommand
               item "Transpose",          TransposeCharactersCommand
+              
+              separator
+              
+              item "Backward Navigation", BackwardNavigationCommand
+              item "Forward Navigation", ForwardNavigationCommand
             end
           end
 

data/plugins/splash_screen/splash_screen.rb

@@ -18,7 +18,7 @@ module Redcar
     
     def show
       @image = Swt::Graphics::Image.new(Swt.display, Redcar.icons_directory + "/redcar-splash.png")
-      @splash = Swt::Widgets::Shell.new(Swt::SWT::NONE)
+      @splash = Swt::Widgets::Shell.new(Swt::SWT::NO_TRIM)
       @bar = Swt::Widgets::ProgressBar.new(@splash, Swt::SWT::NONE)
       @bar.setMaximum(max)
       label = Swt::Widgets::Label.new(@splash, Swt::SWT::NONE)
@@ -30,9 +30,9 @@ module Redcar
       labelData.bottom = Swt::Layout::FormAttachment.new(100, 0)
       label.setLayoutData(labelData)
       progressData = Swt::Layout::FormData.new
-      progressData.left   = Swt::Layout::FormAttachment.new(0, 5)
-      progressData.right  = Swt::Layout::FormAttachment.new(100, -5)
-      progressData.bottom = Swt::Layout::FormAttachment.new(100, -5)
+      progressData.left   = Swt::Layout::FormAttachment.new(0, 70)
+      progressData.right  = Swt::Layout::FormAttachment.new(100, -32)
+      progressData.bottom = Swt::Layout::FormAttachment.new(100, -30)
       @bar.setLayoutData(progressData)
       @splash.pack
       

data/plugins/tree_view_swt/lib/tree_view_swt.rb

@@ -12,9 +12,17 @@ module Redcar
          storage
       end
     end
-    
+
     def initialize(composite, model)
       @composite, @model = composite, model
+      color = ApplicationSWT.tree_background.swt_colors.first
+      font_data = @composite.font.font_data.first
+      font = Swt::Graphics::Font.new(
+        ApplicationSWT.display,
+        font_data.name,
+        Redcar::EditView.font_size - 1,
+        Swt::SWT::NORMAL)
+      @composite.background = color
       tree_style = Swt::SWT::MULTI | Swt::SWT::H_SCROLL | Swt::SWT::V_SCROLL
       @viewer = JFace::Viewers::TreeViewer.new(@composite, tree_style)
       grid_data = Swt::Layout::GridData.new
@@ -26,11 +34,13 @@ module Redcar
       @composite.layout
       JFace::Viewers::ColumnViewerToolTipSupport.enableFor(@viewer)
       @viewer.set_content_provider(TreeMirrorContentProvider.new(self))
+      @viewer.tree.font = font
+      @viewer.tree.background = color
       #@viewer.getTree.setLinesVisible(true)
 	    #@viewer.getTree.setHeaderVisible(true)
       @viewer.set_label_provider(TreeMirrorLabelProvider.new(self))
       @viewer.set_input(@model.tree_mirror)
-      
+
       if @model.tree_controller
         @viewer.add_tree_listener(@viewer.getControl, TreeListener.new)
         @viewer.add_double_click_listener(DoubleClickListener.new)
@@ -38,9 +48,9 @@ module Redcar
         @viewer.add_selection_changed_listener(SelectionChangedListener.new(@model, @viewer))
         control.add_mouse_listener(MouseListener.new(self))
       end
-      
+
       register_dnd if @model.tree_mirror.drag_and_drop?
-      
+
       @model.add_listener(:refresh) do
         begin
           @model.tree_mirror.refresh_operation(@model) do
@@ -50,12 +60,12 @@ module Redcar
           handle_mirror_error(e)
         end
       end
-      
+
       @editor = Swt::Custom::TreeEditor.new(control)
-      
+
       @editor.horizontalAlignment = Swt::SWT::LEFT
       @editor.grabHorizontal = true
-      
+
       @model.add_listener(:edit_element, &method(:edit_element))
       @model.add_listener(:expand_element, &method(:expand_element))
       @model.add_listener(:select_element, &method(:select_element))
@@ -70,12 +80,12 @@ module Redcar
 
     class DragSourceListener
       attr_reader :tree, :dragged_elements
-      
+
       def initialize(tree_view_swt, tree)
         @tree_view_swt = tree_view_swt
         @tree = tree
       end
-      
+
       def drag_start(event)
         selection = tree.get_selection
         if selection.length > 0
@@ -90,7 +100,7 @@ module Redcar
           event.doit = false
         end
       end
-      
+
       def drag_set_data(event)
         case tree_mirror.data_type
         when :file
@@ -107,28 +117,28 @@ module Redcar
           raise "unknown tree data_type #{tree.tree_mirror.data_type}"
         end
       end
-      
+
       def drag_finished(*_); end
-      
+
       def tree_mirror
         @tree_view_swt.model.tree_mirror
       end
     end
-    
+
     class DropAdapter < JFace::Viewers::ViewerDropAdapter
       def initialize(tree_view_swt, drag_source_listener, viewer)
         @tree_view_swt = tree_view_swt
         @drag_source_listener = drag_source_listener
         super(viewer)
       end
-      
+
       def validateDrop(target, operation, transfer_data_type)
         pos = location_to_position(get_current_location)
         Redcar.safely do
           @tree_view_swt.drag_controller.can_drop?(@drag_source_listener.dragged_elements, target, pos)
         end
       end
-      
+
       def performDrop(data)
         elements = data.to_a.map {|datum| @tree_view_swt.model.tree_mirror.from_data(datum) }
         pos = location_to_position(get_current_location)
@@ -139,9 +149,9 @@ module Redcar
         end
         true
       end
-      
+
       private
-      
+
       def location_to_position(location)
         if Redcar.safely { @tree_view_swt.drag_controller.reorderable? }
           {1 => :before, 2 => :after, 3 => :onto}[location]
@@ -150,7 +160,7 @@ module Redcar
         end
       end
     end
-    
+
     def register_dnd
       case Redcar.safely { @model.tree_mirror.data_type }
       when :file
@@ -161,31 +171,31 @@ module Redcar
         raise "unknown tree data_type #{Redcar.safely { tree.tree_mirror.data_type }}"
       end
       operations = Swt::DND::DND::DROP_MOVE | Swt::DND::DND::DROP_COPY
-      
+
       source_listener = DragSourceListener.new(self, @viewer.get_tree)
       drop_adapter = DropAdapter.new(self, source_listener, @viewer)
       drop_adapter.set_feedback_enabled(drag_controller.reorderable?)
-      
+
       @viewer.add_drag_support(operations, types, source_listener)
       @viewer.add_drop_support(operations, types, drop_adapter)
     end
-    
+
     def drag_controller
       @model.tree_controller.drag_controller(@model)
     end
-    
+
     def edit_element(element, select_from, select_to)
       item = element_to_item(element)
       unless item
         puts "ERROR: when trying to edit, no visible item for #{element.inspect}"
         return
       end
-      
+
       text = Swt::Widgets::Text.new(control, Swt::SWT::NONE)
       text.set_text(item.get_text)
       colour = ApplicationSWT.display.get_system_color(Swt::SWT::COLOR_GRAY)
       text.set_background(colour)
-      
+
       @editor.set_editor(text, item)
       text.set_selection(select_from || 0, select_to || text.get_text.length)
       listener = EditorListener.new(self, element, text)
@@ -194,7 +204,7 @@ module Redcar
 
       text.set_focus
     end
-    
+
     def edited_element(element, text)
       if @model.tree_controller and @model.tree_controller.respond_to?(:edited)
         Redcar.safely("edit element") do
@@ -202,13 +212,13 @@ module Redcar
         end
       end
     end
-    
+
     def expand_element(element)
       if item = element_to_item(element)
         @viewer.expandToLevel(element, 1)
       end
     end
-    
+
     def focus
       @viewer.get_tree.set_focus
     end
@@ -222,21 +232,21 @@ module Redcar
     def element_to_item(element)
       @viewer.test_find_item(element)
     end
-    
+
     def item_to_element(item)
       @viewer.getViewerRowFromItem(item).get_element
     end
-    
+
     def selection
       @viewer.get_tree.get_selection.map {|i| item_to_element(i) }
     end
-    
+
     def visible_nodes
       items = @viewer.get_tree.get_items
       all_items = items.map {|item| [item, visible_children_of(item)] }.flatten
       all_items.map {|item| item_to_element(item) }
     end
-    
+
     def visible_children_of(item)
       if item.get_expanded
         items = item.get_items
@@ -245,14 +255,14 @@ module Redcar
         []
       end
     end
-    
+
     class EditorListener
       def initialize(tree_view_swt, element, text_widget)
         @tree_view_swt = tree_view_swt
         @element = element
         @text = text_widget
       end
-      
+
       def handle_event(e)
         case e.type
         when Swt::SWT::FocusOut
@@ -273,11 +283,11 @@ module Redcar
         end
       end
     end
-    
+
     def control
       @viewer.get_control
     end
-    
+
     def close
       @viewer.getControl.dispose
     end
@@ -295,7 +305,7 @@ module Redcar
         end
       end
     end
-    
+
     def handle_mirror_error(e)
       if @model.tree_controller.respond_to?(:handle_error)
         begin
@@ -311,45 +321,45 @@ module Redcar
         Application::Dialog.message_box(e.message, :type => :error)
       end
     end
-    
+
     class TreeListener
       def tree_collapsed(e)
       end
-      
+
       def tree_expanded(e)
       end
     end
-    
+
     class SelectionListener
       def widget_default_selected(e)
       end
-      
+
       def widget_selected(e)
       end
     end
-    
+
     class MouseListener
       def initialize(tree_view_swt)
         @tree_view_swt = tree_view_swt
       end
-      
+
       def mouse_double_click(_); end
       def mouse_up(_)
       end
-      
+
       def mouse_down(e)
         if e.button == 3
           @tree_view_swt.right_click(e)
         end
       end
     end
-    
+
     class SelectionChangedListener
       def initialize(tree_model, viewer)
         @tree_model = tree_model
         @viewer = viewer
       end
-      
+
       def selection_changed(e)
         Redcar.safely do
           element = e.getSelection.toArray.to_a.first
@@ -359,7 +369,7 @@ module Redcar
         end
       end
     end
-    
+
     class DoubleClickListener
       def double_click(e)
 
@@ -369,7 +379,7 @@ module Redcar
         return if double_clicked_element.leaf?
 
         viewer = e.get_viewer
-        node_is_expanded = viewer.getExpandedState(double_clicked_element) 
+        node_is_expanded = viewer.getExpandedState(double_clicked_element)
 
         if node_is_expanded
           viewer.collapseToLevel(double_clicked_element, 1)
@@ -379,22 +389,22 @@ module Redcar
       rescue
       end
     end
-    
+
     class OpenListener
       def initialize(tree_model)
         @tree_model = tree_model
       end
-      
+
       def open(e)
         Redcar.safely("tree row activation") do
           @tree_model.tree_controller.activated(@tree_model, e.getSelection.toArray.to_a.first)
         end
       end
     end
-    
+
     class TreeMirrorContentProvider
       include JFace::Viewers::ITreeContentProvider
-      
+
       def initialize(tree_view_swt)
         @tree_view_swt = tree_view_swt
       end
@@ -431,7 +441,7 @@ module Redcar
         puts e.backtrace
         @tree_view_swt.handle_mirror_error(e)
       end
-      
+
       def get_parent(tree_node)
         # not sure why this is necessary
       end
@@ -442,7 +452,7 @@ module Redcar
 
     class TreeMirrorLabelProvider
       include JFace::Viewers::ILabelProvider
-      
+
       def initialize(tree_view_swt)
         @tree_view_swt = tree_view_swt
       end
@@ -463,7 +473,7 @@ module Redcar
 
       def dispose
       end
-      
+
       #def getToolTipShift(*_)
       #  Swt::Graphics::Point.new(5, 5)
       #end
@@ -480,7 +490,7 @@ module Redcar
       #def getToolTipTimeDisplayed(*_)
       #  5000
       #end
-      
+
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: redcar-dev
 version: !ruby/object:Gem::Version 
   prerelease: 7
-  version: 0.12.11dev
+  version: 0.12.12dev
 platform: java
 authors: 
   - Daniel Lucraft
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-03 00:00:00 -04:00
+date: 2011-08-14 00:00:00 +01:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -252,11 +252,13 @@ files:
   - lib/redcar/usage.rb
   - plugins/application/plugin.rb
   - plugins/application/features/main_menu.feature
+  - plugins/application/features/navigation_history.feature
   - plugins/application/features/step_definitions/command_steps.rb
   - plugins/application/features/step_definitions/dialog_steps.rb
   - plugins/application/features/step_definitions/filter_list_dialog_steps.rb
   - plugins/application/features/step_definitions/key_steps.rb
   - plugins/application/features/step_definitions/menu_steps.rb
+  - plugins/application/features/step_definitions/navigation_history_steps.rb
   - plugins/application/features/step_definitions/speedbar_steps.rb
   - plugins/application/features/step_definitions/tree_steps.rb
   - plugins/application/features/step_definitions/window_steps.rb
@@ -269,6 +271,7 @@ files:
   - plugins/application/lib/application/event_spewer.rb
   - plugins/application/lib/application/keymap.rb
   - plugins/application/lib/application/menu.rb
+  - plugins/application/lib/application/navigation_history.rb
   - plugins/application/lib/application/notebook.rb
   - plugins/application/lib/application/sensitive.rb
   - plugins/application/lib/application/sensitivity.rb
@@ -306,6 +309,7 @@ files:
   - plugins/application/spec/application/clipboard_spec.rb
   - plugins/application/spec/application/command_spec.rb
   - plugins/application/spec/application/menu_spec.rb
+  - plugins/application/spec/application/navigation_history_spec.rb
   - plugins/application/spec/application/notebook_spec.rb
   - plugins/application/spec/application/sensitive_spec.rb
   - plugins/application/spec/application/speedbar_spec.rb