1.1 --- a/isac-java/src/java-tests/isac/gui/mawen/MockWorksheetDialog.java	Fri Oct 27 17:58:43 2017 +0200
     1.2 +++ b/isac-java/src/java-tests/isac/gui/mawen/MockWorksheetDialog.java	Tue Nov 21 08:42:47 2017 +0100
     1.3 @@ -423,12 +423,12 @@
     1.4       *    <code>Position</code> in <code>MockCalcTreeSIMPLIFY</code>
     1.5       */
     1.6      protected void sendFormulaToWorksheet (Position from, Position to) {
     1.7 -      ICalcIterator i_from = new MockDialogIteratorSIMPLIFY(from);
     1.8 -      ICalcIterator i_to = new MockDialogIteratorSIMPLIFY(to);
     1.9 +      ICalcIterator i_from = new MockDialogIterator(from);
    1.10 +      ICalcIterator i_to = new MockDialogIterator(to);
    1.11        CalcChanged e = new CalcChanged(4711, false, i_from, i_from, i_to);
    1.12        try {
    1.13          ((IToUser) datachange_listeners_.elementAt(0)).calcResponse(e);
    1.14 -        context_formula_ =(CalcFormula) ((MockDialogIteratorSIMPLIFY)e.getLastGeneratedFormula()).
    1.15 +        context_formula_ =(CalcFormula) ((MockDialogIterator)e.getLastGeneratedFormula()).
    1.16              getFormula(to);
    1.17        } catch (RemoteException e1) {
    1.18          // TODO Auto-generated catch block

     2.1 --- a/isac-java/src/java-tests/isac/gui/mawen/TestWorksheetForMawen.java	Fri Oct 27 17:58:43 2017 +0200
     2.2 +++ b/isac-java/src/java-tests/isac/gui/mawen/TestWorksheetForMawen.java	Tue Nov 21 08:42:47 2017 +0100
     2.3 @@ -231,10 +231,10 @@
     2.4  		
     2.5  		Vector<Integer> p = new Vector<Integer>(); p.add(1);
     2.6  		Position pos = new Position(p, "Res");
     2.7 -		ICalcIterator from = new MockDialogIteratorSIMPLIFY(pos);
     2.8 +		ICalcIterator from = new MockDialogIterator(pos);
     2.9  		p = new Vector<Integer>(); p.add(2);
    2.10  	    pos = new Position(p, "Res");
    2.11 -		ICalcIterator to = new MockDialogIteratorSIMPLIFY(pos);
    2.12 +		ICalcIterator to = new MockDialogIterator(pos);
    2.13  		
    2.14  		Vector<CalcFormula> fs = null;
    2.15  		try { // in the test NO rmi is involved
    2.16 @@ -247,10 +247,10 @@
    2.17  		// -------------------------------------------------------------------
    2.18  		p = new Vector<Integer>(); p.add(1);
    2.19  		pos = new Position(p, "Frm");
    2.20 -		from = new MockDialogIteratorSIMPLIFY(pos);
    2.21 +		from = new MockDialogIterator(pos);
    2.22  		p = new Vector<Integer>(); p.add(2);
    2.23  	    pos = new Position(p, "Res");
    2.24 -		to = new MockDialogIteratorSIMPLIFY(pos);
    2.25 +		to = new MockDialogIterator(pos);
    2.26  		
    2.27  		fs = null;
    2.28  		try { // in the test NO rmi is involved
    2.29 @@ -270,7 +270,7 @@
    2.30  		
    2.31  		Vector<Integer> p = new Vector<Integer>();
    2.32  		Position pos = new Position(p, "Pbl");
    2.33 -		ICalcIterator ci = new MockDialogIteratorSIMPLIFY(pos);
    2.34 +		ICalcIterator ci = new MockDialogIterator(pos);
    2.35  
    2.36  		CalcChanged e = new CalcChanged(4711, false, ci, ci, ci);
    2.37      	ICalcIterator from = e.getLastUnchangedFormula();
    2.38 @@ -293,10 +293,10 @@
    2.39  		// -------------------------------------------------------------------
    2.40  		p = new Vector<Integer>(); p.add(1);
    2.41  	    pos = new Position(p, "Res");
    2.42 -	    ICalcIterator unc = new MockDialogIteratorSIMPLIFY(pos);
    2.43 +	    ICalcIterator unc = new MockDialogIterator(pos);
    2.44  		p = new Vector<Integer>(); p.add(2);
    2.45  	    pos = new Position(p, "Res");
    2.46 -	    ICalcIterator gen = new MockDialogIteratorSIMPLIFY(pos);
    2.47 +	    ICalcIterator gen = new MockDialogIterator(pos);
    2.48  		
    2.49  		e = new CalcChanged(4711, false, unc, unc, gen);
    2.50  		from = e.getLastUnchangedFormula();