redcar 0.5.3dev → 0.5.4dev

data/Rakefile

@@ -1,4 +1,4 @@
-REDCAR_VERSION = "0.5.3dev" # also change in lib/redcar.rb!
+REDCAR_VERSION = "0.5.4dev" # also change in lib/redcar.rb!
 require 'rubygems'
 require 'fileutils'
 require 'spec/rake/spectask'

data/bin/redcar

@@ -1,7 +1,9 @@
 #!/usr/bin/env ruby
 $redcar_process_start_time = Time.now
 $VERBOSE = true if ARGV.find{|arg| arg == '--verbose'}
-require File.expand_path(File.join(File.dirname(__FILE__), %w(.. lib redcar_quick_start)))
+
+$:.push(File.join(File.dirname(__FILE__), %w(.. lib)))
+require "redcar_quick_start"
 
 if ARGV.include? '--silent'
   # reopen the standard pipes to nothingness if we were forked as part of jruby

data/lib/redcar.rb

@@ -11,7 +11,6 @@ require 'redcar/usage'
 require 'regex_replace'
 
 require 'forwardable'
-require 'yaml'
 require 'uri'
 
 begin
@@ -52,7 +51,7 @@ end
 #
 # and so on.
 module Redcar
-  VERSION         = '0.5.3dev' # also change in the Rakefile!
+  VERSION         = '0.5.4dev' # also change in the Rakefile!
   VERSION_MAJOR   = 0
   VERSION_MINOR   = 5
   VERSION_RELEASE = 0
@@ -108,7 +107,6 @@ module Redcar
     $:.push File.expand_path(File.join(Redcar.asset_dir))
     
     $:.push File.expand_path(File.join(File.dirname(__FILE__), "openssl", "lib"))
-    require 'openssl'
     
     plugin_manager.load("swt")
   end

data/plugins/application/lib/application/window.rb

@@ -148,16 +148,12 @@ module Redcar
       focussed_notebook.new_tab(*args, &block)
     end
     
-    attr_reader :menu, :toolbar, :keymap
+    attr_reader :menu, :keymap
 
     def menu=(menu)
       @menu = menu
     end
 
-    def toolbar=(toolbar)
-      @toolbar = toolbar
-    end
-
     def keymap=(keymap)
       @keymap = keymap
     end
@@ -174,10 +170,6 @@ module Redcar
       notify_listeners(:refresh_menu)
     end
     
-    def refresh_toolbar
-      notify_listeners(:refresh_toolbar)
-    end
-    
     # Focus the Window.
     def focus
       Redcar.app.events.ignore(:window_focus, self) do

data/plugins/application/lib/application.rb

@@ -1,4 +1,6 @@
 
+require 'yaml'
+
 require 'application/command/executor'
 require 'application/command/history'
 require 'application/sensitive'
@@ -11,11 +13,6 @@ require 'application/dialogs/filter_list_dialog'
 require 'application/event_spewer'
 require 'application/keymap'
 require 'application/keymap/builder'
-require 'application/toolbar'
-require 'application/toolbar/item'
-require 'application/toolbar/lazy_toolbar'
-require 'application/toolbar/builder'
-require 'application/toolbar/builder/group'
 require 'application/menu'
 require 'application/menu/item'
 require 'application/menu/lazy_menu'
@@ -74,7 +71,7 @@ module Redcar
       ]
     end
     
-    attr_reader :clipboard, :keymap, :menu, :toolbar, :history, :task_queue, :show_toolbar
+    attr_reader :clipboard, :keymap, :menu, :history, :task_queue
     
     # Create an application instance with a Redcar::Clipboard and a Redcar::History.
     def initialize
@@ -84,7 +81,6 @@ module Redcar
       create_history
       @event_spewer = EventSpewer.new
       @task_queue   = TaskQueue.new
-      @show_toolbar = !!Application.storage['show_toolbar']
     end
     
     def events
@@ -113,7 +109,6 @@ module Redcar
       notify_listeners(:new_window, new_window)
       attach_window_listeners(new_window)
       new_window.refresh_menu
