1.1 --- a/src/java/isac/util/IToCalc.java	Thu Dec 11 16:11:34 2003 +0100
     1.2 +++ b/src/java/isac/util/IToCalc.java	Thu Dec 11 17:16:23 2003 +0100
     1.3 @@ -14,7 +14,7 @@
     1.4   * 
     1.5   */
     1.6  
     1.7 -public interface IToCalc {
     1.8 +public interface IToCalc extends IUserAction{
     1.9  	
    1.10  	public final static int SCOPE_CURRENT_SUBPROBLEM = 1;
    1.11  	public final static int SCOPE_CURRENT_SUBCALCULATION = 2;

     2.1 --- a/src/java/isac/util/IToUser.java	Thu Dec 11 16:11:34 2003 +0100
     2.2 +++ b/src/java/isac/util/IToUser.java	Thu Dec 11 17:16:23 2003 +0100
     2.3 @@ -20,4 +20,5 @@
     2.4  	 * Notify a listener of changes in the data.
     2.5  	 */
     2.6  	public void calcChanged(CalcChangedEvent event);
     2.7 +	
     2.8  }

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/src/java/isac/util/IToWorksheet.java	Thu Dec 11 17:16:23 2003 +0100
     3.3 @@ -0,0 +1,23 @@
     3.4 +/*
     3.5 + * Created on Dec 11, 2003
     3.6 + *
     3.7 + * To change the template for this generated file go to
     3.8 + * Window>Preferences>Java>Code Generation>Code and Comments
     3.9 + */
    3.10 +package isac.util;
    3.11 +
    3.12 +/**
    3.13 + * @author isac
    3.14 + *
    3.15 + * To change the template for this generated type comment go to
    3.16 + * Window>Preferences>Java>Code Generation>Code and Comments
    3.17 + */
    3.18 +public interface IToWorksheet extends IToUser {
    3.19 +
    3.20 +	public void editActiveFormula();
    3.21 +	
    3.22 +	public void appendUserFormula();
    3.23 +	
    3.24 +	public void activateUIObject(int id, boolean active);
    3.25 +	
    3.26 +}

     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/src/java/isac/util/IUserAction.java	Thu Dec 11 17:16:23 2003 +0100
     4.3 @@ -0,0 +1,57 @@
     4.4 +/*
     4.5 + * Created on Dec 11, 2003
     4.6 + *
     4.7 + * To change the template for this generated file go to
     4.8 + * Window>Preferences>Java>Code Generation>Code and Comments
     4.9 + */
    4.10 +package isac.util;
    4.11 +
    4.12 +/**
    4.13 + * @author isac
    4.14 + *
    4.15 + * To change the template for this generated type comment go to
    4.16 + * Window>Preferences>Java>Code Generation>Code and Comments
    4.17 + */
    4.18 +public interface IUserAction {
    4.19 +	
    4.20 +	public static final int UI_SPECIFY_TRY_MATCH = 1;
    4.21 +	public static final int UI_SPECIFY_TRY_REFINE = 2;
    4.22 +	public static final int UI_SPECIFY_CHANGE_VIEW = 3;
    4.23 +	
    4.24 +	public static final int UI_SPECIFY_COMPLETE_CALCHEAD = 4;
    4.25 +	public static final int UI_SPECIFY_COMPLETE_METHOD = 5;
    4.26 +	public static final int UI_SPECIFY_COMPLETE_THEORY = 6;
    4.27 +	public static final int UI_SPECIFY_COMPLETE_PROBLEM = 7;
    4.28 +	public static final int UI_SPECIFY_COMPLETE_GIVEN = 8;
    4.29 +	public static final int UI_SPECIFY_COMPLETE_FIND = 9;
    4.30 +	public static final int UI_SPECIFY_COMPLETE_RELATE = 10;
    4.31 +	
    4.32 +	public static final int UI_SPECIFY_CHECK_CALCHEAD = 11;
    4.33 +	public static final int UI_SPECIFY_CALCULATE_1 = 12;
    4.34 +	public static final int UI_SPECIFY_CALCULATE_ALL = 13;
    4.35 +	
    4.36 +	public static final int UI_SOLVE_CALCULATE_1 = UI_SPECIFY_CALCULATE_1;
    4.37 +	public static final int UI_SOLVE_CALCULATE_ALL = UI_SPECIFY_CALCULATE_ALL;
    4.38 +	public static final int UI_SOLVE_CALCULATE_SUBPROBLEM = 23;
    4.39 +	
    4.40 +	public static final int UI_SOLVE_EDIT_ACTIVE_FORMULA = 24;
    4.41 +	public static final int UI_SOLVE_APPEND_USER_FORMULA = 25;
    4.42 +	public static final int UI_SOLVE_MOVE_ACTIVE_FORMULA = 26;
    4.43 +	
    4.44 +	public static final int UI_SOLVE_GET_PROPOSED_TACTIC = 30;
    4.45 +	public static final int UI_SOLVE_GET_APPLICABLE_TACTICS = 31;
    4.46 +	public static final int UI_SOLVE_SET_NEXT_TACTIC = 32;
    4.47 +	public static final int UI_SOLVE_HELP_ENTERING_FORMULA = 33;
    4.48 +
    4.49 +	public static final int UI_SOLVE_SHOW_ASSUMPTIONS = 40;
    4.50 +	public static final int UI_SOLVE_SHOW_DETAILS = 41;
    4.51 +
    4.52 +
    4.53 +
    4.54 +
    4.55 +	
    4.56 +
    4.57 +
    4.58 +	
    4.59 +	
    4.60 +}

     5.1 --- a/src/java/isac/wsdialog/DGuide.java	Thu Dec 11 16:11:34 2003 +0100
     5.2 +++ b/src/java/isac/wsdialog/DGuide.java	Thu Dec 11 17:16:23 2003 +0100
     5.3 @@ -20,7 +20,7 @@
     5.4   * @version 1.0
     5.5   *
     5.6   */
     5.7 -public interface DGuide extends Remote {
     5.8 +public interface DGuide extends IUserAction, Remote {
     5.9    
    5.10    public void attach(CalcTree calc_tree) throws RemoteException;
    5.11  
    5.12 @@ -54,4 +54,7 @@
    5.13                                                 NotInSpecificationPhaseException;
    5.14    public CalcHead tryRefine(CalcHead ch, CalcHeadCompoundID problemID) throws RemoteException,
    5.15                                                 NotInSpecificationPhaseException;
    5.16 +  
    5.17 +  public boolean UserAction (int action_id) throws RemoteException;
    5.18 +  
    5.19  }

     6.1 --- a/src/java/isac/wsdialog/DialogGuide.java	Thu Dec 11 16:11:34 2003 +0100
     6.2 +++ b/src/java/isac/wsdialog/DialogGuide.java	Thu Dec 11 17:16:23 2003 +0100
     6.3 @@ -16,7 +16,7 @@
     6.4  
     6.5  
     6.6  public class DialogGuide extends UnicastRemoteObject 
     6.7 -                         implements DGuide, IToUser, IToCalc, Serializable {
     6.8 +                         implements DGuide, IToCalc, IToUser, Serializable {
     6.9  
    6.10    protected CalcTree calc_tree_;
    6.11    protected CalcHead calc_head_;
    6.12 @@ -185,6 +185,10 @@
    6.13    	calc_tree_.moveActiveFormula(newActiveFormula);
    6.14    }
    6.15    
    6.16 +  public boolean UserAction(int action_id) {
    6.17 +  	return true;
    6.18 +  }
    6.19 +  
    6.20    private void rmiBind(){
    6.21      if(System.getSecurityManager() == null) {
    6.22        System.setSecurityManager(new RMISecurityManager());