Changeset 689

Timestamp:

01/13/14 17:01:03 (10 years ago)

Author:

jts21

Message:

Added progress bar, rewrote some of MessageBay

Location:

trunk/src/org/expeditee

Files:

• actions/Misc.java (modified) (2 diffs)
• gui/FrameIO.java (modified) (1 diff)
• gui/MessageBay.java (modified) (15 diffs)

trunk/src/org/expeditee/actions/Misc.java

@@ -37 +37 @@
 import org.expeditee.gui.FreeItems;
 import org.expeditee.gui.MessageBay;
+import org.expeditee.gui.MessageBay.Progress;
 import org.expeditee.gui.Reminders;
 import org.expeditee.gui.TimeKeeper;
@@ -1576 +1577 @@
                 FrameIO.SaveFrame(frame);
         }
+        
+        public static void testProgress() {
+                new Thread(new Runnable() {
+
+                        @Override
+            public void run() {
+                                Progress p = MessageBay.displayProgress("Loading something");
+                                for(int i = 1; i <= 100; i++) {
+                                try {
+                        Thread.sleep(100);
+                        p.set(i);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                                }
+            }
+                        
+                }).start();
+        }
 }

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

@@ -139 +139 @@
                 // do not display errors encountered to the user
                 // (they will be shown at load time)
-                MessageBay.supressMessages(true);
+                MessageBay.suppressMessages(true);
                 // loading automatically caches the frame is caching is turned on
                 LoadFromDisk(framename, null, false);
-                MessageBay.supressMessages(false);
+                MessageBay.suppressMessages(false);
         }
 

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

@@ -36 +36 @@
 
         // messages shown in the message window
-        private static Text[] _messages = new Text[3];
+        private static List<Item> _messages = new LinkedList<Item>();
         private static Text _status = null;
 
@@ -52 +52 @@
 
         // if true, error messages are not shown to the user
-        private static boolean _supressMessages = false;
+        private static boolean _suppressMessages = false;
 
         // The link to the message frameset
@@ -73 +73 @@
                 _messageBuffer = null;
 
-                for (int i = 0; i < _messages.length; i++) {
-                        if (_messages[i] != null) {
-                                _messages[i].setOffset(0,
-                                                -FrameGraphics.getMaxFrameSize().height);
-                                // _messages[i].setMaxWidth(FrameGraphics.getMaxFrameSize().width);
+                for(Item i : _messages) {
+                        if(i != null) {
+                                i.setOffset(0, -FrameGraphics.getMaxFrameSize().height);
+                                // i.setMaxWidth(FrameGraphics.getMaxFrameSize().width);
                         }
                 }
@@ -94 +93 @@
          */
         public static boolean isMessageItem(Item i) {
-                if (_messages != null) {
-                        for (Text txt : _messages) {
-                                if (txt == i)
-                                        return true;
-                        }
-                }
-
-                return i == _messageLink;
+                
+                return _messages.contains(i) || i == _messageLink;
         }
 
@@ -118 +111 @@
         }
 
-        public synchronized static Text[] getMessages() {
+        public synchronized static List<Item> getMessages() {
                 return _messages;
         }
@@ -184 +177 @@
                         Graphics g, Color background) {
 
+                if(g == null)
+                        return;
+                
                 if (FrameGraphics.getMaxSize().width <= 0)
                         return;
@@ -217 +213 @@
                         // g.setClip(clip);
 
-                        g.drawImage(_messageBuffer, 0,
-                                        FrameGraphics.getMaxFrameSize().height, null);
+                        g.drawImage(_messageBuffer, 0, FrameGraphics.getMaxFrameSize().height, null);
                 }
 
@@ -270 +265 @@
                 return displayMessage(message, link, actions, color, displayAlways);
         }
