clean up authors and class-names belonging to the isac-admin
authorwneuper
Fri, 29 Jul 2005 11:02:32 +0200
changeset 277082d17f093a16
parent 2769 592c4c7c0ca3
child 2771 601b872411c7
clean up authors and class-names belonging to the isac-admin
src/java/isac/gui/Worksheet.java
src/java/isac/useractions/ActionOnUIElement.java
src/java/isac/useractions/IUIAction.java
src/java/isac/useractions/IUIElement.java
src/java/isac/useractions/IUserAction.java
src/java/isac/util/users/Accounts.java
src/java/isac/util/users/IUserSettings.java
src/java/isac/util/users/UserAdmin.java
src/java/isac/util/users/UserModel.java
src/java/isac/wsdialog/IUIElement.java
src/java/isac/wsdialog/IWorksheetDialog.java
     1.1 --- a/src/java/isac/gui/Worksheet.java	Fri Jul 29 10:48:40 2005 +0200
     1.2 +++ b/src/java/isac/gui/Worksheet.java	Fri Jul 29 11:02:32 2005 +0200
     1.3 @@ -18,6 +18,7 @@
     1.4  import isac.interfaces.IToGUI;
     1.5  import isac.interfaces.IToUser;
     1.6  import isac.useractions.IUIAction;
     1.7 +import isac.useractions.IUIElement;
     1.8  import isac.useractions.IUserAction;
     1.9  import isac.useractions.UIAction;
    1.10  import isac.useractions.UserAction;
    1.11 @@ -34,7 +35,6 @@
    1.12  import isac.util.users.IUserSettings;
    1.13  import isac.wsdialog.IWorksheetDialog;
    1.14  import isac.wsdialog.DialogProtocolException;
    1.15 -import isac.wsdialog.IUIElement;
    1.16  
    1.17  import java.awt.BorderLayout;
    1.18  import java.awt.Component;
     2.1 --- a/src/java/isac/useractions/ActionOnUIElement.java	Fri Jul 29 10:48:40 2005 +0200
     2.2 +++ b/src/java/isac/useractions/ActionOnUIElement.java	Fri Jul 29 11:02:32 2005 +0200
     2.3 @@ -3,13 +3,12 @@
     2.4   */
     2.5  package isac.useractions;
     2.6  
     2.7 -import isac.wsdialog.IUIElement;
     2.8  
     2.9  
    2.10  /**
    2.11   * Describes an action which has to pass a UI Element,
    2.12   * e.g a activation or deactivating buttons.
    2.13 - * @see isac.wsdialog.IUIElement
    2.14 + * @see isac.useractions.IUIElement
    2.15   * @author Alan Krempler
    2.16   */
    2.17  public class ActionOnUIElement extends UserAction {
     3.1 --- a/src/java/isac/useractions/IUIAction.java	Fri Jul 29 10:48:40 2005 +0200
     3.2 +++ b/src/java/isac/useractions/IUIAction.java	Fri Jul 29 11:02:32 2005 +0200
     3.3 @@ -7,7 +7,6 @@
     3.4   */
     3.5  package isac.useractions;
     3.6  
     3.7 -import isac.wsdialog.IUIElement;
     3.8  
     3.9  import java.io.Serializable;
    3.10  
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/src/java/isac/useractions/IUIElement.java	Fri Jul 29 11:02:32 2005 +0200
     4.3 @@ -0,0 +1,254 @@
     4.4 +/*
     4.5 + * @author Alan Krempler
     4.6 + * Created on Dec 12, 2003
     4.7 + */
     4.8 +package isac.useractions;
     4.9 +
    4.10 +/**
    4.11 + * @author Alan Krempler
    4.12 + * 
    4.13 + * Constants describing interactions or request from the user
    4.14 + * TOOODO.AK? rename to IUInteractions ???
    4.15 + */
    4.16 +public interface IUIElement {
    4.17 +
    4.18 +	/** ***************** NOTIFICATIONS: SPECIFYING PHASE ********************** */
    4.19 +
    4.20 +	public static final int UI_DUMMY_FIRST_SPECIFY = 1;
    4.21 +
    4.22 +	/**
    4.23 +	 * get descriptions into all items of a model; these give hints for input to
    4.24 +	 * the user
    4.25 +	 */
    4.26 +	public static final int UI_SPECIFY_GET_DESCRIPTIONS = 2;
    4.27 +
    4.28 +	/**
    4.29 +	 * During the specifying phase, try to match a problem type to the data
    4.30 +	 * entered so far WN //// ?items of the model entered so far
    4.31 +	 */
    4.32 +	public static final int UI_SPECIFY_TRY_MATCH = 2;
    4.33 +
    4.34 +	/**
    4.35 +	 * During the specifying phase, try to refine the problem type. WN ////
    4.36 +	 */
    4.37 +	public static final int UI_SPECIFY_TRY_REFINE = 3;
    4.38 +
    4.39 +	/**
    4.40 +	 * During the specifying phase, change the view on the CalcHead.
    4.41 +	 */
    4.42 +	public static final int UI_SPECIFY_CHANGE_VIEW = 4;
    4.43 +
    4.44 +	/**
    4.45 +	 * During the specifying phase, have the CalcHead completed by the math
    4.46 +	 * engine.
    4.47 +	 */
    4.48 +	public static final int UI_SPECIFY_COMPLETE_CALCHEAD = 5;
    4.49 +
    4.50 +	/**
    4.51 +	 * During the specifying phase, have the Method field of the CalcHead
    4.52 +	 * completed by the math engine.
    4.53 +	 */
    4.54 +	public static final int UI_SPECIFY_COMPLETE_METHOD = 6;
    4.55 +
    4.56 +	/**
    4.57 +	 * During the specifying phase, have the Theory field of the CalcHead
    4.58 +	 * completed by the math engine.
    4.59 +	 */
    4.60 +	public static final int UI_SPECIFY_COMPLETE_THEORY = 7;
    4.61 +
    4.62 +	/**
    4.63 +	 * During the specifying phase, have the Problem field of the CalcHead
    4.64 +	 * completed by the math engine.
    4.65 +	 */
    4.66 +	public static final int UI_SPECIFY_COMPLETE_PROBLEM = 8;
    4.67 +
    4.68 +	/**
    4.69 +	 * During the specifying phase, have the Given field of the CalcHead
    4.70 +	 * completed by the math engine.
    4.71 +	 */
    4.72 +	public static final int UI_SPECIFY_COMPLETE_GIVEN = 9;
    4.73 +
    4.74 +	/**
    4.75 +	 * During the specifying phase, have the Find field of the CalcHead
    4.76 +	 * completed by the math engine.
    4.77 +	 */
    4.78 +	public static final int UI_SPECIFY_COMPLETE_FIND = 10;
    4.79 +
    4.80 +	/**
    4.81 +	 * During the specifying phase, have the Relate field of the CalcHead
    4.82 +	 * completed by the math engine.
    4.83 +	 */
    4.84 +	public static final int UI_SPECIFY_COMPLETE_RELATE = 11;
    4.85 +
    4.86 +	/**
    4.87 +	 * During the specifying phase, have the CalcHead checked for completeness
    4.88 +	 * and consistency.
    4.89 +	 */
    4.90 +	public static final int UI_SPECIFY_CHECK_CALCHEAD = 12;
    4.91 +
    4.92 +	/**
    4.93 +	 * Leave the specifying phase, enter the solving phase and calculate the
    4.94 +	 * first step of the method.
    4.95 +	 */
    4.96 +	public static final int UI_SPECIFY_TO_SOLVE = 13;
    4.97 +
    4.98 +	/**
    4.99 +	 * Leave the specifying phase, enter the solving phase and calculate until a
   4.100 +	 * final result is reached.
   4.101 +	 */
   4.102 +	public static final int UI_SPECIFY_CALCULATE_ALL = 14;
   4.103 +	
   4.104 +	public static final int UI_SPECIFY_SHOW_CALCHEAD = 15;
   4.105 +
   4.106 +	public static final int UI_DUMMY_LAST_SPECIFY = 15;
   4.107 +
   4.108 +	/** ***************** NOTIFICATIONS: SOLVING PHASE ********************** */
   4.109 +
   4.110 +	public static final int UI_DUMMY_FIRST_SOLVE = 121;
   4.111 +
   4.112 +	/**
   4.113 +	 * During the solving phase, calculate one more step.
   4.114 +	 */
   4.115 +	public static final int UI_SOLVE_CALCULATE_1 = 121;
   4.116 +
   4.117 +	/**
   4.118 +	 * During the solving phase, calculate until a final result is reached.
   4.119 +	 */
   4.120 +	public static final int UI_SOLVE_CALCULATE_ALL = 122;
   4.121 +
   4.122 +	/**
   4.123 +	 * During the solving phase, calculate until the current subproblem is
   4.124 +	 * solved.
   4.125 +	 */
   4.126 +	public static final int UI_SOLVE_CALCULATE_SUBPROBLEM = 123;
   4.127 +
   4.128 +	/**
   4.129 +	 * During the solving phase, request editing the currently active formula.
   4.130 +	 * 
   4.131 +	 * WN0412 If request is conceded, do
   4.132 +	 * 
   4.133 +	 * @see UI_SOLVE_EDIT_ACTIVE_FORMULA_COMPLETE
   4.134 +	 */
   4.135 +	public static final int UI_SOLVE_EDIT_ACTIVE_FORMULA = 124;
   4.136 +
   4.137 +	/**
   4.138 +	 * During the solving phase, notify that editing the currently active
   4.139 +	 * formula is finished. This implies a request for updating the CalcTree.
   4.140 +	 */
   4.141 +	public static final int UI_SOLVE_EDIT_ACTIVE_FORMULA_COMPLETE = 125;
   4.142 +
   4.143 +	/**
   4.144 +	 * During the solving phase, request inserting a new formula _after_ the
   4.145 +	 * currently active formula, making the new formula the currently active
   4.146 +	 * formula. At present, this does not imply editing the formula and must be
   4.147 +	 * requested in a separate step. WN0412: ...??? is this right interpreted by
   4.148 +	 * ... WN0412 If request is conceded, do
   4.149 +	 * 
   4.150 +	 * @see UI_SOLVE_EDIT_ACTIVE_FORMULA_COMPLETE
   4.151 +	 */
   4.152 +	public static final int UI_SOLVE_APPEND_USER_FORMULA = 126;
   4.153 +
   4.154 +	/**
   4.155 +	 * During the solving phase, request making the referened formula the
   4.156 +	 * currently active formula.
   4.157 +	 */
   4.158 +	public static final int UI_SOLVE_MOVE_ACTIVE_FORMULA = 127;
   4.159 +
   4.160 +	/**
   4.161 +	 * During the solving phase, ask for the tactic the math engine would apply
   4.162 +	 * to the current formula.
   4.163 +	 */
   4.164 +	public static final int UI_SOLVE_GET_PROPOSED_TACTIC = 130;
   4.165 +
   4.166 +	/**
   4.167 +	 * During the solving phase, ask for a list of tactics to the current
   4.168 +	 * formula.
   4.169 +	 */
   4.170 +	public static final int UI_SOLVE_GET_APPLICABLE_TACTICS = 131;
   4.171 +
   4.172 +	/**
   4.173 +	 * During the solving phase, set the tactic to be applied to the current
   4.174 +	 * formula.
   4.175 +	 */
   4.176 +	public static final int UI_SOLVE_SET_NEXT_TACTIC = 132;
   4.177 +
   4.178 +	/**
   4.179 +	 * When entering a formula during the solving phase, request help on
   4.180 +	 * entering the formula.
   4.181 +	 */
   4.182 +	public static final int UI_SOLVE_HELP_ENTERING_FORMULA = 133;
   4.183 +
   4.184 +	/**
   4.185 +	 * During the solving phase, show which assumptions hold at the current
   4.186 +	 * point of calculation.
   4.187 +	 */
   4.188 +	public static final int UI_SOLVE_SHOW_ASSUMPTIONS = 140;
   4.189 +
   4.190 +	/**
   4.191 +	 * During the solving phase, request more detail about the currently
   4.192 +	 * referenced element.
   4.193 +	 */
   4.194 +	public static final int UI_SOLVE_SHOW_DETAILS = 141;
   4.195 +
   4.196 +	public static final int UI_DUMMY_LAST_SOLVE = 141;
   4.197 +
   4.198 +
   4.199 +	/** ***************** ACTIVE REQUESTS TO THE UI ********************** */
   4.200 +
   4.201 +	/**
   4.202 +	 * Request editing the currently active formula. DG distinguishes between
   4.203 +	 * SPECIFY and SOLVE; thus could drop UI_SOLVE_EDIT_ACTIVE_FORMULA : int
   4.204 +	 * 
   4.205 +	 * LK050711 start editing implicit somewhere in tree, thus unused
   4.206 +	 */
   4.207 +	public static final int UI_DO_EDIT_FORMULA = 229;
   4.208 +
   4.209 +	/**
   4.210 +	 * Request appending a new, empty formula.
   4.211 +	 */
   4.212 +	public static final int UI_DO_APPEND_FORMULA = 230;
   4.213 +
   4.214 +	/**
   4.215 +	 * Activate an UI element.
   4.216 +	 */
   4.217 +	public static final int UI_DO_ACTIVATE = 231;
   4.218 +
   4.219 +	/**
   4.220 +	 * Deactivate an UI element.
   4.221 +	 */
   4.222 +	public static final int UI_DO_DEACTIVATE = 232;
   4.223 +
   4.224 +	/**
   4.225 +	 * The Dialog Guide has detached the listener and will not send any more
   4.226 +	 * control requests. If registered as a Data Change Listener, update
   4.227 +	 * notifications will still arrive!
   4.228 +	 */
   4.229 +	public static final int UI_DO_DETACH = 233;
   4.230 +
   4.231 +	/**
   4.232 +	 * to transmit the problem from the problem browser to 
   4.233 +	 * the worksheet
   4.234 +	 */
   4.235 +	public static final int UI_PROBLEMBROWSER_PROBLEM_TO_WORKSHEET = 234;
   4.236 +	
   4.237 +	/**
   4.238 +	 * to turn the auto match mode on
   4.239 +	 */
   4.240 +	public static final int UI_PROBLEMBROWSER_AUTO_MATCH_ON = 235;
   4.241 +	
   4.242 +	/**
   4.243 +	 * to turn the auto match mode off
   4.244 +	 */
   4.245 +	public static final int UI_PROBLEMBROWSER_AUTO_MATCH_OFF = 236;
   4.246 +	
   4.247 +	/**
   4.248 +	 * to open the problem browser window
   4.249 +	 */
   4.250 +	public static final int UI_PROBLEMBROWSER_OPEN = 237;
   4.251 +
   4.252 +	/**
   4.253 +	 * to tell the proble browser dialog that the selection in the 
   4.254 +	 * problem browser has changed
   4.255 +	 */
   4.256 +	public static final int UI_PROBLEMBROWSER_SELECTION_CHANGED = 238;
   4.257 +}
   4.258 \ No newline at end of file
     5.1 --- a/src/java/isac/useractions/IUserAction.java	Fri Jul 29 10:48:40 2005 +0200
     5.2 +++ b/src/java/isac/useractions/IUserAction.java	Fri Jul 29 11:02:32 2005 +0200
     5.3 @@ -5,7 +5,6 @@
     5.4  
     5.5  import java.io.Serializable;
     5.6  
     5.7 -import isac.wsdialog.IUIElement;
     5.8  
     5.9  /**
    5.10   * Interface common to notifications about user interaction
     6.1 --- a/src/java/isac/util/users/Accounts.java	Fri Jul 29 10:48:40 2005 +0200
     6.2 +++ b/src/java/isac/util/users/Accounts.java	Fri Jul 29 11:02:32 2005 +0200
     6.3 @@ -8,7 +8,6 @@
     6.4   */
     6.5  package isac.util.users;
     6.6  
     6.7 -import java.io.File;
     6.8  import java.io.FileInputStream;
     6.9  import java.io.FileNotFoundException;
    6.10  import java.io.FileOutputStream;
    6.11 @@ -24,46 +23,46 @@
    6.12   */
    6.13  public class Accounts extends Properties {
    6.14  
    6.15 -	public Accounts(String userpath) {
    6.16 -		String filename = userpath + "accounts.txt";
    6.17 -		try {
    6.18 -			FileInputStream propInFile = new FileInputStream(filename);
    6.19 -			this.load(propInFile);
    6.20 -			this.list(System.out);
    6.21 -		} catch (FileNotFoundException e) {
    6.22 -			System.err.println("Can?t find " + filename);
    6.23 -		} catch (IOException e) {
    6.24 -			System.err.println("I/O failed.");
    6.25 -		}
    6.26 -	}
    6.27 +    public Accounts(String userpath) {
    6.28 +        String filename = userpath + "accounts.txt";
    6.29 +        try {
    6.30 +            FileInputStream propInFile = new FileInputStream(filename);
    6.31 +            this.load(propInFile);
    6.32 +            this.list(System.out);
    6.33 +        } catch (FileNotFoundException e) {
    6.34 +            System.err.println("Can?t find " + filename);
    6.35 +        } catch (IOException e) {
    6.36 +            System.err.println("I/O failed.");
    6.37 +        }
    6.38 +    }
    6.39  
    6.40 -	public boolean exists(String username) {
    6.41 -		Enumeration keys = this.propertyNames();//WN050311 how better ?
    6.42 -		String key = null;
    6.43 -		while (keys.hasMoreElements()) {
    6.44 -			key = (String) keys.nextElement();
    6.45 -			if (key.compareTo(username) == 0)
    6.46 -				return true;
    6.47 -		}
    6.48 -		return false;
    6.49 -	}
    6.50 +    public boolean exists(String username) {
    6.51 +        Enumeration keys = this.propertyNames();//WN050311 how better ?
    6.52 +        String key = null;
    6.53 +        while (keys.hasMoreElements()) {
    6.54 +            key = (String) keys.nextElement();
    6.55 +            if (key.compareTo(username) == 0)
    6.56 +                return true;
    6.57 +        }
    6.58 +        return false;
    6.59 +    }
    6.60  
    6.61 -	//WN050311 just for creation of the first file
    6.62 -	//beware of the fix path !
    6.63 -	public static void main(String[] args) {
    6.64 -		Accounts acs = new Accounts("isac/xmldata/users");
    6.65 -		acs.setProperty("x", "x");
    6.66 -		acs.setProperty("y", "y");
    6.67 -		acs.setProperty("anonymous", "anonymous");
    6.68 +    //WN050311 just for creation of the first file
    6.69 +    //beware of the fix path !
    6.70 +    public static void main(String[] args) {
    6.71 +        Accounts acs = new Accounts("isac/xmldata/users");
    6.72 +        acs.setProperty("x", "x");
    6.73 +        acs.setProperty("y", "y");
    6.74 +        acs.setProperty("anonymous", "anonymous");
    6.75  
    6.76 -		String filename = "isac/xmldata/users/accounts.txt";
    6.77 -		try {
    6.78 -			FileOutputStream propOutFile = new FileOutputStream(filename);
    6.79 -			acs.store(propOutFile, "the list of isac users");
    6.80 +        String filename = "isac/xmldata/users/accounts.txt";
    6.81 +        try {
    6.82 +            FileOutputStream propOutFile = new FileOutputStream(filename);
    6.83 +            acs.store(propOutFile, "the list of isac users");
    6.84  
    6.85 -		} catch (IOException e) {
    6.86 -			System.err.println("I/O failed.");
    6.87 -		}
    6.88 -	}
    6.89 +        } catch (IOException e) {
    6.90 +            System.err.println("I/O failed.");
    6.91 +        }
    6.92 +    }
    6.93  
    6.94  }
    6.95 \ No newline at end of file
     7.1 --- a/src/java/isac/util/users/IUserSettings.java	Fri Jul 29 10:48:40 2005 +0200
     7.2 +++ b/src/java/isac/util/users/IUserSettings.java	Fri Jul 29 11:02:32 2005 +0200
     7.3 @@ -10,8 +10,6 @@
     7.4  
     7.5  import isac.util.formulae.CalcHead;
     7.6  
     7.7 -import java.rmi.RemoteException;
     7.8 -
     7.9  /**
    7.10   * @author Walther Neuper
    7.11   * 
    7.12 @@ -19,41 +17,41 @@
    7.13   */
    7.14  public interface IUserSettings {
    7.15  
    7.16 -	//TODO comments with AK?
    7.17 -	//the following are situations implemented as keys for UserSettings
    7.18 -	//the identifiers must start with "KEYn_*" where n reappears in the
    7.19 -	// identifiers of the related values "VALn_*" ---------------------
    7.20 -	public static final String KEY1_START_SPECIFY = "KEY1_START_SPECIFY";
    7.21 +    //TODO comments with AK?
    7.22 +    //the following are situations implemented as keys for UserSettings
    7.23 +    //the identifiers must start with "KEYn_*" where n reappears in the
    7.24 +    // identifiers of the related values "VALn_*" ---------------------
    7.25 +    public static final String KEY1_START_SPECIFY = "KEY1_START_SPECIFY";
    7.26  
    7.27 -	/**
    7.28 -	 * _ALL_ the values of UserSettings _MUST_ be connect their
    7.29 -	 * Integer-representation with the String-representation in
    7.30 -	 * 
    7.31 -	 * @see isac.util.users.UserSettings#createValstrValint
    7.32 -	 */
    7.33 -	public static final int VAL1_SKIP_SPECIFY_TO_START_SOLVE = 23;
    7.34 +    /**
    7.35 +     * _ALL_ the values of UserSettings _MUST_ be connect their
    7.36 +     * Integer-representation with the String-representation in
    7.37 +     * 
    7.38 +     * @see isac.util.users.UserSettings#createValstrValint
    7.39 +     */
    7.40 +    public static final int VAL1_SKIP_SPECIFY_TO_START_SOLVE = 23;
    7.41  
    7.42 -	public static final int VAL1_POP_CALCHEAD_WITH_DESCRIPTIONS = 26;
    7.43 +    public static final int VAL1_POP_CALCHEAD_WITH_DESCRIPTIONS = 26;
    7.44  
    7.45 -	//-----------------------------------------------------------------
    7.46 -	public static final String KEY2_NEXT_BUTTON = "KEY2_NEXT_BUTTON";
    7.47 +    //-----------------------------------------------------------------
    7.48 +    public static final String KEY2_NEXT_BUTTON = "KEY2_NEXT_BUTTON";
    7.49  
    7.50 -	public static final int VAL2_FORMULAE_ONLY = 43;
    7.51 +    public static final int VAL2_FORMULAE_ONLY = 43;
    7.52  
    7.53 -	public static final int VAL2_FORMULA_TACTIC_FORMULA_ = 46;
    7.54 +    public static final int VAL2_FORMULA_TACTIC_FORMULA_ = 46;
    7.55  
    7.56 -	public static final int DUMMY = 0;
    7.57 +    public static final int DUMMY = 0;
    7.58  
    7.59 -	//-----------------------------------------------------------------
    7.60 -	public static final String KEY3_STATUS = "KEY3_STATUS";
    7.61 +    //-----------------------------------------------------------------
    7.62 +    public static final String KEY3_STATUS = "KEY3_STATUS";
    7.63  
    7.64 -	public static final int VAL3_LEARNER = 61;
    7.65 +    public static final int VAL3_LEARNER = 61;
    7.66  
    7.67 -	public static final int VAL3_AUTHOR = 62;
    7.68 +    public static final int VAL3_AUTHOR = 62;
    7.69  
    7.70 -	//=================================================================
    7.71 -	public int getValue(String key);
    7.72 +    //=================================================================
    7.73 +    public int getValue(String key);
    7.74  
    7.75 -	public boolean setValue(String key, int value);
    7.76 +    public boolean setValue(String key, int value);
    7.77  
    7.78  }
    7.79 \ No newline at end of file
     8.1 --- a/src/java/isac/util/users/UserAdmin.java	Fri Jul 29 10:48:40 2005 +0200
     8.2 +++ b/src/java/isac/util/users/UserAdmin.java	Fri Jul 29 11:02:32 2005 +0200
     8.3 @@ -14,36 +14,37 @@
     8.4  
     8.5  /**
     8.6   * @author Walther Neuper
     8.7 - *
     8.8 - * contains administrative data (and nothing about the dialog !!!)
     8.9 - * looking forward to be handled elsewhere outside isac
    8.10 + * 
    8.11 + * contains administrative data (and nothing about the dialog !!!) looking
    8.12 + * forward to be handled elsewhere outside isac
    8.13   */
    8.14  public class UserAdmin extends Properties {
    8.15 -	
    8.16 -	private String userpath_;
    8.17 -	private String username_;
    8.18 -	
    8.19 -	public UserAdmin (String userpath, String username){
    8.20 -		userpath_=userpath;
    8.21 -		username_=username;
    8.22 -	}
    8.23 -		
    8.24 -	//WN050311 just for creation of the first file
    8.25 -	//beware of the fix path !
    8.26 -	public static void main(String[] args) {
    8.27 -		UserAdmin a = new UserAdmin("isac/xmldata/users", "x");
    8.28 -		a.setProperty("firstName", "x-firstName");
    8.29 -		a.setProperty("lastName", "x-lastName");
    8.30  
    8.31 -		String filename = "isac/xmldata/users/x_admin.txt";
    8.32 -		try {
    8.33 -			FileOutputStream propOutFile = new FileOutputStream(filename);
    8.34 -			a.store(propOutFile, "administrative data of user 'x'");
    8.35 +    private String userpath_;
    8.36  
    8.37 -		} catch (IOException e) {
    8.38 -			System.err.println("I/O failed.");
    8.39 -		}
    8.40 +    private String username_;
    8.41  
    8.42 -	}
    8.43 +    public UserAdmin(String userpath, String username) {
    8.44 +        userpath_ = userpath;
    8.45 +        username_ = username;
    8.46 +    }
    8.47  
    8.48 -}
    8.49 +    //WN050311 just for creation of the first file
    8.50 +    //beware of the fix path !
    8.51 +    public static void main(String[] args) {
    8.52 +        UserAdmin a = new UserAdmin("isac/xmldata/users", "x");
    8.53 +        a.setProperty("firstName", "x-firstName");
    8.54 +        a.setProperty("lastName", "x-lastName");
    8.55 +
    8.56 +        String filename = "isac/xmldata/users/x_admin.txt";
    8.57 +        try {
    8.58 +            FileOutputStream propOutFile = new FileOutputStream(filename);
    8.59 +            a.store(propOutFile, "administrative data of user 'x'");
    8.60 +
    8.61 +        } catch (IOException e) {
    8.62 +            System.err.println("I/O failed.");
    8.63 +        }
    8.64 +
    8.65 +    }
    8.66 +
    8.67 +}
    8.68 \ No newline at end of file
     9.1 --- a/src/java/isac/util/users/UserModel.java	Fri Jul 29 10:48:40 2005 +0200
     9.2 +++ b/src/java/isac/util/users/UserModel.java	Fri Jul 29 11:02:32 2005 +0200
     9.3 @@ -1,8 +1,6 @@
     9.4  /*
     9.5 + * @author Alan Krempler
     9.6   * Created on Feb 22, 2005
     9.7 - *
     9.8 - * To change the template for this generated file go to
     9.9 - * Window>Preferences>Java>Code Generation>Code and Comments
    9.10   */
    9.11  package isac.util.users;
    9.12  
    9.13 @@ -23,8 +21,6 @@
    9.14   * The UserModel is a class to gather statistics about one user's interaction
    9.15   * with the system. Statistis are gathered per user and per interactional
    9.16   * context.
    9.17 - * 
    9.18 - * AK? merge with UserModel_AK
    9.19   */
    9.20  public class UserModel extends Properties {
    9.21  
    10.1 --- a/src/java/isac/wsdialog/IUIElement.java	Fri Jul 29 10:48:40 2005 +0200
    10.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
    10.3 @@ -1,253 +0,0 @@
    10.4 -/*
    10.5 - * Created on Dec 12, 2003
    10.6 - */
    10.7 -package isac.wsdialog;
    10.8 -
    10.9 -/**
   10.10 - * @author Alan Krempler
   10.11 - * 
   10.12 - * Constants describing interactions or request from the user
   10.13 - * TOOODO.AK? rename to IUInteractions ???
   10.14 - */
   10.15 -public interface IUIElement {
   10.16 -
   10.17 -	/** ***************** NOTIFICATIONS: SPECIFYING PHASE ********************** */
   10.18 -
   10.19 -	public static final int UI_DUMMY_FIRST_SPECIFY = 1;
   10.20 -
   10.21 -	/**
   10.22 -	 * get descriptions into all items of a model; these give hints for input to
   10.23 -	 * the user
   10.24 -	 */
   10.25 -	public static final int UI_SPECIFY_GET_DESCRIPTIONS = 2;
   10.26 -
   10.27 -	/**
   10.28 -	 * During the specifying phase, try to match a problem type to the data
   10.29 -	 * entered so far WN //// ?items of the model entered so far
   10.30 -	 */
   10.31 -	public static final int UI_SPECIFY_TRY_MATCH = 2;
   10.32 -
   10.33 -	/**
   10.34 -	 * During the specifying phase, try to refine the problem type. WN ////
   10.35 -	 */
   10.36 -	public static final int UI_SPECIFY_TRY_REFINE = 3;
   10.37 -
   10.38 -	/**
   10.39 -	 * During the specifying phase, change the view on the CalcHead.
   10.40 -	 */
   10.41 -	public static final int UI_SPECIFY_CHANGE_VIEW = 4;
   10.42 -
   10.43 -	/**
   10.44 -	 * During the specifying phase, have the CalcHead completed by the math
   10.45 -	 * engine.
   10.46 -	 */
   10.47 -	public static final int UI_SPECIFY_COMPLETE_CALCHEAD = 5;
   10.48 -
   10.49 -	/**
   10.50 -	 * During the specifying phase, have the Method field of the CalcHead
   10.51 -	 * completed by the math engine.
   10.52 -	 */
   10.53 -	public static final int UI_SPECIFY_COMPLETE_METHOD = 6;
   10.54 -
   10.55 -	/**
   10.56 -	 * During the specifying phase, have the Theory field of the CalcHead
   10.57 -	 * completed by the math engine.
   10.58 -	 */
   10.59 -	public static final int UI_SPECIFY_COMPLETE_THEORY = 7;
   10.60 -
   10.61 -	/**
   10.62 -	 * During the specifying phase, have the Problem field of the CalcHead
   10.63 -	 * completed by the math engine.
   10.64 -	 */
   10.65 -	public static final int UI_SPECIFY_COMPLETE_PROBLEM = 8;
   10.66 -
   10.67 -	/**
   10.68 -	 * During the specifying phase, have the Given field of the CalcHead
   10.69 -	 * completed by the math engine.
   10.70 -	 */
   10.71 -	public static final int UI_SPECIFY_COMPLETE_GIVEN = 9;
   10.72 -
   10.73 -	/**
   10.74 -	 * During the specifying phase, have the Find field of the CalcHead
   10.75 -	 * completed by the math engine.
   10.76 -	 */
   10.77 -	public static final int UI_SPECIFY_COMPLETE_FIND = 10;
   10.78 -
   10.79 -	/**
   10.80 -	 * During the specifying phase, have the Relate field of the CalcHead
   10.81 -	 * completed by the math engine.
   10.82 -	 */
   10.83 -	public static final int UI_SPECIFY_COMPLETE_RELATE = 11;
   10.84 -
   10.85 -	/**
   10.86 -	 * During the specifying phase, have the CalcHead checked for completeness
   10.87 -	 * and consistency.
   10.88 -	 */
   10.89 -	public static final int UI_SPECIFY_CHECK_CALCHEAD = 12;
   10.90 -
   10.91 -	/**
   10.92 -	 * Leave the specifying phase, enter the solving phase and calculate the
   10.93 -	 * first step of the method.
   10.94 -	 */
   10.95 -	public static final int UI_SPECIFY_TO_SOLVE = 13;
   10.96 -
   10.97 -	/**
   10.98 -	 * Leave the specifying phase, enter the solving phase and calculate until a
   10.99 -	 * final result is reached.
  10.100 -	 */
  10.101 -	public static final int UI_SPECIFY_CALCULATE_ALL = 14;
  10.102 -	
  10.103 -	public static final int UI_SPECIFY_SHOW_CALCHEAD = 15;
  10.104 -
  10.105 -	public static final int UI_DUMMY_LAST_SPECIFY = 15;
  10.106 -
  10.107 -	/** ***************** NOTIFICATIONS: SOLVING PHASE ********************** */
  10.108 -
  10.109 -	public static final int UI_DUMMY_FIRST_SOLVE = 121;
  10.110 -
  10.111 -	/**
  10.112 -	 * During the solving phase, calculate one more step.
  10.113 -	 */
  10.114 -	public static final int UI_SOLVE_CALCULATE_1 = 121;
  10.115 -
  10.116 -	/**
  10.117 -	 * During the solving phase, calculate until a final result is reached.
  10.118 -	 */
  10.119 -	public static final int UI_SOLVE_CALCULATE_ALL = 122;
  10.120 -
  10.121 -	/**
  10.122 -	 * During the solving phase, calculate until the current subproblem is
  10.123 -	 * solved.
  10.124 -	 */
  10.125 -	public static final int UI_SOLVE_CALCULATE_SUBPROBLEM = 123;
  10.126 -
  10.127 -	/**
  10.128 -	 * During the solving phase, request editing the currently active formula.
  10.129 -	 * 
  10.130 -	 * WN0412 If request is conceded, do
  10.131 -	 * 
  10.132 -	 * @see UI_SOLVE_EDIT_ACTIVE_FORMULA_COMPLETE
  10.133 -	 */
  10.134 -	public static final int UI_SOLVE_EDIT_ACTIVE_FORMULA = 124;
  10.135 -
  10.136 -	/**
  10.137 -	 * During the solving phase, notify that editing the currently active
  10.138 -	 * formula is finished. This implies a request for updating the CalcTree.
  10.139 -	 */
  10.140 -	public static final int UI_SOLVE_EDIT_ACTIVE_FORMULA_COMPLETE = 125;
  10.141 -
  10.142 -	/**
  10.143 -	 * During the solving phase, request inserting a new formula _after_ the
  10.144 -	 * currently active formula, making the new formula the currently active
  10.145 -	 * formula. At present, this does not imply editing the formula and must be
  10.146 -	 * requested in a separate step. WN0412: ...??? is this right interpreted by
  10.147 -	 * ... WN0412 If request is conceded, do
  10.148 -	 * 
  10.149 -	 * @see UI_SOLVE_EDIT_ACTIVE_FORMULA_COMPLETE
  10.150 -	 */
  10.151 -	public static final int UI_SOLVE_APPEND_USER_FORMULA = 126;
  10.152 -
  10.153 -	/**
  10.154 -	 * During the solving phase, request making the referened formula the
  10.155 -	 * currently active formula.
  10.156 -	 */
  10.157 -	public static final int UI_SOLVE_MOVE_ACTIVE_FORMULA = 127;
  10.158 -
  10.159 -	/**
  10.160 -	 * During the solving phase, ask for the tactic the math engine would apply
  10.161 -	 * to the current formula.
  10.162 -	 */
  10.163 -	public static final int UI_SOLVE_GET_PROPOSED_TACTIC = 130;
  10.164 -
  10.165 -	/**
  10.166 -	 * During the solving phase, ask for a list of tactics to the current
  10.167 -	 * formula.
  10.168 -	 */
  10.169 -	public static final int UI_SOLVE_GET_APPLICABLE_TACTICS = 131;
  10.170 -
  10.171 -	/**
  10.172 -	 * During the solving phase, set the tactic to be applied to the current
  10.173 -	 * formula.
  10.174 -	 */
  10.175 -	public static final int UI_SOLVE_SET_NEXT_TACTIC = 132;
  10.176 -
  10.177 -	/**
  10.178 -	 * When entering a formula during the solving phase, request help on
  10.179 -	 * entering the formula.
  10.180 -	 */
  10.181 -	public static final int UI_SOLVE_HELP_ENTERING_FORMULA = 133;
  10.182 -
  10.183 -	/**
  10.184 -	 * During the solving phase, show which assumptions hold at the current
  10.185 -	 * point of calculation.
  10.186 -	 */
  10.187 -	public static final int UI_SOLVE_SHOW_ASSUMPTIONS = 140;
  10.188 -
  10.189 -	/**
  10.190 -	 * During the solving phase, request more detail about the currently
  10.191 -	 * referenced element.
  10.192 -	 */
  10.193 -	public static final int UI_SOLVE_SHOW_DETAILS = 141;
  10.194 -
  10.195 -	public static final int UI_DUMMY_LAST_SOLVE = 141;
  10.196 -
  10.197 -
  10.198 -	/** ***************** ACTIVE REQUESTS TO THE UI ********************** */
  10.199 -
  10.200 -	/**
  10.201 -	 * Request editing the currently active formula. DG distinguishes between
  10.202 -	 * SPECIFY and SOLVE; thus could drop UI_SOLVE_EDIT_ACTIVE_FORMULA : int
  10.203 -	 * 
  10.204 -	 * LK050711 start editing implicit somewhere in tree, thus unused
  10.205 -	 */
  10.206 -	public static final int UI_DO_EDIT_FORMULA = 229;
  10.207 -
  10.208 -	/**
  10.209 -	 * Request appending a new, empty formula.
  10.210 -	 */
  10.211 -	public static final int UI_DO_APPEND_FORMULA = 230;
  10.212 -
  10.213 -	/**
  10.214 -	 * Activate an UI element.
  10.215 -	 */
  10.216 -	public static final int UI_DO_ACTIVATE = 231;
  10.217 -
  10.218 -	/**
  10.219 -	 * Deactivate an UI element.
  10.220 -	 */
  10.221 -	public static final int UI_DO_DEACTIVATE = 232;
  10.222 -
  10.223 -	/**
  10.224 -	 * The Dialog Guide has detached the listener and will not send any more
  10.225 -	 * control requests. If registered as a Data Change Listener, update
  10.226 -	 * notifications will still arrive!
  10.227 -	 */
  10.228 -	public static final int UI_DO_DETACH = 233;
  10.229 -
  10.230 -	/**
  10.231 -	 * to transmit the problem from the problem browser to 
  10.232 -	 * the worksheet
  10.233 -	 */
  10.234 -	public static final int UI_PROBLEMBROWSER_PROBLEM_TO_WORKSHEET = 234;
  10.235 -	
  10.236 -	/**
  10.237 -	 * to turn the auto match mode on
  10.238 -	 */
  10.239 -	public static final int UI_PROBLEMBROWSER_AUTO_MATCH_ON = 235;
  10.240 -	
  10.241 -	/**
  10.242 -	 * to turn the auto match mode off
  10.243 -	 */
  10.244 -	public static final int UI_PROBLEMBROWSER_AUTO_MATCH_OFF = 236;
  10.245 -	
  10.246 -	/**
  10.247 -	 * to open the problem browser window
  10.248 -	 */
  10.249 -	public static final int UI_PROBLEMBROWSER_OPEN = 237;
  10.250 -
  10.251 -	/**
  10.252 -	 * to tell the proble browser dialog that the selection in the 
  10.253 -	 * problem browser has changed
  10.254 -	 */
  10.255 -	public static final int UI_PROBLEMBROWSER_SELECTION_CHANGED = 238;
  10.256 -}
  10.257 \ No newline at end of file
    11.1 --- a/src/java/isac/wsdialog/IWorksheetDialog.java	Fri Jul 29 10:48:40 2005 +0200
    11.2 +++ b/src/java/isac/wsdialog/IWorksheetDialog.java	Fri Jul 29 11:02:32 2005 +0200
    11.3 @@ -15,6 +15,7 @@
    11.4  import isac.bridge.CalcIterator;
    11.5  import isac.bridge.CalcTree;
    11.6  import isac.interfaces.*;
    11.7 +import isac.useractions.IUIElement;
    11.8  import isac.useractions.IUserAction;
    11.9  import isac.util.*;
   11.10  import isac.util.formulae.*;