Changeset 962

Timestamp:

09/08/15 13:10:16 (9 years ago)

Author:

bln4

Message:

 

Location:

trunk/src/org/expeditee/items/MagneticConstraint

Files:

• Actions/DownALineAction.java (modified) (2 diffs)
• Actions/RepelTextAction.java (modified) (2 diffs)
• Actions/RepelTextDownAction.java (modified) (4 diffs)
• Actions/UpALineAction.java (modified) (2 diffs)
• MagneticConstraintAction.java (modified) (2 diffs)
• Utilities/Line.java (modified) (4 diffs)
• Utilities/Paragraph.java (modified) (3 diffs)
• Utilities/TextLogic.java (modified) (1 diff)

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

@@ -1 +1 @@
 package org.expeditee.items.MagneticConstraint.Actions;
 
-import java.awt.Point;
-
 import org.expeditee.gui.DisplayIO;
-import org.expeditee.gui.FrameGraphics;
 import org.expeditee.items.Item;
 import org.expeditee.items.Text;
@@ -45 +42 @@
                 if(toMoveTo instanceof Text) {
                         final Text asText = (Text) toMoveTo;
-                        final Point position = toMoveTo.getPosition();
-                        DisplayIO.setCursorPosition(position.x + asText.getPixelBoundsUnion().width, position.y, false);
-                        FrameGraphics.refresh(false);
+                        DisplayIO.setTextCursor(asText, Text.END);
                 } else DisplayIO.setCursorPosition(toMoveTo.getPosition(), false);
                 return true;

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

@@ -1 +1 @@
 package org.expeditee.items.MagneticConstraint.Actions;
 
+import java.awt.Point;
+
+import org.expeditee.gui.FrameUtils;
 import org.expeditee.items.Item;
 import org.expeditee.items.MagneticConstraint.MagneticConstraintActionWithArguments;
