1.1 --- a/src/java/isac/util/formulae/Specification.java	Fri Jun 24 11:35:39 2005 +0200
     1.2 +++ b/src/java/isac/util/formulae/Specification.java	Fri Jun 24 11:35:39 2005 +0200
     1.3 @@ -13,7 +13,7 @@
     1.4  
     1.5      protected CalcHeadSimpleID theory_;
     1.6  
     1.7 -    protected CalcHeadCompoundID problem_, method_;
     1.8 +    protected KEStoreID problem_, method_;
     1.9  
    1.10      public String toSMLString() {
    1.11          StringBuffer sb = new StringBuffer();
    1.12 @@ -29,11 +29,11 @@
    1.13          return theory_;
    1.14      }
    1.15  
    1.16 -    public CalcHeadCompoundID getMethod() {
    1.17 +    public KEStoreID getMethod() {
    1.18          return method_;
    1.19      }
    1.20  
    1.21 -    public CalcHeadCompoundID getProblem() {
    1.22 +    public KEStoreID getProblem() {
    1.23          return problem_;//(ProblemID)problem_ ---> ClassCastException LK?
    1.24      }
    1.25  
    1.26 @@ -41,11 +41,11 @@
    1.27          theory_ = el;
    1.28      }
    1.29  
    1.30 -    public void setProblem(CalcHeadCompoundID el) {
    1.31 +    public void setProblem(KEStoreID el) {
    1.32          problem_ = el;
    1.33      }
    1.34  
    1.35 -    public void setMethod(CalcHeadCompoundID el) {
    1.36 +    public void setMethod(KEStoreID el) {
    1.37          method_ = el;
    1.38      }
    1.39  

     2.1 --- a/src/java/isac/util/interfaces/IToCalc.java	Fri Jun 24 11:35:39 2005 +0200
     2.2 +++ b/src/java/isac/util/interfaces/IToCalc.java	Fri Jun 24 11:35:39 2005 +0200
     2.3 @@ -303,7 +303,7 @@
     2.4       * @return CalcHead, if the operation was successful, else null ... replaced
     2.5       *         by ref-arg to be used instead
     2.6       */
     2.7 -    public void tryMatch(CalcHead calcHead, CalcHeadCompoundID problemID)
     2.8 +    public void tryMatch(CalcHead calcHead, KEStoreID problemID)
     2.9              throws NotInSpecificationPhaseException;
    2.10  
    2.11  }
    2.12 \ No newline at end of file

     3.1 --- a/src/java/isac/util/parser/FormalizationDigest.java	Fri Jun 24 11:35:39 2005 +0200
     3.2 +++ b/src/java/isac/util/parser/FormalizationDigest.java	Fri Jun 24 11:35:39 2005 +0200
     3.3 @@ -8,7 +8,7 @@
     3.4  import isac.util.ResponseWrapper;
     3.5  import isac.util.Variant;
     3.6  import isac.util.formulae.CalcHead;
     3.7 -import isac.util.formulae.CalcHeadCompoundID;
     3.8 +import isac.util.formulae.KEStoreID;
     3.9  import isac.util.formulae.ModelItem;
    3.10  import isac.util.formulae.ModelItemList;
    3.11  import isac.util.formulae.CalcHeadSimpleID;
    3.12 @@ -106,13 +106,13 @@
    3.13          digester_.addSetNext("*/SPECIFICATION/THEORY", "setTheory");
    3.14  
    3.15          digester_.addObjectCreate("*/SPECIFICATION/PROBLEM",
    3.16 -                CalcHeadCompoundID.class);
    3.17 +                KEStoreID.class);
    3.18          digester_.addCallMethod("*/SPECIFICATION/PROBLEM/KEY/ID", "addString",
    3.19                  0);
    3.20          digester_.addSetNext("*/SPECIFICATION/PROBLEM", "setProblem");
    3.21  
    3.22          digester_.addObjectCreate("*/SPECIFICATION/METHOD",
    3.23 -                CalcHeadCompoundID.class);
    3.24 +                KEStoreID.class);
    3.25          digester_
    3.26                  .addCallMethod("*/SPECIFICATION/METHOD/KEY/ID", "addString", 0);
    3.27          digester_.addSetNext("*/SPECIFICATION/METHOD", "setMethod");
    3.28 @@ -155,14 +155,14 @@
    3.29                  .addCallMethod("*/CALCHEAD/SPECIFICATION/THEORYID", "setID", 0);
    3.30          digester_.addSetNext("*/CALCHEAD/SPECIFICATION/THEORYID", "setTheory");
    3.31          digester_.addObjectCreate("*/CALCHEAD/SPECIFICATION/PROBLEMID",
    3.32 -                CalcHeadCompoundID.class);
    3.33 +                KEStoreID.class);
    3.34          digester_.addCallMethod(
    3.35                  "*/CALCHEAD/SPECIFICATION/PROBLEMID/STRINGLIST/STRING",
    3.36                  "addString", 0);
    3.37          digester_
    3.38                  .addSetNext("*/CALCHEAD/SPECIFICATION/PROBLEMID", "setProblem");
    3.39          digester_.addObjectCreate("*/CALCHEAD/SPECIFICATION/METHODID",
    3.40 -                CalcHeadCompoundID.class);
    3.41 +                KEStoreID.class);
    3.42          digester_.addCallMethod(
    3.43                  "*/CALCHEAD/SPECIFICATION/METHODID/STRINGLIST/STRING",
    3.44                  "addString", 0);

     4.1 --- a/src/java/isac/util/parser/XMLParserDigest.java	Fri Jun 24 11:35:39 2005 +0200
     4.2 +++ b/src/java/isac/util/parser/XMLParserDigest.java	Fri Jun 24 11:35:39 2005 +0200
     4.3 @@ -8,7 +8,7 @@
     4.4  import isac.util.ResponseWrapper;
     4.5  import isac.util.formulae.Assumptions;
     4.6  import isac.util.formulae.CalcHead;
     4.7 -import isac.util.formulae.CalcHeadCompoundID;
     4.8 +import isac.util.formulae.KEStoreID;
     4.9  import isac.util.formulae.Model;
    4.10  import isac.util.formulae.ModelItem;
    4.11  import isac.util.formulae.ModelItemList;
    4.12 @@ -187,14 +187,14 @@
    4.13                  .addCallMethod("*/CALCHEAD/SPECIFICATION/THEORYID", "setID", 0);
    4.14          digester_.addSetNext("*/CALCHEAD/SPECIFICATION/THEORYID", "setTheory");
    4.15          digester_.addObjectCreate("*/CALCHEAD/SPECIFICATION/PROBLEMID",
    4.16 -                CalcHeadCompoundID.class);
    4.17 +                KEStoreID.class);
    4.18          digester_.addCallMethod(
    4.19                  "*/CALCHEAD/SPECIFICATION/PROBLEMID/STRINGLIST/STRING",
    4.20                  "addString", 0);
    4.21          digester_
    4.22                  .addSetNext("*/CALCHEAD/SPECIFICATION/PROBLEMID", "setProblem");
    4.23          digester_.addObjectCreate("*/CALCHEAD/SPECIFICATION/METHODID",
    4.24 -                CalcHeadCompoundID.class);
    4.25 +                KEStoreID.class);
    4.26          digester_.addCallMethod(
    4.27                  "*/CALCHEAD/SPECIFICATION/METHODID/STRINGLIST/STRING",
    4.28                  "addString", 0);