1.1 --- a/isac-java/src/java-tests/isac/gui/mawen/MockCalcTreeSIMPLIFY.java Thu Jul 06 15:36:25 2017 +0200
1.2 +++ b/isac-java/src/java-tests/isac/gui/mawen/MockCalcTreeSIMPLIFY.java Thu Jul 06 16:01:53 2017 +0200
1.3 @@ -1,7 +1,6 @@
1.4 package isac.gui.mawen;
1.5
1.6 import isac.gui.mawen.scalaterm.TestsDATA;
1.7 -import isac.gui.mawen.syntax.Ast;
1.8 import isac.gui.mawen.syntax.Syntax_Phases;
1.9 import isac.util.formulae.CalcFormula;
1.10 import isac.util.formulae.Formula;
2.1 --- a/isac-java/src/java-tests/isac/gui/mawen/editor/TestDATAeditor.scala Thu Jul 06 15:36:25 2017 +0200
2.2 +++ b/isac-java/src/java-tests/isac/gui/mawen/editor/TestDATAeditor.scala Thu Jul 06 16:01:53 2017 +0200
2.3 @@ -399,8 +399,7 @@
2.4 Appl(List(
2.5 Constant("CURSOR"),
2.6 Appl(List(
2.7 - Constant("BOX"),
2.8 - Constant("1"),
2.9 + Constant("BOX.8"),
2.10 Appl(List(
2.11 Constant("Groups.plus_class.plus"),
2.12 Variable("aaa"),
3.1 --- a/isac-java/src/java-tests/isac/gui/mawen/editor/TestEditorPanel.java Thu Jul 06 15:36:25 2017 +0200
3.2 +++ b/isac-java/src/java-tests/isac/gui/mawen/editor/TestEditorPanel.java Thu Jul 06 16:01:53 2017 +0200
3.3 @@ -34,7 +34,7 @@
3.4 }
3.5
3.6 public void test_frame() {
3.7 -/*err*/createFrame(TestDATAeditor.f8());
3.8 +/*err*/createFrame(TestDATAeditor.nest_CURSOR_BOX_3B());
3.9 }
3.10
3.11
4.1 --- a/isac-java/src/java-tests/isac/gui/mawen/syntax/TestAst.scala Thu Jul 06 15:36:25 2017 +0200
4.2 +++ b/isac-java/src/java-tests/isac/gui/mawen/syntax/TestAst.scala Thu Jul 06 16:01:53 2017 +0200
4.3 @@ -3,7 +3,6 @@
4.4 import isac.gui.mawen.scalaterm.TestsDATA
4.5 import isac.gui.mawen.TestDATA
4.6 import isac.gui.mawen.syntax.Ast._ //"._" simplifies "Ast.Ast" to "Ast"
4.7 -import isac.gui.mawen.syntax.XSyntax
4.8 import edu.tum.cs.isabelle.pure._ // for Term
4.9 import isac.gui.mawen.syntax.isabelle.XLibrary
4.10 import isac.gui.mawen.editor.TestDATAeditor
5.1 --- a/isac-java/src/java/isac/gui/Worksheet.java Thu Jul 06 15:36:25 2017 +0200
5.2 +++ b/isac-java/src/java/isac/gui/Worksheet.java Thu Jul 06 16:01:53 2017 +0200
5.3 @@ -8,7 +8,6 @@
5.4 ******************************************************************/
5.5 package isac.gui;
5.6
5.7 -import isac.gui.mawen.syntax.Ast;
5.8 import isac.gui.mawen.termtree.WSHelper;
5.9 import isac.gui.treetable.CalcModelHierarchy;
5.10 import isac.gui.treetable.CalcModelNode;
5.11 @@ -88,7 +87,6 @@
5.12
5.13 import org.apache.log4j.Logger;
5.14
5.15 -import edu.tum.cs.isabelle.pure.Term;
5.16
5.17 /**
5.18 * CR070723 This should be WorksheetSwing, inheriting from Worksheet like a
6.1 --- a/isac-java/src/java/isac/gui/mawen/editor/Box.scala Thu Jul 06 15:36:25 2017 +0200
6.2 +++ b/isac-java/src/java/isac/gui/mawen/editor/Box.scala Thu Jul 06 16:01:53 2017 +0200
6.3 @@ -51,7 +51,7 @@
6.4 def drawBox(b: DrawBox, g: Graphics) {
6.5 if (b.isBoxed) {
6.6 g.setColor(Settings.CollorMapping(b.colorCode))
6.7 - g.drawRect(b.x, b.y - b.height, b.width, b.height)
6.8 + g.fillRect(b.x, b.y - b.height, b.width, b.height)
6.9 g.setColor(java.awt.Color.BLACK)
6.10 }
6.11 }
7.1 --- a/isac-java/src/java/isac/gui/mawen/editor/BoxUtil.scala Thu Jul 06 15:36:25 2017 +0200
7.2 +++ b/isac-java/src/java/isac/gui/mawen/editor/BoxUtil.scala Thu Jul 06 16:01:53 2017 +0200
7.3 @@ -9,7 +9,6 @@
7.4 import isac.gui.mawen.syntax.Ast
7.5 import java.awt.Font
7.6 import isac.gui.mawen.editor.Box._
7.7 -import isac.gui.mawen.editor.Box
7.8 import java.awt.Graphics2D
7.9
7.10 /**
8.1 --- a/isac-java/src/java/isac/gui/mawen/editor/EditingUtil.scala Thu Jul 06 15:36:25 2017 +0200
8.2 +++ b/isac-java/src/java/isac/gui/mawen/editor/EditingUtil.scala Thu Jul 06 16:01:53 2017 +0200
8.3 @@ -93,7 +93,6 @@
8.4 println(b)
8.5 c.setAst(TransformAstUtil.Update(c.getAst(), b, (a) => a match {
8.6 case Appl(List(Constant(str), ast)) if str.startsWith("BOX") => Appl(List(Constant("CURSOR"), ast))
8.7 -
8.8 }))
8.9 None
8.10 }
8.11 @@ -123,7 +122,10 @@
8.12 for(a <- operatorParams) {
8.13 newOperatorAst = ReplaceFirstGap(newOperatorAst, a)
8.14 }
8.15 - newOperatorAst = newOperatorAst match { case Appl(c::a) => Appl(Appl(List(c, Constant("CURSOR"))) :: a) }
8.16 + newOperatorAst = newOperatorAst match {
8.17 + case Appl(c::a) => Appl(Appl(List(c, Constant("CURSOR"))) :: a)
8.18 + case _ => Constant("GAP")
8.19 + }
8.20 c.setAst(TransformAstUtil.Update(c.getAst(), AstInfoUtil.Parent(c.getAst(), cursorAst), (a) => newOperatorAst))
8.21 None
8.22 }
9.1 --- a/isac-java/src/java/isac/gui/mawen/editor/EditorPanel.java Thu Jul 06 15:36:25 2017 +0200
9.2 +++ b/isac-java/src/java/isac/gui/mawen/editor/EditorPanel.java Thu Jul 06 16:01:53 2017 +0200
9.3 @@ -1,15 +1,11 @@
9.4 package isac.gui.mawen.editor;
9.5
9.6 import javax.swing.*;
9.7 -import javax.swing.event.EventListenerList;
9.8
9.9 import isac.gui.mawen.syntax.Ast;
9.10 import isac.interfaces.IEditor;
9.11 -import isac.util.formulae.Formula;
9.12
9.13 import java.awt.*;
9.14 -import java.awt.event.MouseEvent;
9.15 -import java.awt.event.MouseMotionListener;
9.16 import java.util.ArrayList;
9.17
9.18
10.1 --- a/isac-java/src/java/isac/gui/mawen/editor/EventUtil.scala Thu Jul 06 15:36:25 2017 +0200
10.2 +++ b/isac-java/src/java/isac/gui/mawen/editor/EventUtil.scala Thu Jul 06 16:01:53 2017 +0200
10.3 @@ -16,6 +16,7 @@
10.4 import isac.gui.mawen.syntax.Ast.Variable
10.5 import java.awt.datatransfer.DataFlavor
10.6 import isac.gui.mawen.syntax.Ast._
10.7 +import java.awt.datatransfer.StringSelection
10.8
10.9 /**
10.10 * Event handler for <code>AstComponent</code>
10.11 @@ -134,6 +135,10 @@
10.12 // !!!! Dirty Code !!!!
10.13 c.setAst(Variable(Toolkit.getDefaultToolkit().getSystemClipboard().getData(DataFlavor.stringFlavor).asInstanceOf[String]))
10.14 EditorListenerHandler.fireNotifyIsaCheck(c)
10.15 + }else if (event.isControlDown() && event.getKeyCode == KeyEvent.VK_C) {
10.16 + val astString = new StringSelection(Ast.math_string_of(c.getAst()))
10.17 + Toolkit.getDefaultToolkit().getSystemClipboard().setContents(astString, null)
10.18 + EditorListenerHandler.fireNotifyIsaCheck(c)
10.19 }
10.20
10.21 else if (
11.1 --- a/isac-java/src/java/isac/gui/treetable/CalcTreeCellEditor.java Thu Jul 06 15:36:25 2017 +0200
11.2 +++ b/isac-java/src/java/isac/gui/treetable/CalcTreeCellEditor.java Thu Jul 06 16:01:53 2017 +0200
11.3 @@ -2,7 +2,6 @@
11.4
11.5 import isac.gui.Worksheet;
11.6 import isac.gui.mawen.editor.EditorListener;
11.7 -import isac.gui.mawen.editor.EditorPanel;
11.8 import isac.gui.mawen.syntax.Ast;
11.9 import isac.interfaces.IEditor;
11.10 import isac.util.formulae.Formula;
11.11 @@ -11,12 +10,7 @@
11.12 import java.awt.Color;
11.13 import java.awt.Component;
11.14 import java.awt.Dimension;
11.15 -import java.awt.GridBagConstraints;
11.16 -import java.awt.GridBagLayout;
11.17 -import java.awt.Insets;
11.18 import java.awt.Rectangle;
11.19 -import java.awt.event.KeyEvent;
11.20 -import java.awt.event.KeyListener;
11.21 import java.util.ArrayList;
11.22 import java.util.EventObject;
11.23 import java.util.Iterator;
12.1 --- a/isac-java/src/java/isac/gui/treetable/CalcTreeCellRenderer.java Thu Jul 06 15:36:25 2017 +0200
12.2 +++ b/isac-java/src/java/isac/gui/treetable/CalcTreeCellRenderer.java Thu Jul 06 16:01:53 2017 +0200
12.3 @@ -13,12 +13,9 @@
12.4 import isac.gui.Worksheet;
12.5 import isac.gui.mawen.syntax.Ast;
12.6 import isac.interfaces.IEditor;
12.7 -import isac.util.WindowApplicationPaths;
12.8 -
12.9
12.10 import java.awt.*;
12.11 import java.io.*;
12.12 -import java.util.Properties;
12.13
12.14 import javax.swing.*;
12.15 import javax.swing.plaf.ColorUIResource;
12.16 @@ -137,8 +134,6 @@
12.17 return this;
12.18 }
12.19
12.20 - private boolean needRepaint = false;
12.21 -
12.22 public Dimension getSize() {
12.23 Dimension textD = text.getPreferredSize();
12.24 int height = image.getSize().height < textD.height ? textD.height : image.getSize().height;
13.1 --- a/isac-java/src/java/isac/gui/treetable/FormulaTextField.java Thu Jul 06 15:36:25 2017 +0200
13.2 +++ b/isac-java/src/java/isac/gui/treetable/FormulaTextField.java Thu Jul 06 16:01:53 2017 +0200
13.3 @@ -8,11 +8,9 @@
13.4 import javax.swing.JComponent;
13.5 import javax.swing.JTextField;
13.6
13.7 -import isac.gui.Worksheet;
13.8 import isac.gui.mawen.editor.EditorListener;
13.9 -import isac.gui.mawen.syntax.Ast;
13.10 import isac.interfaces.IEditor;
13.11 -import isac.util.formulae.Formula;
13.12 +
13.13
13.14 public class FormulaTextField extends JTextField implements IEditor, KeyListener {
13.15
14.1 --- a/isac-java/src/java/isac/gui/treetable/TacticTextField.java Thu Jul 06 15:36:25 2017 +0200
14.2 +++ b/isac-java/src/java/isac/gui/treetable/TacticTextField.java Thu Jul 06 16:01:53 2017 +0200
14.3 @@ -6,7 +6,6 @@
14.4 import javax.swing.JComponent;
14.5 import javax.swing.JTextField;
14.6
14.7 -import isac.gui.Worksheet;
14.8 import isac.gui.mawen.editor.EditorListener;
14.9 import isac.interfaces.IEditor;
14.10
15.1 --- a/isac-java/src/java/isac/interfaces/IEditor.java Thu Jul 06 15:36:25 2017 +0200
15.2 +++ b/isac-java/src/java/isac/interfaces/IEditor.java Thu Jul 06 16:01:53 2017 +0200
15.3 @@ -1,6 +1,5 @@
15.4 package isac.interfaces;
15.5
15.6 -import isac.gui.Worksheet;
15.7 import isac.gui.mawen.editor.EditorListener;
15.8 import isac.gui.mawen.syntax.Ast;
15.9