all-050217b-ASM-2 intermediate dev.step all-050217c-ASM-2
authorwneuper
Thu, 17 Feb 2005 16:34:16 +0100
changeset 2102602a1a37be1c
parent 2101 b8212f522b48
child 2103 c9d7192d2866
all-050217b-ASM-2 intermediate dev.step
auto, next, TestAll OK
src/java/isac/wsdialog/DialogIterator.java
src/xml/isac.dtd
     1.1 --- a/src/java/isac/wsdialog/DialogIterator.java	Thu Feb 17 16:34:16 2005 +0100
     1.2 +++ b/src/java/isac/wsdialog/DialogIterator.java	Thu Feb 17 16:34:16 2005 +0100
     1.3 @@ -10,7 +10,7 @@
     1.4  import java.rmi.server.UnicastRemoteObject;
     1.5  
     1.6  import isac.bridge.CalcIterator;
     1.7 -import isac.util.formulae.Assumption;
     1.8 +import isac.util.formulae.Assumptions;
     1.9  import isac.util.formulae.CalcHead;
    1.10  import isac.util.formulae.CalcFormula;
    1.11  import isac.util.formulae.Position;
    1.12 @@ -187,7 +187,7 @@
    1.13  /* (non-Javadoc)
    1.14   * @see isac.util.interfaces.ICalcIterator#getAssumption()
    1.15   */
    1.16 -public Assumption getAssumption() throws RemoteException{
    1.17 +public Assumptions getAssumption() throws RemoteException{
    1.18  	// TODO Auto-generated method stub
    1.19  	return null;
    1.20  }
     2.1 --- a/src/xml/isac.dtd	Thu Feb 17 16:34:16 2005 +0100
     2.2 +++ b/src/xml/isac.dtd	Thu Feb 17 16:34:16 2005 +0100
     2.3 @@ -14,8 +14,8 @@
     2.4  <!ELEMENT OK (#PCDATA)>
     2.5  <!ELEMENT ERROR (#PCDATA)>
     2.6  
     2.7 +<!ELEMENT NEXTTAC (CALCID, TACTIC)>
     2.8  <!ELEMENT GETTACTIC (CALCID, TACTIC)>
     2.9 -<!ELEMENT NEXTTAC (CALCID, TACTIC)>
    2.10  <!ELEMENT APPLICABLETACTICS (CALCID, TACLIST)>
    2.11  <!ELEMENT TACLIST (TACTIC)*>
    2.12