Changeset 376 for trunk/src/org/expeditee/actions/Misc.java

Timestamp:

11/02/08 13:05:01 (16 years ago)

Author:

ra33

Message:

 

File:

• trunk/src/org/expeditee/actions/Misc.java (modified) (5 diffs)

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

@@ -17 +17 @@
 import javax.imageio.ImageIO;
 
-import org.expeditee.agents.wordprocessing.JSpellChecker;
+import org.expeditee.gui.AttributeUtils;
 import org.expeditee.gui.Browser;
 import org.expeditee.gui.DisplayIO;
@@ -35 +35 @@
 import org.expeditee.simple.SString;
 import org.expeditee.stats.CometStats;
-import org.expeditee.stats.DocumentStats;
+import org.expeditee.stats.DocumentStatsFast;
 import org.expeditee.stats.SessionStats;
 import org.expeditee.stats.StatsLogger;
@@ -274 +274 @@
 
         }
-        
+
         public static String GetDocumentStats(Frame frame) {
                 TimeKeeper timer = new TimeKeeper();
                 MessageBay.displayMessage("Computing document stats...");
-
-                DocumentStats docStats = new DocumentStats(frame);
+                FrameIO.ForceSaveFrame(frame);
+                DocumentStatsFast docStats = new DocumentStatsFast(frame.getName(),
+                                frame.getTitle());
                 String result = docStats.toString();
-                
+
                 MessageBay.overwriteMessage("Document stats time: "
                                 + timer.getElapsedStringSeconds());
@@ -436 +437 @@
          * PNGFrame(currentFrame.getName())
          */
-        public static void PNGFrame() {
-                ImageFrame(DisplayIO.getCurrentFrame().getName(), "PNG");
+        public static void PNGFrame(Frame frame) {
+                ImageFrame(frame.getName(), "PNG");
         }
 
         public static String SaveImage(BufferedImage screen, String format,
                         String directory, String fileName) {
+                String suffix = "." + format.toLowerCase();
+                String shortFileName = fileName;
                 // Check if we need to append the suffix
                 if (fileName.indexOf('.') < 0)
-                        fileName += "." + format.toLowerCase();
+                        fileName += suffix;
+                else
+                        shortFileName = fileName.substring(0, fileName.length() - suffix.length());
 
                 try {
+                        int count = 2;
                         // set up the file for output
-                        String fullFileName = directory + fileName;
-                        File out = new File(fullFileName);
+                        File out = new File(directory + fileName);
+                        while (out.exists()) {
+                                fileName = shortFileName + "_" + count++ + suffix;
+                                out = new File(directory + fileName);
+                        }
+
                         if (!out.getParentFile().exists())
                                 out.mkdirs();
@@ -910 +920 @@
         }
 
-        public static String checkSpelling(String word) {
-                try {
-                        return JSpellChecker.getInstance().getSuggestions(word);
-                } catch (FileNotFoundException e) {
-                        MessageBay.errorMessage("Could not find dictionary: "
-                                        + e.getMessage());
-                } catch (IOException e) {
-                        // TODO Auto-generated catch block
-                        e.printStackTrace();
-                }
-                return null;
-        }
-        
-        public static String spellCheck(String word) {
-                return checkSpelling(word);
-        }
-        
         public static int wordCount(String paragraph) {
                 return paragraph.trim().split("\\s+").length + 1;
         }
-        
+
         public static int wordCount(Frame frame) {
                 int count = 0;
-                
-                for(Text t: frame.getBodyTextItems(false)){
+
+                for (Text t : frame.getBodyTextItems(false)) {
                         count += wordCount(t.getText());
                 }
-                
+
                 return count;
         }
-        
-        public static void moveToPublic(Frame frame){
+
+        public static void moveToPublic(Frame frame) {
                 FrameIO.moveFrameset(frame.getFramesetName(), FrameIO.PUBLIC_PATH);
         }
-        
-        public static void moveToPrivate(Frame frame){
+
+        public static void moveToPrivate(Frame frame) {
                 FrameIO.moveFrameset(frame.getFramesetName(), FrameIO.FRAME_PATH);
         }
+
+        /**
+         * Returns the value of a specified item attribute.
+         * 
+         * @param item
+         *            from which to extract the value
+         * @param attribute
+         *            name of an items attribute
+         * @return the value of the attribute
+         */
+        public static String extract(Item item, String attribute) {
+                return AttributeUtils.getAttribute(item, attribute);
+        }
 }