Changeset 290

Timestamp:

09/03/08 14:01:24 (16 years ago)

Author:

ra33

Message:

 

Location:

trunk/src/org/expeditee

Files:

• agents/mail/MailSession.java (modified) (1 diff)
• gui/Browser.java (modified) (1 diff)
• gui/Frame.java (modified) (1 diff)
• io/AbstractHTMLWriter.java (modified) (2 diffs)
• io/DefaultTreeWriter.java (modified) (2 diffs)
• io/HTMLBWriter.java (modified) (1 diff)
• io/PDFWriter.java (modified) (6 diffs)
• items/Text.java (modified) (1 diff)

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

@@ -337 +337 @@
         }
 
-        public synchronized void finalise() {
+        /**
+         * Closes the mail folders.
+         * @return true if the folders needed to be closed.
+         */
+        public synchronized boolean finalise() {
+                boolean result = false;
                 try {
                         if (_transport != null && _transport.isConnected()) {
                                 _transport.close();
+                                result = true;
                         }
 
                         if (_folder != null && _folder.isOpen()) {
                                 _folder.close(false);
+                                result = true;
                         }
 
                         if (_store != null && _store.isConnected()) {
                                 _store.close();
+                                result = true;
                         }
                 } catch (Exception e) {
 
                 }
+                return result;
         }
 

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

@@ -426 +426 @@
 
                                         if (MailSession.getInstance() != null) {
-                                                MessageBay.displayMessage("Closing ExpMail...");
-                                                MailSession.getInstance().finalise();
+                                                if (MailSession.getInstance().finalise()) {
+                                                        MessageBay.displayMessage("Closing ExpMail...");
+                                                }
                                         }
 

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

@@ -1646 +1646 @@
          */
         public String getExportFileName() {
-                Text tag = ItemUtils.FindTag(getItems(), "@file:");
-                if (tag != null) {
-                        String file = ItemUtils.StripTag(tag.getFirstLine(), "@file");
-                        file = file.trim();
-                        if (file.length() > 0)
-                                return file;
-                }
-
-                return _frameName.getText();
+                return getAnnotationValue("file");
         }
 

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

@@ -52 +52 @@
 
                 writer.write(styleName + " { font-size: " + Math.round(style.getSize())
-                                + "pt");
+                                + "px");
 
                 Font font = style.getPaintFont();
@@ -120 +120 @@
 
         protected void indent() throws IOException {
-                for (int i = 0; i < _indent; i++)
+                for (int i = 0; i < getIndent(); i++)
                         _writer.write(INDENT);
         }
-
-        protected int getIndent() {
-                return _indent;
-        }
 }

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

@@ -14 +14 @@
                 TreeWriter {
 
-        protected int _indent = 0;
+        private int _indent = 0;
         
         // the list of frames currently being processed
@@ -177 +177 @@
                 }
         }
+        
+        protected int getIndent() {
+                return _indent;
+        }
 }

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

@@ -19 +19 @@
         protected void writeTitle(Text toWrite, List<Item> items)
                         throws IOException {
+                int indent = getIndent();
+                if(indent == 0)
+                        return;
+                
                 String heading = toWrite.getText();
-                String tag = "h" + (getIndent() + 1);
+                String tag = "h" + indent;
                 // indenting for tag
                 indent();

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

@@ -14 +14 @@
 import com.lowagie.text.Document;
 import com.lowagie.text.DocumentException;
+import com.lowagie.text.Font;
 import com.lowagie.text.FontFactory;
 import com.lowagie.text.Paragraph;
@@ -20 +21 @@
 /**
  * Writes out a tree in a linear format.
+ * 
  * @author root
- *
+ * 
  */
 public class PDFWriter extends DefaultTreeWriter {
@@ -27 +29 @@
         private Document _pdfDocument;
 
+        private Font _bodyFont;
+
         public PDFWriter() {
+                if (UserSettings.Style.size() > 0) {
+                        Text text = UserSettings.Style.get(0);
+                        _bodyFont = FontFactory.getFont(Conversion.getPdfFont(text
+                                        .getFamily()), text.getSize(), text.getPaintFont()
+                                        .getStyle(), text.getColor());
+                }
                 _pdfDocument = new Document();
         }
@@ -42 +52 @@
                         _pdfDocument.addAuthor(UserSettings.Username);
                         _pdfDocument.addCreator("Expeditee");
+                        _pdfDocument.addTitle(start.getTitle());
                 } catch (DocumentException e) {
                         e.printStackTrace();
@@ -51 +62 @@
         protected void writeTitle(Text toWrite, List<Item> items)
                         throws IOException {
-                _pdfDocument.addTitle(toWrite.getText());
-                writeText(toWrite);
+                int indent = getIndent();
+                if (indent == 0)
+                        return;
+
+                if (indent < UserSettings.Style.size()) {
+                        String text = toWrite.getText();
+                        toWrite = UserSettings.Style.get(indent).getTemplateForm();
+                        toWrite.setText(text);
+                }
+
+                writeText(toWrite, false);
         }
 
@@ -62 +82 @@
 
         @Override
-        protected void writeStartLink(Item linker) throws IOException {
+        protected void writeText(Text text) throws IOException {
+                writeText(text, true);
         }
 
-        @Override
-        protected void writeEndLink(Item linker) throws IOException {
-        }
+        protected void writeText(Text text, boolean bodyText) throws IOException {
+                try {
+                        Font font = null;
+                        if (bodyText) {
+                                font = _bodyFont;
+                        }
 
-        @Override
-        protected void writeText(Text text) throws IOException {
-                try {
-
-                        _pdfDocument.add(new Paragraph(text.getText(), FontFactory.getFont(
-                                        Conversion.getPdfFont(text.getFamily()), text.getSize(),
-                                        text.getPaintFont().getStyle(), text.getColor())));
+                        if (font == null) {
+                                font = FontFactory.getFont(Conversion.getPdfFont(text
+                                                .getFamily()), text.getSize(), text.getPaintFont()
+                                                .getStyle(), text.getColor());
+                        }
+                        
+                        _pdfDocument.add(new Paragraph(text.getText(), font));
                 } catch (DocumentException e) {
                         // TODO Auto-generated catch block

trunk/src/org/expeditee/items/Text.java

@@ -1255 +1255 @@
                 // --- Get the output of the LineBreakMeasurer and store it in a
                 while ((layout = _lineBreaker.nextLayout(width)) != null) {
-                        // for some reason lineBreaker will not break on newline
+                        // lineBreaker does not break on newline
                         // characters so they have to be check manually
                         int start = _lineOffsets.get(_lineOffsets.size() - 1);