redcar 0.5.3dev → 0.5.4dev

data/plugins/swt/lib/swt/full_swt.rb

@@ -0,0 +1,117 @@
+
+module Swt
+  import org.eclipse.swt.SWT
+
+  module Widgets
+    import org.eclipse.swt.widgets.Button
+    import org.eclipse.swt.widgets.Caret
+    import org.eclipse.swt.widgets.Combo
+    import org.eclipse.swt.widgets.Composite
+    import org.eclipse.swt.widgets.Event
+    import org.eclipse.swt.widgets.DirectoryDialog
+    import org.eclipse.swt.widgets.FileDialog
+    import org.eclipse.swt.widgets.List
+    import org.eclipse.swt.widgets.Menu
+    import org.eclipse.swt.widgets.MenuItem
+    import org.eclipse.swt.widgets.MessageBox
+    import org.eclipse.swt.widgets.Sash
+    import org.eclipse.swt.widgets.TabFolder
+    import org.eclipse.swt.widgets.TabItem
+    import org.eclipse.swt.widgets.Text
+    import org.eclipse.swt.widgets.ToolTip
+    import org.eclipse.swt.widgets.Table
+    import org.eclipse.swt.widgets.TableItem
+  end
+  
+  module Custom
+    import org.eclipse.swt.custom.CTabFolder
+    import org.eclipse.swt.custom.CTabItem
+    import org.eclipse.swt.custom.SashForm
+    import org.eclipse.swt.custom.StackLayout
+    import org.eclipse.swt.custom.ST
+    import org.eclipse.swt.custom.StyledText
+    import org.eclipse.swt.custom.TreeEditor
+  end
+  
+  module DND
+    import org.eclipse.swt.dnd.DND
+    import org.eclipse.swt.dnd.Clipboard
+    import org.eclipse.swt.dnd.Transfer
+    import org.eclipse.swt.dnd.TextTransfer
+    import org.eclipse.swt.dnd.FileTransfer
+    import org.eclipse.swt.dnd.ByteArrayTransfer
+    
+    import org.eclipse.swt.dnd.DropTarget
+    import org.eclipse.swt.dnd.DropTargetEvent
+    import org.eclipse.swt.dnd.DropTargetListener
+    
+    import org.eclipse.swt.dnd.DragSource
+    import org.eclipse.swt.dnd.DragSourceEvent
+    import org.eclipse.swt.dnd.DragSourceListener
+  end
+  
+  module Layout
+    import org.eclipse.swt.layout.FillLayout
+    import org.eclipse.swt.layout.GridLayout
+    import org.eclipse.swt.layout.GridData
+    import org.eclipse.swt.layout.RowLayout
+    import org.eclipse.swt.layout.RowData
+  end
+  
+  module Graphics
+    import org.eclipse.swt.graphics.Color
+    import org.eclipse.swt.graphics.Device
+    import org.eclipse.swt.graphics.Font
+    import org.eclipse.swt.graphics.GC
+    import org.eclipse.swt.graphics.Point
+  end
+  
+  module Events
+    import org.eclipse.swt.events.KeyEvent
+  end
+  
+  import org.eclipse.swt.browser.Browser
+  class Browser
+    import org.eclipse.swt.browser.BrowserFunction
+  end
+  
+  class RRunnable
+    include java.lang.Runnable
+
+    def initialize(&block)
+      @block = block
+    end
+
+    def run
+      @block.call
+    end
+  end
+end
+
+module JFace
+  Dir[Redcar.asset_dir + "/jface/*.jar"].each do |jar_fn|
+    require jar_fn
+  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
+    import org.eclipse.jface.viewers.ILazyTreeContentProvider
+    import org.eclipse.jface.viewers.ILabelProvider
+    import org.eclipse.jface.viewers.TextCellEditor
+    import org.eclipse.jface.viewers.ViewerDropAdapter
+  end
+  
+  module Text
+    import org.eclipse.jface.text.TextViewerUndoManager
+  end
+  
+  module Dialogs
+    import org.eclipse.jface.dialogs.Dialog
+    import org.eclipse.jface.dialogs.InputDialog
+  end
+end
+
+require 'swt/grid_data'

