Thread: [FOray-commit] SF.net SVN: foray:[10746] trunk/foray (Page 2)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 10746
          http://foray.svn.sourceforge.net/foray/?rev=10746&view=rev
Author:   victormote
Date:     2009-04-24 02:21:44 +0000 (Fri, 24 Apr 2009)

Log Message:
-----------
Use new aXSL package to reduce dependencies on FOrayMIF.

Modified Paths:
--------------
    trunk/foray/foray-app/.classpath
    trunk/foray/foray-app/src/java/org/foray/app/OutputTargetFactory.java
    trunk/foray/foray-mif/.classpath
    trunk/foray/foray-mif/src/java/org/foray/mif/MifBook.java
    trunk/foray/foray-mif/src/java/org/foray/mif/MifDocument.java
    trunk/foray/foray-output/.classpath
    trunk/foray/foray-output/scripts/build.xml
    trunk/foray/foray-output/src/java/org/foray/output/MIFConverter.java

Modified: trunk/foray/foray-app/.classpath
===================================================================

--- trunk/foray/foray-app/.classpath	2009-04-23 23:09:34 UTC (rev 10745)
+++ trunk/foray/foray-app/.classpath	2009-04-24 02:21:44 UTC (rev 10746)
@@ -38,5 +38,7 @@
 	<classpathentry kind="lib" path="/FOray Lib-Build/ant/ant.jar" sourcepath="/FOray Lib-Build/ant/ant-src.zip"/>
 	<classpathentry kind="lib" path="/FOray Lib-Build/junit/junit-4.4.jar" sourcepath="/FOray Lib-Build/junit/junit-4.4-src.jar"/>
 	<classpathentry kind="lib" path="/FOray Lib/commons-io-1.4.jar" sourcepath="/FOray Lib-Build/commons-io/commons-io-1.4-sources.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/axslMif"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/FOrayMIF"/>
 	<classpathentry kind="output" path="build/eclipse"/>
 </classpath>

Modified: trunk/foray/foray-app/src/java/org/foray/app/OutputTargetFactory.java
===================================================================
--- trunk/foray/foray-app/src/java/org/foray/app/OutputTargetFactory.java	2009-04-23 23:09:34 UTC (rev 10745)
+++ trunk/foray/foray-app/src/java/org/foray/app/OutputTargetFactory.java	2009-04-24 02:21:44 UTC (rev 10746)
@@ -40,6 +40,7 @@
 import org.foray.render.xml.XMLRenderer;
 
 import org.axsl.graphic.GraphicServer;
+import org.axsl.mif.MifBook;
 import org.axsl.output.OutputTarget;
 import org.axsl.pdf.PdfDocument;
 
