redcar 0.2.9dev → 0.3.0dev

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

@@ -2,7 +2,7 @@
 module Redcar
   class Project
     class DirMirror
-      include Redcar::TreeView::Mirror
+      include Redcar::Tree::Mirror
       
       # @param [String] a path to a directory
       def initialize(path)
@@ -16,10 +16,15 @@ module Redcar
       end
       
       # Have the toplevel nodes changed?
+      #
+      # @return [Boolean]
       def changed?
         @changed
       end
       
+      # Get the top-level nodes
+      #
+      # @return [Array<Node>]
       def top
         @changed = false
         Node.create_all_from_path(@path)
@@ -27,10 +32,12 @@ module Redcar
       
       class Node
         def self.create_all_from_path(path)
-          Dir[path + "/*"].map {|fn| Node.new(fn)}
+          Dir[path + "/*"].sort_by {|fn| fn.downcase }.map {|fn| Node.new(fn)}
         end
         
-        include Redcar::TreeView::Mirror::NodeMirror
+        include Redcar::Tree::Mirror::NodeMirror
+        
+        attr_reader :path
         
         def initialize(path)
           @path = path
@@ -40,6 +47,14 @@ module Redcar
           File.basename(@path)
         end
         
+        def icon
+          if File.file?(@path)
+            :file
+          elsif File.directory?(@path)
+            :directory
+          end
+        end
+        
         def leaf?
           File.file?(@path)
         end

data/plugins/project/lib/project/file_mirror.rb

@@ -8,7 +8,7 @@ module Redcar
     # loaded in Redcar. EditView contains a Document which contains a Mirror
     # which reflects a file.
     class FileMirror
-      include Redcar::EditView::Mirror
+      include Redcar::Document::Mirror
       
       # @param [String] a path to a file
       def initialize(path)

data/plugins/redcar/redcar.rb

@@ -11,6 +11,7 @@ module Redcar
         tab = win.new_tab(Redcar::EditTab)
         tab.title = "untitled"
         tab.focus
+        tab
       end
     end
     
@@ -132,6 +133,7 @@ module Redcar
           item "New Notebook", NewNotebookCommand
           item "New Window", NewWindowCommand
           item "Open", Project::FileOpenCommand
+          item "Open Directory", Project::DirectoryOpenCommand
           separator
           item "Save", Project::FileSaveCommand
           item "Save As", Project::FileSaveAsCommand
@@ -139,6 +141,7 @@ module Redcar
           item "Close Tab", CloseTabCommand
           item "Close Notebook", CloseNotebookCommand
           item "Close Window", CloseWindowCommand
+          item "Close Directory", Project::DirectoryCloseCommand
         end
         sub_menu "Debug" do
           item "Print Command History", PrintHistoryCommand

data/plugins/repl/lib/repl/internal_mirror.rb

@@ -2,7 +2,7 @@
 module Redcar
   class REPL
     class InternalMirror
-      include Redcar::EditView::Mirror
+      include Redcar::Document::Mirror
       
       attr_reader :history, :results
       

data/plugins/tree/lib/tree.rb

@@ -0,0 +1,17 @@
+
+require 'tree/controller'
+require 'tree/mirror'
+
+module Redcar
+  class Tree
+    include Redcar::Model
+    
+    attr_reader :tree_mirror, :tree_controller
+    
+    def initialize(tree_mirror, tree_controller=nil)
+      @tree_mirror     = tree_mirror
+      @tree_controller = tree_controller
+    end
+  end
+end
+

data/plugins/tree/lib/tree/controller.rb

@@ -0,0 +1,12 @@
+
+module Redcar
+  class Tree
+    # Abstract interface. The Controller's methods are called when the Tree's
+    # rows are activated.
+    module Controller
+      def activated(node)
+        raise "not implemented"
+      end
+    end
+  end
+end

data/plugins/{tree_view/lib/tree_view → tree/lib/tree}/mirror.rb

@@ -1,6 +1,6 @@
 
 module Redcar
-  class TreeView
+  class Tree
     # Abstract interface. A Mirror allows an TreeView contents to reflect 
     # some other resource, for example a directory tree on disk.
     # They have methods for loading the contents from the resource.

data/plugins/{tree_view → tree}/plugin.yaml

@@ -1,11 +1,11 @@
 --- !ruby/object:FreeBASE::PluginConfiguration
