Changeset 1288 for trunk

Timestamp:

04/05/19 14:34:45 (5 years ago)

Author:

bln4

Message:

Completed work on the FrameCreators new functionality that allows it to resume building a frame that it had started on a previous run of Expeditee.

File:

• trunk/src/org/expeditee/gui/FrameCreator.java (modified) (2 diffs)

trunk/src/org/expeditee/gui/FrameCreator.java

@@ -24 +24 @@
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Collection;
+import java.util.Comparator;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.Optional;
 
 import org.expeditee.agents.ExistingFramesetException;
@@ -124 +127 @@
                 _firstFrame = this.framesCreated.get(0);
                 _current = this.framesCreated.get(this.framesCreated.size() - 1);
-
-                createNextFrame();
                 
-                Paths.get(_current.getFramePathLogical());
+                Collection<Text> allExistingTextItems = _current.getTextItems();
+                allExistingTextItems.remove(_Mfirst);
+                allExistingTextItems.remove(_Mnext);
+                allExistingTextItems.remove(_Mprev);
+                Optional<Text> maxByY = allExistingTextItems.stream().max(new Comparator<Text>() {
+                        @Override
+                        public int compare(Text t1, Text t2) {
+                                return t1.getY() - t2.getY();
+                        }
+                });
+                if (maxByY.isPresent()) {
+                        Text lowest = maxByY.get();
+                        _lastY = lowest.getY() + lowest.getBoundsHeight() / 2;
+                }
+                Optional<Text> maxByX = allExistingTextItems.stream().max(new Comparator<Text>() {
+                        @Override
+                        public int compare(Text t1, Text t2) {
+                                return t1.getX() - t2.getX();
+                        }
+                });
+                if (maxByX.isPresent()) {
+                        Text furthest = maxByX.get();
+                        _lastX = furthest.getX();
+                }
         }