Changeset 966 for trunk/src

Timestamp:

09/29/15 14:25:04 (9 years ago)

Author:

bln4

Message:

 

Location:

trunk/src/org/expeditee/items/MagneticConstraint

Files:

• Actions/RepelTextAction.java (modified) (1 diff)
• Utilities/Line.java (modified) (1 diff)

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

@@ -43 +43 @@
                 } else {
                         final Line tokensToMove = Line.getLineFromToken(item);
+                        System.err.println("#Repeling tokens: " + tokensToMove);
                         tokensToMove.removeFirst();
                         tokensToMove.deltaX(args[0].intValue());

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

@@ -46 +46 @@
                 Item current = token;
                 while(current.getMagnetizedItemLeft() != -1) {
-                        current = current.getParent().getItemWithID(current.getMagnetizedItemLeft());
+                        final Item potentialStart = current.getParent().getItemWithID(current.getMagnetizedItemLeft());
+                        if(potentialStart == null) break;
+                        current = potentialStart;
                         ret.addFirst(current);
                 }