Changeset 1102 for trunk/src/org/expeditee/items/MagneticConstraint/Actions/DeleteAction.java

Timestamp:

05/10/18 16:04:51 (6 years ago)

Author:

davidb

Message:

Reworking of the code-base to separate logic from graphics. This version of Expeditee now supports a JFX graphics as an alternative to SWING

File:

• trunk/src/org/expeditee/items/MagneticConstraint/Actions/DeleteAction.java (modified) (3 diffs)

trunk/src/org/expeditee/items/MagneticConstraint/Actions/DeleteAction.java

@@ -1 +1 @@
 package org.expeditee.items.MagneticConstraint.Actions;
 
-import org.expeditee.gui.DisplayIO;
+import org.expeditee.gui.DisplayController;
 import org.expeditee.items.Item;
 import org.expeditee.items.Text;
@@ -15 +15 @@
                 if(item.getParent() == null || !this.isSpIDERCodePage(item.getParent())) return false;
                 if(item == null || ((Text) item).isEmpty()) {
-                        final Text temp = DisplayIO.getCurrentFrame().createNewText(".");
+                        final Text temp = DisplayController.getCurrentFrame().createNewText(".");
                         callback(temp);
                         if(temp.getMagnetizedItemRight() != -1) 
-                                DisplayIO.setTextCursor((Text) temp.getParent().getItemWithID(temp.getMagnetizedItemRight()), Text.HOME);
+                                DisplayController.setTextCursor((Text) temp.getParent().getItemWithID(temp.getMagnetizedItemRight()), Text.HOME);
                         else if(temp.getMagnetizedItemBottom() != -1) 
-                                DisplayIO.setTextCursor((Text) temp.getParent().getItemWithID(temp.getMagnetizedItemBottom()), Text.HOME);
+                                DisplayController.setTextCursor((Text) temp.getParent().getItemWithID(temp.getMagnetizedItemBottom()), Text.HOME);
                         temp.delete();
                         callback(temp);
                         return true;
-                } else if(item.getMagnetizedItemRight() != -1 && TextLogic.XIsAfterCharacters((Text) item, DisplayIO.getMouseX())) {
+                } else if(item.getMagnetizedItemRight() != -1 && TextLogic.XIsAfterCharacters((Text) item, DisplayController.getMouseX())) {
                         new NextItemAction().exec(item);
                         return true;
-                } else if(item.getMagnetizedItemBottom() != -1 && TextLogic.XIsAfterCharacters((Text) item, DisplayIO.getMouseX())) {
+                } else if(item.getMagnetizedItemBottom() != -1 && TextLogic.XIsAfterCharacters((Text) item, DisplayController.getMouseX())) {
                         callback(item);
                         final Line currentLine = Line.getLineFromToken(item);
@@ -33 +33 @@
                         if(nextLine != null && Paragraph.getParagraphFromLine(currentLine).contains(nextLine)) {
                                 currentLine.appendLine(nextLine);
-                                DisplayIO.setTextCursor((Text) item, Text.END);
+                                DisplayController.setTextCursor((Text) item, Text.END);
                                 callback(item);
                                 return true;