[FOray-commit] SF.net SVN: foray: [7924] trunk/foray/foray-common/src/java/org/foray/ common

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

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

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

Modified Paths:
--------------
    trunk/foray/foray-common/src/java/org/foray/common/ColorSpaceCMYK.java
    trunk/foray/foray-common/src/java/org/foray/common/RandomReader.java
    trunk/foray/foray-common/src/java/org/foray/common/sax/DocumentReader.java

Modified: trunk/foray/foray-common/src/java/org/foray/common/ColorSpaceCMYK.java
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/ColorSpaceCMYK.java	2006-09-05 23:51:06 UTC (rev 7923)
+++ trunk/foray/foray-common/src/java/org/foray/common/ColorSpaceCMYK.java	2006-09-05 23:54:49 UTC (rev 7924)
@@ -31,10 +31,11 @@
  * A {@link ColorSpace} implementation for CMYK.
  */
 public class ColorSpaceCMYK extends ColorSpace {
-    static final long serialVersionUID = 34959014422981446L;
 
     protected static final float BLACK_FACTOR = 2.0f; // could be 3.0 as well.
 
+    static final long serialVersionUID = 34959014422981446L;
+
     private static ColorSpaceCMYK THE_INSTANCE;
 
     public ColorSpaceCMYK() {

Modified: trunk/foray/foray-common/src/java/org/foray/common/RandomReader.java
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/RandomReader.java	2006-09-05 23:51:06 UTC (rev 7923)
+++ trunk/foray/foray-common/src/java/org/foray/common/RandomReader.java	2006-09-05 23:54:49 UTC (rev 7924)
@@ -467,24 +467,22 @@
      * end of the file.
      */
     class ByteSearcher {
-        private final byte[] bytesToFind;
-        private final long startRange;
-        private final long endRange;
-        private final boolean readBackward;
 
-        /*
-         * The size, in bytes, to be read in. Set up here as a variable in
-         * case we want someday to try to optimize it.
-         */
+        /** The size, in bytes, to be read in. Set up here as a variable in
+         * case we want someday to try to optimize it. */
         private static final int idealReadSize = 1024;
-        /*
-         * The size, in bytes, of the working array. Set it to 2 x readSize,
+
+        /** The size, in bytes, of the working array. Set it to 2 x readSize,
          * so that we can see two readSize chunks at a time. Otherwise, it
          * will be complicated to handle situations where the text straddles
-         * two readSize chunks.
-         */
+         * two readSize chunks. */
         private static final int viewboxSize = idealReadSize * 2;
 
+        private final byte[] bytesToFind;
+        private final long startRange;
+        private final long endRange;
+        private final boolean readBackward;
+
         private byte[] viewbox = new byte[viewboxSize];
 
         /**

Modified: trunk/foray/foray-common/src/java/org/foray/common/sax/DocumentReader.java
===================================================================
--- trunk/foray/foray-common/src/java/org/foray/common/sax/DocumentReader.java	2006-09-05 23:51:06 UTC (rev 7923)
+++ trunk/foray/foray-common/src/java/org/foray/common/sax/DocumentReader.java	2006-09-05 23:54:49 UTC (rev 7924)
@@ -51,13 +51,21 @@
 
 public class DocumentReader implements XMLReader {
 
-    // //////////////////////////////////////////////////////////////////
-    // Configuration.
-    // //////////////////////////////////////////////////////////////////
+    /** Configuration variable. */
     private boolean _namespaces = true;
+
+    /** Configuration variable. */
     private boolean _namespace_prefixes = true;
 
+    private EntityResolver _entityResolver = null;
+    private DTDHandler _dtdHandler = null;
+    private ContentHandler _contentHandler = null;
+    private ErrorHandler _errorHandler = null;
 
+
+    // //////////////////////////////////////////////////////////////////
+    // Configuration.
+    // //////////////////////////////////////////////////////////////////
     /**
      * Look up the value of a feature.
      *
@@ -241,12 +249,6 @@
     // //////////////////////////////////////////////////////////////////
     // Event handlers.
     // //////////////////////////////////////////////////////////////////
-    private EntityResolver _entityResolver = null;
-    private DTDHandler _dtdHandler = null;
-    private ContentHandler _contentHandler = null;
-    private ErrorHandler _errorHandler = null;
-
-
     /**
      * Allow an application to register an entity resolver.
      *


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