redcar-dev 0.12.17dev → 0.12.18dev

data/plugins/application/spec/application/application_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 describe Redcar::Application do
   it "has a name" do

data/plugins/application/spec/application/clipboard_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 describe Redcar::Clipboard do
   before do

data/plugins/application/spec/application/command/executor_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
+require "spec_helper"
 
 class Redcar::Command
   describe Executor do

data/plugins/application/spec/application/command/history_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
+require "spec_helper"
 
 describe Redcar::Command::History do
   class HistoryTestCommand1 < Redcar::Command

data/plugins/application/spec/application/command_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 describe Redcar::Command do
   describe "a command" do

data/plugins/application/spec/application/keymap/builder_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
+require "spec_helper"
 
 describe "Redcar::Keymap::Builder DSL" do
   it "creates a keymap" do

data/plugins/application/spec/application/menu/builder_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
+require "spec_helper"
 
 describe "Redcar::Menu::Builder DSL" do
   it "creates a menu" do

data/plugins/application/spec/application/menu/menu_item_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
+require "spec_helper"
 
 describe Redcar::Menu::Item do
   class DummyCommand; end

data/plugins/application/spec/application/menu_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 describe Redcar::Menu do
   class DummyCommand; end

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

@@ -1,3 +1,5 @@
+require "spec_helper"
+
 describe Redcar::NavigationHistory do
   module NavigationHistoryTest
     class TestEditView

data/plugins/application/spec/application/notebook_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 describe Redcar::Notebook do
   describe "with no tabs" do

data/plugins/application/spec/application/sensitive_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 describe Redcar::Sensitive do
   class ExampleModel

data/plugins/application/spec/application/speedbar_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 describe Redcar::Speedbar do
   it "should let you add labels" do

data/plugins/application/spec/application/treebook_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 describe Redcar::Treebook do
 

data/plugins/application/spec/application/window_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 describe Redcar::Window do
   

data/plugins/application/spec/spec_helper.rb

@@ -1,8 +1,4 @@
-$:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
-require 'redcar'
-Redcar.environment = :test
-Redcar.no_gui_mode!
-Redcar.load_unthreaded
+
 Dir[File.dirname(__FILE__) + "/application/controllers/*.rb"].each do |fn|
   require fn
 end
@@ -15,4 +11,6 @@ class MockTree
   end
 
   def focus; end
-end
+end
+
+Redcar.plugin_manager.load("application")

data/plugins/application_swt/lib/application_swt/dialogs/filter_list_dialog_controller.rb

@@ -18,7 +18,7 @@ module Redcar
           layout = Swt::Layout::RowLayout.new(Swt::SWT::VERTICAL)
           composite.setLayout(layout)
 
-          @text = Swt::Widgets::Text.new(composite, Swt::SWT::SINGLE | Swt::SWT::LEFT | Swt::SWT::ICON_CANCEL)
+          @text = Swt::Widgets::Text.new(composite, Swt::SWT::SINGLE | Swt::SWT::LEFT | Swt::SWT::ICON_CANCEL | Swt::SWT::SEARCH)
           @text.set_layout_data(Swt::Layout::RowData.new(400, 20))
           @list = Swt::Widgets::List.new(composite, Swt::SWT::V_SCROLL | Swt::SWT::H_SCROLL | Swt::SWT::SINGLE)
           @list.set_layout_data(Swt::Layout::RowData.new(400, 200))

data/plugins/application_swt/lib/application_swt/gradient.rb

@@ -24,9 +24,9 @@ module Redcar
         stops_with_implicit_zero.to_java(:int)
       end
   
-      def swt_colors
+      def colors
         hex_rgb_strings = @color_stops.sort.map { |position, color| color }
-        swt_colors = hex_rgb_strings.map do |hex_rgb_string|
+        colors = hex_rgb_strings.map do |hex_rgb_string|
           if hex_rgb_string =~ /^ (\W+)? ([0-9A-Fa-f]{3}{1,2}) (\W+)? $/x
             hex_string = Regexp.last_match.captures[1]
             if(hex_string.size == 3) # Shorthand
