[FOray-commit] SF.net SVN: foray: [7917] trunk/foray

[<vic...@us...>]

Revision: 7917
          http://svn.sourceforge.net/foray/?rev=7917&view=rev
Author:   victormote
Date:     2006-09-05 16:14:35 -0700 (Tue, 05 Sep 2006)

Log Message:
-----------
Standardize document ordering, as reported by checkstyle.

Modified Paths:
--------------
    trunk/foray/foray-output/src/java/org/foray/output/MIFConverter.java
    trunk/foray/foray-output/src/java/org/foray/output/OutputTarget.java
    trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java
    trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java

Modified: trunk/foray/foray-output/src/java/org/foray/output/MIFConverter.java
===================================================================
--- trunk/foray/foray-output/src/java/org/foray/output/MIFConverter.java	2006-09-05 23:07:25 UTC (rev 7916)
+++ trunk/foray/foray-output/src/java/org/foray/output/MIFConverter.java	2006-09-05 23:14:35 UTC (rev 7917)
@@ -53,19 +53,9 @@
     private int pageWidth;
 
     /**
-     * the current vertical position in millipoints from bottom
-     */
-    protected int currentYPosition = 0;
-
-    /**
-     * the current horizontal position in millipoints from left
-     */
-    protected int currentXPosition = 0;
-
-    /**
      * the MIF Document being created
      */
-    protected MIFDocument mifDoc;
+    private MIFDocument mifDoc;
 
 
     /* is a table currently open? */

Modified: trunk/foray/foray-output/src/java/org/foray/output/OutputTarget.java
===================================================================
--- trunk/foray/foray-output/src/java/org/foray/output/OutputTarget.java	2006-09-05 23:07:25 UTC (rev 7916)
+++ trunk/foray/foray-output/src/java/org/foray/output/OutputTarget.java	2006-09-05 23:14:35 UTC (rev 7917)
@@ -35,16 +35,16 @@
  */
 public abstract class OutputTarget implements org.axsl.output.OutputTarget {
 
-    OutputStream outputStream;
+    private OutputStream outputStream;
     private String applicationName;
     private String applicationNameShort;
     private String applicationVersion;
     private String developerURLShort;
-    boolean strokeSVGText;
-    Log logger;
-    FontConsumer fontConsumer;
+    private boolean strokeSVGText;
+    private Log logger;
+    private FontConsumer fontConsumer;
 
-    protected OutputConfig options;
+    private OutputConfig options;
 
     /**
      *
@@ -163,4 +163,11 @@
         this.fontConsumer = fontConsumer;
     }
 
+    /**
+     * @return Returns the options.
+     */
+    public OutputConfig getOptions() {
+        return this.options;
+    }
+
 }

Modified: trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java	2006-09-05 23:07:25 UTC (rev 7916)
+++ trunk/foray/foray-render/src/java/org/foray/render/pdf/PDFRenderer.java	2006-09-05 23:14:35 UTC (rev 7917)
@@ -97,18 +97,19 @@
     }
 
     private void addEncryption() {
-        if (this.options == null) {
+        if (this.getOptions() == null) {
             return;
         }
         // Process encryption options, if any exist
         boolean encrypt = false;
-        final String oPassword = this.options.optionPDFOwnerPassword();
-        final String uPassword = this.options.optionPDFUserPassword();
-        final boolean allowPrint           = this.options.optionPDFUserPrint();
-        final boolean allowCopyContent     = this.options.optionPDFUserCopy();
-        final boolean allowEditContent     = this.options.optionPDFUserModify();
+        final String oPassword = this.getOptions().optionPDFOwnerPassword();
+        final String uPassword = this.getOptions().optionPDFUserPassword();
+        final boolean allowPrint = this.getOptions().optionPDFUserPrint();
+        final boolean allowCopyContent = this.getOptions().optionPDFUserCopy();
+        final boolean allowEditContent =
+            this.getOptions().optionPDFUserModify();
         final boolean allowEditAnnotations =
-                this.options.optionPDFUserAnnotate();
+            this.getOptions().optionPDFUserAnnotate();
 
         if (oPassword != null) {
             encrypt = true;
@@ -133,7 +134,7 @@
      * {@inheritDoc}
      */
     public void startOutput() throws IOException {
-        final String pdfVersion = this.options.optionPDFVersion();
+        final String pdfVersion = this.getOptions().optionPDFVersion();
         if (pdfVersion != null) {
             final int pdfVersionConstant = PDFUtility.integralVersion(
                     pdfVersion);
@@ -150,7 +151,7 @@
         this.pdfDoc.setCreationDate(now);
         // setup Encryption
         addEncryption();
-        final List filters = this.options.optionPDFFilters();
+        final List filters = this.getOptions().optionPDFFilters();
         for (int i = 0; i < filters.size(); i++) {
             final String filter = (String)filters.get(i);
             pdfDoc.addDefaultFilter(filter);

Modified: trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java	2006-09-05 23:07:25 UTC (rev 7916)
+++ trunk/foray/foray-render/src/java/org/foray/render/txt/TXTRenderer.java	2006-09-05 23:14:35 UTC (rev 7917)
@@ -504,8 +504,8 @@
         getLogger().info("rendering areas to TEXT");
         currentStream = new TXTStream(this.getOutputStream());
         String encoding;
-        if (options != null) {
-            encoding = options.optionTXTEncoding();
+        if (this.getOptions() != null) {
+            encoding = this.getOptions().optionTXTEncoding();
             try {
                 " ".getBytes(encoding);
             } catch (final UnsupportedEncodingException uee) {

Modified: trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java	2006-09-05 23:07:25 UTC (rev 7916)
+++ trunk/foray/foray-render/src/java/org/foray/render/xml/XMLRenderer.java	2006-09-05 23:14:35 UTC (rev 7917)
@@ -535,10 +535,10 @@
     }
 
     private boolean isCoarseXml() {
-        if (options == null) {
+        if (this.getOptions() == null) {
             return false;
         }
-        return options.optionATSparse();
+        return this.getOptions().optionATSparse();
     }
 
     /**


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