lib/jldrill/contexts/LoadTanakaContext.rb in jldrill-0.5.1.7 vs lib/jldrill/contexts/LoadTanakaContext.rb in jldrill-0.6.0.1

@@ -1,5 +1,6 @@
+# encoding: utf-8
 require 'Context/Context'
 require 'Context/Context'
 require 'Context/Bridge'
 require 'jldrill/model/Config'
 require 'jldrill/contexts/LoadFileContext'
@@ -24,18 +25,17 @@
 
         def dictionaryName(options)
             if !options.nil? && !options.tanaka.nil?
                 return options.tanaka
             else
-                return Config::TANAKA_NAME
+                return Config::TANAKA_FILE
             end
         end
 
         # Returns the filename of the dictionary including the path
         def getFilename(options)
-            return File.expand_path(dictionaryName(options), 
-                                    Config::TANAKA_DIR)
+            return Config::resolveDataFile(dictionaryName(options))
         end
 
         def loadTanaka(tanaka, filename)
             @loadFileContext.onExit do
                exitLoadTanakaContext 
@@ -43,9 +43,17 @@
             @loadFileContext.enter(self, tanaka, filename)
         end
 
         def exitLoadTanakaContext
             self.exit
+        end
+
+        def startLongEvent()
+            @parent.startLongEvent()
+        end
+
+        def stopLongEvent()
+            @parent.stopLongEvent()
         end
 
         def enter(parent, tanaka, options)
             super(parent)
             loadTanaka(tanaka, getFilename(options))