-      new_window.refresh_toolbar
       new_window.show
       set_focussed_window(new_window)
       #puts "App#new_window took #{Time.now - s}s"
@@ -142,7 +137,6 @@ module Redcar
       @storage ||= begin
          storage = Plugin::Storage.new('application_plugin')
          storage.set_default('stay_resident_after_last_window_closed', false)
-         storage.set_default('show_toolbar', true)
          storage
       end
     end
@@ -193,13 +187,6 @@ module Redcar
       notify_listeners(:refresh_menu)
     end
     
-    # Redraw the main toolbar, reloading all the ToolBars and Keymaps from the plugins.
-    def refresh_toolbar!
-      @main_toolbar = nil
-      windows.each {|window| window.refresh_toolbar }
-      controller.refresh_toolbar
-    end
-    
     # Generate the main menu by combining menus from all plugins.
     #
     # @return [Redcar::Menu]
@@ -213,19 +200,6 @@ module Redcar
       end
     end
     
-    # Generate the toolbar combining toolbars from all plugins.
-    #
-    # @return [Redcar::ToolBar]
-    def main_toolbar
-      @main_toolbar ||= begin
-        toolbar = ToolBar.new
-        Redcar.plugin_manager.objects_implementing(:toolbars).each do |object|
-          toolbar.merge(object.toolbars)
-        end
-        toolbar
-      end
-    end
-    
     # Generate the main keymap by merging the keymaps from all plugins.
     #
     # @return [Redcar::Keymap]
@@ -327,20 +301,6 @@ module Redcar
     def create_history
       @history = Command::History.new
     end
-
-    public 
-
-    def show_toolbar?
-      @show_toolbar
-    end
-
-    def show_toolbar=(bool)
-      Application.storage['show_toobar'] = @show_toolbar = bool
-    end
-
-    def toggle_show_toolbar
-      Application.storage['show_toolbar'] = @show_toolbar = !Application.storage['show_toolbar']
-    end
   end
 end
 

data/plugins/application_swt/lib/application_swt/window.rb

@@ -6,8 +6,6 @@ module Redcar
 
       SASH_WIDTH = 5
       TREEBOOK_WIDTH = 200
-      TOOLBAR_HEIGHT = 25
-      @toolbar_height = 25
 
       class ShellListener
         include org.eclipse.swt.events.ShellListener
@@ -51,7 +49,6 @@ module Redcar
       def add_listeners
         @window.add_listener(:show,          &method(:show))
         @window.add_listener(:refresh_menu,  &method(:refresh_menu))
-        @window.add_listener(:refresh_toolbar,  &method(:refresh_toolbar))
         @window.add_listener(:popup_menu,    &method(:popup_menu))
         @window.add_listener(:popup_menu_with_numbers, &method(:popup_menu_with_numbers))
         @window.add_listener(:title_changed, &method(:title_changed))
@@ -123,20 +120,6 @@ module Redcar
         old_menu_bar.dispose if old_menu_bar
       end
       
-      def refresh_toolbar
-	if Redcar.app.show_toolbar?
-		@toolbar_controller = ApplicationSWT::ToolBar.new(self, Redcar.app.main_toolbar, Swt::SWT::HORIZONTAL | Swt::SWT::BORDER)
-	        @toolbar_controller.show()
-		puts "Show toolbar"
-		@toolbar_height = 25
-	else
-		@toolbar_controller.hide() if @toolbar_controller
-		puts "Hide toolbar"
-		@toolbar_height = 0
-	end
-	reset_sash_height
-      end
-      
       def set_icon
         path = File.join(icon_dir, icon_file)
         icon = Swt::Graphics::Image.new(ApplicationSWT.display, path)
@@ -214,13 +197,11 @@ module Redcar
       def closed(_)
         @shell.close
         @menu_controller.close
-        @toolbar_controller.close
       end
 
       def dispose
         @shell.dispose
         @menu_controller.close
-        @toolbar_controller.close
       end
 
       attr_reader :right_composite, :left_composite, :tree_composite, :tree_layout, :tree_sash
