redcar 0.3.7.1 → 0.3.8

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

@@ -0,0 +1,62 @@
+
+Then /^the (.*) speedbar should be open$/ do |class_name|
+  Redcar.app.focussed_window.speedbar.class.to_s.should == class_name
+end
+
+def get_speedbar_text_field(field_name)
+  speedbar = Redcar.app.focussed_window.speedbar
+  item = speedbar.__get_item_by_label(field_name) || 
+          speedbar.__get_item_by_label(field_name + ":") || 
+          speedbar.__get_item(field_name)
+  expected_klass = Redcar::Speedbar::TextBoxItem
+  unless item.is_a?(expected_klass)
+    raise "expected #{item} to be a #{expected_klass}"
+  end
+  item
+end
+
+When /^I type "([^"]*)" into the "([^"]*)" field in the speedbar$/ do |text, field_name|
+  get_speedbar_text_field(field_name).edit_view.document.text = text
+end
+
+When /^I press "([^"]*)" in the speedbar$/ do |button_name|
+  speedbar = Redcar.app.focussed_window.speedbar
+  speedbar.controller.execute_listener_in_model(speedbar.__get_item_by_text_or_name(button_name))
+end
+
+When /^I check "([^"]*)" in the speedbar$/ do |checkbox_name|
+  speedbar = Redcar.app.focussed_window.speedbar
+  item = speedbar.__get_item_by_text_or_name(checkbox_name)
+  item.set_value(true)
+  speedbar.controller.execute_listener_in_model(item, true)
+end
+
+When /^I uncheck "([^"]*)" in the speedbar$/ do |checkbox_name|
+  speedbar = Redcar.app.focussed_window.speedbar
+  item = speedbar.__get_item_by_text_or_name(checkbox_name)
+  item.set_value(false)
+  speedbar.controller.execute_listener_in_model(item, false)
+end
+
+When /^I close the speedbar$/ do
+  Redcar.app.focussed_window.close_speedbar
+end
+
+Then /^the "([^"]*)" field in the speedbar should have text "([^"]*)"$/ do |field_name, text|
+  get_speedbar_text_field(field_name).edit_view.document.to_s.should == text
+end
+
+Then /^"([^"]*)" should be checked in the speedbar$/ do |checkbox_name|
+  speedbar = Redcar.app.focussed_window.speedbar
+  item = speedbar.__get_item_by_text_or_name(checkbox_name)
+  item.value.should be_true
+end
+
+Then /^"([^"]*)" should not be checked in the speedbar$/ do |checkbox_name|
+  speedbar = Redcar.app.focussed_window.speedbar
+  item = speedbar.__get_item_by_text_or_name(checkbox_name)
+  item.value.should be_false
+end
+
+
+

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

@@ -17,8 +17,8 @@ Then /^I should (not )?see "([^\"]*)" in the tree$/ do |bool, rows|
   end
 end
 
-Then /^the directory tree width should be the default$/ do
+Then /^the tree width should be the default$/ do
   width = Redcar.app.focussed_window.treebook.trees.last.controller.viewer.control.bounds.width
-  default = Redcar::ApplicationSWT::Window::TREEBOOK_WIDTH + Redcar::ApplicationSWT::Window::SASH_WIDTH
-  raise "The directory tree width was #{width}, expected #{default}" unless width == default
+  default = Redcar::ApplicationSWT::Window::TREEBOOK_WIDTH + Redcar::ApplicationSWT::Window::SASH_WIDTH - 5
+  raise "The tree width was #{width}, expected #{default}" unless width == default
 end

data/plugins/application/features/support/env.rb

@@ -25,7 +25,7 @@ module SwtHelper
   end
   
   def tree_book
-    active_shell.children.to_a.first.children.to_a.first
+    active_shell.children.to_a.first.children.to_a.first.children.to_a.first.children.to_a.first
   end
   
   def top_tree
@@ -114,6 +114,7 @@ def close_everything
     end
   end
   Redcar::ApplicationSWT.sync_exec do
+    Redcar.app.focussed_window.close_speedbar if Redcar.app.focussed_window.speedbar
     Redcar.app.windows.first.title = Redcar::Window::DEFAULT_TITLE
   end
 end

data/plugins/application/lib/application/notebook.rb

@@ -68,21 +68,67 @@ module Redcar
     end
     
     # Focus the next tab to the right from the currently focussed tab.
-    # Does not wrap.
+    # Wraps.
     def switch_up
