Changeset 954

Timestamp:

07/07/15 10:35:32 (9 years ago)

Author:

bln4

Message:

 

Location:

trunk/src/org/expeditee/items

Files:

• Item.java (modified) (1 diff)
• MagneticConstraint/Utilities/BoxLogic.java (modified) (3 diffs)
• MagneticConstraint/Utilities/Line.java (modified) (1 diff)

trunk/src/org/expeditee/items/Item.java

@@ -1176 +1176 @@
         public void clearTooltips() {
                 final Frame frame = this.getParent();
-                for(final Text tooltip: _tooltip.getTooltips()) frame.removeItem(tooltip);
+                if(_tooltip != null)
+                        for(final Text tooltip: _tooltip.getTooltips()) frame.removeItem(tooltip);
         }
         

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

@@ -35 +35 @@
                 return ret;
         }
-
+        
         public static boolean boxCollision(final Item item) {
                 final List<org.expeditee.items.Line> verticalLines = BoxLogic
@@ -56 +56 @@
 
         public static void resolveCollision(final Item item, final MagneticConstraintAction remagnet) {
-                //System.err.println("Resolving box collision");
-                boolean updateCursor = false;
-                if(FrameUtils.getCurrentItem() == item) updateCursor = true;
+                boolean updateCursor = FrameUtils.getCurrentItem() == item;
                 final Line currentLine = Line.getLineContainingToken(item);
                 final Paragraph currentParagraph = Paragraph.getParagraphFromLine(currentLine);
@@ -78 +76 @@
                 if(updateCursor) DisplayIO.MoveCursorToEndOfItem(item);
                 FrameIO.ForceSaveFrame(item.getParent());
-                FrameIO.Reload();
         }
 }

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

@@ -76 +76 @@
                 
         private static Line getLineFromToken(final Item token, final Line acc) {
-                if(token.getMagnetizedItemRight() == -1) { //TODO: This change got accidentally deleted
+                if(token.getMagnetizedItemRight() == -1) {
                         acc.add(token);
                         return acc;