@@ -263,7 +244,7 @@ module Redcar
 
         @sash.layout_data = Swt::Layout::FormData.new.tap do |d|
           d.left = Swt::Layout::FormAttachment.new(0, 0)
-          d.top =  Swt::Layout::FormAttachment.new(0, TOOLBAR_HEIGHT)
+          d.top =  Swt::Layout::FormAttachment.new(0, 0)
           d.bottom = Swt::Layout::FormAttachment.new(100, 0)
         end
 
@@ -285,14 +266,14 @@ module Redcar
         @left_composite.layout_data = Swt::Layout::FormData.new.tap do |l|
           l.left = Swt::Layout::FormAttachment.new(0, 5)
           l.right = Swt::Layout::FormAttachment.new(@sash, 0)
-          l.top = Swt::Layout::FormAttachment.new(0, 5 + TOOLBAR_HEIGHT)
+          l.top = Swt::Layout::FormAttachment.new(0, 5)
           l.bottom = Swt::Layout::FormAttachment.new(100, -5)
         end
 
         @right_composite.layout_data = Swt::Layout::FormData.new.tap do |d|
           d.left = Swt::Layout::FormAttachment.new(@sash, 0)
           d.right = Swt::Layout::FormAttachment.new(100, -5)
-          d.top = Swt::Layout::FormAttachment.new(0, 5 + TOOLBAR_HEIGHT)
+          d.top = Swt::Layout::FormAttachment.new(0, 5)
           d.bottom = Swt::Layout::FormAttachment.new(100, -5)
         end
 
@@ -330,16 +311,6 @@ module Redcar
         widths = [width]*@window.notebooks.length
       	@notebook_sash.setWeights(widths.to_java(:int))
       end
-      
-      def reset_sash_height
-
-        @sash.layout_data.top =  Swt::Layout::FormAttachment.new(0, @toolbar_height.to_i)
-        @left_composite.layout_data.top = Swt::Layout::FormAttachment.new(0, 5 + @toolbar_height.to_i)
-        @right_composite.layout_data.top = Swt::Layout::FormAttachment.new(0, 5 + @toolbar_height.to_i)
-	@shell.layout        
-        @shell.redraw
-      end
-      
     end
   end
-end
+end

data/plugins/application_swt/lib/application_swt.rb

@@ -1,5 +1,5 @@
 
-SWT_APP_NAME = "Redcar"
+require 'swt/full_swt'
 
 require "application_swt/tab"
 
@@ -10,8 +10,6 @@ require "application_swt/dialogs/filter_list_dialog_controller"
 require "application_swt/html_tab"
 require "application_swt/menu"
 require "application_swt/menu/binding_translator"
-require "application_swt/toolbar"
-require "application_swt/toolbar/binding_translator"
 require "application_swt/notebook"
 require "application_swt/notebook/tab_transfer"
 require "application_swt/notebook/tab_drag_and_drop_listener"
@@ -126,15 +124,6 @@ module Redcar
       end
     end
 
-    def refresh_toolbar
-      if Redcar.platform == :osx
-        #old_toolbar_bar = @fake_shell.toolbar_bar
-        fake_toolbar_controller = ApplicationSWT::ToolBar.new(FakeWindow.new(@fake_shell), Redcar.app.main_toolbar, Swt::SWT::FLAT)
-        #fake_shell.toolbar_bar = fake_toolbar_controller.toolbar_bar
-        #old_toolbar_bar.dispose if old_toolbar_bar
-      end
-    end
-
     def add_listeners
       @model.add_listener(:new_window, &method(:new_window))
       @model.add_listener(:refresh_menu, &method(:refresh_menu))

data/plugins/core/spec/core/resource_spec.rb

@@ -1,124 +1,125 @@
 
