Changeset 286 for trunk/src/org/expeditee/gui/FrameUtils.java

Timestamp:

08/29/08 08:17:54 (16 years ago)

Author:

ra33

Message:

 

File:

• trunk/src/org/expeditee/gui/FrameUtils.java (modified) (8 diffs)

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

@@ -4 +4 @@
 import java.awt.Point;
 import java.awt.Polygon;
+import java.awt.Rectangle;
 import java.io.File;
 import java.util.ArrayList;
@@ -31 +32 @@
 import org.expeditee.items.widgets.WidgetCorner;
 import org.expeditee.items.widgets.WidgetEdge;
+import org.expeditee.network.PeerToPeer;
 import org.expeditee.stats.SessionStats;
 
@@ -580 +582 @@
                         else if (attribute.equals("mailsettings"))
                                 MailSession.init(item.getChild());
+                        else if (attribute.equals("peertopeersettings"))
+                                PeerToPeer.init(item.getChild());
                         else if (attribute.equals("reminders"))
                                 Reminders.init(item.getChild());
@@ -779 +783 @@
                                 } else if (i.hasFormula()) {
                                         i.setText(i.getFormula());
+                                } else if (i.hasOverlay()) {
+                                        i.setVisible(true);
                                 }
                         }
@@ -849 +855 @@
                                                 }
                                                 // check for new OVERLAY items
-                                                else if (!ignoreAnnotations && ItemUtils.startsWithTag(i,
-                                                                ItemUtils.TAG_OVERLAY)
+                                                else if (!ignoreAnnotations
+                                                                && ItemUtils.startsWithTag(i,
+                                                                                ItemUtils.TAG_OVERLAY)
                                                                 && i.getLink() != null) {
                                                         if (i.getAbsoluteLink().equalsIgnoreCase(
@@ -872 +879 @@
                                                 }
                                                 // check for ACTIVE_OVERLAY items
-                                                else if (!ignoreAnnotations && ItemUtils.startsWithTag(i,
-                                                                ItemUtils.TAG_ACTIVE_OVERLAY)
+                                                else if (!ignoreAnnotations
+                                                                && ItemUtils.startsWithTag(i,
+                                                                                ItemUtils.TAG_ACTIVE_OVERLAY)
                                                                 && i.getLink() != null) {
                                                         String link = i.getAbsoluteLink();
@@ -1028 +1036 @@
                         } catch (Exception e) {
                         }
-                        Vector newVector = new Vector(vector, vectorPermission, i
-                                        .getPosition(), scale, i.getColor(), i.getBackgroundColor());
+                        Vector newVector = new Vector(vector, vectorPermission, scale, i);
                         i.setOverlay(newVector);
+                        i.setVisible(false);
                         vectors.add(newVector);
                 }
@@ -1451 +1459 @@
                         if (lastEdited != LastEdited) {
                                 if (LastEdited.startsWith("@i")) {
+                                        // Check if its an image that can be resized to fit a box
+                                        // around it
+                                        String text = LastEdited.getText();
+                                        if (text.startsWith("@i:")
+                                                        && !Character.isDigit(text
+                                                                        .charAt(text.length() - 1))) {
+                                                Collection<Item> enclosure = FrameUtils
+                                                                .getEnclosingLineEnds(LastEdited.getPosition());
+                                                if (enclosure != null) {
+                                                        for (Item i : enclosure) {
+                                                                if (i.isLineEnd() && i.isEnclosed()) {
+                                                                        DisplayIO.getCurrentFrame().removeAllItems(
+                                                                                        enclosure);
+                                                                        Rectangle rect = i.getEnclosedRectangle();
+                                                                        LastEdited
+                                                                                        .setText(LastEdited.getText()
+                                                                                                        + " "
+                                                                                                        + Math.round(rect
+                                                                                                                        .getWidth()));
+                                                                        LastEdited.setPosition(new Point(rect.x,
+                                                                                        rect.y));
+                                                                        LastEdited.setThickness(i.getThickness());
+                                                                        LastEdited.setBorderColor(i.getColor());
+                                                                        break;
+                                                                }
+                                                        }
+                                                        FrameMouseActions.deleteItems(enclosure, false);
+                                                }
+                                        }
                                         toReparse = LastEdited.getParent();
                                 } else if (LastEdited.recalculateWhenChanged()) {