Author: vdichev
Date: Tue Sep 29 08:21:54 2009
New Revision: 819859
URL: http://svn.apache.org/viewvc?rev=819859&view=rev
Log:
Eliminate match warnings
Modified:
incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/HttpSender.scala
incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/MsgParser.scala
incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Action.scala
Modified:
incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/HttpSender.scala
URL:
http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/HttpSender.scala?rev=819859&r1=819858&r2=819859&view=diff
==============================================================================
---
incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/HttpSender.scala
(original)
+++
incubator/esme/trunk/server/src/main/scala/org/apache/esme/actor/HttpSender.scala
Tue Sep 29 08:21:54 2009
@@ -58,7 +58,7 @@
private def send(action: Performances, msg: Message, user: User, reason:
MailboxReason, token: String) {
import Mailer._
- action match {
+ (action: @unchecked) match {
case MailTo(who, text) =>
val body = text match {
case None => XHTMLMailBodyType(msg.digestedXHTML)
Modified:
incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/MsgParser.scala
URL:
http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/MsgParser.scala?rev=819859&r1=819858&r2=819859&view=diff
==============================================================================
---
incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/MsgParser.scala
(original)
+++
incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/MsgParser.scala
Tue Sep 29 08:21:54 2009
@@ -351,6 +351,7 @@
(whiteSpace ~ '@' ~> rep1(digit) <~ whiteSpace ^^ {case dig =>
AtUserAction(dig.mkString.toLong)}) |
(atName ^^ {
case AtName(user) => AtUserAction(user.id)
+ case _ => throw new RuntimeException("Unknown user name")
})
lazy val reChars: Parser[Char] = (('\\' ~ '/') ^^^ '/') |
@@ -359,6 +360,7 @@
lazy val testRegex: Parser[TestAction] =
whiteSpace ~ '/' ~> rep1(reChars) <~ '/' ~ whiteSpace ^^ {
case re if validRegex(re.mkString).isDefined => RegexAction(re.mkString)
+ case _ => throw new RuntimeException("Invalid regular expression")
}
lazy val strChars: Parser[Char] = (('\\' ~ '"') ^^^ '/') |
Modified:
incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Action.scala
URL:
http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Action.scala?rev=819859&r1=819858&r2=819859&view=diff
==============================================================================
---
incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Action.scala
(original)
+++
incubator/esme/trunk/server/src/main/scala/org/apache/esme/model/Action.scala
Tue Sep 29 08:21:54 2009
@@ -178,6 +178,8 @@
case FetchRss(_) => new RssFeed(u, url.url, urlSourcePrefix +
url.uniqueId, 0, Nil)
}
MessagePullActor ! MessagePullActor.StartPullActor(id, lastMsg,
feed)
+
+ case _ =>
}
}
case _ =>
@@ -206,7 +208,8 @@
case _ => Nil
}
- def actionFunc = _perform(is) match {
+ // already parsed, so should always return Success
+ def actionFunc = (_perform(is): @unchecked) match {
case Success(v, _) => v
}
}
@@ -221,7 +224,8 @@
case _ => Nil
}
- def testFunc = testExpr(is) match {
+ // already parsed, so should always return Success
+ def testFunc = (testExpr(is): @unchecked) match {
case Success(v, _) => Action.toFunc(v)
}
}
@@ -251,6 +255,7 @@
def regularActions: List[RegularAction] = testExpr(testText) match {
case Success(v, _) => Action.regularActions(v)
+ case _ => Nil
}
def actionText = theAction.is
