Changeset 362 for trunk/src/org/expeditee/agents

Timestamp:

10/10/08 11:05:28 (16 years ago)

Author:

ra33

Message:

Added Spell Checker
Added word count stats
Fixed some mail stuff

Location:

trunk/src/org/expeditee/agents

Files:

• MailTree.java (modified) (3 diffs)
• SearchAgent.java (modified) (2 diffs)
• SearchFrameset.java (modified) (1 diff)
• SearchFramesetFast.java (modified) (3 diffs)
• mail/MailSession.java (modified) (4 diffs)
• wordprocessing (added)
• wordprocessing/JSpellChecker.java (added)

trunk/src/org/expeditee/agents/MailTree.java

@@ -4 +4 @@
 import java.util.Map;
 
+import org.expeditee.actions.Misc;
 import org.expeditee.agents.mail.MailSession;
 import org.expeditee.gui.AttributeValuePair;
@@ -9 +10 @@
 import org.expeditee.gui.FrameIO;
 import org.expeditee.gui.FreeItems;
+import org.expeditee.io.Logger;
 import org.expeditee.items.Item;
 import org.expeditee.items.Text;
@@ -159 +161 @@
                 }
 
+                FreeItems.getInstance().clear();
+                
+                //Produce output for the user to put down on their frame
+                StringBuffer sb = new StringBuffer();
+                sb.append("@Sent: ").append(Logger.EasyDateFormat(Logger.LONG_DATE_FORMAT));
+                
+                if(to != null){
+                        sb.append("\nTo: " + to);
+                }
+                
+                if(cc != null){
+                        sb.append("\nCc: " + cc);
+                }
+                
+                if(bcc != null){
+                        sb.append("\nBcc: " + bcc);
+                }
+                
+                Misc.attachStatsToCursor(sb.toString());
+                
                 // Last chance for the user to stop
                 if (_stop)

trunk/src/org/expeditee/agents/SearchAgent.java

@@ -13 +13 @@
         private static final String DEFAULT_RESULTS_FRAMESET = "SearchResults";
 
+        public static final int SURROGATE_LENGTH = 50;
+
         protected FrameCreator _results;
 
@@ -22 +24 @@
 
         public SearchAgent(String searchText) {
-                _pattern = searchText;
+                _pattern = searchText.toLowerCase();
         }
 

trunk/src/org/expeditee/agents/SearchFrameset.java

@@ -27 +27 @@
                         String frameName = _startName + i;
                         overwriteMessage("Searching " + frameName);
-                        searchFrame(_results, frameName, _pattern,
-                                        _replacementString);
+                        if(searchFrame(_results, frameName, _pattern,
+                                        _replacementString))
+                                _frameCount++;
                 }
                 _results.save();

trunk/src/org/expeditee/agents/SearchFramesetFast.java

@@ -17 +17 @@
                 _maxFrame = maxFrame;
         }
-        
+
         public SearchFramesetFast(String searchText) {
                 super(searchText);
@@ -24 +24 @@
         @Override
         protected Frame process(Frame frame) {
-                if(frame == null) {
+                if (frame == null) {
                         frame = FrameIO.LoadFrame(_startName + '0');
                 }
                 String path = frame.getPath();
-                
+
                 int count = FrameIO.getLastNumber(_startName);
-                for (long i = _firstFrame;i <= _maxFrame && i <= count; i++) {
+                for (long i = _firstFrame; i <= _maxFrame && i <= count; i++) {
                         if (_stop) {
                                 break;
@@ -36 +36 @@
                         String frameName = _startName + i;
                         overwriteMessage("Searching " + frameName);
-                        Collection<String> found = FrameIO.searchFrame(frameName, _pattern, path);
-                        int size = found == null? 0 :found.size();
+                        Collection<String> found = FrameIO.searchFrame(frameName, _pattern,
+                                        path);
+                        int size = found == null ? 0 : found.size();
                         // If the frame exists
-                        if(found != null)
+                        if (found != null)
                                 _frameCount++;
-                        if(size > 0){
-                                String repeats = size > 1? ("("+ size+ ")") : "";
-                                _results.addText(frameName + repeats, null, frameName, null, false);
-                                FrameGraphics.requestRefresh(true);
+                        if (size > 0) {
+                                // String repeats = size > 1? ("("+ size+ ")") : "";
+                                for (String s : found) {
+                                        StringBuffer surrogate = new StringBuffer();
+                                        surrogate.append("[").append(i).append("] ");
+                                        if (s.length() > SearchAgent.SURROGATE_LENGTH)
+                                                surrogate.append(
+                                                                s.substring(0, SearchAgent.SURROGATE_LENGTH - 3))
+                                                                .append("...");
+                                        else {
+                                                surrogate.append(s);
+                                        }
+
+                                        _results.addText(surrogate.toString(), null,
+                                                        frameName, null, false);
+                                        FrameGraphics.requestRefresh(true);
+                                }
                         }
                 }

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

@@ -207 +207 @@
                                                 for (;;) {
                                                         try {
-                                                                Thread.sleep(2000);
+                                                                Thread.sleep(5000);
                                                                 /*
                                                                  * sleep for freq milliseconds. This is to force
@@ -505 +505 @@
                                 try {
                                         String subject = message.getSubject();
-                                        source.setText(" " + messageNo + ". " + subject);
+                                        source.setText("[" + messageNo + "] " + subject);
                                         // Create a frameCreator
                                         final FrameCreator frames = new FrameCreator(frame
@@ -562 +562 @@
                                                                 new InputStreamReader(is));
                                                 String thisLine = reader.readLine();
+                                                StringBuffer nextText = new StringBuffer();
                                                 while (thisLine != null) {
-                                                        frames.addText(thisLine, null, null, null, false);
+                                                        // A blank line is a signal to start a new text item
+                                                        if (thisLine.trim() == "") {
+                                                                addTextItem(frames, nextText.toString());
+                                                                nextText = new StringBuffer();
+                                                        } else {
+                                                                nextText.append(thisLine).append('\n');
+                                                        }
                                                         thisLine = reader.readLine();
                                                 }
+                                                addTextItem(frames, nextText.toString());
                                         }
                                         message.setFlag(Flag.SEEN, true);
@@ -579 +587 @@
                                         e.printStackTrace();
                                 }
+                        }
+
+                        /**
+                         * @param frames
+                         * @param nextText
+                         */
+                        private void addTextItem(final FrameCreator frames, String nextText) {
+                                nextText = nextText.trim();
+                                if (nextText.length() == 0)
+                                        return;
+
+                                frames.addText(nextText.substring(0, nextText.length() - 1),
+                                                null, null, null, false);
                         }
                 }.start();