[FOray-commit] SF.net SVN: foray: [7918] trunk/foray/foray-mif/src/java/org/foray/mif/ MIFDocument.java

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

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

Log Message:
-----------
Conform to standard class-ordering scheme, as reported by checkstyle.

Modified Paths:
--------------
    trunk/foray/foray-mif/src/java/org/foray/mif/MIFDocument.java

Modified: trunk/foray/foray-mif/src/java/org/foray/mif/MIFDocument.java
===================================================================
--- trunk/foray/foray-mif/src/java/org/foray/mif/MIFDocument.java	2006-09-05 23:14:35 UTC (rev 7917)
+++ trunk/foray/foray-mif/src/java/org/foray/mif/MIFDocument.java	2006-09-05 23:20:57 UTC (rev 7918)
@@ -44,14 +44,22 @@
     private static final String TAB = "\t";
 
     /** the version of MIF supported */
-    protected static final String mifVersion = "5.5";
-    protected BookComponent bookComponent;
+//    private static final String mifVersion = "5.5";
+    private BookComponent bookComponent;
 
     /* this is a ref to the current flow which could be a textflow or a table */
     private Flow curFlow;    //
     private ID curIDCounter = new ID();
     private Log logger;
 
+    /**
+     * creates an empty MIF document
+     */
+    public MIFDocument(final Log logger) {
+        this.logger = logger;
+        bookComponent = new BookComponent();
+    }
+
     public static final String MIFEncode(final String val) {
         final int len = val.length();
         final StringBuffer buf = new StringBuffer(len * 2);
@@ -128,10 +136,11 @@
      */
     class ParagraphFormat extends FontFormat {
 
+        int startIndent;
+        int endIndent;
+
         public ParagraphFormat() {}
 
-        int startIndent;
-        int endIndent;
     }
 
     /**
@@ -222,7 +231,7 @@
 
         private int ID;
         private int x, y, w, h;
-        ArrayList content = new ArrayList();
+        private ArrayList content = new ArrayList();
 
         public Frame(final int x, final int y, final int w, final int h) {
             this.ID = curIDCounter.getnewID();
@@ -699,6 +708,20 @@
      */
     class Tbl extends Flow {
 
+        private int ID;
+        private ArrayList tblColumns = new ArrayList();
+        private ArrayList tblBody, tblHead, tblFoot;
+        /* is a reference to one of tblHead,tblBody or tblFoot */
+        private ArrayList current;
+
+        public Tbl() {
+            this.ID = curIDCounter.getnewID();
+            tblBody = new ArrayList();
+            tblHead = new ArrayList();
+            tblFoot = new ArrayList();
+
+        }
+
         /**
          * A MIF Table Column.
          */
@@ -725,6 +748,12 @@
          */
         class Row {
 
+            private ArrayList cells;
+
+            public Row() {
+                cells = new ArrayList();
+            }
+
             /**
              * A MIF Table Cell.
              */
@@ -752,16 +781,10 @@
                 }
             }
 
-            private ArrayList cells;
-
             public void addCell(final int rowSpan, final int colSpan) {
                 cells.add(new Cell(rowSpan, colSpan));
             }
 
-            public Row() {
-                cells = new ArrayList();
-            }
-
             public Cell curCell() {
                 return (Cell)this.cells.get(cells.size() - 1);
             }
@@ -777,11 +800,6 @@
             }
         }
 
-        private int ID;
-        private ArrayList tblColumns = new ArrayList();
-        private ArrayList tblBody, tblHead, tblFoot;
-        /* is a reference to one of tblHead,tblBody or tblFoot */
-        private ArrayList current;
         public void addColumn(final int colWidth) {
 
             tblColumns.add(new TblColumn(colWidth));
@@ -809,14 +827,6 @@
                     colSpan);
         }
 
-        public Tbl() {
-            this.ID = curIDCounter.getnewID();
-            tblBody = new ArrayList();
-            tblHead = new ArrayList();
-            tblFoot = new ArrayList();
-
-        }
-
         public int getID() {
 
             return this.ID;
@@ -1018,14 +1028,6 @@
 
     }
 
-    /**
-     * creates an empty MIF document
-     */
-    public MIFDocument(final Log logger) {
-        this.logger = logger;
-        bookComponent = new BookComponent();
-    }
-
     public void createPage() {
 
         bookComponent.pages.add(new Page());


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