1.1 --- a/src/java-tests/isac/gui/calcheadviews/TestCalcheadView.java	Wed Aug 17 11:47:15 2005 +0200
     1.2 +++ b/src/java-tests/isac/gui/calcheadviews/TestCalcheadView.java	Wed Aug 17 16:15:31 2005 +0200
     1.3 @@ -9,7 +9,6 @@
     1.4  import isac.util.formulae.CalcHeadSimpleID;
     1.5  import isac.util.formulae.Formula;
     1.6  import isac.util.formulae.KEStoreID;
     1.7 -import isac.util.formulae.Match;
     1.8  import isac.util.formulae.Model;
     1.9  import isac.util.formulae.ModelItem;
    1.10  import isac.util.formulae.ModelItemList;
    1.11 @@ -29,9 +28,6 @@
    1.12  import javax.swing.JInternalFrame;
    1.13  import javax.swing.JPanel;
    1.14  
    1.15 -//import junit.extensions.jfcunit.JFCTestCase;
    1.16 -//import junit.extensions.jfcunit.JFCTestHelper;
    1.17 -//import junit.framework.TestCase;
    1.18  
    1.19  /**
    1.20   * @author Manuel Koschuch
    1.21 @@ -39,7 +35,7 @@
    1.22   * Manually create Calchead and display in a Calchead-Pane
    1.23   */
    1.24  
    1.25 -public class TestCalcheadView /* extends JFCTestCase */implements
    1.26 +public class TestCalcheadView implements
    1.27          ActionListener {
    1.28  
    1.29      private JDesktopPane worksheet_desktop_pane_;
    1.30 @@ -81,11 +77,7 @@
    1.31      }
    1.32  
    1.33      protected void tearDown() throws Exception {
    1.34 -        // windowApplication.dispose();
    1.35 -        // windowApplication = null;
    1.36 -        //       JFCTestHelper.cleanUp(this);
    1.37 -        //        super.tearDown();
    1.38 -    }
    1.39 +          }
    1.40  
    1.41      private CalcHead setupEquationCalcHead() {
    1.42          CalcHead ch = new CalcHead();
    1.43 @@ -108,7 +100,7 @@
    1.44          its = new ModelItemList();
    1.45          its.addItem(it1);
    1.46          its.addItem(it2);
    1.47 -        m.setGiven(its);//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    1.48 +        m.setGiven(its);
    1.49  
    1.50          ModelItem it3 = new ModelItem(), it4 = new ModelItem();
    1.51  
    1.52 @@ -116,13 +108,13 @@
    1.53          it3.setItemStatus("correct");
    1.54          its = new ModelItemList();
    1.55          its.addItem(it3);
    1.56 -        m.setWhere(its);//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    1.57 +        m.setWhere(its);
    1.58  
    1.59          it4.setText("solutions L");
    1.60          it4.setItemStatus("correct");
    1.61          its = new ModelItemList();
    1.62          its.addItem(it4);
    1.63 -        m.setFind(its);//!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    1.64 +        m.setFind(its);
    1.65          ch.setModel(m);
    1.66  
    1.67          //----------------------
    1.68 @@ -159,16 +151,9 @@
    1.69          return ch;
    1.70      }
    1.71  
    1.72 -    private void addInternalFrame(JInternalFrame frame) {
    1.73 -        worksheet_desktop_pane_.add(frame);
    1.74 -        worksheet_desktop_pane_.getDesktopManager().activateFrame(frame);
    1.75 -        frame.toFront();
    1.76 -        frame.grabFocus();
    1.77 -    }
    1.78 -
    1.79 +  
    1.80      private void buildCalcHeadPanelButtons() {
    1.81          button_panel_ = new JPanel();
    1.82 -        //		//TODO localize!!!
    1.83          start_solving_ = new JButton("start Solving");
    1.84          comp_calcHead_ = new JButton("complete CalcHead");
    1.85          check_calcHead_ = new JButton("check CalcHead");
    1.86 @@ -204,9 +189,7 @@
    1.87  
    1.88          frame_.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
    1.89          frame_.getContentPane().add(button_);
    1.90 -        //frame_.getContentPane().add(chp_, BorderLayout.NORTH);
    1.91 -        //frame_.setTitle(ch_.getHeadLine().toString());
    1.92 -
    1.93 +        
    1.94          dialog_.getContentPane().add(chp_, BorderLayout.NORTH);
    1.95          dialog_.setSize(600, 300);
    1.96          dialog_.pack();
    1.97 @@ -234,7 +217,6 @@
    1.98              chp_.reset();
    1.99          } else if (e.getSource() == next_) {
   1.100              System.out.println("next Button pressed");
   1.101 -            chp_.next(ch_);
   1.102          } else if (e.getSource() == start_solving_) {
   1.103              ch_.setBelongsTo("Met");
   1.104              chp_.fillTextFieldsFromCalcHead(ch_);