-
-        public synchronized static Text displayMessage(String message, String link,
-                        List<String> actions, Color color, boolean displayAlways) {
-
+        
+        private static Text newMessage(String message, String link, List<String> actions, Color color) {
+                Text t = new Text(getMessagePrefix(true) + message);
+                t.setPosition(20, 15 + _messages.size() * 25);
+                t.setOffset(0, -FrameGraphics.getMaxFrameSize().height);
+                t.setColor(color);
+                t.setLink(link);
+                t.setActions(actions);
+                t.setFont(_messageFont);
+                _creator.addItem(t.copy(), true);
+                if(link == null) t.setLink(_creator.getCurrent());
+                return t;
+        }
+        
+        private synchronized static Text displayMessage(String message, String link,
+                        List<String> actions, Color color, boolean displayAlways, boolean redraw) {
                 System.out.println(message);
                 assert (message != null);
@@ -280 +287 @@
                 invalidateFullBay();
 
-                if (_supressMessages)
+                if (_suppressMessages)
                         return null;
 
@@ -297 +304 @@
                 updateLink();
 
-                // if the message slots have not all been used yet
-                if (_messageCount <= _messages.length) {
-                        int pos = 15;
-                        // find the next empty slot, and create the new message
-                        for (int i = 0; i < _messages.length; i++) {
-                                if (_messages[i] == null) {
-                                        _messages[i] = new Text(getMessagePrefix(true) + message);
-                                        _messages[i].setPosition(20, pos);
-                                        _messages[i].setOffset(0,
-                                                        -FrameGraphics.getMaxFrameSize().height);
-                                        // _messages[i].setMaxWidth(FrameGraphics.getMaxFrameSize().width);
-                                        _messages[i].setColor(color);
-                                        _messages[i].setLink(link);
-                                        _messages[i].setActions(actions);
-                                        _messages[i].setFont(_messageFont);
-                                        _creator.addItem(_messages[i].copy(), true);
-                                        _messageLink.setLink(_creator.getCurrent());
-
-                                        Graphics g = FrameGraphics.createGraphics();
-                                        if (g != null) {
-                                                refresh(false, g, Item.DEFAULT_BACKGROUND);
-                                        }
-                                        return _messages[i];
-                                }
-
-                                pos += 25;
+                if(_messages.size() >= 3) {
+                        _messages.remove(0);
+                        for(Item i : _messages) {
+                                i.setY(i.getY() - 25);
                         }
                 }
-
-                // if we have not returned then all message slots are used
-                for (int i = 0; i < _messages.length - 1; i++) {
-                        _messages[i].setText(_messages[i + 1].getFirstLine());
-                        _messages[i].setColor(_messages[i + 1].getColor());
-                        _messages[i].setLink(_messages[i + 1].getLink());
-                        _messages[i].setActions(_messages[i + 1].getAction());
-                }
-
-                // show the new message
-                Text last = _messages[_messages.length - 1];
-                last.setColor(color);
-                // Set the text for the new message
-                last.setText(getMessagePrefix(true) + message);
-                last.setLink(link);
-                last.setActions(actions);
-
-                _creator.addItem(last.copy(), true);
+                
+                Text t = newMessage(message, link, actions, color);
+                
+                _messages.add(t);
+                
                 // update the link to the latest message frame
                 _messageLink.setLink(_creator.getCurrent());
 
+                if(redraw) {
+                Graphics g = FrameGraphics.createGraphics();
+                if (g != null) {
+                    refresh(false, g, Item.DEFAULT_BACKGROUND);
+                }
+                }
+
+                return t;
+        }
+
+        public synchronized static Text displayMessage(String message, String link,
+                        List<String> actions, Color color, boolean displayAlways) {
+                return displayMessage(message, link, actions, color, displayAlways, true);
+        }
+
+        public synchronized static void overwriteMessage(String message) {
+                overwriteMessage(message, null);
+        }
+
+        public synchronized static void overwriteMessage(String message, Color color) {
+                _messages.remove(_messages.size());
+                Text t = newMessage(message, null, null, color);
+                _messages.add(t);
                 Graphics g = FrameGraphics.createGraphics();
                 if (g != null) {
                     refresh(false, g, Item.DEFAULT_BACKGROUND);
                 }
-
-                return last;
-        }
-
-        public synchronized static void overwriteMessage(String message) {
-                overwriteMessage(message, null);
-        }
-
-        public synchronized static void overwriteMessage(String message, Color color) {
-                for (int ind = _messages.length - 1; ind >= 0; ind--) {
-                        if (_messages[ind] != null) {
-                                _messages[ind].setColor(color);
-                                _messages[ind].setText(getMessagePrefix(false) + message);
-                                refresh(false, FrameGraphics.createGraphics(),
-                                                Item.DEFAULT_BACKGROUND);
-                                return;
-                        }
-                }
-
-                // if we have not returned, then there are no messages yet
-                displayMessage(message, Color.darkGray);
+        }
+        
+        private static String getMessagePrefix(int counter) {
+                return "@" + counter + ": ";
         }
 
@@ -376 +354 @@
                 if (incrementCounter)
                         _messageCount++;
-                return "@" + _messageCount + ": ";
+                return getMessagePrefix(_messageCount);
         }
 
@@ -387 +365 @@
          */
         public synchronized static Text linkedErrorMessage(String message) {
-                if (_supressMessages)
+                if (_suppressMessages)
                         return null;
                 Misc.beep();
@@ -398 +376 @@
 
         public synchronized static Text errorMessage(String message) {
-                if (_supressMessages)
+                if (_suppressMessages)
                         return null;
                 Misc.beep();
@@ -446 +424 @@
         }
 
-        public synchronized static void supressMessages(boolean val) {
-                _supressMessages = val;
+        public synchronized static void suppressMessages(boolean val) {
+                _suppressMessages = val;
         }
         
@@ -465 +443 @@
                 }
         }
+        
+        public static final class Progress {
+                
+                private static final String t = "▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓";
+                private static final String f = "░░░░░░░░░░░░░░░░░░░░";
+                
+                String message;
+                Text text;
+                
+                protected Progress(String text) {
+                        this.text = displayMessage(text, null, null, Color.BLACK, true, false);
+                        //this.text.setFont(Font.decode(Text.MONOSPACED_FONT + "-16"));
+                        this.message = this.text.getText();
+                        this.text.setText(this.message + " [" + f + "] 0%");
+                        refresh(false, FrameGraphics.createGraphics(), Item.DEFAULT_BACKGROUND);
+                }
+                
+                /**
+                 * 
+                 * @param progress progress value from 0 to 100
+                 * @return true if the progress was updated, false if the progress was off the screen
+                 * @throws Exception if progress out of bounds
+                 */
+                public boolean set(int progress) throws Exception {
+                        if(progress < 0 || progress > 100) throw new Exception("Progress value out of bounds");
+                        int p = progress / 5;
+                        if(isMessageItem(this.text)) {
+                                this.text.setText(this.message + " [" + t.substring(0, p) + f.substring(p) + "] " + progress + "%");
+                                refresh(false, FrameGraphics.createGraphics(), Item.DEFAULT_BACKGROUND);
+                                return true;
+                        }
+                return false;
+        }
+        }
+        
+        public synchronized static Progress displayProgress(String message) {
+                return new Progress(message);
+        }
 
 }