Changeset 72 for trunk/src/org/expeditee/gui/FrameGraphics.java

Timestamp:

05/23/08 09:02:59 (16 years ago)

Author:

ra33

Message:

Added lots of stuff

File:

• trunk/src/org/expeditee/gui/FrameGraphics.java (modified) (13 diffs)

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

@@ -12 +12 @@
 import java.awt.RenderingHints;
 import java.awt.image.VolatileImage;
+import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
@@ -19 +20 @@
 
 import org.expeditee.actions.Misc;
-import org.expeditee.items.Dot;
 import org.expeditee.items.InteractiveWidget;
 import org.expeditee.items.Item;
+import org.expeditee.items.ItemUtils;
 import org.expeditee.items.Line;
 import org.expeditee.items.Picture;
@@ -64 +65 @@
 
         // if true, error messages are not shown to the user
-        private static boolean _SupressErrors = false;
+        private static boolean _SupressMessages = false;
 
         public static String MESSAGES_FRAMESET_NAME = "Messages";
@@ -79 +80 @@
          */
         public static void ToggleAudienceMode() {
+                Frame current = DisplayIO.getCurrentFrame();
                 if (_Mode == MODE_AUDIENCE)
                         _Mode = MODE_NORMAL;
-                else
+                else {
                         _Mode = MODE_AUDIENCE;
-
-                FrameUtils.Parse(DisplayIO.getCurrentFrame());
+                        ItemUtils.UpdateConnectedToAnnotations(current.getItems());
+                }
+                FrameUtils.Parse(current);
                 DisplayIO.UpdateTitle();
                 Repaint();
@@ -178 +181 @@
                 if (g != null
                                 && (!isAudienceMode()
-                                                || (isAudienceMode() && !i.isAnnotation()) || i == FrameUtils.LastEdited)) {
+                                                || (isAudienceMode() && !i.isConnectedToAnnotation() && !i
+                                                                .isAnnotation()) || i == FrameUtils.LastEdited)) {
 
                         Graphics2D tg = (Graphics2D) g.create();
@@ -503 +507 @@
                         if (i instanceof Picture)
                                 PaintItem(g, i);
-                        else if (i instanceof Dot)
-                                ((Dot) i).paintFill(g);
+                        else if (i.isLineEnd() && (!isAudienceMode() ||
+                                        !i.isConnectedToAnnotation()))
+                                i.paintFill(g);
                 }
         }
@@ -538 +543 @@
                                 toDisconnect.setSelectedMode(newMode);
                         } else {
-                                List<Item> connected = i.getAllConnected();
+                                Collection<Item> connected = i.getAllConnected();
                                 for (Item conn : connected) {
                                         conn.setSelectedMode(Item.SelectedMode.Connected);
@@ -585 +590 @@
         public static void DisplayMessage(String message, Color textColor) {
                 displayMessage(message, null, null, textColor);
-                //Misc.Beep();
+                // Misc.Beep();
         }
 
         public static void DisplayMessage(Text message) {
-                displayMessage(message.getFirstLine(), message.getLink(), message.getAction(), message.getColor());
+                displayMessage(message.getFirstLine(), message.getLink(), message
+                                .getAction(), message.getColor());
                 // Misc.Beep();
         }
@@ -596 +602 @@
                 // _lastMessage = null;
                 displayMessage(message, null, null, Color.BLACK);
-                //Misc.Beep();
+                // Misc.Beep();
         }
 
         public static void WarningMessage(String message) {
                 displayMessage(message, null, null, Color.MAGENTA);
-                //Misc.Beep();
+                // Misc.Beep();
         }
 
@@ -608 +614 @@
         private static void displayMessage(String message, String link,
                         List<String> actions, Color color) {
-                // add timestamp to message
-                // if (message.equals(_lastMessage))
-                // return;
-                // _lastMessage = message;
-
-                // message += _formatter.format(Calendar.getInstance().getTime());
-
-                // if the creator needs to be initialised (happens on first message)
+                if (_SupressMessages)
+                        return;
+
                 if (_creator == null) {
                         _creator = new FrameCreator(MESSAGES_FRAMESET_NAME, true);
@@ -682 +683 @@
          */
         public static void LinkedErrorMessage(String message) {
-                if (_SupressErrors)
+                if (_SupressMessages)
                         return;
                 Misc.Beep();
@@ -693 +694 @@
 
         public static void ErrorMessage(String message) {
-                if (_SupressErrors)
+                if (_SupressMessages)
                         return;
                 Misc.Beep();
@@ -745 +746 @@
         }
 
-        public static void SupressErrors(boolean val) {
-                _SupressErrors = val;
+        public static void SupressMessages(boolean val) {
+                _SupressMessages = val;
         }