data/plugins/swt/lib/swt.rb

@@ -3,7 +3,6 @@ require 'rbconfig'
 
 require 'swt/cucumber_runner'
 require 'swt/event_loop'
-require 'swt/grid_data'
 require 'swt/listener_helpers'
 
 module Swt
@@ -127,96 +126,29 @@ module Swt
   end
 
   module Widgets
-    import org.eclipse.swt.widgets.Button
-    import org.eclipse.swt.widgets.Caret
-    import org.eclipse.swt.widgets.Combo
-    import org.eclipse.swt.widgets.Composite
     import org.eclipse.swt.widgets.Display
-    import org.eclipse.swt.widgets.Event
-    import org.eclipse.swt.widgets.DirectoryDialog
-    import org.eclipse.swt.widgets.FileDialog
     import org.eclipse.swt.widgets.Label
-    import org.eclipse.swt.widgets.List
-    import org.eclipse.swt.widgets.Menu
-    import org.eclipse.swt.widgets.MenuItem
-    import org.eclipse.swt.widgets.MessageBox
     import org.eclipse.swt.widgets.ProgressBar
-    import org.eclipse.swt.widgets.Sash
     import org.eclipse.swt.widgets.Shell
-    import org.eclipse.swt.widgets.TabFolder
-    import org.eclipse.swt.widgets.TabItem
-    import org.eclipse.swt.widgets.Text
-    import org.eclipse.swt.widgets.ToolTip
-    import org.eclipse.swt.widgets.Table
-    import org.eclipse.swt.widgets.TableItem
   end
   
-  def self.display
-    return nil if Redcar.no_gui_mode?
-    if defined?(SWT_APP_NAME)
-      Swt::Widgets::Display.app_name = SWT_APP_NAME
-    end
-    @display ||= (Swt::Widgets::Display.getCurrent || Swt::Widgets::Display.new)
-  end
-
-  unless Redcar.no_gui_mode?
-    display # must be created before we import the Clipboard class.
-  end
-
   module Custom
-    import org.eclipse.swt.custom.CTabFolder
-    import org.eclipse.swt.custom.CTabItem
-    import org.eclipse.swt.custom.SashForm
-    import org.eclipse.swt.custom.StackLayout
-    import org.eclipse.swt.custom.ST
-    import org.eclipse.swt.custom.StyledText
-    import org.eclipse.swt.custom.TreeEditor
   end
   
   module DND
-    import org.eclipse.swt.dnd.DND
-    import org.eclipse.swt.dnd.Clipboard
-    import org.eclipse.swt.dnd.Transfer
-    import org.eclipse.swt.dnd.TextTransfer
-    import org.eclipse.swt.dnd.FileTransfer
-    import org.eclipse.swt.dnd.ByteArrayTransfer
-    
-    import org.eclipse.swt.dnd.DropTarget
-    import org.eclipse.swt.dnd.DropTargetEvent
-    import org.eclipse.swt.dnd.DropTargetListener
-    
-    import org.eclipse.swt.dnd.DragSource
-    import org.eclipse.swt.dnd.DragSourceEvent
-    import org.eclipse.swt.dnd.DragSourceListener
   end
   
   module Layout
-    import org.eclipse.swt.layout.FillLayout
     import org.eclipse.swt.layout.FormAttachment
-    import org.eclipse.swt.layout.FormLayout
     import org.eclipse.swt.layout.FormData
-    import org.eclipse.swt.layout.GridLayout
-    import org.eclipse.swt.layout.GridData
-    import org.eclipse.swt.layout.RowLayout
-    import org.eclipse.swt.layout.RowData
+    import org.eclipse.swt.layout.FormLayout
   end
   
   module Graphics
-    import org.eclipse.swt.graphics.Color
-    import org.eclipse.swt.graphics.Device
-    import org.eclipse.swt.graphics.Font
-    import org.eclipse.swt.graphics.GC
     import org.eclipse.swt.graphics.Image
-    import org.eclipse.swt.graphics.Point
   end
   
   module Events