-      current_ix = @tabs.index(@focussed_tab)
-      unless current_ix == @tabs.length - 1 or current_ix == nil
-        @tabs[current_ix+1].focus
+      focussed do |current_ix|
+        current_ix = wrap_index(current_ix + 1)
+        @tabs[current_ix].focus
       end
     end
     
     # Focus the next tab to the left from the currently focussed tab.
-    # Does not wrap.
+    # Wraps.
     def switch_down
+      focussed do |current_ix|
+        current_ix = wrap_index(current_ix - 1)
+        @tabs[current_ix].focus
+      end
+    end
+    
+    # Moves the currently focussed tab to the right.
+    # Wraps.
+    def move_up
+      focussed do |current_ix|
+        new_ix = wrap_index(current_ix + 1)
+        swap_tab_with(@tabs[current_ix], new_ix)
+      end
+    end
+    
+    # Moves the currently focussed tab to the left.
+    # Wraps.
+    def move_down
+      focussed do |current_ix|
+        new_ix = wrap_index(current_ix - 1)
+        swap_tab_with(@tabs[current_ix], new_ix)
+      end
+    end
+    
+    # Yields the current index of the foccussed tab, if it exists.
+    def focussed(&block)
       current_ix = @tabs.index(@focussed_tab)
-      unless current_ix == 0 or current_ix == nil
-        @tabs[current_ix - 1].focus
+      unless current_ix.nil?
+        yield(current_ix)
+      end
+    end
+    
+    # Swaps a tab with another one at a certain position.
+    # If no position is specified, this will default to 0.
+    #
+    # @param [Redcar::Tab] the tab to be moved
+    # @param [Integer] the position
+    def swap_tab_with(move_tab, position = 0)
+      swap_tab = @tabs[position]
+      unless move_tab == swap_tab || [move_tab, swap_tab].include?(nil)
+        move_tab.move_to_position(position)
+      end
+    end
+    
+    # Wraps an index according to the current number of tabs.
+    def wrap_index(index)
+      until (0..@tabs.size - 1).include?(index)
+        index = index > 0 ? index - @tabs.size : @tabs.size + index
       end
+      index
     end
     
     def inspect

data/plugins/application/lib/application/speedbar.rb

@@ -46,6 +46,18 @@ module Redcar
       @__items ||= self.class.items.map {|i| i.clone }
     end
     
+    def __get_item_by_text_or_name(name)
+      __items.detect {|i| (i.respond_to?(:text) and i.text == name) or i.name.to_s == name.to_s }
+    end
+    
+    def __get_item_by_label(name)
+      label = __items.detect {|i| i.is_a?(LabelItem) and (i.text == name or i.name.to_s == name.to_s)}
+      if label
+        index_of_label = __items.index(label)
+        __items[index_of_label + 1]
+      end
+    end
+    
     def self.label(name, text)
       append_item LabelItem.new(name, text)
       define_item_finder(name)

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

@@ -28,24 +28,35 @@ module Redcar
         notify_listeners(:focus)
       end
     end
-    
+
     def title
       @title
     end
-    
+
     def title=(title)
       @title = title
       notify_listeners(:changed_title, title)
     end
-    
+
     def inspect
       "#<#{self.class.name} \"#{title}\">"
     end
-    
+
     # Sets the notebook of the tab. Should not be called from user code.
     def set_notebook(notebook)
       @notebook = notebook
     end
+
+    # Moves the tab to a new position in the notebook, if said position 
+    # is currently occupied. Defaults to the first position, if none
+    # is passed.
+    #    
+    # Events: moved (position)
+    def move_to_position(position = 0)
+      if (0..@notebook.tabs.size - 1).include?(position)
+        notify_listeners(:moved, position)
+      end
+    end
     
     def edit_tab?
       is_a?(EditTab)
@@ -60,6 +71,6 @@ module Redcar
     # document, if applicable.
     def document_mirror
       document.mirror if document
-    end
+    end    
   end
 end

data/plugins/application/lib/application/treebook.rb

@@ -3,10 +3,11 @@ module Redcar
     include Redcar::Observable
     include Redcar::Model
     
-    attr_reader :trees
+    attr_reader :trees, :focussed_tree
     
     def initialize
       @trees = []
+      @focussed_tree = nil
     end
     
     # Add a tree to this treebook
@@ -14,9 +15,18 @@ module Redcar
     # @param [Redcar::Tree]
     def add_tree(tree)
       @trees << tree
