Changeset 50 for trunk/src/org/expeditee/gui/Frame.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/gui/Frame.java (modified) (5 diffs)

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

@@ -231 +231 @@
         public List<Text> getBodyTextItems(boolean includeAnnotations) {
                 List<Text> bodyTextItems = new ArrayList<Text>();
-                Text frameTitle = getTitle();
-
                 for (Item i : getItems()) {
                         // only add up normal body text items
@@ -426 +424 @@
 
                 for (Item i : _body)
-                        if (i.isVisible() && i != _frameName && i.intersects(poly)) {
+                        if (i.isVisible() /*&& i != _frameName*/ && i.intersects(poly)) {
                                 if (!results.contains(i))
                                         results.add(i);
@@ -730 +728 @@
                                         line.getStartItem().addLine(line);
                                         line.getEndItem().addLine(line);
+                                } else {
+                                        i.setOffset(0, 0);
                                 }
                         }
@@ -1133 +1133 @@
 
         /**
-         * Creates a new Text Item with no text. The newly created Item is a copy
-         * the ItemTemplate if one is present, and inherits all the attributes of
-         * the Template
-         * 
-         * @return The newly created Text Item
+         * Creates a new text item with the given text.
+         * @param text
+         * @return
          */
         public Text createNewText(String text) {
@@ -1145 +1143 @@
         }
 
+        /**
+         * Creates a new Text Item with no text. The newly created Item is a copy
+         * the ItemTemplate if one is present, and inherits all the attributes of
+         * the Template
+         * 
+         * @return The newly created Text Item
+         */
         public Text createBlankText(String templateType) {
                 Text t;