Changeset 309

Timestamp:

09/16/08 18:09:56 (16 years ago)

Author:

ra33

Message:

Documents created with write tree open automatically using the Desktop class which is only available in Java6

Location:

trunk/src/org/expeditee

Files:

• actions/Misc.java (modified) (3 diffs)
• gui/Browser.java (modified) (2 diffs)
• gui/DisplayIO.java (modified) (2 diffs)
• gui/FrameUtils.java (modified) (8 diffs)
• gui/UserSettings.java (modified) (2 diffs)
• io/AbstractHTMLWriter.java (modified) (3 diffs)
• io/DefaultFrameWriter.java (modified) (5 diffs)
• io/PDFWriter.java (modified) (1 diff)

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

@@ -2 +2 @@
 
 import java.awt.Color;
+import java.awt.Desktop;
 import java.awt.Image;
 import java.awt.image.BufferedImage;
@@ -16 +17 @@
 import javax.imageio.ImageIO;
 
+import org.expeditee.gui.Browser;
 import org.expeditee.gui.DisplayIO;
 import org.expeditee.gui.Frame;
@@ -872 +874 @@
                 Reminders.stop();
         }
+        
+        public static void print(String file){
+                try {
+                        if (Browser._theBrowser.isVersion6()) {
+                                if (Desktop.isDesktopSupported()) {
+                                        Desktop.getDesktop().print(new File(file));
+                                }
+                        }
+                } catch (Exception e) {
+                        MessageBay.errorMessage("Printing error: " + e.getMessage());
+                }
+        }
 }

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

@@ -56 +56 @@
         // A flag which is set once the application is exiting.
         private boolean _isExiting = false;
+
+        private boolean _version6 = false;
+        
+        public boolean isVersion6() {
+                return _version6;
+        }
 
         private static boolean _initComplete = false;
@@ -187 +193 @@
                 if (version.startsWith("1.6")) {
                         // Set the drag and drop handler
+                        _version6  = true;
                         setTransferHandler(FrameDNDTransferHandler.getInstance());
                 } else {

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

@@ -69 +69 @@
          * The title to display in the Title bar.
          */
-        public static final String TITLE = "Exp15Sep2008A";
+        public static final String TITLE = "Exp16Sep2008A";
 
         private DisplayIO() {
@@ -730 +730 @@
                         if (_VisitedFrames[opposite].size() == 0) {
                                 FrameIO.SuspendCache();
-                                setCurrentFrame(FrameIO.LoadFrame(UserSettings.FirstFrame), true);
+                                setCurrentFrame(FrameIO.LoadFrame(UserSettings.HomeFrame), true);
                                 FrameIO.ResumeCache();
                         } else {

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

@@ -34 +34 @@
 import org.expeditee.network.FrameShare;
 import org.expeditee.stats.SessionStats;
-import org.jfree.util.ArrayUtilities;
 
 public class FrameUtils {
@@ -447 +446 @@
 
         public static void DisplayHomeFrame() {
-                DisplayFrame(UserSettings.FirstFrame);
+                DisplayFrame(UserSettings.HomeFrame);
         }
 
@@ -565 +564 @@
 
                         if (attribute.equals("homeframe")) {
-                                String first = getLink(item, UserSettings.FirstFrame);
+                                String first = getLink(item, UserSettings.HomeFrame);
                                 // do not use non-existant frames as the first frame
                                 if (FrameIO.isValidFrameName(first)) {
-                                        UserSettings.FirstFrame = first;
+                                        UserSettings.HomeFrame = first;
                                 }
                                 // warn the user
@@ -574 +573 @@
                                         // MessageBay.warningMessage("Home frame: " + first
                                         // + " is not a valid frame.");
-                                        UserSettings.FirstFrame = profile.getName();
+                                        UserSettings.HomeFrame = profile.getName();
                                 }
                         } else if (attribute.equals("menuframe"))
@@ -638 +637 @@
                         } else if (attribute.equals("framesetdirs")) {
                                 UserSettings.FrameDirs.addAll(getDirs(item));
+                        } else if (attribute.equals("imagedirs")) {
+                                UserSettings.ImageDirs.addAll(getDirs(item));
                         } else if (attribute.equals("style")) {
                                 UserSettings.Style = getStyle(item.getChild());
@@ -644 +645 @@
                         }
                 }
+
                 return errors;
         }