@@ -20 +23 @@
         @Override
         public boolean exec(final Item item, final Float... args) {
-                if(item.getParent() == null || item.getText().startsWith("@")) {
+                if(item == null || item.getParent() == null || item.getText().startsWith("@") || !isSpIDERCodePage(item.getParent())) {
                         return false;
                 }
-                if (item.getMagnetizedItemRight() == -1) {
-                        if(item.getParent() == null) return false;
-                        if(BoxLogic.boxCollision(item)) {
-                                callback(null);
-//                              BoxLogic.resolveCollision(item, this);
-//                              callback(null);
-//                              MagneticConstraints.Log(this.getClass(), new Item[]{item}, 
-//                                              Line.getLineContainingToken(item).toArray(new Item[]{}), 
-//                                              "No item found to right to repel.  Collision occured.");
-                        } else {
-                                MagneticConstraints.Log(this.getClass(), new Item[]{item}, 
-                                                Line.getLineContainingToken(item).toArray(new Item[]{}), 
-                                                "No item found to right to repel.");
-                        }
-                        return false;
-                } else if (item.getParent().getItemWithID(item.getMagnetizedItemRight()) == null) {
+                if(FrameUtils.getCurrentItem() == null) return false;
+                final Point selectedItemPosition = FrameUtils.getCurrentItem().getPosition();
+                if(!selectedItemPosition.equals(item.getPosition())) return false;
+                
+                if(item.getMagnetizedItemRight() == -1) {
+                        
+                } else if(item.getParent().getItemWithID(item.getMagnetizedItemRight()) == null) {
                         item.setMagnetizedItemRight(null);
-                        MagneticConstraints.Log(this.getClass(), new Item[]{item}, 
-                                        Line.getLineContainingToken(item).toArray(new Item[]{}), 
-                                        "Right neighbor has id: " + item.getMagnetizedItemRight() + 
-                                        " according to datastructure but no item on frame has that id.");
                         return false;
                 } else {
-                        final Item toMyRight = item.getParent().getItemWithID(
-                                        item.getMagnetizedItemRight());
-                        if(item.getX() + item.getBoundsWidth() + args[0] >= toMyRight.getX()) {
-                                float newX = toMyRight.getX() + args[0];
-                                //System.err.println("Repeling item with text: " + toMyRight.getText() + " Origonal X: " + toMyRight.getX() + " New X: " + newX);
-                                if(newX < toMyRight.getX()) {
-                                        System.err.println();
+                        final Line tokensToMove = Line.getLineFromToken(item);
+                        tokensToMove.removeFirst();
+                        tokensToMove.deltaX(args[0].intValue());
+                        for(final Item token : tokensToMove) {
+                                if(BoxLogic.boxCollision(token)) {
+                                        final RepelTextDownAction textDownAction = new RepelTextDownAction();
+                                        textDownAction.setCallbackAction(this.callbackAction);
+                                        textDownAction.exec(token);
+                                        break;
                                 }
-                                toMyRight.setX(newX);
-                                MagneticConstraints.Log(this.getClass(), new Item[]{item, toMyRight}, 
-                                                Line.getLineContainingToken(item).toArray(new Item[]{}), 
-                                                "Repeling second primary to first.  Delta: " + args[0] + ". NewX: " + newX + ". Recursing.");
-                                RepelTextAction recurse = new RepelTextAction();
-                                recurse.setCallbackAction(this.callbackAction);
-                                recurse.exec(toMyRight, args);
-                                return true;
-                        } else return false;
+                        }
                 }
+                
+
+
+                
+                callback(item);
+
+                return true;
         }
 

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

@@ -5 +5 @@
 import org.expeditee.gui.DisplayIO;
 import org.expeditee.gui.FrameIO;
-import org.expeditee.items.*;
+import org.expeditee.gui.FrameUtils;
+import org.expeditee.items.Item;
+import org.expeditee.items.Text;
 import org.expeditee.items.MagneticConstraint.MagneticConstraintAction;
 import org.expeditee.items.MagneticConstraint.Utilities.Line;
@@ -13 +15 @@
 public class RepelTextDownAction extends MagneticConstraintAction {
         
+//      private void f(final Item item) {
+//              final List<Item> items = item.getParent().getItems();
+//              for (final Item item2 : items) {
+//                      if(item2.getText().compareTo("main") == 0) System.err.println("#Found main");
+//              }
+//      }
+        
         @Override
         public boolean exec(final Item item) {
-                if(item == null) return false;
-                callback(null);
+                if(item == null || item.getParent() == null) return false;
+                callback(item);
                 //Calculate content that needs to be moved to next line.
                         //1. Get remainder of line
@@ -22 +31 @@
                         //2. Check if the current item should be included; remove it if not.
                 if(remainderOfLine.getFirst().getText().isEmpty() || 
-                                (remainderOfLine.size() > 0 && TextLogic.XIsTowardsRight(DisplayIO.getMouseX(), (Text) remainderOfLine.getFirst())))
+                                (FrameUtils.getCurrentItem().getPosition().equals(item.getPosition()) 
+                                && remainderOfLine.size() > 0 
+                                && TextLogic.XIsTowardsRight(DisplayIO.getMouseX(), (Text) remainderOfLine.getFirst()))) {
                         remainderOfLine.removeFirst();
+                }
+                        
                 //Move content below this line down
                         //1. Get current line & current paragraph.
@@ -34 +47 @@
                 if(!remainderOfLine.isEmpty()) {
                                 //2a. Yes. Move the content
-                        final Point first = remainderOfLine.get(0).getPosition();
+                        final Point first = remainderOfLine.getBoundingBox().getLocation();
                         for(final Item token : remainderOfLine) {
                                 double newX = token.getX() - first.getX() + newLineAt.getX();
-                                double newY = token.getY() - first.getY() + newLineAt.getY();
-                                token.setPosition((float) newX, (float) newY);
+                                token.setPosition((float) newX, (float) newLineAt.getY());
                         }
                                 //2b. Move the cursor; refresh the screen and use callback to update the magnets
-                        DisplayIO.setCursorPosition(remainderOfLine.get(0).getPosition());
-                        FrameIO.ForceSaveFrame(item.getParent());
-                        FrameIO.Reload();
+                        DisplayIO.setTextCursor((Text) remainderOfLine.getFirst(), Text.HOME);
                         callback(null);
+                        FrameIO.SaveFrame(remainderOfLine.getLast().getParent());
                 } else {
                                 //3a No. Move the cursor; refresh the screen and use callback to update the magnets
                         DisplayIO.setCursorPosition(newLineAt);
-                        FrameIO.ForceSaveFrame(item.getParent());
-                        FrameIO.Reload();
-                        callback(null);
                 }
+
                 return true;
         }

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

@@ -1 +1 @@
 package org.expeditee.items.MagneticConstraint.Actions;
 
-import java.awt.Point;
-
 import org.expeditee.gui.DisplayIO;
-import org.expeditee.gui.FrameGraphics;
 import org.expeditee.items.Item;
 import org.expeditee.items.Text;
@@ -39 +36 @@
                 if(toMoveTo instanceof Text) {
                         final Text asText = (Text) toMoveTo;
-                        final Point position = toMoveTo.getPosition();
-                        DisplayIO.setCursorPosition(position.x + asText.getPixelBoundsUnion().width, position.y, false);
-                        FrameGraphics.refresh(false);
+                        DisplayIO.setTextCursor(asText, Text.END);
                 } else DisplayIO.setCursorPosition(toMoveTo.getPosition(), false);
                 return true;

trunk/src/org/expeditee/items/MagneticConstraint/MagneticConstraintAction.java

@@ -19 +19 @@
 package org.expeditee.items.MagneticConstraint;
 
+import java.util.List;
+
+import org.expeditee.gui.Frame;
 import org.expeditee.items.Item;
 
@@ -35 +38 @@
                 callbackAction = action;
         }
+        
+        protected boolean isSpIDERCodePage(final Frame frame) {
+                if(frame.getTitleItem() == null) return false;
+                final List<String> data = frame.getTitleItem().getData();
+                boolean hasProjectTag = false;
+                boolean hasPackageTag = false;
+                boolean hasClassTag = false;
+                if(data == null) return false;
+                for(final String s : data) {
+                        if(s.startsWith("Project:")) hasProjectTag = true;
+                        else if(s.startsWith("Package:")) hasPackageTag = true;
+                        else if(s.startsWith("Class:")) hasClassTag = true;
+                }
+                return hasProjectTag && hasPackageTag && hasClassTag;
+        }
 }

trunk/src/org/expeditee/items/MagneticConstraint/Utilities/Line.java

@@ -68 +68 @@
         
         public Line next() {
-                final Item lastInThisLine = this.get(this.size() - 1);
+                final Item lastInThisLine = this.getLast();//this.get(this.size() - 1);
                 if(lastInThisLine.getMagnetizedItemBottom() == -1) return null;
                 else return getLineFromToken(this.get(0).getParent().getItemWithID(lastInThisLine.getMagnetizedItemBottom()));
@@ -74 +74 @@
         
         public Line last() {
-                final Item firstInThisLine = this.get(0);
+                final Item firstInThisLine = this.getFirst();//this.get(0);
                 if(firstInThisLine.getMagnetizedItemTop() == -1) return null;
                 else return getLineContainingToken(this.get(0).getParent().getItemWithID(firstInThisLine.getMagnetizedItemTop()));
@@ -80 +80 @@
                 
         private static Line getLineFromToken(final Item token, final Line acc) {
+                if(token == null) return acc;
                 if(token.getMagnetizedItemRight() == -1) {
                         acc.add(token);
@@ -85 +86 @@
                 } else {
                         final Line lineSoFar = new Line(acc);
+                        if(lineSoFar.contains(token)) return lineSoFar;
                         lineSoFar.add(token);
                         return getLineFromToken(token.getParent().getItemWithID(token.getMagnetizedItemRight()), lineSoFar);

trunk/src/org/expeditee/items/MagneticConstraint/Utilities/Paragraph.java

@@ -3 +3 @@
 import java.awt.*;
 import java.util.LinkedList;
+import org.expeditee.items.Text;
 
 @SuppressWarnings("serial")
@@ -58 +59 @@
                         //4b. No; then we simply need to calculate the position of the next line and return that.
                         final Rectangle boundingBox = splitAt.getBoundingBox();
-                        return new Point((int)boundingBox.getX(), (int)boundingBox.getMaxY() + lineHeight);
+                        return new Point(((Text) splitAt.getFirst()).getX(), (int)boundingBox.getMaxY() + lineHeight);
                 } 
                 //NB at this point we know that there are lines below our 'splitAt' line in the same paragraph so they need to be moved down.
@@ -64 +65 @@
                 paragraphStartingAtNextLine.deltaY(lineHeight);
                 //6. Return the position of the new line we have made space for.
+                
                 final Rectangle boundingBox = splitAt.getBoundingBox();
-                return new Point((int)boundingBox.getX(), (int)boundingBox.getMinY() + lineHeight);
+                final int x = ((Text) splitAt.getFirst()).getX();
+                return new Point(x, (int)boundingBox.getMaxY() + lineHeight);
         }
         

trunk/src/org/expeditee/items/MagneticConstraint/Utilities/TextLogic.java

@@ -9 +9 @@
                 if(text.getPixelBoundsUnion() == null) return false;
                 final double distanceThroughText = x - text.getPixelBoundsUnion().getX();
-                return text.getText().length() == 1 || distanceThroughText > (text.getPixelBoundsUnion().getWidth() / 2);
+                return /*text.getText().length() == 1 ||*/ distanceThroughText > (text.getPixelBoundsUnion().getWidth() / 2);
         }