-    import org.eclipse.swt.events.KeyEvent
-  end
-  
-  import org.eclipse.swt.browser.Browser
-  class Browser
-    import org.eclipse.swt.browser.BrowserFunction
   end
   
   class RRunnable
@@ -230,6 +162,18 @@ module Swt
       @block.call
     end
   end
+  
+  def self.display
+    return nil if Redcar.no_gui_mode?
+    if defined?(SWT_APP_NAME)
+      Swt::Widgets::Display.app_name = SWT_APP_NAME
+    end
+    @display ||= (Swt::Widgets::Display.getCurrent || Swt::Widgets::Display.new)
+  end
+
+  unless Redcar.no_gui_mode?
+    display # must be created before we import the Clipboard class.
+  end
 end
 
 module JFace
@@ -238,22 +182,11 @@ 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
-    import org.eclipse.jface.viewers.ILazyTreeContentProvider
-    import org.eclipse.jface.viewers.ILabelProvider
-    import org.eclipse.jface.viewers.TextCellEditor
-    import org.eclipse.jface.viewers.ViewerDropAdapter
   end
   
   module Text
-    import org.eclipse.jface.text.TextViewerUndoManager
   end
   
   module Dialogs
-    import org.eclipse.jface.dialogs.Dialog
-    import org.eclipse.jface.dialogs.InputDialog
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: redcar
 version: !ruby/object:Gem::Version 
-  hash: 2050143162
+  hash: -1574061313
   prerelease: true
   segments: 
   - 0
   - 5
-  - 3dev
-  version: 0.5.3dev
+  - 4dev
+  version: 0.5.4dev
 platform: ruby
 authors: 
 - Daniel Lucraft
@@ -661,11 +661,6 @@ files:
 - plugins/application/lib/application/speedbar.rb
 - plugins/application/lib/application/tab/command.rb
 - plugins/application/lib/application/tab.rb
-- plugins/application/lib/application/toolbar/builder/group.rb
-- plugins/application/lib/application/toolbar/builder.rb
-- plugins/application/lib/application/toolbar/item.rb
-- plugins/application/lib/application/toolbar/lazy_toolbar.rb
-- plugins/application/lib/application/toolbar.rb
 - plugins/application/lib/application/treebook.rb
 - plugins/application/lib/application/window.rb
 - plugins/application/lib/application.rb
@@ -702,8 +697,6 @@ files:
 - plugins/application_swt/lib/application_swt/notebook.rb
 - plugins/application_swt/lib/application_swt/speedbar.rb
 - plugins/application_swt/lib/application_swt/tab.rb
-- plugins/application_swt/lib/application_swt/toolbar/binding_translator.rb
-- plugins/application_swt/lib/application_swt/toolbar.rb
 - plugins/application_swt/lib/application_swt/treebook.rb
 - plugins/application_swt/lib/application_swt/window.rb
 - plugins/application_swt/lib/application_swt.rb
@@ -1548,6 +1541,7 @@ files:
 - plugins/swt/lib/swt/cucumber_patches.rb
 - plugins/swt/lib/swt/cucumber_runner.rb
 - plugins/swt/lib/swt/event_loop.rb
+- plugins/swt/lib/swt/full_swt.rb
 - plugins/swt/lib/swt/grid_data.rb
 - plugins/swt/lib/swt/listener_helpers.rb
 - plugins/swt/lib/swt.rb

data/plugins/application/lib/application/toolbar/builder/group.rb

@@ -1,47 +0,0 @@
-
-module Redcar
-  class ToolBar
-    class Builder
-      # An extension to the Builder to allow groups of toolbar object to inherit options.
-      #
-      # This is supported for all options, even options that don't exist yet!
-      #
-      # Currently, this is only useful in a practical sense to apply a :priority to a 
-      # set of objects
-      class Group
-        
-        def initialize(builder, options={}, &block)
-          @builder = builder
-          @defaults = options
-          
-          if block.arity == 1
-            block.call(self)
-          else
-            instance_eval(&block)
-          end
-        end
-        
-        def item(text, options={}, &block)
-          options = {:command => options} if not options.respond_to?('[]')
-          @builder.item(text, @defaults.merge(options), &block)
-        end
-        
-        def separator(options={})
-          @builder.separator(@defaults.merge(options))
-        end
-        
-        def sub_toolbar(text, options={}, &block)
-          @builder.sub_toolbar(text, @defaults.merge(options), &block)
-        end
-        
-        def lazy_sub_toolbar(text, options={}, &block)
-          @builder.lazy_sub_toolbar(text, @defaults.merge(options), &block)
-        end
-
-        def append(item)
-          @builder.append(item)
-        end
-      end
-    end
-  end
-end