@@ -35,17 +35,27 @@ module Redcar
             
             color_components = hex_string.scan(/.{2}/)          
             int_components = color_components.map { |component| component.to_i(16) }
-            Swt::Graphics::Color.new(ApplicationSWT.display, *int_components[0...3])
+            [:components, int_components[0...3]]
             
           elsif Swt::SWT.const_defined?(const_name = "COLOR_#{ hex_rgb_string.upcase }")
             swt_const = Swt::SWT.const_get(const_name)
-            ApplicationSWT.display.get_system_color(swt_const)
+            [:constant, swt_const]
               
           else
             raise "Colors must be RGB hex strings or SWT color names"
           end
         end
-        
+      end
+  
+      def swt_colors
+        swt_colors = colors.map do |color|
+          case color.first
+          when :components
+            Swt::Graphics::Color.new(ApplicationSWT.display, *color.last)
+          when :constant
+            ApplicationSWT.display.get_system_color(color.last)
+          end
+        end
         swt_colors.to_java(Swt::Graphics::Color)
       end
       

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

@@ -173,7 +173,7 @@ module Redcar
       end
 
       def icon_file
-        if Redcar::VERSION =~ /dev$/
+        if Redcar::VERSION =~ /dev$/ and !ARGV.include?("--red-icon")
           :redcar_icon_beta_dev
         else
           :redcar_icon_beta

data/plugins/application_swt/spec/application_swt/gradient_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 describe Redcar::ApplicationSWT::Gradient do
   
@@ -28,9 +28,9 @@ describe Redcar::ApplicationSWT::Gradient do
   describe "swt_colors" do
   
     it "should be Swt::Color versions of the gradient colors in increasing order by stop position" do
-      subject.swt_colors[0].should == Swt::Graphics::Color.new(Redcar::ApplicationSWT.display, 255, 255, 255)
-      subject.swt_colors[1].should == Swt::Graphics::Color.new(Redcar::ApplicationSWT.display, 153, 153, 153)
-      subject.swt_colors[2].should == Swt::Graphics::Color.new(Redcar::ApplicationSWT.display, 0, 0, 0)
+      subject.colors[0].should == [:components, [255, 255, 255]]
+      subject.colors[1].should == [:components, [153, 153, 153]]
+      subject.colors[2].should == [:components, [0, 0, 0]]
     end
     
   end
@@ -50,9 +50,9 @@ describe Redcar::ApplicationSWT::Gradient do
     describe "swt_colors" do
       
       it "should have the gradient's first color as its first two elements" do
-        first_color = Swt::Graphics::Color.new(Redcar::ApplicationSWT.display, 0, 0, 0)
-        subject.swt_colors[0].should == first_color
-        subject.swt_colors[1].should == first_color
+        first_color = [:components, [0, 0, 0]]
+        subject.colors[0].should == first_color
+        subject.colors[1].should == first_color
       end
       
     end
@@ -74,9 +74,9 @@ describe Redcar::ApplicationSWT::Gradient do
     describe "swt_colors" do
       
       it "should have the gradient's last color as its last two elements" do
-        last_color = Swt::Graphics::Color.new(Redcar::ApplicationSWT.display, 255, 255, 255)
-        subject.swt_colors[1].should == last_color
-        subject.swt_colors[2].should == last_color
+        last_color = [:components, [255, 255, 255]]
+        subject.colors[1].should == last_color
+        subject.colors[2].should == last_color
       end
       
     end
@@ -104,7 +104,7 @@ describe Redcar::ApplicationSWT::Gradient do
     subject { Redcar::ApplicationSWT::Gradient.new( 50 => "#F0F" ) }
     
     it "should process the colors correctly" do
-      subject.swt_colors[0].should == Swt::Graphics::Color.new(Redcar::ApplicationSWT.display, 255, 0, 255)
+      subject.colors[0].should == [:components, [255, 0, 255]]
     end
     
   end
