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

Timestamp:

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

Author:

bln4

Message:

 

File:

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

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

@@ -15 +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");
-//              }
-//      }
+        public static boolean MergeSameLineParagraphCollisions = false;
         
         @Override
         public boolean exec(final Item item) {
-                if(item == null || item.getParent() == null) return false;
-                callback(item);
+                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
@@ -37 +32 @@
                 }
                         
-                //Move content below this line down
-                        //1. Get current line & current paragraph.
                 final Line currentLine = Line.getLineContainingToken(item);
                 final Paragraph currentParagraph = Paragraph.getParagraphFromLine(currentLine);
-                        //2. Split current paragraph
-                final Point newLineAt = currentParagraph.split(currentLine);
+                final Line nextLine = currentLine.next();
+                
+                final Point newLineAt;
                 //Move content contained in 'remainderOfLine'
-                        //1. Is remainderOfLine not Empty?
-                if(!remainderOfLine.isEmpty()) {
-                                //2a. Yes. Move the content
+
+                
+                if(!remainderOfLine.isEmpty() && currentParagraph.contains(nextLine) && MergeSameLineParagraphCollisions) { 
+                        nextLine.prependLine(remainderOfLine);
+                        DisplayIO.setTextCursor((Text) remainderOfLine.getFirst(), Text.HOME);
+                        callback(remainderOfLine.getFirst());
+                        FrameIO.SaveFrame(remainderOfLine.getLast().getParent());
+                } else if(!remainderOfLine.isEmpty()) {
+                        newLineAt = currentParagraph.split(currentLine);
                         final Point first = remainderOfLine.getBoundingBox().getLocation();
                         for(final Item token : remainderOfLine) {
@@ -52 +52 @@
                                 token.setPosition((float) newX, (float) newLineAt.getY());
                         }
-                                //2b. Move the cursor; refresh the screen and use callback to update the magnets
                         DisplayIO.setTextCursor((Text) remainderOfLine.getFirst(), Text.HOME);
-                        callback(null);
+                        callback(remainderOfLine.getFirst());
                         FrameIO.SaveFrame(remainderOfLine.getLast().getParent());
-                } else {
-                                //3a No. Move the cursor; refresh the screen and use callback to update the magnets
+                }else {
+                                //3a No. Move the cursor
+                        newLineAt = currentParagraph.split(currentLine);
                         DisplayIO.setCursorPosition(newLineAt);
                 }
-
+                
                 return true;
         }