1.1 --- a/src/java/isac/gui/Worksheet.java Sat Dec 11 10:51:23 2004 +0100
1.2 +++ b/src/java/isac/gui/Worksheet.java Sat Dec 11 11:23:05 2004 +0100
1.3 @@ -537,8 +537,6 @@
1.4 it_ = current_node.getValue();
1.5 if (it_ == null) { // append formula
1.6 //appends after the currently active formula
1.7 - logger.fatal("WS->DG: UI_SOLVE_MOVE_ACTIVE_FORMULA");
1.8 - dialog.notifyUserAction(new UserActionOnIterator(IUserAction.UI_SOLVE_MOVE_ACTIVE_FORMULA, it_));
1.9 edited_formula_ = new Formula();
1.10 edited_formula_.setText((String)o);
1.11 logger.fatal("WS->DG: UI_DO_APPEND_FORMULA");
2.1 --- a/src/java/isac/gui/treetable/CalculationModel.java Sat Dec 11 10:51:23 2004 +0100
2.2 +++ b/src/java/isac/gui/treetable/CalculationModel.java Sat Dec 11 11:23:05 2004 +0100
2.3 @@ -48,6 +48,10 @@
2.4 it_ = it;
2.5 hierarchy_ = h;
2.6 try{
2.7 + /*
2.8 + * the following three lines were created to append an empty node at the end of the worksheet
2.9 + * @see isac.gui.util.CalcModelHierarchy
2.10 + */
2.11 Object[] oa = hierarchy_.addInsertionNode();
2.12 fireTreeNodesInserted(this, (Object[])oa[0], (int[])oa[1], (Object[])oa[2]);
2.13 fireTreeStructureChanged(this, (Object[])oa[0], (int[])oa[1], (Object[])oa[2]);
3.1 --- a/src/java/isac/gui/util/CalcModelHierarchy.java Sat Dec 11 10:51:23 2004 +0100
3.2 +++ b/src/java/isac/gui/util/CalcModelHierarchy.java Sat Dec 11 11:23:05 2004 +0100
3.3 @@ -247,6 +247,8 @@
3.4 * result[1] = int[1] with the index of the inserted Node as only element
3.5 * result[2] = Object[1] with the inserted Node as only element
3.6 *
3.7 + * this code was created for the insertion of an empty node at the end of the worksheet
3.8 + * @see isac.gui.treetable.CalculationModel
3.9 */
3.10 public Object[] addInsertionNode() {
3.11 CalcModelNode node = new CalcModelNode(null);
4.1 --- a/src/java/isac/wsdialog/DialogGuide.java Sat Dec 11 10:51:23 2004 +0100
4.2 +++ b/src/java/isac/wsdialog/DialogGuide.java Sat Dec 11 11:23:05 2004 +0100
4.3 @@ -419,8 +419,7 @@
4.4 if (formula.getPosition()== null) {
4.5 appendFormula(formula);
4.6 } else {
4.7 - replaceFormula((Formula) ((UserActionOnCalcElement) action)
4.8 - .getCalcElement());
4.9 + replaceFormula(formula);
4.10 }
4.11 break;
4.12