|
@@ -1,4 +1,4 @@
|
|
-package ui.view;
|
|
|
|
|
|
+package ui.view.main;
|
|
|
|
|
|
import java.awt.BasicStroke;
|
|
import java.awt.BasicStroke;
|
|
import java.awt.Color;
|
|
import java.awt.Color;
|
|
@@ -24,9 +24,9 @@ import classes.HolonElement;
|
|
import classes.HolonObject;
|
|
import classes.HolonObject;
|
|
import classes.Node;
|
|
import classes.Node;
|
|
import classes.Position;
|
|
import classes.Position;
|
|
|
|
+import model.Model;
|
|
import ui.controller.Control;
|
|
import ui.controller.Control;
|
|
import ui.controller.UpdateController;
|
|
import ui.controller.UpdateController;
|
|
-import ui.model.Model;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
* Collection of methods and values needed in both <code>MyCanvas</code> and
|
|
* Collection of methods and values needed in both <code>MyCanvas</code> and
|
|
@@ -45,7 +45,7 @@ public abstract class AbstractCanvas extends JPanel {
|
|
|
|
|
|
final JMenuItem itemCut = new JMenuItem("Cut");
|
|
final JMenuItem itemCut = new JMenuItem("Cut");
|
|
final JMenuItem itemCopy = new JMenuItem("Copy");
|
|
final JMenuItem itemCopy = new JMenuItem("Copy");
|
|
- final JMenuItem itemPaste = new JMenuItem("Paste");
|
|
|
|
|
|
+ public final JMenuItem itemPaste = new JMenuItem("Paste");
|
|
final JMenuItem itemDelete = new JMenuItem("Delete");
|
|
final JMenuItem itemDelete = new JMenuItem("Delete");
|
|
final JMenuItem itemGroup = new JMenuItem("Group");
|
|
final JMenuItem itemGroup = new JMenuItem("Group");
|
|
final JMenuItem itemUngroup = new JMenuItem("Ungroup");
|
|
final JMenuItem itemUngroup = new JMenuItem("Ungroup");
|
|
@@ -60,14 +60,14 @@ public abstract class AbstractCanvas extends JPanel {
|
|
protected int x = 0;
|
|
protected int x = 0;
|
|
protected int y = 0;
|
|
protected int y = 0;
|
|
// Selection
|
|
// Selection
|
|
- AbstractCanvasObject tempCps = null;
|
|
|
|
|
|
+ public AbstractCanvasObject tempCps = null;
|
|
UpdateController updCon;
|
|
UpdateController updCon;
|
|
|
|
|
|
//Replacement
|
|
//Replacement
|
|
/**
|
|
/**
|
|
* the CpsObject that might be replaced by drag&drop
|
|
* the CpsObject that might be replaced by drag&drop
|
|
*/
|
|
*/
|
|
- protected AbstractCanvasObject mayBeReplaced = null;
|
|
|
|
|
|
+ public AbstractCanvasObject mayBeReplaced = null;
|
|
|
|
|
|
// PopUpMenu
|
|
// PopUpMenu
|
|
JPopupMenu popmenu = new JPopupMenu();
|
|
JPopupMenu popmenu = new JPopupMenu();
|
|
@@ -76,14 +76,14 @@ public abstract class AbstractCanvas extends JPanel {
|
|
Position toolTipPos = new Position(); // Tooltip Position
|
|
Position toolTipPos = new Position(); // Tooltip Position
|
|
String toolTipText = "";
|
|
String toolTipText = "";
|
|
ArrayList<HolonElement> dataSelected = new ArrayList<>();
|
|
ArrayList<HolonElement> dataSelected = new ArrayList<>();
|
|
- ArrayList<AbstractCanvasObject> tempSelected = new ArrayList<>();
|
|
|
|
|
|
+ public ArrayList<AbstractCanvasObject> tempSelected = new ArrayList<>();
|
|
boolean[] showedInformation = new boolean[5];
|
|
boolean[] showedInformation = new boolean[5];
|
|
boolean showConnectionInformation;
|
|
boolean showConnectionInformation;
|
|
boolean dragging = false; // for dragging
|
|
boolean dragging = false; // for dragging
|
|
boolean dragged = false; // if an object/objects was/were dragged
|
|
boolean dragged = false; // if an object/objects was/were dragged
|
|
boolean drawEdge = false; // for drawing edges
|
|
boolean drawEdge = false; // for drawing edges
|
|
boolean doMark = false; // for double click
|
|
boolean doMark = false; // for double click
|
|
- Edge edgeHighlight = null;
|
|
|
|
|
|
+ public Edge edgeHighlight = null;
|
|
Point mousePosition = new Point(); // Mouse Position when
|
|
Point mousePosition = new Point(); // Mouse Position when
|
|
ArrayList<Position> savePos;
|
|
ArrayList<Position> savePos;
|
|
// edge Object Start Point
|
|
// edge Object Start Point
|