+      @focussed_tree = tree
       notify_listeners(:tree_added, tree)
     end
     
+    # Bring the tree to the front
+    #
+    # @param [Redcar::Tree]
+    def focus_tree(tree)
+      @focussed_tree = tree
+      notify_listeners(:tree_focussed, tree)
+    end
+    
     # Remove a tree from this treebook
     #
     # @param [Redcar::Tree]
@@ -24,7 +34,17 @@ module Redcar
       if @trees.include?(tree)
         @trees.delete(tree)
         notify_listeners(:tree_removed, tree)
+        if tree == focussed_tree
+          focus_tree(trees.first) if trees.any?
+        end
       end
     end
+    
+    private
+    
+    # Tell the Treebook that this tree has been focussed in the GUI.
+    def set_focussed_tree(tree)
+      @focussed_tree = tree
+    end
   end
 end

data/plugins/application_swt/lib/application_swt.rb

@@ -60,8 +60,18 @@ module Redcar
     
     # Runs the given block in the SWT Event thread
     def self.sync_exec(&block)
-      runnable = Swt::RRunnable.new(&block)
-      Redcar::ApplicationSWT.display.syncExec(runnable)
+      runnable = Swt::RRunnable.new do
+        begin
+          block.call
+        rescue => e
+          puts "error in sync exec"
+          puts e.message
+          puts e.backtrace
+        end
+      end
+      unless Redcar::ApplicationSWT.display.is_disposed
+        Redcar::ApplicationSWT.display.syncExec(runnable)
+      end
     end
     
     # Runs the given block in the SWT Event thread after

data/plugins/application_swt/lib/application_swt/html_tab.rb

@@ -36,6 +36,10 @@ module Redcar
         super
       end
       
+      def go_to_location(url)
+        @browser.set_url(url)
+      end
+      
       class LocationListener
         def initialize(html_tab)
           @html_tab = html_tab

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

@@ -57,7 +57,9 @@ module Redcar
       def create_tab_folder(sash)
         folder_style = Swt::SWT::BORDER + Swt::SWT::CLOSE
         @tab_folder = Swt::Custom::CTabFolder.new(sash, folder_style)
-        grid_data = Swt::Layout::GridData.new(Swt::Layout::GridData::FILL_BOTH)
+        grid_data = Swt::Layout::GridData.new
+        grid_data.grabExcessHorizontalSpace = true
+        grid_data.horizontalAlignment = Swt::Layout::GridData::FILL
         @tab_folder.set_layout_data(grid_data)
         @tab_folder.pack
         register_tab_dnd(@tab_folder)
@@ -108,12 +110,12 @@ module Redcar
 
       def model_event_tab_moved(from_notebook, to_notebook, tab_model)
         tab_controller = tab_model.controller
-        data           = tab_model.serialize
+        title          = tab_model.title
         tab_controller.set_notebook(to_notebook.controller)
         tab_controller.create_item_widget
         tab_controller.move_tab_widget_to_current_notebook
         tab_controller.focus
-        tab_model.deserialize(data)
+        tab_model.title = title
       end
       
       def recalculate_tab_order

data/plugins/application_swt/lib/application_swt/speedbar.rb

@@ -76,6 +76,16 @@ module Redcar
 	    label.add_mouse_listener(MouseListener.new(self))
 	  end
 	  
+    def execute_listener_in_model(item, *args)
+      if item.listener
+        begin
+          @model.instance_exec(*args, &item.listener)
+        rescue => err
+          error_in_listener(err)
+        end
+      end
+    end
+    
 	  def create_item_widgets
         @model.__items.each do |item|
           case item
@@ -102,13 +112,7 @@ module Redcar
             edit_view.document.add_listener(:changed) do
               ignore(item.name) do
                 item.value = edit_view.document.to_s
-                if item.listener
-                  begin
-                    @model.instance_exec(item.value, &item.listener)
-                  rescue => err
-                    error_in_listener(err)
-                  end
-                end
+                execute_listener_in_model(item, item.value)
               end
             end
             item.add_listener(:changed_value) do |new_value|
@@ -121,14 +125,8 @@ module Redcar
           when Redcar::Speedbar::ButtonItem
             button = Swt::Widgets::Button.new(@composite, 0)
             button.set_text(item.text)