-require 'java'
-
-require File.join(File.dirname(__FILE__), *%w".. spec_helper")
-
-TaskQueue = Redcar::TaskQueue
-Task      = Redcar::Task
-Resource  = Redcar::Resource
-
-describe Resource do
-  before do
-    $started_tasks = []
-    @block_runs = 0
-    @started_flag = false
-    @finish_flag  = false
-    $wait_task_finish = false
-    @q = TaskQueue.new
-    Resource.stub!(:task_queue).and_return(@q)
-  end
-  
-  after do
-    @q.stop
-  end
-  
-  describe "synchronous get" do
-    it "should let you synchronously get the value" do
-      resource = Resource.new { 101 }
-      resource.value.should == 101
-    end
-    
-    it "should cache the value across multiple calls" do
-      resource = Resource.new { @block_runs += 1; 101 }
-      resource.value
-      resource.value
-      resource.value.should == 101
-      @block_runs.should == 1
-    end
-      
-    it "should wait for a background job to finish if one is already in progress" do
-      resource = Resource.new do
-        @block_runs += 1
-        1 until @finish_flag
-      end
-      resource.compute
-      Thread.new do
-        resource.value
-      end
-      sleep 0.1
-      @finish_flag = true
-      @block_runs.should == 1
-    end
-    
-    it "should not wait for a background job if it pending, because it may have a long wait" do
-      @q.submit(BlockingTask.new)
-      resource = Resource.new do
-        @block_runs += 1
-        911
-      end
-      resource.compute
-      Thread.new do
-        resource.value
-      end
-      sleep 0.1
-      resource.value.should == 911
-      @block_runs.should == 1
-    end
-    
-    it "should cancel background jobs that it overtakes" do
-      @q.submit(BlockingTask.new)
-      resource = Resource.new do
-        @block_runs += 1
-        911
-      end
-      resource.compute
-      task = resource.task
-      Thread.new do
-        resource.value
-      end
-      sleep 0.1
-      task.should be_cancelled
-    end
-  end
-  
-  it "should let you compute the resource in the background" do
-    resource = Resource.new do
-      1 until @started_flag
-      @block_runs += 1
-      @finish_flag = true
-    end
-    resource.compute
-    @block_runs.should == 0
-    @started_flag = true
-    1 until @finish_flag
-    @block_runs.should == 1
-  end
-  
-  it "should have the background computed value" do
-    resource = Resource.new do
-      @block_runs += 1
-      @started_flag = true
-      999
-    end
-    resource.compute
-    1 until @started_flag
-    sleep 0.1
-    resource.value.should == 999
-    @block_runs.should == 1
-  end
-  
-  it "should not compute lots of times" do
-    resource = Resource.new do
-      @block_runs += 1
-      1 until @finish_flag
-      999
-    end
-    20.times { resource.compute }
-    @finish_flag = true
-    resource.value.should == 999
-    1 until @block_runs == 2
-    @block_runs.should == 2
-  end
-end
-
-
+#require 'java'
+#
+#require File.join(File.dirname(__FILE__), *%w".. spec_helper")
+#
+#TaskQueue = Redcar::TaskQueue
+#Task      = Redcar::Task
+#Resource  = Redcar::Resource
+#
+#describe Resource do
+#  before do
+#    $started_tasks = []
+#    @block_runs = 0
+#    @started_flag = false
+#    @finish_flag  = false
+#    $wait_task_finish = false
+#    @q = TaskQueue.new
+#    Resource.stub!(:task_queue).and_return(@q)
+#  end
+#  
+#  after do
+#    @q.stop
+#  end
+#  
+#  describe "synchronous get" do
+#    it "should let you synchronously get the value" do
+#      resource = Resource.new { 101 }
+#      resource.value.should == 101
+#    end
+#    
+#    it "should cache the value across multiple calls" do
+#      resource = Resource.new { @block_runs += 1; 101 }
+#      resource.value
+#      resource.value
+#      resource.value.should == 101
+#      @block_runs.should == 1
+#    end
+#      
+#    it "should wait for a background job to finish if one is already in progress" do
+#      resource = Resource.new do
+#        @block_runs += 1
+#        1 until @finish_flag
+#      end
+#      resource.compute
+#      Thread.new do
+#        resource.value
+#      end
+#      sleep 0.1
+#      @finish_flag = true
+#      @block_runs.should == 1
+#    end
+#    
+#    it "should not wait for a background job if it pending, because it may have a long wait" do
+#      @q.submit(BlockingTask.new)
+#      resource = Resource.new do
+#        @block_runs += 1
+#        911
+#      end
+#      resource.compute
+#      Thread.new do
+#        resource.value
+#      end
+#      sleep 0.1
+#      resource.value.should == 911
+#      @block_runs.should == 1
+#    end
+#    
+#    it "should cancel background jobs that it overtakes" do
+#      @q.submit(BlockingTask.new)
+#      resource = Resource.new do
+#        @block_runs += 1
+#        911
+#      end
+#      resource.compute
+#      task = resource.task
+#      Thread.new do
+#        resource.value
+#      end
+#      sleep 0.1
+#      task.should be_cancelled
+#    end
+#  end
+#  
+#  it "should let you compute the resource in the background" do
+#    resource = Resource.new do
+#      1 until @started_flag
+#      @block_runs += 1
+#      @finish_flag = true
+#    end
+#    resource.compute
+#    @block_runs.should == 0
+#    @started_flag = true
+#    1 until @finish_flag
+#    @block_runs.should == 1
+#  end
+#  
+#  it "should have the background computed value" do
+#    resource = Resource.new do
+#      @block_runs += 1
+#      @started_flag = true
+#      999
+#    end
+#    resource.compute
+#    1 until @started_flag
+#    sleep 0.1
+#    resource.value.should == 999
+#    @block_runs.should == 1
+#  end
+#  
+#  it "should not compute lots of times" do
+#    resource = Resource.new do
+#      @block_runs += 1
+#      1 until @finish_flag
+#      999
+#    end
+#    20.times { resource.compute }
+#    @finish_flag = true
+#    resource.value.should == 999
+#    1 until @block_runs == 2
+#    @block_runs.should == 2
+#  end
+#end
+#
+#
+#

