java: CalcFormula extends Formula with Position exists_Formula_CalcFormula_now_separate
authorwneuper
Fri, 04 Feb 2005 14:33:10 +0100
changeset 2056af1a699c66fe
parent 2055 e1e04da55fcd
child 2057 baeaae216e88
java: CalcFormula extends Formula with Position
shell: cvs update -A worked
src/java/isac/util/formulae/PosCalcHead.java
src/java/isac/util/formulae/PosFormHead.java
src/java/isac/util/formulae/PosFormHeadContainer.java
src/java/isac/util/formulae/PosFormula.java
src/java/isac/util/parser/XMLParserDigest.java
     1.1 --- a/src/java/isac/util/formulae/PosCalcHead.java	Fri Feb 04 14:22:17 2005 +0100
     1.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.3 @@ -1,19 +0,0 @@
     1.4 -/*
     1.5 - * @author Walther Neuper, member of the ISAC-team, 
     1.6 - * Copyright (c) 2005 by Walther Neuper 
     1.7 - * created Feb 4, 2005 2:19:29 PM
     1.8 - * Institute for Softwaretechnology, Graz University of Technology, Austria.
     1.9 - * 
    1.10 - * Use is subject to PGPL license terms.
    1.11 - */
    1.12 -package isac.util.formulae;
    1.13 -
    1.14 -/**
    1.15 - * @author neuper
    1.16 - *
    1.17 - * TODO To change the template for this generated type comment go to
    1.18 - * Window - Preferences - Java - Code Style - Code Templates
    1.19 - */
    1.20 -public class PosCalcHead {
    1.21 -
    1.22 -}
     2.1 --- a/src/java/isac/util/formulae/PosFormHead.java	Fri Feb 04 14:22:17 2005 +0100
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,19 +0,0 @@
     2.4 -/*
     2.5 - * @author Walther Neuper, member of the ISAC-team, 
     2.6 - * Copyright (c) 2005 by Walther Neuper 
     2.7 - * created Feb 4, 2005 2:19:54 PM
     2.8 - * Institute for Softwaretechnology, Graz University of Technology, Austria.
     2.9 - * 
    2.10 - * Use is subject to PGPL license terms.
    2.11 - */
    2.12 -package isac.util.formulae;
    2.13 -
    2.14 -/**
    2.15 - * @author neuper
    2.16 - *
    2.17 - * TODO To change the template for this generated type comment go to
    2.18 - * Window - Preferences - Java - Code Style - Code Templates
    2.19 - */
    2.20 -public class PosFormHead {
    2.21 -
    2.22 -}
     3.1 --- a/src/java/isac/util/formulae/PosFormHeadContainer.java	Fri Feb 04 14:22:17 2005 +0100
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,19 +0,0 @@
     3.4 -/*
     3.5 - * @author Walther Neuper, member of the ISAC-team, 
     3.6 - * Copyright (c) 2005 by Walther Neuper 
     3.7 - * created Feb 4, 2005 2:20:14 PM
     3.8 - * Institute for Softwaretechnology, Graz University of Technology, Austria.
     3.9 - * 
    3.10 - * Use is subject to PGPL license terms.
    3.11 - */
    3.12 -package isac.util.formulae;
    3.13 -
    3.14 -/**
    3.15 - * @author neuper
    3.16 - *
    3.17 - * TODO To change the template for this generated type comment go to
    3.18 - * Window - Preferences - Java - Code Style - Code Templates
    3.19 - */
    3.20 -public class PosFormHeadContainer {
    3.21 -
    3.22 -}
     4.1 --- a/src/java/isac/util/formulae/PosFormula.java	Fri Feb 04 14:22:17 2005 +0100
     4.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.3 @@ -1,19 +0,0 @@
     4.4 -/*
     4.5 - * @author Walther Neuper, member of the ISAC-team, 
     4.6 - * Copyright (c) 2005 by Walther Neuper 
     4.7 - * created Feb 4, 2005 2:20:33 PM
     4.8 - * Institute for Softwaretechnology, Graz University of Technology, Austria.
     4.9 - * 
    4.10 - * Use is subject to PGPL license terms.
    4.11 - */
    4.12 -package isac.util.formulae;
    4.13 -
    4.14 -/**
    4.15 - * @author neuper
    4.16 - *
    4.17 - * TODO To change the template for this generated type comment go to
    4.18 - * Window - Preferences - Java - Code Style - Code Templates
    4.19 - */
    4.20 -public class PosFormula {
    4.21 -
    4.22 -}
     5.1 --- a/src/java/isac/util/parser/XMLParserDigest.java	Fri Feb 04 14:22:17 2005 +0100
     5.2 +++ b/src/java/isac/util/parser/XMLParserDigest.java	Fri Feb 04 14:33:10 2005 +0100
     5.3 @@ -147,7 +147,7 @@
     5.4      
     5.5  //    digester.addObjectCreate("*/FORMULA", Formula.class);
     5.6  //    digester.addCallMethod("*/FORMULA/MATHML/ISA", "setText", 0);
     5.7 -//    digester.addSetNext("*/POSFORMHEADS/FORMULA", "add");//MUST be before
     5.8 +//    digester.addSetNext("*/FORMHEADS/FORMULA", "add");//MUST be before
     5.9  //    digester.addSetNext("*/FORMULA", "setResponse");//.....MUST be after
    5.10  
    5.11      //	Rules for parsing CalcHead
    5.12 @@ -184,7 +184,7 @@
    5.13      digester.addSetNext("*/CALCHEAD/SPECIFICATION/METHODID", "setMethod");
    5.14      digester.addSetNext("*/CALCHEAD/SPECIFICATION", "setSpecification");
    5.15  
    5.16 -    digester.addSetNext("*/POSFORMHEADS/CALCHEAD", "add");//MUST be before
    5.17 +    digester.addSetNext("*/FORMHEADS/CALCHEAD", "add");//MUST be before
    5.18      digester.addSetNext("*/CALCHEAD", "setResponse");//.....MUST be after
    5.19      
    5.20      //	Rules for parsing various Tactic Objects