@@ -649 +651 @@
         private static List<Text> getStyle(Frame child) {
                 List<Text> style = new ArrayList<Text>(8);
-                for (int i  = 0; i < 10; i++){
+                for (int i = 0; i < 10; i++) {
                         style.add(null);
                 }
@@ -666 +668 @@
 
         public static void loadFirstFrame(Frame profile) {
-                if (UserSettings.FirstFrame == null)
-                        UserSettings.FirstFrame = profile.getName();
+                if (UserSettings.HomeFrame == null)
+                        UserSettings.HomeFrame = profile.getName();
                 // else {
-                Frame firstFrame = FrameIO.LoadFrame(UserSettings.FirstFrame);
+                Frame firstFrame = FrameIO.LoadFrame(UserSettings.HomeFrame);
                 if (firstFrame == null) {
                         MessageBay.warningMessage("Home frame not found: "
-                                        + UserSettings.FirstFrame);
-                        UserSettings.FirstFrame = profile.getName();
+                                        + UserSettings.HomeFrame);
+                        UserSettings.HomeFrame = profile.getName();
                         DisplayIO.setCurrentFrame(profile, true);
                 } else {

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

@@ -16 +16 @@
 public abstract class UserSettings {
 
-        public static List<Text> Style;
+        public static List<Text> Style = new LinkedList<Text>();;
         
         public static int Gravity = 3;
@@ -38 +38 @@
         public static String MenuFrame = null;
 
-        public static String FirstFrame = null;
+        public static String HomeFrame = null;
 
         public static List<String> FrameDirs = new LinkedList<String>();

trunk/src/org/expeditee/io/AbstractHTMLWriter.java

@@ -52 +52 @@
                         return;
 
-                writer.write(styleName + " { font-size: " + Math.round(style.getSize())
-                                + "px");
+                Font font = style.getPaintFont();
+                if (font == null)
+                        return;
 
-                Font font = style.getPaintFont();
-                if(font == null)
-                        return;
+                writer.write(styleName + " { font-family: "
+                                + Conversion.getCssFontFamily(font.getFamily()));
+
+                //writer.write("; font-size: " + Math.round(style.getSize()) + "px");
                 
-                writer.write("; font-family: " + Conversion.getCssFontFamily(font.getFamily()));
                 if (font.isBold()) {
                         writer.write("; font-weight: bold");
@@ -79 +80 @@
                         writer.write("; color: " + Conversion.getCssColor(c));
                 }
-                
+
                 c = style.getBorderColor();
                 if (c != null) {
@@ -85 +86 @@
                         writer.write("; outline-style: solid");
                 }
-                
+
                 writer.write("}" + ItemWriter.NEW_LINE);
 

trunk/src/org/expeditee/io/DefaultFrameWriter.java

@@ -1 +1 @@
 package org.expeditee.io;
 
+import java.awt.Desktop;
 import java.io.File;
 import java.io.FileWriter;
@@ -11 +12 @@
 
 import org.expeditee.agents.WriteTree;
+import org.expeditee.gui.Browser;
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameIO;
@@ -126 +128 @@
                 return writeFrame(toWrite, null);
         }
-        
+
         public String writeFrame(Frame toWrite, Writer writer) throws IOException {
                 try {
@@ -167 +169 @@
         protected void writeEndFrame(Frame ending) throws IOException {
         }
-        
+
         protected final void initialise(Frame start) throws IOException {
                 initialise(start, null);
         }
-        
+
         protected void initialise(Frame start, Writer writer) throws IOException {
                 if (_filename == null)
-                        _filename = FrameIO.EXPORTS_DIR
-                                        + getFileName(start) + _format;
-
-                if(writer != null){
+                        _filename = FrameIO.EXPORTS_DIR + getFileName(start) + _format;
+
+                if (writer != null) {
                         _writer = new ProxyWriter(writer);
                         _output = writer.toString();
-                }else if (_filename.equalsIgnoreCase(WriteTree.CLIPBOARD)) {
+                } else if (_filename.equalsIgnoreCase(WriteTree.CLIPBOARD)) {
                         _writer = new ProxyWriter(true);
                         _output = WriteTree.CLIPBOARD;
@@ -223 +224 @@
                         _writer.close();
                 }
-
+                try {
+                        if (Browser._theBrowser.isVersion6()) {
+                                if (Desktop.isDesktopSupported()) {
+                                        Desktop.getDesktop().open(new File(_output));
+                                }
+                        }
+                } catch (Exception e) {
+                        e.printStackTrace();
+                }
                 return " exported to " + _output;
         }

trunk/src/org/expeditee/io/PDFWriter.java

@@ -33 +33 @@
 
         public PDFWriter() {
+                assert(UserSettings.Style != null);
                 if (UserSettings.Style.size() > 0) {
                         Text text = UserSettings.Style.get(0);