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

Timestamp:

09/15/15 12:32:33 (9 years ago)

Author:

bln4

Message:

 

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 java.awt.event.KeyEvent;
 
 import org.expeditee.gui.DisplayIO;
@@ -7 +5 @@
 import org.expeditee.items.Text;
 import org.expeditee.items.MagneticConstraint.MagneticConstraintAction;
-import org.expeditee.items.MagneticConstraint.MagneticConstraints;
+import org.expeditee.items.MagneticConstraint.Utilities.Line;
+import org.expeditee.items.MagneticConstraint.Utilities.Paragraph;
 import org.expeditee.items.MagneticConstraint.Utilities.TextLogic;
 
@@ -14 +13 @@
         @Override
         public boolean exec(final Item item) {
-                if(TextLogic.XIsAfterCharacters((Text) item, DisplayIO.getMouseX())) {
-                        if(item.getMagnetizedItemRight() != -1) {
-                                final Text toMyRight = (Text) item.getParent().getItemWithID(item.getMagnetizedItemRight());
-                                final int deltaX = TextLogic.DistanceThroughTextWithXCharacters(toMyRight, 1);
-                                DisplayIO.setCursorPosition((float) toMyRight.getPixelBoundsUnion().getX() + deltaX, DisplayIO.getFloatMouseY());
-                                MagneticConstraints.getInstance().keyHit(KeyEvent.VK_BACK_SPACE, toMyRight);
-                                DisplayIO.MoveCursorToEndOfItem(item);
+                if(item == null || ((Text) item).isEmpty()) {
+                        final Text temp = DisplayIO.getCurrentFrame().createNewText(".");
+                        callback(temp);
+                        if(temp.getMagnetizedItemRight() != -1) 
+                                DisplayIO.setTextCursor((Text) temp.getParent().getItemWithID(temp.getMagnetizedItemRight()), Text.HOME);
+                        else if(temp.getMagnetizedItemBottom() != -1) 
+                                DisplayIO.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())) {
+                        new NextItemAction().exec(item);
+                        return true;
+                } else if(item.getMagnetizedItemBottom() != -1 && TextLogic.XIsAfterCharacters((Text) item, DisplayIO.getMouseX())) {
+                        callback(item);
+                        final Line currentLine = Line.getLineFromToken(item);
+                        final Line nextLine = currentLine.next();
+                        if(nextLine != null && Paragraph.getParagraphFromLine(currentLine).contains(nextLine)) {
+                                currentLine.appendLine(nextLine);
+                                DisplayIO.setTextCursor((Text) item, Text.END);
+                                callback(item);
                                 return true;
-                        } else if (item.getMagnetizedItemBottom() != -1) {
-                                final Text belowMe = (Text) item.getParent().getItemWithID(item.getMagnetizedItemBottom());
-                                DisplayIO.setCursorPosition(belowMe.getPosition());
-                                MagneticConstraints.getInstance().keyHit(KeyEvent.VK_BACK_SPACE, belowMe);
-                                return true;
-                        } else return false;
-                } else return false;
+                        }
+                }
+                return false;
         }