Scala fixes

windyroad · Jan 2, 2012 · 65cbace · 65cbace
1 parent fab44ff
commit 65cbace
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 4 deletions.
diff --git a/cucumber-jvm.ipr b/cucumber-jvm.ipr
@@ -80,6 +80,16 @@
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </component>
+  <component name="FacetAutodetectingManager">
+    <autodetection-disabled>
+      <facet-type id="scala">
+        <modules>
+          <module name="cucumber-scala" />
+          <module name="scala-calculator" />
+        </modules>
+      </facet-type>
+    </autodetection-disabled>
+  </component>
   <component name="InspectionProjectProfileManager">
     <profiles>
       <profile version="1.0" is_locked="false">
@@ -1416,6 +1426,14 @@
         <root url="jar://$MAVEN_REPOSITORY$/org/quartz-scheduler/quartz/1.8.5/quartz-1.8.5-sources.jar!/" />
       </SOURCES>
     </library>
+    <library name="Maven: org.scala-lang:scala-compiler-bundle:2.9.1">
+      <CLASSES>
+        <root url="jar://$MAVEN_REPOSITORY$/org/scala-lang/scala-compiler/2.9.1/scala-compiler-2.9.1.jar!/" />
+        <root url="jar://$MAVEN_REPOSITORY$/org/scala-lang/scala-library/2.9.1/scala-library-2.9.1.jar!/" />
+      </CLASSES>
+      <JAVADOC />
+      <SOURCES />
+    </library>
     <library name="Maven: org.scala-lang:scala-compiler:2.9.1">
       <CLASSES>
         <root url="jar://$MAVEN_REPOSITORY$/org/scala-lang/scala-compiler/2.9.1/scala-compiler-2.9.1.jar!/" />

diff --git a/...scalacalculator/BasicArithmeticTest.scala → ...amples/scalacalculator/RunCukesTest.scala b/...scalacalculator/BasicArithmeticTest.scala → ...amples/scalacalculator/RunCukesTest.scala
@@ -5,4 +5,4 @@ import cucumber.junit.{Feature, Cucumber}
 
 @RunWith(classOf[Cucumber])
 @Feature("basic_arithmetic.feature")
-class BasicArithmeticTest
+class RunCukesTest
diff --git a/.../java/cucumber/runtime/ioke/RunCukes.java → ...a/cucumber/runtime/ioke/RunCukesTest.java b/.../java/cucumber/runtime/ioke/RunCukes.java → ...a/cucumber/runtime/ioke/RunCukesTest.java
@@ -4,5 +4,5 @@
 import org.junit.runner.RunWith;
 
 @RunWith(Cucumber.class)
-public class RunCukes {
+public class RunCukesTest {
 }
diff --git a/...java/cucumber/runtime/rhino/RunCukes.java → .../cucumber/runtime/rhino/RunCukesTest.java b/...java/cucumber/runtime/rhino/RunCukes.java → .../cucumber/runtime/rhino/RunCukesTest.java
@@ -4,5 +4,5 @@
 import org.junit.runner.RunWith;
 
 @RunWith(Cucumber.class)
-public class RunCukes {
+public class RunCukesTest {
 }
diff --git a/scala/src/main/scala/cucumber/runtime/ScalaBackend.scala b/scala/src/main/scala/cucumber/runtime/ScalaBackend.scala
@@ -4,11 +4,12 @@ package runtime
 import _root_.java.util.{List => JList}
 
 import gherkin.formatter.model.Step
+import io.ResourceLoader
 import io.ClasspathResourceLoader
 
 import scala.collection.JavaConversions._
 
-class ScalaBackend() extends Backend {
+class ScalaBackend(ignore:ResourceLoader) extends Backend {
 
   private var instances:Seq[ScalaDsl] = Nil