fix orm

[pettanr/pettanr.git] / lib / editor / editor.rb

diff --git a/lib/editor/editor.rb b/lib/editor/editor.rb
index 07e4076..957003e 100644 (file)
--- a/lib/editor/editor.rb
+++ b/lib/editor/editor.rb
@@ -1,8 +1,9 @@
 require_dependency "editor/dock"
+require_dependency "editor/dock/dock"
 module Editor
 
   class Editor
-    include DockModule
+    include EditorModule
     
     class Generator
       def initialize editor
@@ -13,19 +14,46 @@ module Editor
         @editor.root_item
       end
       
+      def template_dir
+        'templates/r/editor/'
+      end
+      
+      def template_file_name
+        'generator'
+      end
+      
+      def template_name
+        self.template_dir + self.template_file_name
+      end
+      
     end
     
-    attr_accessor :root_item, :dock, :template_dir, :generator, :operators
+    attr_accessor :root_item, :dock, :generator, :operators
     def initialize root_item, operators
       @root_item = root_item
       @operators = operators
-      @template_dir = 'templates/r/editor/'
-      @dock = Dock.new self
+      @dock = self.new_dock
       @generator = Generator.new self
     end
     
     #InstanceMethods
     
+    def new_dock
+      Dock.new self
+    end
+    
+    def template_dir
+      'templates/r/editor/'
+    end
+    
+    def template_file_name
+      'editor'
+    end
+    
+    def template_name
+      self.template_dir + self.template_file_name
+    end
+    
     def dom_id
       'editor-' + @root_item.id.to_s
     end
@@ -40,4 +68,5 @@ module Editor
       }
     end
   end
+  
 end