Changeset 50 for trunk/src/org/expeditee/items/ItemUtils.java

Timestamp:

05/16/08 10:25:28 (16 years ago)

Author:

ra33

Message:

A whole day of big changes.
Adding the ability to have Text at the end of Lines.
Also a lot of refactoring to improve the quality of code relating to constraints and lines

File:

• trunk/src/org/expeditee/items/ItemUtils.java (modified) (5 diffs)

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

@@ -450 +450 @@
                                         for (Constraint c : consts) {
                                                 if (c.contains(line.getEndItem())) {
-                                                        if (c.getConstraintType() == Constraint.VERTICAL) {
+                                                        if (c.getType() == Constraint.VERTICAL) {
                                                                 vConst.add(line.getStartItem());
                                                                 vConst.add(line.getEndItem());
@@ -659 +659 @@
                 _seen.clear();
 
-                // get all dots on the Frame
-                List<Dot> dots = new ArrayList<Dot>(0);
+                // get all lineEnds on the Frame
+                List<Item> lineEnds = new ArrayList<Item>(0);
                 for (Item i : items) {
-                        if (i instanceof Dot) {
-                                Dot d = (Dot) i;
-                                d.setEnclosedList(null);
-
-                                if (d.getLines().size() == 2)
-                                        dots.add(d);
-                        }
-                }
-
-                // if there are no dots on the Frame, then there can't be an enclosure
-                if (dots.size() == 0)
+                        if (i.isLineEnd()) {
+                                i.setEnclosedList(null);
+
+                                if (i.getLines().size() == 2)
+                                        lineEnds.add(i);
+                        }
+                }
+
+                // if there are no line endpoints on the Frame, then there can't be an enclosure
+                if (lineEnds.size() == 0)
                         return;
 
                 //TODO optimise this code!!
-                // iterate through all the dots
-                for (Dot searchFor : dots) {
+                // iterate through all the lineEnds
+                for (Item searchFor : lineEnds) {
                         _seen.clear();
 
@@ -683 +682 @@
                                 _seen.add(l);
                                 if (traverse(searchFor, l.getOppositeEnd(searchFor))) {
-                                        _path.add((Dot) l.getOppositeEnd(searchFor));
-
-                                        for (Dot d : _path)
-                                                d.setEnclosedList(_path);
-
-                                        _path = new ArrayList<Dot>(0);
+                                        _path.add(l.getOppositeEnd(searchFor));
+
+                                        for (Item i : _path)
+                                                i.setEnclosedList(_path);
+
+                                        _path = new ArrayList<Item>(0);
 
                                         break;
@@ -699 +698 @@
         private static List<Line> _seen = new ArrayList<Line>();
 
-        private static List<Dot> _path = new ArrayList<Dot>();
-
-        private static boolean traverse(Dot toFind, Item searchFrom) {
+        private static List<Item> _path = new ArrayList<Item>();
+
+        private static boolean traverse(Item toFind, Item searchFrom) {
                 if (toFind == null || searchFrom == null
-                                || !(searchFrom instanceof Dot))
+                                || !searchFrom.isLineEnd())
                         return false;
 
@@ -716 +715 @@
                                 _seen.add(l);
                                 if (traverse(toFind, l.getOppositeEnd(searchFrom))) {
-                                        _path.add((Dot) l.getOppositeEnd(searchFrom));
+                                        _path.add(l.getOppositeEnd(searchFrom));
                                         return true;
                                 }