1.1 --- a/src/java/isac/gui/Worksheet.java	Tue Jun 28 13:14:03 2005 +0200
     1.2 +++ b/src/java/isac/gui/Worksheet.java	Wed Jun 29 10:21:03 2005 +0200
     1.3 @@ -30,7 +30,7 @@
     1.4  import isac.wsdialog.IUserAction;
     1.5  import isac.wsdialog.UserAction;
     1.6  import isac.wsdialog.UserActionOnCalcElement;
     1.7 -import isac.wsdialog.UserActionOnCalcHeadCompoundID;
     1.8 +import isac.wsdialog.UserActionOnKEStoreID;
     1.9  import isac.wsdialog.UserActionOnIterator;
    1.10  
    1.11  import java.awt.BorderLayout;
    1.12 @@ -381,7 +381,7 @@
    1.13  	public void tryMatch(KEStoreID problemID) {
    1.14  		try {
    1.15  			// dialog.try_match_(ch, problemID);
    1.16 -			dialog_.notifyUserAction(new UserActionOnCalcHeadCompoundID(
    1.17 +			dialog_.notifyUserAction(new UserActionOnKEStoreID(
    1.18  					IUIElement.UI_SPECIFY_TRY_MATCH, problemID));
    1.19  			logger.debug("CalcHead after try_match_: " + ch_.toSMLString());
    1.20  			chp_.fillTextFieldsFromCalcHead(ch_);
    1.21 @@ -406,7 +406,7 @@
    1.22  	public void tryRefine(KEStoreID problemID) {
    1.23  		try {
    1.24  			// dialog.try_refine_(ch, problemID);
    1.25 -			dialog_.notifyUserAction(new UserActionOnCalcHeadCompoundID(
    1.26 +			dialog_.notifyUserAction(new UserActionOnKEStoreID(
    1.27  					IUIElement.UI_SPECIFY_TRY_REFINE, problemID));
    1.28  			chp_.fillTextFieldsFromCalcHead(ch_);
    1.29  			this.showCalcHeadPane();

     2.1 --- a/src/java/isac/wsdialog/UserActionOnCalcElement.java	Tue Jun 28 13:14:03 2005 +0200
     2.2 +++ b/src/java/isac/wsdialog/UserActionOnCalcElement.java	Wed Jun 29 10:21:03 2005 +0200
     2.3 @@ -11,7 +11,7 @@
     2.4   * e.g a newly entered formula or tactic which is not yet
     2.5   * part of the calculation tree.
     2.6   * @see isac.wsdialog.UserActionOnIterator
     2.7 - * @see isac.wsdialog.UserActionOnCalcHeadCompoundID
     2.8 + * @see isac.wsdialog.UserActionOnKEStoreID
     2.9   * @author Alan Krempler
    2.10   */
    2.11  public class UserActionOnCalcElement extends UserAction {

     3.1 --- a/src/java/isac/wsdialog/UserActionOnCalcHeadCompoundID.java	Tue Jun 28 13:14:03 2005 +0200
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,27 +0,0 @@
     3.4 -/*
     3.5 - * Created on Dec 12, 2003
     3.6 - */
     3.7 -package isac.wsdialog;
     3.8 -
     3.9 -import isac.util.formulae.KEStoreID;
    3.10 -
    3.11 -
    3.12 -/**
    3.13 - * Describes an user action on part of a CalcHead.
    3.14 - * @see isac.wsdialog.UserActionOnIterator
    3.15 - * @see isac.wsdialog.UserActionOnCalcHeadCompoundID
    3.16 - * @author Alan Krempler
    3.17 - */
    3.18 -public class UserActionOnCalcHeadCompoundID extends UserAction {
    3.19 -	private KEStoreID chc_id_;
    3.20 -	
    3.21 -	public UserActionOnCalcHeadCompoundID(int id, KEStoreID chc_id) {
    3.22 -		super(id);
    3.23 -		chc_id_ = chc_id; 
    3.24 -	}
    3.25 -	
    3.26 -	public KEStoreID getObjectID() {
    3.27 -		return chc_id_;
    3.28 -	}
    3.29 -
    3.30 -}

     4.1 --- a/src/java/isac/wsdialog/UserActionOnInt.java	Tue Jun 28 13:14:03 2005 +0200
     4.2 +++ b/src/java/isac/wsdialog/UserActionOnInt.java	Wed Jun 29 10:21:03 2005 +0200
     4.3 @@ -7,7 +7,7 @@
     4.4  /**
     4.5   * Describes an user action passing an integer value.
     4.6   * @see isac.wsdialog.UserActionOnIterator
     4.7 - * @see isac.wsdialog.UserActionOnCalcHeadCompoundID
     4.8 + * @see isac.wsdialog.UserActionOnKEStoreID
     4.9   * @author Alan Krempler
    4.10   */
    4.11  public class UserActionOnInt extends UserAction {

     5.1 --- a/src/java/isac/wsdialog/UserActionOnIterator.java	Tue Jun 28 13:14:03 2005 +0200
     5.2 +++ b/src/java/isac/wsdialog/UserActionOnIterator.java	Wed Jun 29 10:21:03 2005 +0200
     5.3 @@ -9,7 +9,7 @@
     5.4   * Describes an user action which relates to a CalcElement which
     5.5   * is part of the current calculation.
     5.6   * @see isac.wsdialog.UserActionOnCalcElement
     5.7 - * @see isac.wsdialog.UserActionOnCalcHeadCompoundID
     5.8 + * @see isac.wsdialog.UserActionOnKEStoreID
     5.9   * @author Alan Krempler
    5.10   */
    5.11  public class UserActionOnIterator extends UserAction {

     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/src/java/isac/wsdialog/UserActionOnKEStoreID.java	Wed Jun 29 10:21:03 2005 +0200
     6.3 @@ -0,0 +1,27 @@
     6.4 +/*
     6.5 + * Created on Dec 12, 2003
     6.6 + */
     6.7 +package isac.wsdialog;
     6.8 +
     6.9 +import isac.util.formulae.KEStoreID;
    6.10 +
    6.11 +
    6.12 +/**
    6.13 + * Describes an user action on part of a CalcHead.
    6.14 + * @see isac.wsdialog.UserActionOnIterator
    6.15 + * @see isac.wsdialog.UserActionOnKEStoreID
    6.16 + * @author Alan Krempler
    6.17 + */
    6.18 +public class UserActionOnKEStoreID extends UserAction {
    6.19 +	private KEStoreID chc_id_;
    6.20 +	
    6.21 +	public UserActionOnKEStoreID(int id, KEStoreID chc_id) {
    6.22 +		super(id);
    6.23 +		chc_id_ = chc_id; 
    6.24 +	}
    6.25 +	
    6.26 +	public KEStoreID getObjectID() {
    6.27 +		return chc_id_;
    6.28 +	}
    6.29 +
    6.30 +}