-            if item.listener
-              button.add_selection_listener do
-                begin
-                  @model.instance_exec(&item.listener)
-                rescue => err
-                  error_in_listener(err)
-                end
-              end
+            button.add_selection_listener do
+              execute_listener_in_model(item)
             end
             item.add_listener(:changed_text) do |new_text|
               button.set_text(item.text)
@@ -144,11 +142,7 @@ module Redcar
             combo.add_selection_listener do
               ignore(item.name) do
                 item.value = combo.text
-                if item.listener
-                  rescue_speedbar_errors do
-                    @model.instance_exec(item.value, &item.listener)
-                  end
-                end
+                execute_listener_in_model(item, item.value)
               end
             end
             item.add_listener(:changed_items) do |new_items|
@@ -174,13 +168,7 @@ module Redcar
             button.set_selection(!!item.value)
             button.add_selection_listener do
               item.value = button.get_selection
-              if item.listener
-                begin
-                  @model.instance_exec(item.value, &item.listener)
-                rescue => err
-                  error_in_listener(err)
-                end
-              end
+              execute_listener_in_model(item, item.value)
             end
             item.add_listener(:changed_text) do |new_text|
               rescue_speedbar_errors do

data/plugins/application_swt/lib/application_swt/swt_wrapper.rb

@@ -137,6 +137,7 @@ module JFace
   end
   
   module Viewers
+    import org.eclipse.jface.viewers.ColumnViewerToolTipSupport
     import org.eclipse.jface.viewers.TreeViewer
     import org.eclipse.jface.viewers.ITreeContentProvider
     import org.eclipse.jface.viewers.ILabelProvider

data/plugins/application_swt/lib/application_swt/tab.rb

@@ -65,6 +65,7 @@ module Redcar
       def attach_listeners
         @model.add_listener(:focus, &method(:focus))
         @model.add_listener(:close, &method(:close))
+        @model.add_listener(:moved, &method(:move_tab_widget_to_position))
       end
       
       def focus

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

@@ -2,29 +2,57 @@ module Redcar
   class ApplicationSWT
     class Treebook
       
-      def initialize(composite, layout, model)
-        @composite, @layout, @model = composite, layout, model
+      def initialize(window, model)
+        @window, @model = window, model
         add_listeners
+        create_tree_view
       end
       
       def add_listeners
         @model.add_listener(:tree_added,   &method(:tree_added))
         @model.add_listener(:tree_removed, &method(:tree_removed))
+        @model.add_listener(:tree_focussed, &method(:tree_focussed))
       end
 
       def tree_added(tree)
-        create_tree_view(tree)
+        tree_view = TreeViewSWT.new(@tree_composite, tree)
+        tree.controller = tree_view
+        title = tree.tree_mirror.title
+        @tree_combo.add(title)
+        @tree_combo.select(@tree_combo.get_items.to_a.index(title))
+        @tree_layout.topControl = tree_view.control
+        @tree_composite.layout
       end
       
       def tree_removed(tree)
         tree.controller.close
+        @tree_combo.remove(tree.tree_mirror.title)
+      end
+      
+      def tree_focussed(tree)
+        @tree_layout.topControl = tree.controller.control
+        @tree_composite.layout
+        @tree_combo.select(@tree_combo.get_items.to_a.index(tree.tree_mirror.title))
       end
 
-      def create_tree_view(tree)
-        tree_view = TreeViewSWT.new(@composite, tree)
-        tree.controller = tree_view
-        @layout.topControl = tree_view.control
-        @composite.layout
+      def create_tree_view
+        @tree_composite = Swt::Widgets::Composite.new(@window.tree_sash, Swt::SWT::NONE)
+        @tree_layout = Swt::Custom::StackLayout.new
+        @tree_composite.setLayout(@tree_layout)
+        
+        @tree_combo = Swt::Widgets::Combo.new(@window.left_composite, Swt::SWT::READ_ONLY)
+        grid_data = Swt::Layout::GridData.new
+        grid_data.grabExcessHorizontalSpace = true
+        grid_data.horizontalAlignment = Swt::Layout::GridData::FILL
+        grid_data.grabExcessVerticalSpace = false
+      	@tree_combo.setLayoutData(grid_data)
+        @tree_combo.add_selection_listener do
+          selected_tree = @model.trees.detect {|t| t.tree_mirror.title == @tree_combo.text}
+          @model.focus_tree(selected_tree)
+        end
+        
+        @tree_composite.layout
+        @window.left_composite.layout
       end
       
     end