Skip to content
This repository has been archived by the owner on May 15, 2019. It is now read-only.

Commit

Permalink
changed all error() calls to sys.error() calls
Browse files Browse the repository at this point in the history
  • Loading branch information
josharnold52 committed Oct 11, 2011
1 parent 2415d6a commit 590abaa
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
Expand Up @@ -115,7 +115,7 @@ object ZipperMergeStrategy {
object RequireLocal extends ZipperMergeStrategy {
override def apply(context: ZipperMergeContext) = context.directUpdate map {
case (e:Elem, _) if (e.children==context.original.children) => e.copy(children=context.indirectUpdate._1.children)
case n => error("A conflict has been detected in the following node that cannot be resolved by the RequireLocal merge strategy:\n" + n)
case n => sys.error("A conflict has been detected in the following node that cannot be resolved by the RequireLocal merge strategy:\n" + n)
}
}

Expand All @@ -126,7 +126,7 @@ object ZipperMergeStrategy {
*/
object RequireConflictFree extends ZipperMergeStrategy {
override def apply(context: ZipperMergeContext): Nothing =
error("A node and one or more of its descendents were contained in the same zipper.\n" +
sys.error("A node and one or more of its descendents were contained in the same zipper.\n" +
"Possible fixes include either using a different merge strategy or using a different selection\n" +
"operator.\n"+
context.original)
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/com/codecommit/antixml/conversion.scala
Expand Up @@ -145,7 +145,7 @@ private[antixml] sealed trait SecondPrecedenceConvertables extends ThirdPreceden
case e: xml.Elem => ElemConvertable(e)
case a: xml.Atom[String] => TextConvertable(a)
case r: xml.EntityRef => EntityRefConvertable(r)
case g: xml.Group => error("xml.Group should never have been a Node; there is no sane conversion")
case g: xml.Group => sys.error("xml.Group should never have been a Node; there is no sane conversion")
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/scala/com/codecommit/antixml/util/vectorCases.scala
Expand Up @@ -125,8 +125,8 @@ private[antixml] case object Vector0 extends VectorCase[Nothing] {
def +:[B](b: B) = Vector1(b)
def :+[B](b: B) = Vector1(b)

def apply(index: Int) = error("Apply on empty vector")
def updated[B](index: Int, b: B) = error("Updated on empty vector")
def apply(index: Int) = sys.error("Apply on empty vector")
def updated[B](index: Int, b: B) = sys.error("Updated on empty vector")

def ++[B](that: VectorCase[B]) = that

Expand Down

0 comments on commit 590abaa

Please sign in to comment.