Improvements in thread handling.
1.1 --- a/src/java/isac/gui/CalcHeadPanel.java Wed Dec 03 13:49:23 2003 +0100
1.2 +++ b/src/java/isac/gui/CalcHeadPanel.java Wed Dec 03 14:11:51 2003 +0100
1.3 @@ -35,15 +35,13 @@
1.4 /** changeable view to the data of the calchead */
1.5 protected CalcHeadView infoPanel;
1.6
1.7 - protected Worksheet ws;
1.8 -
1.9 +
1.10 public CalcHeadPanel(Locale locale,
1.11 - CalcHead ch, Worksheet ws) {
1.12 - this.init(locale, ch, ws);
1.13 + CalcHead ch) {
1.14 + this.init(locale, ch);
1.15 }
1.16
1.17 - protected void init(Locale locale, CalcHead ch, Worksheet ws) {
1.18 - this.ws = ws;
1.19 + protected void init(Locale locale, CalcHead ch) {
1.20 infoPanel = new FullCalcHeadView(locale, ch);
1.21 this.layoutComponents();
1.22 }
2.1 --- a/src/java/isac/gui/Worksheet.java Wed Dec 03 13:49:23 2003 +0100
2.2 +++ b/src/java/isac/gui/Worksheet.java Wed Dec 03 14:11:51 2003 +0100
2.3 @@ -75,15 +75,15 @@
2.4 //TODO remove: only for testing purposes!
2.5 JTextArea outputText;
2.6
2.7 - public Worksheet(Locale l, DGuide dialogGuide, Formalization f, int source,
2.8 + public Worksheet(final Locale l, DGuide dialogGuide, Formalization f, int source,
2.9 int viewStyle) {
2.10 callProblemAllowed = false;
2.11 - this.setLayout(new BorderLayout());
2.12 + this.setLayout(new BorderLayout());
2.13 dialog = dialogGuide;
2.14 try {
2.15 ch = dialog.startSpecifying(0, f, source, viewStyle);
2.16 dialog.addListener(this);
2.17 - chp = new CalcHeadPanel(l, ch, this);
2.18 + chp = new CalcHeadPanel(l, ch);
2.19 this.buildCalcHeadPanelButtons();
2.20 this.add(chp, BorderLayout.NORTH);
2.21 } catch (RemoteException e) {
2.22 @@ -120,12 +120,7 @@
2.23 this.add(tp, BorderLayout.EAST);
2.24 }
2.25 }
2.26 -
2.27 - public void writeTestOutput(String output) {
2.28 - outputText.append(output);
2.29 - outputText.append("\n");
2.30 - }
2.31 -
2.32 +
2.33 public void setTreeTableModel() {
2.34 CalcModelHierarchy calc = new CalcModelHierarchy(dialog);
2.35 model = new CalculationModel(calc.getRoot(), calc);