Changeset 305 for trunk/src/org/expeditee/actions

Timestamp:

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

Author:

ra33

Message:

Updated mail stuff and networking stuff!!

Location:

trunk/src/org/expeditee/actions

Files:

• Actions.java (modified) (8 diffs)
• MailActions.java (modified) (8 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);
         }