@@ -111,7 +112,8 @@
             break;
         }
         case MIF: {
-            renderer = new MIFConverter(logger, outputOptions);
+            final MifBook mifBook = new org.foray.mif.MifBook(logger);
+            renderer = new MIFConverter(mifBook, logger, outputOptions);
             break;
         }
         case XML: {

Modified: trunk/foray/foray-mif/.classpath
===================================================================
--- trunk/foray/foray-mif/.classpath	2009-04-23 23:09:34 UTC (rev 10745)
+++ trunk/foray/foray-mif/.classpath	2009-04-24 02:21:44 UTC (rev 10746)
@@ -6,5 +6,6 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/FOrayCommon"/>
 	<classpathentry kind="lib" path="/FOray Lib/commons-logging-1.1.jar" sourcepath="/FOray Lib-Build/commons-logging/commons-logging-1.1-src.zip"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/axslOutput"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/axslMif"/>
 	<classpathentry kind="output" path="build/eclipse"/>
 </classpath>

Modified: trunk/foray/foray-mif/src/java/org/foray/mif/MifBook.java
===================================================================
--- trunk/foray/foray-mif/src/java/org/foray/mif/MifBook.java	2009-04-23 23:09:34 UTC (rev 10745)
+++ trunk/foray/foray-mif/src/java/org/foray/mif/MifBook.java	2009-04-24 02:21:44 UTC (rev 10746)
@@ -43,7 +43,7 @@
  *
  * @author Seshadri G
  */
-public class MifBook {
+public class MifBook implements org.axsl.mif.MifBook {
 
     /** Constant for the end-of-line String, used in building mif output. */
     public static final String EOL = "\n";
@@ -127,7 +127,7 @@
     }
 
     /**
-     * Add a page to this book.
+     * {@inheritDoc}
      */
     public void createPage() {
         this.bookComponent.getPages().add(new MifPage(this));
@@ -145,9 +145,7 @@
     }
 
     /**
-     * Writes the content of this book to a given output stream.
-     * @param stream The stream to which the content should be written.
-     * @throws OutputException For I/O errors during writing.
+     * {@inheritDoc}
      */
     public void output(final OutputStream stream) throws OutputException {
         // Output the contents of bookComponent
@@ -159,9 +157,7 @@
     }
 
     /**
-     * Sets the dimensions of this document.
-     * @param height The height, in millipoints (??), of this document.
-     * @param width The width, in millipoints (??), of this document.
+     * {@inheritDoc}
      */
     public void setDocumentHeightWidth(final int height, final int width) {
         if (this.bookComponent.getDocument() == null) {
@@ -216,9 +212,7 @@
     }
 
     /**
-     * Creates a new paragraph and sets its properties.
-     * @param startIndent The start-indent value of the new paragraph.
-     * @param endIndent The end-indent value of the new paragraph.
+     * {@inheritDoc}
      */
     public void setBlockProp(final int startIndent, final int endIndent) {
         this.curFlow.startPara();    // Start a para
@@ -258,7 +252,7 @@
     }
 
     /**
-     * Create a new table.
+     * {@inheritDoc}
      */
     public void createTable() {
         // First create a table with an ID, then add it to the textflow
@@ -286,9 +280,7 @@
     }
 
     /**
-     * Sets the current component of the current table, either body, header, or
-     * footer.
-     * @param current The description of the current component.
+     * {@inheritDoc}
      */
     public void setCurrent(final String current) {
         // Start the table body or header or footer
@@ -297,7 +289,7 @@
     }
 
     /**
-     * Start a new row in the current table.
+     * {@inheritDoc}
      */
     public void startRow() {
         final MifTbl table = this.bookComponent.curTable();
@@ -305,9 +297,7 @@
     }
 
     /**
-     * Start a new cell in the current row of the current table.
-     * @param rowSpan The number of rows spanned by the new cell.
-     * @param colSpan The number of columns spanned by the new cell.
+     * {@inheritDoc}
      */
     public void startCell(final int rowSpan, final int colSpan) {
         final MifTbl table = this.bookComponent.curTable();

Modified: trunk/foray/foray-mif/src/java/org/foray/mif/MifDocument.java
===================================================================
--- trunk/foray/foray-mif/src/java/org/foray/mif/MifDocument.java	2009-04-23 23:09:34 UTC (rev 10745)
+++ trunk/foray/foray-mif/src/java/org/foray/mif/MifDocument.java	2009-04-24 02:21:44 UTC (rev 10746)
@@ -33,7 +33,7 @@
 /**
  * A MIF Document.
  */
-public class MifDocument extends MifToken {
+public class MifDocument extends MifToken implements org.axsl.mif.MifDocument {
 
     /** The height of pages in this document, in points (??). */
     private int height;

Modified: trunk/foray/foray-output/.classpath
===================================================================
--- trunk/foray/foray-output/.classpath	2009-04-23 23:09:34 UTC (rev 10745)
+++ trunk/foray/foray-output/.classpath	2009-04-24 02:21:44 UTC (rev 10746)
@@ -7,8 +7,8 @@
 	<classpathentry kind="src" path="/axslFont"/>
 	<classpathentry kind="src" path="/axslFoTree"/>
 	<classpathentry kind="src" path="/axslCommon"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/FOrayMIF"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/axslOutput"/>
 	<classpathentry kind="lib" path="/FOray Lib/commons-logging-1.1.jar" sourcepath="/FOray Lib-Build/commons-logging/commons-logging-1.1-src.zip"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/axslMif"/>
 	<classpathentry kind="output" path="build/eclipse"/>
 </classpath>

Modified: trunk/foray/foray-output/scripts/build.xml
===================================================================
--- trunk/foray/foray-output/scripts/build.xml	2009-04-23 23:09:34 UTC (rev 10745)
+++ trunk/foray/foray-output/scripts/build.xml	2009-04-24 02:21:44 UTC (rev 10746)
@@ -28,9 +28,6 @@
       <fileset dir="${foray.sandbox}/foray-common/build/ant">
         <include name="*.jar"/>
       </fileset>
-      <fileset dir="${foray.sandbox}/foray-mif/build/ant">
-        <include name="*.jar"/>
-      </fileset>
     </path>
 
   </target>

Modified: trunk/foray/foray-output/src/java/org/foray/output/MIFConverter.java
===================================================================
--- trunk/foray/foray-output/src/java/org/foray/output/MIFConverter.java	2009-04-23 23:09:34 UTC (rev 10745)
+++ trunk/foray/foray-output/src/java/org/foray/output/MIFConverter.java	2009-04-24 02:21:44 UTC (rev 10746)
@@ -28,8 +28,6 @@
 
 package org.foray.output;
 
-import org.foray.mif.MifBook;
-
 import org.axsl.fo.FoContext;
 import org.axsl.fo.fo.Block;
 import org.axsl.fo.fo.Table;
@@ -38,6 +36,7 @@
 import org.axsl.fo.fo.TableColumn;
 import org.axsl.fo.fo.TableRow;
 import org.axsl.font.FontConsumer;
+import org.axsl.mif.MifBook;
 import org.axsl.output.OutputException;
 
 import org.apache.commons.logging.Log;
@@ -69,11 +68,13 @@
 
     /**
      * Create the MIF renderer.
+     * @param mifBook The MIF book to be rendered.
      * @param logger The logger.
      * @param outputConfig The output configuration.
      */
-    public MIFConverter(final Log logger, final OutputConfig outputConfig) {
+    public MIFConverter(final MifBook mifBook, final Log logger, final OutputConfig outputConfig) {
         super(logger, outputConfig);
+        this.mifDoc = mifBook;
     }
 
     /**
@@ -242,7 +243,6 @@
      * {@inheritDoc}
      */
     public void startOutput() throws OutputException {
-        this.mifDoc = new MifBook(getLogger());
         getLogger().info("rendering areas to MIF");
         this.mifDoc.setDocumentHeightWidth(this.pageHeight, this.pageWidth);
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [FOray-commit] SF.net SVN: foray:[10746] trunk/foray (Page 2)

Modular XSL-FO Implementation for Java.

foray-commit