data/plugins/application/lib/application/toolbar/builder.rb

@@ -1,80 +0,0 @@
-
-module Redcar
-  class ToolBar
-    # A DSL for building toolbars simply. An example of usage
-    #
-    #     builder = ToolBar::Builder.new "Edit" do
-    #       item "Select All", SelectAllCommand
-    #       sub_toolbar "Indent" do
-    #         item "Increase", IncreaseIndentCommand
-    #         item("Decrease") { puts "decrease selected" }
-    #       end
-    #     end
-    #
-    # This is equivalent to:
-    # 
-    #     toolbar = Redcar::ToolBar.new("Edit")
-    #     toolbar << Redcar::ToolBar::Item.new("Select All", SelectAllCommand)
-    #     indent_toolbar = Redcar::ToolBar.new("Indent") 
-    #     indent_toolbar << Redcar::ToolBar::Item.new("Increase", IncreaseIndentCommand)
-    #     indent_toolbar << Redcar::ToolBar::Item.new("Decrease") do
-    #       puts "decrease selected"
-    #     end
-    #     toolbar << indent_toolbar
-    class Builder
-      attr_reader :toolbar
-      
-      def self.build(name=nil, &block)
-        new(name, &block).toolbar
-      end
-      
-      def initialize(toolbar_or_text=nil, &block)
-        case toolbar_or_text
-        when String, nil
-          @toolbar = Redcar::ToolBar.new(toolbar_or_text||"")
-        when ToolBar
-          @toolbar = toolbar_or_text
-        end
-        @current_toolbar = @toolbar
-        if block.arity == 1
-          block.call(self)
-        else
-          instance_eval(&block)
-        end
-      end
-      
-      def item(text, options={}, &block)
-        @current_toolbar << Item.new(text, options, &block)
-      end
-      
-      def separator(options={})
-        @current_toolbar << Item::Separator.new(options)
-      end
-      
-      def sub_toolbar(text, options={}, &block)
-        new_toolbar = ToolBar.new(text, options)
-        @current_toolbar << new_toolbar
-        old_toolbar, @current_toolbar = @current_toolbar, new_toolbar
-        if block.arity == 1
-          block.call(self)
-        else
-          instance_eval(&block)
-        end
-        @current_toolbar = old_toolbar
-      end
-      
-      def lazy_sub_toolbar(text, options={}, &block)
-        new_toolbar = LazyToolBar.new(block, text, options)
-        @current_toolbar << new_toolbar
-      end
-      
-      def group(options={}, &block)
-        Builder::Group.new(self, options, &block)
-      end
-      
-      def append(item)
-        @current_toolbar << item
-      end
-    end
-  end
-end

data/plugins/application/lib/application/toolbar/item.rb