-name: tree_view
-description: Tree view is the tree view widget 
+name: tree
+description: Trees are shown in the sidepane
 version: 1.0
 author: Daniel Lucraft
 autoload: true
-require_path: tree_view/lib/tree_view.rb
-startup_module: Redcar::TreeView
+require_path: tree/lib/tree.rb
+startup_module: Redcar::Tree
 load_dependencies: 
   core: "*"
   application: "*"

data/plugins/tree_view_swt/lib/tree_view_swt.rb

@@ -1,5 +1,127 @@
 
 module Redcar
   class TreeViewSWT
+    
+    def initialize(composite, model)
+      @composite, @model = composite, model
+      @viewer = JFace::Viewers::TreeViewer.new(@composite, Swt::SWT::VIRTUAL)
+      @viewer.set_content_provider(TreeMirrorContentProvider.new)
+      @viewer.set_input(@model.tree_mirror)
+      @viewer.set_label_provider(TreeMirrorLabelProvider.new)
+      
+      if @model.tree_controller
+        @viewer.add_tree_listener(@viewer.getControl, TreeListener.new)
+        @viewer.add_open_listener(OpenListener.new(@model.tree_controller))
+      end
+    end
+    
+    def control
+      @viewer.getControl
+    end
+    
+    def close
+      @viewer.getControl.dispose
+    end
+    
+    class TreeListener
+      def tree_collapsed(e)
+        p [:collapsed, e]
+      end
+      
+      def tree_expanded(e)
+        p [:expanded, e]
+      end
+    end
+    
+    class SelectionListener
+      def widget_default_selected(e)
+        p [:def_selected, e]
+      end
+      
+      def widget_selected(e)
+        p [:selected, e]
+      end
+    end
+    
+    class DoubleClickListener
+      def double_click(e)
+        p [:double_click, e]
+      end
+    end
+    
+    class OpenListener
+      def initialize(controller)
+        @controller = controller
+      end
+      
+      def open(e)
+        @controller.activated(e.getSelection.toArray.to_a.first)
+      end
+    end
+    
+    class TreeMirrorContentProvider
+      include JFace::Viewers::ITreeContentProvider
+
+      def input_changed(viewer, _, tree_mirror)
+        @viewer, @tree_mirror = viewer, tree_mirror
+      end
+
+      def get_elements(tree_mirror)
+        tree_mirror.top.to_java
+      end
+
+      def has_children(tree_node)
+        tree_node.children.any?
+      end
+
+      def get_children(tree_node)
+        tree_node.children.to_java
+      end
+
+      def dispose
+      end
+    end
+
+    class TreeMirrorLabelProvider
+      include JFace::Viewers::ILabelProvider
+
+      def add_listener(*_)
+      end
+
+      def remove_listener(*_)
+      end
+
+      def get_text(tree_node)
+        tree_node.text
+      end
+
+      def get_image(tree_node)
+        case tree_node.icon
+        when :directory
+          dir_image
+        when :file
+          file_image
+        end
+      end
+
+      def dispose
+      end
+      
+      private
+      
+      def dir_image
+        @dir_image ||= begin
+          path = File.join(Redcar.root, %w(plugins application icons darwin-folder.png))
+          Swt::Graphics::Image.new(ApplicationSWT.display, path)
+        end
+      end
+      
+      def file_image
+        @file_image ||= begin
+          path = File.join(Redcar.root, %w(plugins application icons darwin-file.png))
+          Swt::Graphics::Image.new(ApplicationSWT.display, path)
+        end
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: redcar
 version: !ruby/object:Gem::Version 
-  version: 0.2.9dev
+  version: 0.3.0dev
 platform: ruby
 authors: 
   - Daniel Lucraft
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-17 00:00:00 +00:00
+date: 2009-12-25 00:00:00 +00:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -155,8 +155,11 @@ files:
   - plugins/application/features/main_window.feature
   - plugins/application/features/step_definitions/dialog_steps.rb
   - plugins/application/features/step_definitions/menu_steps.rb
+  - plugins/application/features/step_definitions/tree_steps.rb
   - plugins/application/features/step_definitions/window_steps.rb
   - plugins/application/features/support/env.rb
+  - plugins/application/icons/darwin-file.png
+  - plugins/application/icons/darwin-folder.png
   - plugins/application/lib/application.rb
   - plugins/application/lib/application/command.rb
   - plugins/application/lib/application/dialog.rb
