You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/04/17 17:44:19 UTC

svn commit: r766062 - in /camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl: SAbstractDefinition.scala STryDefinition.scala

Author: davsclaus
Date: Fri Apr 17 15:44:18 2009
New Revision: 766062

URL: http://svn.apache.org/viewvc?rev=766062&view=rev
Log:
CAMEL-1447: Aligned and renamed the DSL names for try .. catch .. finally so they are the same in Java and Spring DSL.

Modified:
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
    camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/STryDefinition.scala

Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala?rev=766062&r1=766061&r2=766062&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/SAbstractDefinition.scala Fri Apr 17 15:44:18 2009
@@ -53,7 +53,7 @@
     new SProcessorDefinition(target.asInstanceOf[RawProcessorDefinition])
   }
   
-  def attempt : STryDefinition = new STryDefinition(target.tryBlock)
+  def attempt : STryDefinition = new STryDefinition(target.doTry)
   
   def split(expression: Exchange => Any) = 
     new SSplitDefinition(target.split(expression))

Modified: camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/STryDefinition.scala
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/STryDefinition.scala?rev=766062&r1=766061&r2=766062&view=diff
==============================================================================
--- camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/STryDefinition.scala (original)
+++ camel/trunk/components/camel-scala/src/main/scala/org/apache/camel/scala/dsl/STryDefinition.scala Fri Apr 17 15:44:18 2009
@@ -29,12 +29,12 @@
   override def apply(block: => Unit) : STryDefinition = super.apply(block).asInstanceOf[STryDefinition]
   
   def handle[Target](exception: Class[Target]) = {
-    target.handle(exception)
+    target.doCatch(exception)
     this
   }
   
   def ensure = {
-    target.finallyBlock
+    target.doFinally
     this
   }