@@ -1,72 +0,0 @@
-
-module Redcar
-  class ToolBar
-    class Item
-      class Separator < Item
-        def initialize(options={})
-          super(nil, options)
-        end
-        
-        def is_unique?
-          true
-        end
-      end
-
-      attr_reader :text, :command, :priority, :value, :type, :icon
- 
-      # Create a new Item, with the given text to display in the toolbar, and
-      # either:
-      #   the Redcar::Command that is run when the item is selected.
-      #   or a block to run when the item is selected
-      def initialize(text, options={}, &block)
-        @text = text
-        
-        if options.respond_to?('[]')
-          @command = options[:command] || block
-	  @icon = options[:icon]
-          @value = options[:value]
-          @priority = options[:priority]
-          @type = options[:type]
-          @active = options[:active] ? true : false
-        # This branch is for compatibility with old code. Please use :command 
-        # option in new code
-        # FIXME: Should this be removed at some point?
-        else
-          @command = options || block
-        end
-        
-        @priority ||= ToolBar::DEFAULT_PRIORITY
-      end
-      
-      # Call this to signal that the toolbar item has been selected by the user.
-      def selected(with_key=false)
-        if @value
-          @command.new.run(:value => @value)
-        else  
-          @command.new.run#(:with_key => with_key)
-        end
-      end
-      
-      def type
-        @type
-      end
-      
-      def type
-        @type
-      end
-      
-      def merge(other)
-        @command = other.command
-        @priority = other.priority
-      end
-      
-      def ==(other)
-        text == other.text and command == other.command
-      end
-      
-      def is_unique?
-        false
-      end
-    end
-  end
-end

data/plugins/application/lib/application/toolbar/lazy_toolbar.rb

@@ -1,25 +0,0 @@
-
-module Redcar
-  class ToolBar
-    class LazyToolBar < ToolBar
-      
-      def initialize(block, text=nil, options={})
-        @text = text
-        @block = block
-        @priority = options[:priority] || ToolBar::DEFAULT_PRIORITY
-      end
-      
-      def entries
-        ToolBar::Builder.build(&@block).entries
-      end
-      
-      def <<(*_)
-        raise
-      end
-      
-      def merge(*_)
-        raise
-      end
-    end
-  end
-end

data/plugins/application/lib/application/toolbar.rb

@@ -1,91 +0,0 @@
-
-module Redcar
-  class ToolBar
-    include Enumerable
-    include Redcar::Model
-    
-    # Default priority for all toolbar's and items if they aren't explicitly provided
-    DEFAULT_PRIORITY = 50
-    
-    attr_reader :text, :entries, :priority
-  
-    # A ToolBar will initially have nothing in it.
-    def initialize(text=nil, options={})
-      @text, @entries, @priority = text || "", [], options[:priority]
-    end
-  
-    # Iterate over each entry, sorted by priority
-    def each
-      sorted = {:first => [], :last => []}
-      entries.each {|e| (sorted[e.priority || ToolBar::DEFAULT_PRIORITY] ||= []) << e}
-      
-      # Get the nasty Symbols out of the hash so we can sort it
-      first = sorted.delete(:first)
-      last = sorted.delete(:last)
-      
-      # Yield up the results
-      first.each {|val| yield val }
-      sorted.keys.sort.each {|i| sorted[i].each {|val| yield val }}
-      last.each {|val| yield val }
-    end
-  
-    # Add a Redcar::ToolItem or a Redcar::ToolBar
-    def <<(entry)
-      entries << entry
-      self
-    end
-  
-    # Number of entries in the toolbar
-    def length
-      entries.length
-    end
-    
-    # Fetch the sub_toolbar with the given name
-    #
-    # @param [String]
-    # @return [ToolBar]
-    def sub_toolbar(text)
-      detect {|e| e.text == text and e.is_a?(ToolBar) }
-    end
-    
-    def entry(text)
-      detect {|e| e.text == text }
-    end
-    
-    # Append items and sub_toolbars using the same syntax as ToolBar::Builder
-    def build(&block)
-      ToolBar::Builder.new(self, &block)
-    end
-    
-    def ==(other)
-      return false unless length == other.length
-      return false unless text == other.text
-      entries.zip(other.entries) do |here, there|
-        return false unless here.class == there.class and here == there
-      end
-      true
-    end
-    
-    def is_unique?
-      false
-    end
-    
-    # Merge two ToolBar trees together. Modifies this ToolBar.
-    #
-    # @param [ToolBar] another ToolBar
-    def merge(other)
-      @priority = @priority || other.priority
-      other.entries.each do |other_entry|
-        if here = entry(other_entry.text) and not other_entry.is_unique?
-          if here.class == other_entry.class
-            here.merge(other_entry)
-          else
-            entries[entries.index(here)] = other_entry
-          end
-        else
-          self << other_entry
-        end
-      end
-    end
-  end
-end