1.1 --- a/isac-java/src/java/isac/bridge/xml/IsaToJava.scala	Mon Aug 24 17:38:19 2015 +0200
     1.2 +++ b/isac-java/src/java/isac/bridge/xml/IsaToJava.scala	Fri Aug 28 15:35:16 2015 +0200
     1.3 @@ -49,16 +49,16 @@
     1.4    def is_message(t: XML.Tree): java.lang.Boolean = t match {
     1.5      case
     1.6        XML.Elem(Markup("MESSAGE", Nil), List(
     1.7 -        XML.Elem(Markup("CALCID", Nil), List(XML.Text (_),
     1.8 -        XML.Elem(Markup("STRING", Nil), List(XML.Text (_))))))) => true
     1.9 +        XML.Elem(Markup("CALCID", Nil), List(XML.Text (_))),
    1.10 +        XML.Elem(Markup("STRING", Nil), List(XML.Text (_))))) => true
    1.11      case
    1.12        XML.Elem(Markup("SYSERROR", Nil), List(
    1.13 -        XML.Elem(Markup("CALCID", Nil), List(XML.Text (_),
    1.14 -        XML.Elem(Markup("ERROR", Nil), List(XML.Text (_))))))) => true
    1.15 +        XML.Elem(Markup("CALCID", Nil), List(XML.Text (_))),
    1.16 +        XML.Elem(Markup("ERROR", Nil), List(XML.Text (_))))) => true
    1.17      case
    1.18        XML.Elem(Markup(_/*"SETNEXTTACTIC"*/, Nil), List(
    1.19 -        XML.Elem(Markup("CALCID", Nil), List(XML.Text (_),
    1.20 -        XML.Elem(Markup("MESSAGE", Nil), List(XML.Text (_))))))) => true
    1.21 +        XML.Elem(Markup("CALCID", Nil), List(XML.Text (_))),
    1.22 +        XML.Elem(Markup("MESSAGE", Nil), List(XML.Text (_))))) => true
    1.23      case _ => false //expected data going to Dialog
    1.24    }
    1.25  
    1.26 @@ -223,7 +223,7 @@
    1.27          cevent_xml))
    1.28        => new IntCEvent(new java.lang.Integer(calcid), 
    1.29             DataTypes.xml_to_CEvent(cevent_xml))
    1.30 -    case _ => throw new IllegalArgumentException("auto_calc_out wrong arg: " + t)
    1.31 +    case _ => throw new IllegalArgumentException("append_form_out wrong arg: " + t)
    1.32    }
    1.33  
    1.34    //fun autoCalculate : calcID -> auto -> XML.tree