1.1 --- a/isac-java/src/java/isac/gui/mawen/editor/Box.scala	Tue Nov 21 11:53:30 2017 +0100
     1.2 +++ b/isac-java/src/java/isac/gui/mawen/editor/Box.scala	Tue Nov 21 14:09:54 2017 +0100
     1.3 @@ -10,10 +10,10 @@
     1.4   * The "Empty*Box"es initalise respective data before calculation.
     1.5   */
     1.6  object Box {
     1.7 -  
     1.8 +
     1.9    sealed abstract class Box(val ast: Ast)
    1.10    class EmptyBox(val level: Int, val x0: Int, val y0: Int, override val ast: Ast) extends Box(ast) {
    1.11 -    def apply (level: Int, x0: Int, y0: Int, ast: Ast) = new EmptyBox(level, x0, y0, ast)
    1.12 +    def apply(level: Int, x0: Int, y0: Int, ast: Ast) = new EmptyBox(level, x0, y0, ast)
    1.13      def toEmptyBox() = new EmptyBox(level, x0, y0, ast)
    1.14      def toEmptyBox(ast: Ast) = new EmptyBox(level, x0, y0, ast)
    1.15      def toEmptyBox(x: Int, y: Int, ast: Ast) = new EmptyBox(level, x, y, ast)
    1.16 @@ -22,24 +22,24 @@
    1.17    case class EmptyUniOpBox(override val level: Int, override val x0: Int, override val y0: Int, param: Ast, override val ast: Ast) extends EmptyBox(level, x0, y0, ast)
    1.18    case class EmptyBinOpBox(override val level: Int, override val x0: Int, override val y0: Int, operator: Ast, paraml: Ast, paramr: Ast, override val ast: Ast) extends EmptyBox(level, x0, y0, ast)
    1.19  
    1.20 -  case class DrawBox(name: String, val level: Int, val x: Int, val y: Int, val width: Int, val height: Int, x0 : Int, y0 : Int, override val ast: Ast) extends Box(ast) {
    1.21 -    var children : List[DrawBox] = List.empty[DrawBox]
    1.22 -    var isBoxed: Boolean  = false
    1.23 -    var colorCode : Int = 0
    1.24 -    var boxedElement : Int = 0
    1.25 +  case class DrawBox(name: String, val level: Int, val x: Int, val y: Int, val width: Int, val height: Int, x0: Int, y0: Int, override val ast: Ast) extends Box(ast) {
    1.26 +    var children: List[DrawBox] = List.empty[DrawBox]
    1.27 +    var isBoxed: Boolean = false
    1.28 +    var colorCode: Int = 0
    1.29 +    var boxedElement: Int = 0
    1.30    }
    1.31 -  def isLeaf(b: DrawBox) : Boolean = b.children.length == 0
    1.32 -  
    1.33 -  def Contains(parent: DrawBox, box: DrawBox) : Boolean  =
    1.34 -    box == parent || parent.children.exists( y => Contains(y, box))
    1.35 +  def isLeaf(b: DrawBox): Boolean = b.children.length == 0
    1.36 +
    1.37 +  def Contains(parent: DrawBox, box: DrawBox): Boolean =
    1.38 +    box == parent || parent.children.exists(y => Contains(y, box))
    1.39  
    1.40    /*
    1.41     * draw a box around an <code>Ast</code>
    1.42     */
    1.43 -  def draw(b: DrawBox, g: Graphics) : Unit = draw(b, g, true) //save a param.
    1.44 -  def draw(b: DrawBox, g: Graphics, withChildren: Boolean) : Unit = {
    1.45 +  def draw(b: DrawBox, g: Graphics): Unit = draw(b, g, true) //save a param.
    1.46 +  def draw(b: DrawBox, g: Graphics, withChildren: Boolean): Unit = {
    1.47      g.drawRect(b.x, b.y - b.height, b.width, b.height)
    1.48 -    if (withChildren) b.children.foreach(draw(_,g))
    1.49 +    if (withChildren) b.children.foreach(draw(_, g))
    1.50    }
    1.51    // draw a box around an <code>Ast</code>
    1.52    def drawFrame(b: DrawBox, g: Graphics) {
    1.53 @@ -50,7 +50,7 @@
    1.54      }
    1.55    }
    1.56  
    1.57 -  def BoxIn(b: DrawBox, rect: Rectangle) : Boolean = 
    1.58 +  def BoxIn(b: DrawBox, rect: Rectangle): Boolean =
    1.59      rect.contains(b.x, b.y) || rect.contains(b.x + b.width, b.y) ||
    1.60 -    rect.contains(b.x, b.y + b.height) || rect.contains(b.x + b.width, b.y + b.height)
    1.61 +      rect.contains(b.x, b.y + b.height) || rect.contains(b.x + b.width, b.y + b.height)
    1.62  }
    1.63 \ No newline at end of file

     2.1 --- a/isac-java/src/java/isac/gui/mawen/editor/Settings.scala	Tue Nov 21 11:53:30 2017 +0100
     2.2 +++ b/isac-java/src/java/isac/gui/mawen/editor/Settings.scala	Tue Nov 21 14:09:54 2017 +0100
     2.3 @@ -36,11 +36,7 @@
     2.4      } catch { case e: Exception => 
     2.5        println("Error loading Property file: " + e.getMessage())
     2.6      }
     2.7 -  println("isdraggingAllowed: " + isdraggingAllowed);
     2.8 -  println("isZoomAllowed: " + isZoomAllowed);
     2.9 -  println("zoom: " + zoom);
    2.10 -  println("translateX: " + translateX);
    2.11 -  println("translateY: " + translateY);
    2.12 +
    2.13  
    2.14    def LARGESPACE = ((( 50f / 100f ) * INITIALFONTSIZE) ).round
    2.15    def MEDIUMSPACE = ((( 30f / 100f ) * INITIALFONTSIZE) ).round

     3.1 --- a/isac-java/src/java/isac/gui/treetable/CalcTreeCellEditor.java	Tue Nov 21 11:53:30 2017 +0100
     3.2 +++ b/isac-java/src/java/isac/gui/treetable/CalcTreeCellEditor.java	Tue Nov 21 14:09:54 2017 +0100
     3.3 @@ -54,7 +54,7 @@
     3.4        
     3.5        @Override
     3.6        public void notifyLocalCheck() {
     3.7 -        System.out.println("notifyLocalCheck");
     3.8 +        
     3.9        }
    3.10        
    3.11        @Override
    3.12 @@ -63,8 +63,7 @@
    3.13          notifyWorksheet();
    3.14        }
    3.15  /*err*/public void notifyBraille(Ast.Ast formula) {
    3.16 -			System.out.println("output to Braille display");
    3.17 -			System.out.println(Ast.math_string_of(formula));
    3.18 +			
    3.19        }
    3.20  
    3.21      });
    3.22 @@ -111,7 +110,6 @@
    3.23  	public void addCellEditorListener(CellEditorListener listener) {
    3.24  		if( !listeners_.contains( listener ) )
    3.25  			listeners_.add( listener ); 
    3.26 -		System.out.println("### Listeners : " + listeners_.size() );
    3.27  		Iterator<CellEditorListener> it = listeners_.iterator();
    3.28  		while(it.hasNext())
    3.29  			System.out.println( it.next().toString() );