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

Timestamp:

05/21/08 09:40:52 (16 years ago)

Author:

ra33

Message:

Made LOTS of changes...
Added DisplayComet
A whole bunch more stats for items and events
Changed lots of stuff for drawing better especially using text as line endpoints

File:

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

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

@@ -67 +67 @@
 
         public static String MESSAGES_FRAMESET_NAME = "Messages";
+
         // The link to the message frameset
         public static Text MessageLink = new Text(-2, MESSAGES_FRAMESET_NAME);
@@ -141 +142 @@
                                 MESSAGE_LINK_X);
 
-                //Repaint();
+                // Repaint();
         }
 
@@ -281 +282 @@
                                 PaintPictures(bg, Frame.FreeItems);
 
+                        PaintLines(bg, paintItems);
                         PaintNonLinesNonPicture(bg, paintItems);
-                        PaintLines(bg, paintItems);
-
-                        if (toPaint == DisplayIO.getCurrentFrame())
-                                PaintNonLinesNonPicture(bg, Frame.FreeItems);
 
                         // toPaint.setBufferValid(true);
@@ -330 +328 @@
                         }
 
+                        if (toPaint == DisplayIO.getCurrentFrame())
+                                PaintNonLinesNonPicture(bg, Frame.FreeItems);
+
                         if (paintOverlay) {
                                 PaintItem(bg, toPaint.getFrameNameItem());
@@ -428 +429 @@
         /**
          * Paints the message area
+         * 
          * @param g
          * @param background
@@ -458 +460 @@
          */
         public static void Repaint() {
-                //Thread.dumpStack();
+                // Thread.dumpStack();
                 if (_DisplayGraphics == null)
                         return;
@@ -547 +549 @@
                 Repaint();
         }
-        
+
         public static void ChangeSelectionMode(Item item, Item.SelectedMode newMode) {
                 if (item == null)
                         return;
-                
-                for(Item i: item.getAllConnected())
+
+                for (Item i : item.getAllConnected())
                         i.setSelectedMode(newMode);
                 Repaint();
@@ -582 +584 @@
 
         public static void DisplayMessage(String message, Color textColor) {
-                displayMessage(message, null, textColor);
-                Misc.Beep();
+                displayMessage(message, null, null, textColor);
+                //Misc.Beep();
         }
 
         public static void DisplayMessage(Text message) {
-                displayMessage(message.getFirstLine(), message.getLink(), message
-                                .getColor());
+                displayMessage(message.getFirstLine(), message.getLink(), message.getAction(), message.getColor());
                 // Misc.Beep();
         }
@@ -594 +595 @@
         public static void DisplayMessageAlways(String message) {
                 // _lastMessage = null;
-                displayMessage(message, null, Color.BLACK);
-                Misc.Beep();
+                displayMessage(message, null, null, Color.BLACK);
+                //Misc.Beep();
         }
 
         public static void WarningMessage(String message) {
-                displayMessage(message, null, Color.MAGENTA);
-                Misc.Beep();
+                displayMessage(message, null, null, Color.MAGENTA);
+                //Misc.Beep();
         }
 
         // private static String _lastMessage = null;
 
-        private static void displayMessage(String message, String link, Color color) {
+        private static void displayMessage(String message, String link,
+                        List<String> actions, Color color) {
                 // add timestamp to message
                 // if (message.equals(_lastMessage))
@@ -629 +631 @@
                         for (int i = 0; i < Messages.length; i++) {
                                 if (Messages[i] == null) {
-                                        Messages[i] = new Text(-1, getMessagePrefix(true)
-                                                        + message);
+                                        Messages[i] = new Text(-1, getMessagePrefix(true) + message);
                                         Messages[i].setPosition(20, pos);
                                         Messages[i].setOffset(0, -_MaxSize.height);
@@ -659 +660 @@
                 last.setText(getMessagePrefix(true) + message);
                 last.setLink(link);
+                last.setAction(actions);
 
                 _creator.addItem(last.copy());
@@ -687 +689 @@
                 if (tokens.length > 1)
                         link = tokens[tokens.length - 1];
-                displayMessage(message, link, ERROR_COLOR);
+                displayMessage(message, link, null, ERROR_COLOR);
         }
 
@@ -694 +696 @@
                         return;
                 Misc.Beep();
-                displayMessage(message, null, ERROR_COLOR);
+                displayMessage(message, null, null, ERROR_COLOR);
         }