data/plugins/html_view/plugin.rb

@@ -7,6 +7,7 @@ Plugin.define do
   file "lib", "html_view"
   
   dependencies "core", ">0",
-               "application", ">0"
+               "application", ">0",
+               "application_swt", ">0"
   
 end

data/plugins/project/lib/project.rb

@@ -8,6 +8,8 @@ unless defined?(DRb)
   require 'drb/drb'
 end
 
+require 'openssl'
+
 require "project/adapters/remote_protocols/protocol"
 require "project/adapters/remote_protocols/sftp"
 require "project/adapters/remote_protocols/ftp"

data/plugins/redcar/redcar.rb

@@ -685,13 +685,6 @@ Redcar.environment: #{Redcar.environment}
       end
     end
 
-    class ToggleToolbar < Redcar::EditTabCommand
-      def execute
-        Redcar.app.toggle_show_toolbar
-        Redcar.app.refresh_toolbar!
-      end
-    end
-
     class SelectNewFont < Command
       def execute
         Redcar::EditView::SelectFontDialog.new.open
@@ -873,16 +866,6 @@ Redcar.environment: #{Redcar.environment}
       [linwin, osx]
     end
 
-    def self.toolbars
-      ToolBar::Builder.build do
-        item "New", :command => NewCommand, :icon => :new
-        item "Open", :command => Project::FileOpenCommand, :icon => :open
-        item "Save", :command => Project::FileSaveCommand, :icon => :save
-        item "Undo", :command => UndoCommand, :icon => :undo
-        item "Redo", :command => RedoCommand, :icon => :redo
-      end
-    end
-
     def self.menus
       Menu::Builder.build do
         sub_menu "File", :priority => :first do
@@ -1043,7 +1026,6 @@ Redcar.environment: #{Redcar.environment}
         if Redcar.gui
           Redcar.app.controller = ApplicationSWT.new(Redcar.app)
         end
-      Redcar.app.refresh_toolbar!
         Redcar.app.refresh_menu!
         Redcar.app.load_sensitivities
         puts "initializing gui took #{Time.now - s}s"