[jbehave-scm] [scm-core/jbehave-4.x][6/11] JBEHAVE-1002: Extending StoryLoader from ResourceLoader.

[Cristiano Gavião]

commit 4e74398b12a53cb19cec2a3d870299942290e779
Author:     Cristiano Gavião <cvgav...@gmail.com>
AuthorDate: Mon, 17 Mar 2014 20:55:30 -0300
Commit:     Mauro Talevi <mauro.tal...@aquilonia.org>
CommitDate: Sun, 13 Apr 2014 12:28:43 +0200

    JBEHAVE-1002: Extending StoryLoader from ResourceLoader.

diff --git 
a/jbehave-core/src/main/java/org/jbehave/core/io/LoadFromClasspath.java 
b/jbehave-core/src/main/java/org/jbehave/core/io/LoadFromClasspath.java
index 30c8ca6..e27370b 100755
--- a/jbehave-core/src/main/java/org/jbehave/core/io/LoadFromClasspath.java
+++ b/jbehave-core/src/main/java/org/jbehave/core/io/LoadFromClasspath.java
@@ -9,7 +9,7 @@ import org.apache.commons.lang.builder.ToStringStyle;
 /**
  * Loads story resources from classpath
  */
-public class LoadFromClasspath implements ResourceLoader, StoryLoader {
+public class LoadFromClasspath implements StoryLoader {
 
     protected final ClassLoader classLoader;
 
diff --git a/jbehave-core/src/main/java/org/jbehave/core/io/StoryLoader.java 
b/jbehave-core/src/main/java/org/jbehave/core/io/StoryLoader.java
index 9d759a7..3869644 100755
--- a/jbehave-core/src/main/java/org/jbehave/core/io/StoryLoader.java
+++ b/jbehave-core/src/main/java/org/jbehave/core/io/StoryLoader.java
@@ -1,6 +1,6 @@
 package org.jbehave.core.io;
 
-public interface StoryLoader {
+public interface StoryLoader extends ResourceLoader {
 
     String loadStoryAsText(String storyPath);
 
diff --git 
a/jbehave-core/src/main/java/org/jbehave/core/model/ExamplesTableFactory.java 
b/jbehave-core/src/main/java/org/jbehave/core/model/ExamplesTableFactory.java
index c5ed6f3..3655c7f 100755
--- 
a/jbehave-core/src/main/java/org/jbehave/core/model/ExamplesTableFactory.java
+++ 
b/jbehave-core/src/main/java/org/jbehave/core/model/ExamplesTableFactory.java
@@ -70,7 +70,7 @@ public class ExamplesTableFactory {
     
     public ExamplesTableFactory(Configuration configuration) {
        this.keywords = configuration.keywords();
-       this.resourceLoader = configuration.resourceLoader();
+       this.resourceLoader = configuration.storyLoader();
        this.parameterConverters = configuration.parameterConverters();
        this.tableTransformers = new TableTransformers();
     }
diff --git 
a/jbehave-core/src/test/java/org/jbehave/core/embedder/ConcurrencyBehaviour.java
 
b/jbehave-core/src/test/java/org/jbehave/core/embedder/ConcurrencyBehaviour.java
index e98d809..2fe79cb 100644
--- 
a/jbehave-core/src/test/java/org/jbehave/core/embedder/ConcurrencyBehaviour.java
+++ 
b/jbehave-core/src/test/java/org/jbehave/core/embedder/ConcurrencyBehaviour.java
@@ -166,6 +166,10 @@ public class ConcurrencyBehaviour {
                 return "Scenario: \nGiven something too long";
             }
 
+                       public String loadResourceAsText(String resourcePath) {
+                               return null;
+                       }
+
         }
     }