@@ -114,7 +114,7 @@ describe Redcar::ApplicationSWT::Gradient do
     subject { Redcar::ApplicationSWT::Gradient.new( "#FFFFFF" ) }
   
     it "it should construct a gradient with that color" do
-      subject.swt_colors[0].should == Swt::Graphics::Color.new(Redcar::ApplicationSWT.display, 255, 255, 255)
+      subject.colors[0].should == [:components, [255, 255, 255]]
     end
   
   end
@@ -124,8 +124,7 @@ describe Redcar::ApplicationSWT::Gradient do
     subject { Redcar::ApplicationSWT::Gradient.new( "black" ) }
     
     it "should return the SWT system color corresponding to that name" do
-      Redcar::ApplicationSWT.instance_variable_set("@display", Swt::Widgets::Display.current) if Redcar::ApplicationSWT.display.nil?
-      subject.swt_colors[0].should == Redcar::ApplicationSWT.display.get_system_color(Swt::SWT::COLOR_BLACK)
+      subject.colors[0].should == [:constant, Swt::SWT::COLOR_BLACK]
     end
     
   end

data/plugins/application_swt/spec/application_swt/menu/binding_translator_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "..", "spec_helper")
+require "spec_helper"
 
 BindingTranslator = Redcar::ApplicationSWT::Menu::BindingTranslator
 describe BindingTranslator do

data/plugins/application_swt/spec/application_swt/menu_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 describe Redcar::ApplicationSWT::Menu do
   it "should" do

data/plugins/application_swt/spec/spec_helper.rb

@@ -1,20 +1,2 @@
-$:.push File.join(File.dirname(__FILE__), '..', '..', '..', 'lib')
-
-require 'redcar'
-Redcar.environment = :test
-Redcar.load_unthreaded
-
-Spec::Runner.configure do |config|
-  config.before(:suite) do
-  end
-
-  config.before(:each) do
-  end
-
-  config.after(:each) do
-  end
-
-  config.after(:suite) do
-  end
-end
 
+Redcar.plugin_manager.load("application_swt")

data/plugins/auto_completer/features/auto_complete.feature

@@ -3,21 +3,21 @@ Feature: Auto Complete
   Scenario: Autocomplete with no completions
     When I open a new edit tab
     And I replace the contents with "Tess"
-    And I move the cursor to 4
+    And I move the cursor to (0,4)
     And I auto-complete
     Then I should see "Tess" in the edit tab
 
   Scenario: Autocomplete with one completions
     When I open a new edit tab
     And I replace the contents with "Daly Da"
-    And I move the cursor to 7
+    And I move the cursor to (0,7)
     And I auto-complete
     Then I should see "Daly Daly" in the edit tab
 
   Scenario: Autocomplete with one completions, twice
     When I open a new edit tab
     And I replace the contents with "Daly Da"
-    And I move the cursor to 7
+    And I move the cursor to (0,7)
     And I auto-complete
     And I auto-complete
     Then I should see "Daly Da" in the edit tab
@@ -26,14 +26,14 @@ Feature: Auto Complete
   Scenario: Autocomplete with two completions
     When I open a new edit tab
     And I replace the contents with "Dan Daly Da"
-    And I move the cursor to 11
+    And I move the cursor to (0,11)
     And I auto-complete
     Then I should see "Dan Daly Daly" in the edit tab
 
   Scenario: Autocomplete with two completions, twice
     When I open a new edit tab
     And I replace the contents with "Dan Daly Da"
-    And I move the cursor to 11
+    And I move the cursor to (0,11)
     And I auto-complete
     And I auto-complete
     Then I should see "Dan Daly Dan" in the edit tab
@@ -41,7 +41,7 @@ Feature: Auto Complete
   Scenario: Autocomplete with two completions, thrice
     When I open a new edit tab
     And I replace the contents with "Dan Daly Da"
-    And I move the cursor to 11
+    And I move the cursor to (0,11)
     And I auto-complete
     And I auto-complete
     And I auto-complete
