Changeset 305

Timestamp:

09/12/08 17:19:37 (16 years ago)

Author:

ra33

Message:

Updated mail stuff and networking stuff!!

Location:

trunk/src/org/expeditee

Files:

• actions/Actions.java (modified) (8 diffs)
• actions/MailActions.java (modified) (8 diffs)
• agents/mail/MailSession.java (modified) (13 diffs)
• gui/FrameIO.java (modified) (2 diffs)
• network/FrameServer.java (modified) (5 diffs)
• network/FrameShare.java (modified) (5 diffs)

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

@@ -257 +257 @@
 
         /**
-         * Temporary, if a plugin system is devised then this would porbably become redundant.
-         * For now this allows external agents to be included.
-         *
+         * Temporary, if a plugin system is devised then this would porbably become
+         * redundant. For now this allows external agents to be included.
+         * 
          * @param fullClassNames
-         *              A set of full class names, that is, the class package and name. For example"
-         *              "org.myplugin.agents.SerializedSearch"
-         * 
-         * @return
-         *              A collection of classes their were omitted because either there was a name clash
-         *              with existing agents or did not exist.
-         *              i.e. is completely successful this will be empty. Never null.
+         *            A set of full class names, that is, the class package and
+         *            name. For example" "org.myplugin.agents.SerializedSearch"
+         * 
+         * @return A collection of classes their were omitted because either there
+         *         was a name clash with existing agents or did not exist. i.e. is
+         *         completely successful this will be empty. Never null.
          * 
          * @throws NullPointerException
-         *              If fullClassNames is null.
-         *              
+         *             If fullClassNames is null.
+         * 
          */
         public static Collection<String> addAgents(Set<String> fullClassNames) {
-                if (fullClassNames == null) throw new NullPointerException("fullClassNames");
-                
+                if (fullClassNames == null)
+                        throw new NullPointerException("fullClassNames");
+
                 List<String> omittedAgents = new LinkedList<String>();
-                
+
                 for (String fullName : fullClassNames) {
-                        
-                        if (fullName == null || fullName.length() == 0) continue;
-                        
+
+                        if (fullName == null || fullName.length() == 0)
+                                continue;
+
                         boolean didAdd = false;
-                
+
                         try {
                                 // Does the class even exist?
                                 Class c = Class.forName(fullName);
-                                
+
                                 String name = c.getSimpleName().toLowerCase();
 
                                 if (!_JAGs.containsKey(name)) {
-                                        
+
                                         _JAGs.put(name, fullName);
                                         didAdd = true;
-                                        
+
                                 }
 
@@ -300 +301 @@
                                 e.printStackTrace();
                         }
-                        
-                        if (!didAdd) omittedAgents.add(fullName);
-        
-                }
-                        
-        
+
+                        if (!didAdd)
+                                omittedAgents.add(fullName);
+
+                }
+
                 return omittedAgents;
         }
