[FOray-commit] SF.net SVN: foray: [7920] trunk/foray/foray-hyphen-r/src/java/org/foray/ hyphenR

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

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

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

Modified Paths:
--------------
    trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationServer.java
    trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/PatternParser.java
    trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/TernaryTree.java

Modified: trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationServer.java
===================================================================
--- trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationServer.java	2006-09-05 23:21:51 UTC (rev 7919)
+++ trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/HyphenationServer.java	2006-09-05 23:23:26 UTC (rev 7920)
@@ -58,14 +58,14 @@
      * deserialized or parsed. The key is the language or language and country
      * connected by an underscore (e.g. en_US).
      */
-    HashMap hyphenTrees = new HashMap();
+    private HashMap hyphenTrees = new HashMap();
 
     /**
      * Collection of language and language_country combinations for which we
      * already know we can't instantiate a HyphenationTree. This is used to
      * log only one error message per language.
      */
-    ArrayList hyphenTreesNotFound = new ArrayList();
+    private ArrayList hyphenTreesNotFound = new ArrayList();
 
     private boolean errorDump = false;
     private String hyphenationDir;

Modified: trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/PatternParser.java
===================================================================
--- trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/PatternParser.java	2006-09-05 23:21:51 UTC (rev 7919)
+++ trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/PatternParser.java	2006-09-05 23:23:26 UTC (rev 7920)
@@ -51,6 +51,11 @@
  */
 public class PatternParser extends DefaultHandler implements PatternConsumer {
 
+    static final int ELEM_CLASSES = 1;
+    static final int ELEM_EXCEPTIONS = 2;
+    static final int ELEM_PATTERNS = 3;
+    static final int ELEM_HYPHEN = 4;
+
     XMLReader parser;
     int currElement;
     PatternConsumer consumer;
@@ -60,11 +65,6 @@
     String errMsg;
     Log logger;
 
-    static final int ELEM_CLASSES = 1;
-    static final int ELEM_EXCEPTIONS = 2;
-    static final int ELEM_PATTERNS = 3;
-    static final int ELEM_HYPHEN = 4;
-
     public PatternParser(final Log logger) throws HyphenationException {
         this.logger = logger;
         token = new StringBuffer();

Modified: trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/TernaryTree.java
===================================================================
--- trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/TernaryTree.java	2006-09-05 23:21:51 UTC (rev 7919)
+++ trunk/foray/foray-hyphen-r/src/java/org/foray/hyphenR/TernaryTree.java	2006-09-05 23:23:26 UTC (rev 7920)
@@ -75,6 +75,9 @@
  */
 
 public class TernaryTree implements Cloneable, Serializable {
+
+    protected static final int BLOCK_SIZE = 2048; // allocation size for arrays
+
     static final long serialVersionUID = 240904407206584695L;
 
     /**
@@ -122,8 +125,6 @@
     protected char freenode;
     protected int length;    // number of items in tree
 
-    protected static final int BLOCK_SIZE = 2048; // allocation size for arrays
-
     TernaryTree() {
         init();
     }


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