@@ -165,6 +168,7 @@ files:
   - plugins/application/lib/application/sensitive.rb
   - plugins/application/lib/application/sensitivity.rb
   - plugins/application/lib/application/tab.rb
+  - plugins/application/lib/application/treebook.rb
   - plugins/application/lib/application/window.rb
   - plugins/application/lib/application/assets/file.png
   - plugins/application/lib/application/command/executor.rb
@@ -178,6 +182,7 @@ files:
   - plugins/application/spec/application/menu_spec.rb
   - plugins/application/spec/application/notebook_spec.rb
   - plugins/application/spec/application/sensitive_spec.rb
+  - plugins/application/spec/application/treebook_spec.rb
   - plugins/application/spec/application/window_spec.rb
   - plugins/application/spec/application/command/executor_spec.rb
   - plugins/application/spec/application/command/history_spec.rb
@@ -196,6 +201,7 @@ files:
   - plugins/application_swt/lib/application_swt/notebook.rb
   - plugins/application_swt/lib/application_swt/swt_wrapper.rb
   - plugins/application_swt/lib/application_swt/tab.rb
+  - plugins/application_swt/lib/application_swt/treebook.rb
   - plugins/application_swt/lib/application_swt/window.rb
   - plugins/application_swt/lib/application_swt/menu/binding_translator.rb
   - plugins/application_swt/lib/application_swt/notebook/drag_and_drop_listener.rb
@@ -207,6 +213,9 @@ files:
   - plugins/application_swt/vendor/swt/osx/dummy
   - plugins/application_swt/vendor/swt/osx64/dummy
   - plugins/application_swt/vendor/swt/win32/dummy
+  - plugins/auto_indenter/plugin.yaml
+  - plugins/auto_indenter/lib/auto_indenter.rb
+  - plugins/auto_indenter/lib/auto_indenter/document_controller.rb
   - plugins/core/plugin.yaml
   - plugins/core/lib/core.rb
   - plugins/core/lib/core/controller.rb
@@ -231,7 +240,8 @@ files:
   - plugins/edit_view/lib/edit_view/command.rb
   - plugins/edit_view/lib/edit_view/document.rb
   - plugins/edit_view/lib/edit_view/edit_tab.rb
-  - plugins/edit_view/lib/edit_view/mirror.rb
+  - plugins/edit_view/lib/edit_view/document/controller.rb
+  - plugins/edit_view/lib/edit_view/document/mirror.rb
   - plugins/edit_view/spec/spec_helper.rb
   - plugins/edit_view/spec/edit_view/document_spec.rb
   - plugins/edit_view_swt/plugin.yaml
@@ -242,10 +252,13 @@ files:
   - plugins/edit_view_swt/vendor/java-mateview.rb
   - plugins/project/plugin.yaml
   - plugins/project/features/open_and_save_files.feature
+  - plugins/project/features/open_directory_tree.feature
   - plugins/project/features/fixtures/winter.txt
+  - plugins/project/features/step_definitions/directory_steps.rb
   - plugins/project/features/step_definitions/file_steps.rb
   - plugins/project/features/support/env.rb
   - plugins/project/lib/project.rb
+  - plugins/project/lib/project/dir_controller.rb
   - plugins/project/lib/project/dir_mirror.rb
   - plugins/project/lib/project/file_mirror.rb
   - plugins/project/spec/spec_helper.rb
@@ -258,10 +271,11 @@ files:
   - plugins/repl/lib/repl/internal_mirror.rb
   - plugins/repl/spec/spec_helper.rb
   - plugins/repl/spec/repl/internal_mirror_spec.rb
-  - plugins/tree_view/plugin.yaml
-  - plugins/tree_view/lib/tree_view.rb
-  - plugins/tree_view/lib/tree_view/mirror.rb
-  - plugins/tree_view/spec/spec_helper.rb
+  - plugins/tree/plugin.yaml
+  - plugins/tree/lib/tree.rb
+  - plugins/tree/lib/tree/controller.rb
+  - plugins/tree/lib/tree/mirror.rb
+  - plugins/tree/spec/spec_helper.rb
   - plugins/tree_view_swt/plugin.yaml
   - plugins/tree_view_swt/lib/tree_view_swt.rb
   - textmate/Bundles/C.tmbundle/Syntaxes/C.plist

data/plugins/tree_view/lib/tree_view.rb

@@ -1,7 +0,0 @@
-
-require 'tree_view/mirror'
-
-module Redcar
-  class TreeView
-  end
-end