-        
+
         /**
          * Loads all the Methods that meet the requirements checked by MethodCheck
@@ -470 +471 @@
                 String nameWithCorrectCase = name;
                 name = name.toLowerCase();
-                
+
                 String fullClassName = AGENTS_PACKAGE + name;
 
@@ -481 +482 @@
                                                 + " " + parameters;
                                 fullClassName = AGENTS_PACKAGE + "writetree";
-                                
+
                         } else if (name.endsWith("frame")) {
                                 parameters = name
@@ -552 +553 @@
                         // create the JAG
                         Agent toLaunch = (Agent) con.newInstance(params);
-                        
+
                         LaunchAgent(toLaunch, source, clicked);
 
@@ -559 +560 @@
                         throw new RuntimeException(nameWithCorrectCase
                                         + "' is not an action or agent.");
-                } 
-        }
-        
+                }
+        }
+
         /**
          * Launches an agent from a aleady instantiated object.
          * 
          * @param agent
-         *              The agent to launch. Must not be null.
+         *            The agent to launch. Must not be null.
          * 
          * @param source
-         *              The calling frame that launched it. Must not be null.
+         *            The calling frame that launched it. Must not be null.
          * 
          * @param itemParam
-         *              The item paremeter for the agent. Must not be null.
+         *            The item paremeter for the agent.
          * 
          * @throws NullPointerException
-         *              if any of the arguments are null.
-         */
-        public static void LaunchAgent(
-                        Agent agent, 
-                        Frame source, 
-                        Item itemParam) {
-                
-                if (agent == null) throw new NullPointerException("agent");
-                if (source == null) throw new NullPointerException("source");
-                if (itemParam == null) throw new NullPointerException("itemParam");
-                
+         *             if any of the arguments are null.
+         */
+        public static void LaunchAgent(Agent agent, Frame source, Item itemParam) {
+
+                if (agent == null)
+                        throw new NullPointerException("agent");
+                if (source == null)
+                        throw new NullPointerException("source");
+                // if (itemParam == null) throw new NullPointerException("itemParam");
+
                 String nameWithCorrectCase = agent.getClass().getSimpleName();
-                
+
                 try {
-        
-        
+
                         // create the JAG
                         _Agent = agent;
-        
+
                         Thread t = new Thread(_Agent);
                         t.setPriority(Thread.MIN_PRIORITY);
@@ -600 +599 @@
                                 itemParam = FreeItems.getItemAttachedToCursor();
                         }
-        
+
                         // check for errors during initialisation
                         if (!_Agent.initialise(source, itemParam)) {
@@ -607 +606 @@
                                                 + nameWithCorrectCase);
                         }
-        
+
                         // save the current frame (if necesssary)
                         // TODO make this nicer... ie. make Format an action rather than an
                         // agent and save frames only before running agents
-                        if (!nameWithCorrectCase.equalsIgnoreCase("format") && !nameWithCorrectCase.equalsIgnoreCase("sort")) {
+                        if (!nameWithCorrectCase.equalsIgnoreCase("format")
+                                        && !nameWithCorrectCase.equalsIgnoreCase("sort")) {
                                 FrameUtils.LeavingFrame(source);
                         }
-        
+
                         if (_Agent.hasResultString()) {
                                 // Just run the agent on this thread... dont run it in the

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

@@ -6 +6 @@
 
 import org.expeditee.agents.mail.MailSession;
+import org.expeditee.gui.AttributeValuePair;
 import org.expeditee.gui.DisplayIO;
 import org.expeditee.gui.Frame;
@@ -48 +49 @@
                 return mail;
         }
-        
+
         public static Collection<Text> getRecentMail(int number) {
                 return getMail(null, null, number);
         }
-        
+
+        public static Collection<Text> getUnreadMail(Item clicked, int number) {
+                if (clicked instanceof Text) {
+                        AttributeValuePair avp = new AttributeValuePair(clicked
+                                        .getText());
+                        if (avp.hasPair() && avp.getValue().contains(MailSession.UNREAD_MESSAGE)) {
+                                avp.setValue("0" + MailSession.UNREAD_MESSAGE + "s");
+                                clicked.setText(avp.toString());
+                                clicked.setActions(null);
+                        }
+                }
+
+                return getMail(Flag.SEEN, false, number);
+        }
+
         public static Collection<Text> getUnreadMail() {
                 return getMail(Flag.SEEN, false, Integer.MAX_VALUE);
@@ -60 +75 @@
                 return getMail(null, null, Integer.MAX_VALUE);
         }
-        
+
+        public static Text getMail(int messageNo) {
+                Text mailItem = MailSession.getInstance().getMail(
+                                DisplayIO.getCurrentFrame(), FrameMouseActions.getPosition(),
+                                messageNo - 1);
+                // MessageBay.displayMessage(mailItems.size() + " messages read",
+                // Color.green);
+
+                return mailItem;
+        }
+
         public static Collection<Text> getMail() {
                 return getAllMail();
@@ -68 +93 @@
                 return getMail(Flag.RECENT, true, Integer.MAX_VALUE);
         }
-        
-        private static Collection<Text> getMail(Flag flag, Boolean isPresent, int noOfMessages){
-                Collection<Text> mailItems = MailSession.getInstance().getMail(flag, isPresent,
-                                DisplayIO.getCurrentFrame(), FrameMouseActions.getPosition(), noOfMessages);
-                //MessageBay.displayMessage(mailItems.size() + " messages read", Color.green);
-                
+
+        private static Collection<Text> getMail(Flag flag, Boolean isPresent,
+                        int noOfMessages) {
+                Collection<Text> mailItems = MailSession.getInstance().getMail(flag,
+                                isPresent, DisplayIO.getCurrentFrame(),
+                                FrameMouseActions.getPosition(), noOfMessages);
+                // MessageBay.displayMessage(mailItems.size() + " messages read",
+                // Color.green);
+
                 return mailItems;
         }
@@ -95 +123 @@
                 }
         }
-        
+
         public static String getMailCount() {
                 return getAllMailCount();
@@ -121 +149 @@
                 Frame replyFrame = DisplayIO.getCurrentFrame();
                 String titleText = frame.getTitle();
-                //Add Re on the end if it is not already there
+                // Add Re on the end if it is not already there
                 if (titleText.length() >= 3
                                 && !"re:".equals(titleText.substring(0, 3).toLowerCase())) {
@@ -128 +156 @@
                 replyFrame.setTitle(titleText);
                 FrameKeyboardActions.Drop(null, false);
-                
-                //Add a link to the original message
+
+                // Add a link to the original message
                 Text original = replyFrame.createNewText("@original");
                 original.setPosition(FrameMouseActions.getPosition());
@@ -139 +167 @@
                 to.addAction("MailTree");
                 FrameKeyboardActions.Drop(to, false);
-                DisplayIO.setCursorPosition(FrameMouseActions.MouseX, FrameMouseActions.MouseY + 15);
+                DisplayIO.setCursorPosition(FrameMouseActions.MouseX,
+                                FrameMouseActions.MouseY + 15);
         }
 

trunk/src/org/expeditee/agents/mail/MailSession.java

@@ -32 +32 @@
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameCreator;
+import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.MessageBay;
 import org.expeditee.importer.FrameDNDTransferHandler;
@@ -38 +39 @@
 
 public class MailSession {
+        public static final String UNREAD_MESSAGE = " unread message";
+
         public static boolean _autoConnect = false;
 
@@ -154 +157 @@
                 try {
                         if (!_transport.isConnected()) {
-                                Text message = MessageBay.displayMessage("Connecting to SMTP server...");
+                                Text message = MessageBay
+                                                .displayMessage("Connecting to SMTP server...");
                                 _bConnecting = true;
                                 _transport.connect();
@@ -168 +172 @@
                 if (_mailServer != null && !_store.isConnected()) {
                         try {
-                                Text message = MessageBay.displayMessage("Connecting to " + _mailServer
-                                                + "...");
+                                Text message = MessageBay.displayMessage("Connecting to "
+                                                + _mailServer + "...");
                                 _store.connect(_mailServer, _username, _password);
 
@@ -185 +189 @@
                                         @Override
                                         public void messagesAdded(MessageCountEvent e) {
-                                                MessageBay.displayMessage("New mail message!",
-                                                                Color.green);
+                                                try {
+                                                        MessageBay.displayMessage("New mail message!",
+                                                                        null, Color.green, true, "getMail "
+                                                                                        + _folder.getMessageCount());
+                                                } catch (MessagingException e1) {
+                                                        e1.printStackTrace();
+                                                }
                                                 displayUnreadMailCount();
                                         }
@@ -204 +213 @@
                                                                 _folder.getMessageCount();
                                                                 _folder.exists();
-                                                                //_folder.getUnreadMessageCount();
+                                                                // _folder.getUnreadMessageCount();
                                                         } catch (Exception e) {
                                                                 e.printStackTrace();
-                                                                MessageBay.errorMessage("Mail connection unavailable");
+                                                                MessageBay
+                                                                                .errorMessage("Mail connection unavailable");
                                                                 finalise();
                                                                 break;
@@ -228 +238 @@
         }
 
-        private void displayUnreadMailCount() {
+        public void displayUnreadMailCount() {
                 int unreadCount = getUnreadCount();
-                Text text = new Text(-1, unreadCount + " unread message"
+                Text text = new Text(-1, unreadCount + UNREAD_MESSAGE
                                 + (unreadCount == 1 ? "" : "s"), Color.BLUE, null);
-                text.addAction("getRecentMail " + unreadCount);
+                if (unreadCount > 0)
+                        text.addAction("getUnreadMail " + unreadCount);
                 MessageBay.displayMessage(text);
         }
@@ -342 +353 @@
         /**
          * Closes the mail folders.
+         * 
          * @return true if the folders needed to be closed.
          */
@@ -433 +445 @@
                         msgs = _folder.getMessages();
 
-                        int start = Math.max(msgs.length - numberOfMessages, 0);
-
-                        for (int msgNum = start; msgNum < msgs.length; msgNum++) {
+                        int messagesRead = 0;
+
+                        for (int msgNum = msgs.length - 1; messagesRead < numberOfMessages
+                                        && msgNum >= 0; msgNum--) {
                                 if (flag == null
                                                 || msgs[msgNum].getFlags().contains(flag) == isPresent) {
@@ -443 +456 @@
                                                 mailItems.add(newItem);
                                                 point.y += newItem.getBoundsHeight();
+                                                messagesRead++;
                                         }
                                 }
@@ -450 +464 @@
                         e.printStackTrace();
                 }
-                
+
                 return mailItems;
+        }
+
+        public Text getMail(Frame frame, Point point, int msgNum) {
+                if (_folder == null)
+                        return null;
+
+                // -- Get the message wrappers and process them --
+                try {
+                        Message[] msgs = _folder.getMessages();
+                        return readMessage(msgs[msgNum], msgNum + 1, frame, point);
+                } catch (MessagingException e) {
+                        e.printStackTrace();
+                }
+
+                return null;
         }
 
@@ -467 +496 @@
                                         // Create a frameCreator
                                         final FrameCreator frames = new FrameCreator(frame
-                                                        .getFramesetName(), frame.getPath(), subject, false, false);
+                                                        .getFramesetName(), frame.getPath(), subject,
+                                                        false, false);
 
                                         frames.addText("@date: " + message.getSentDate(), null,
@@ -529 +559 @@
                                         frames.save();
                                         source.setLink(frames.getName());
+                                        FrameGraphics.requestRefresh(true);
                                 } catch (MessagingException e) {
                                         MessageBay.errorMessage("GetMail error: " + e.getMessage());

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

@@ -171 +171 @@
         }
 
-        public static String LoadPublicFrame(String frameName) {
-                assert (isValidFrameName(frameName));
-                Frame loaded = null;
-                String frameNameLower = frameName.toLowerCase();
-                // first try reading from cache
-                if (isCacheOn() && _Cache.containsKey(frameNameLower)) {
-                        Logger.Log(Logger.SYSTEM, Logger.LOAD, "Loading " + frameName
-                                        + " from cache.");
-                        loaded = _Cache.get(frameNameLower);
-                } else {
-
-                        Logger.Log(Logger.SYSTEM, Logger.LOAD, "Loading " + frameName
-                                        + " from disk.");
-
-                        loaded = LoadFrame(PUBLIC_PATH, frameName);
-                }
-
-                String result = null;
-                // Get the contents of the frame to send to someone...
-                // TODO use a more efficient method to directly get the frame contents
-                // if possible
-                if (loaded != null) {
-                        result = SaveFrame(loaded);
-                }
-
-                return result;
+        public static BufferedReader LoadPublicFrame(String frameName) {
+                String fullPath = FrameIO.getFrameFullPathName(PUBLIC_PATH, frameName);
+                
+                File frameFile = new File(fullPath);
+                if (frameFile.exists() && frameFile.canRead()) {
+                        try {
+                                return new BufferedReader(new FileReader(frameFile));
+                        } catch (FileNotFoundException e) {
+                                e.printStackTrace();
+                        }
+                }
+                return null;
         }
 
@@ -210 +196 @@
                 }
 
-                if (loaded == null) {
+                if (loaded == null && FrameShare.getInstance() != null) {
                         loaded = FrameShare.getInstance().loadFrame(framename);
                 }

trunk/src/org/expeditee/network/FrameServer.java

@@ -1 +1 @@
 package org.expeditee.network;
 
+import java.io.BufferedReader;
 import java.io.IOException;
 import java.net.DatagramPacket;
@@ -10 +11 @@
 
 public class FrameServer extends Thread {
+
+        private static final int MAX_PACKET_LENGTH = 2000;
 
         private boolean _stop = false;
@@ -29 +32 @@
 
         public void run() {
-                MessageBay.displayMessage("Serving frames on port " + socket.getLocalPort());
-                
+                MessageBay.displayMessage("Serving frames on port "
+                                + socket.getLocalPort());
+
                 while (!_stop) {
                         try {
-                                byte[] buf = new byte[256];
+                                byte[] buf = new byte[MAX_PACKET_LENGTH];
 
                                 // receive request
@@ -39 +43 @@
                                 socket.receive(packet);
 
-                                String frameName = new String(packet.getData());
+                                String frameName = new String(packet.getData(), 0, packet
+                                                .getLength());
+                                MessageBay.displayMessage("Recieved request for " + frameName);
 
                                 // figure out response
                                 String dString = getFrame(frameName);
 
-                                if (dString != null) {
+                                if (dString != null && dString.length() > 0) {
                                         buf = dString.getBytes();
 
@@ -61 +67 @@
 
         protected String getFrame(String frameName) {
-                return FrameIO.LoadPublicFrame(frameName);
+                StringBuffer sb = new StringBuffer();
+                BufferedReader br = FrameIO.LoadPublicFrame(frameName);
+                if (br == null)
+                        return null;
+                
+                String s = null;
+                try {
+                        while ((s = br.readLine()) != null && sb.length() < MAX_PACKET_LENGTH) {
+                                sb.append(s).append('\n');
+                        }
+                } catch (IOException e) {
+                        e.printStackTrace();
+                }
+
+                return sb.toString();
         }
 }

trunk/src/org/expeditee/network/FrameShare.java

@@ -38 +38 @@
                 // Set the settings
                 for (Text item : settingsFrame.getBodyTextItems(false)) {
-                        String text = item.getText().toLowerCase().trim();
+
                         AttributeValuePair avp = new AttributeValuePair(item.getText());
+                        if (avp.isAnnotation())
+                                continue;
 
-                        if (text.equals("server")) {
+                        String attribute = avp.getAttributeOrValue().toLowerCase();
+
+                        if (attribute.equals("server")) {
                                 try {
                                         if (!avp.hasPair()) {
@@ -59 +63 @@
                         if (!avp.hasPair())
                                 continue;
-                        String attribute = avp.getAttribute().toLowerCase();
 
                         try {
@@ -77 +80 @@
                 }
         }
-        
+
         public void finalise() {
                 _server.close();
@@ -119 +122 @@
                                         break;
                                 } catch (Exception e) {
+                                        e.printStackTrace();
                                 }
                         }
@@ -125 +129 @@
 
                 }
-
+                
+                if(result == null)
+                        return null;
+                
                 // Now read the frame from the file contents
                 FrameReader reader = new ExpReader(frameName);