@@ -58,7 +58,7 @@ Feature: Auto Complete
   Scenario: Autocomplete with one completions at the end of a line
     When I open a new edit tab
     And I replace the contents with "Daly Da\nfoo"
-    And I move the cursor to 7
+    And I move the cursor to (0,7)
     And I auto-complete
     Then I should see "Daly Daly\nfoo" in the edit tab
 

data/plugins/auto_completer/features/step_definitions/auto_complete_steps.rb

@@ -1,4 +1,6 @@
 
 When /I auto-complete/ do
-  Redcar::AutoCompleter::AutoCompleteCommand.new.run
+  Swt.sync_exec do
+    Redcar::AutoCompleter::AutoCompleteCommand.new.run
+  end
 end

data/plugins/auto_indenter/features/java_style_indentation.feature

@@ -10,8 +10,9 @@ Feature: Indents Java code correctly
 				"""
 				  if(condition) {
 				    // stuff goes here...
-				  } <c>
+				  } 
 				"""
+    And I move the cursor to (2,4)
     When I type "e"
     Then the content should be:
 				"""
@@ -23,9 +24,10 @@ Feature: Indents Java code correctly
   Scenario: It should expand blocks
     Given the content is:
 				"""
-				  if(condition) {<c>}
+				  if(condition) {}
 				"""
-    When I insert "\n" at the cursor
+    And I move the cursor to (0,17)
+    When I type "\n"
     Then the content should be:
 				"""
 				  if(condition) {

data/plugins/auto_indenter/features/ruby_style_indentation.feature

@@ -6,32 +6,32 @@ Feature: Indents Ruby code correctly
     And tabs are hard
     
   Scenario: It should increase indentation after 'def's
-    When I insert "def f" at the cursor
-    And I move the cursor to 5
-    And I insert "\n" at the cursor
+    Given I replace the contents with "def f"
+    And I move the cursor to (0,5)
+    And I type "\n"
     Then the contents should be "def f\n\t"
     
   Scenario: It should decrease indentation on 'end' line
-    When I insert "def f\n\t1\n\ten" at the cursor
-    And I move the cursor to 12
-    And I insert "d" at the cursor
+    When I replace the contents with "def f\n\t1\n\ten"
+    And I move the cursor to (2,3)
+    And I type "d"
     Then the contents should be "def f\n\t1\nend"
     
   Scenario: It should keep indentation the same if no change
-    When I insert "\tfoo" at the cursor
-    And I move the cursor to 4
-    And I insert "\n" at the cursor
+    When I replace the contents with "\tfoo"
+    And I move the cursor to (0,4)
+    And I type "\n"
     Then the contents should be "\tfoo\n\t"
     
   Scenario: It should autoindent correctly
-    When I insert "\tdef my_awesome_method\n\t\tfoo\n\tend" at the cursor
-    And I select from 0 to 33
+    When I replace the contents with "\tdef my_awesome_method\n\t\tfoo\n\tend"
+    And I select from (0,0) to (2,4)
     And I auto-indent
     Then the contents should be "def my_awesome_method\n\tfoo\nend"
     
   Scenario: It should autoindent correctly
-    When I insert "\tdef my_awesome_method\n\t\tfoo\n\tend" at the cursor
-    And I select from 0 to 33
+    When I replace the contents with "\tdef my_awesome_method\n\t\tfoo\n\tend"
+    And I select from (0,0) to (2,4)
     And I auto-indent
     Then the contents should be "def my_awesome_method\n\tfoo\nend"
     When I undo

data/plugins/auto_indenter/features/step_definitions/indentation_steps.rb

@@ -11,5 +11,7 @@ Given /^the indentation rules are like Java's$/ do
 end
 
 When /^I auto-indent/ do
-  Redcar::AutoIndenter::IndentCommand.new.run
+  Swt.sync_exec do
+    Redcar::AutoIndenter::IndentCommand.new.run
+  end
 end

data/plugins/auto_indenter/spec/auto_indenter/analyzer_spec.rb

@@ -1,5 +1,5 @@
 
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 include Redcar