1.1 --- a/src/java-tests/isac/bridge/TestBridge.java	Tue Feb 08 12:05:04 2005 +0100
     1.2 +++ b/src/java-tests/isac/bridge/TestBridge.java	Tue Feb 08 12:05:04 2005 +0100
     1.3 @@ -153,9 +153,8 @@
     1.4  
     1.5  		//display the steps generated
     1.6  		Object fch = null;
     1.7 +		ci = (ICalcIterator) cce.getLastUnchangedFormula().clone();
     1.8  		int i = 0;
     1.9 -		//ci.moveDown();
    1.10 -		ci = (ICalcIterator) cce.getLastUnchangedFormula().clone();
    1.11  		while (ci.compareTo(cce.getLastGeneratedFormula()) < 0) {
    1.12  			i++;
    1.13  			boolean b = ci.moveDown();
    1.14 @@ -164,8 +163,10 @@
    1.15  			System.out.println("   yields "
    1.16  					+ ((ICalcElement) fch).toSMLString());
    1.17  		}
    1.18 +//		Vector elems = ct.getElementsFromTo(cce.getLastUnchangedFormula(),
    1.19 +//				cce.getLastGeneratedFormula(), new Integer(2), false);
    1.20  		System.out.println("mini-auto: steps= " + i);
    1.21 -		//assertEquals("mini-auto: steps= ",i,10);
    1.22 +		assertEquals("mini-auto: steps= ",i,10);
    1.23  		assertEquals("mini-auto: last step",
    1.24  				((ICalcElement) fch).toSMLString(), "[x = 1]");
    1.25  		System.out.println(".end step_d-----");

     2.1 --- a/src/java/isac/bridge/BridgeRMI.java	Tue Feb 08 12:05:04 2005 +0100
     2.2 +++ b/src/java/isac/bridge/BridgeRMI.java	Tue Feb 08 12:05:04 2005 +0100
     2.3 @@ -425,6 +425,12 @@
     2.4  			return (CalcChanged) wrapper.getResponse();
     2.5  	}
     2.6  
     2.7 +	public Vector intermediateSteps(int id, ICalcIterator i) {
     2.8 +		ResponseWrapper wrapper = null;
     2.9 +		//
    2.10 +		return null;
    2.11 +	}
    2.12 +
    2.13  	public Vector getElementsFromTo(int id, ICalcIterator iterator_from,
    2.14  			ICalcIterator iterator_to, Integer level,
    2.15  			boolean result_includes_tactics) {
    2.16 @@ -435,10 +441,10 @@
    2.17  				+ " " + level + " " + result_includes_tactics + ";", false);
    2.18  		if (wrapper == null)
    2.19  			return null;
    2.20 -		FormHeadsContainer c = (FormHeadsContainer) wrapper.getResponse();
    2.21 -		return c.getElements();
    2.22 +		FormHeadsContainer con = (FormHeadsContainer) wrapper.getResponse();
    2.23 +		return con.getElements();
    2.24  	}
    2.25 -
    2.26 +	
    2.27  	public int iterator(int id) {
    2.28  		logger_.warn("iterator: id=" + id);
    2.29  		//		ResponseWrapper wrapper = null;

     3.1 --- a/src/java/isac/bridge/CalcTree.java	Tue Feb 08 12:05:04 2005 +0100
     3.2 +++ b/src/java/isac/bridge/CalcTree.java	Tue Feb 08 12:05:04 2005 +0100
     3.3 @@ -493,9 +493,9 @@
     3.4  	 * 
     3.5  	 * @see isac.util.interfaces.IToCalc#intermediateSteps()
     3.6  	 */
     3.7 -	public int intermediateSteps() throws RemoteException {
     3.8 +	public Vector intermediateSteps(ICalcIterator i) throws RemoteException {
     3.9  		// TODO Auto-generated method stub
    3.10 -		return 0;
    3.11 +		return null;
    3.12  	}
    3.13  
    3.14  	/*

     4.1 --- a/src/java/isac/util/interfaces/IToCalc.java	Tue Feb 08 12:05:04 2005 +0100
     4.2 +++ b/src/java/isac/util/interfaces/IToCalc.java	Tue Feb 08 12:05:04 2005 +0100
     4.3 @@ -122,7 +122,7 @@
     4.4  	 * 
     4.5  	 * @return Vector of Formulae and CalcHeads
     4.6  	 */
     4.7 -	public int intermediateSteps() throws RemoteException;
     4.8 +	public Vector intermediateSteps(ICalcIterator i) throws RemoteException;
     4.9  
    4.10  	/**
    4.11  	 * Tries to append the passed formula after the active formula. This could

     5.1 --- a/src/java/isac/wsdialog/DialogGuide.java	Tue Feb 08 12:05:04 2005 +0100
     5.2 +++ b/src/java/isac/wsdialog/DialogGuide.java	Tue Feb 08 12:05:04 2005 +0100
     5.3 @@ -525,14 +525,13 @@
     5.4      
     5.5    }
     5.6  
     5.7 -/* (non-Javadoc)
     5.8 - * @see isac.util.interfaces.IToCalc#intermediateSteps()
     5.9 - */
    5.10 -public int intermediateSteps() throws RemoteException {
    5.11 -	// TODO Auto-generated method stub
    5.12 -	return 0;
    5.13 -}
    5.14 -
    5.15 +  /* (non-Javadoc)
    5.16 +   * @see isac.util.interfaces.IToCalc#intermediateSteps(isac.util.interfaces.ICalcIterator)
    5.17 +   */
    5.18 +  public Vector intermediateSteps(ICalcIterator i) throws RemoteException {
    5.19 +  	// TODO Auto-generated method stub
    5.20 +  	return null;
    5.21 +  }
    5.22  /* (non-Javadoc)
    5.23   * @see isac.util.interfaces.IToCalc#getElementsFromTo(isac.util.interfaces.ICalcIterator, isac.util.interfaces.ICalcIterator, java.lang.Integer, boolean)
    5.24   */
    5.25 @@ -541,4 +540,5 @@
    5.26  	return null;
    5.27  }
    5.28  
    5.29 +
    5.30  }
    5.31 \ No newline at end of file