You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@joshua.apache.org by le...@apache.org on 2016/05/26 07:03:48 UTC

[07/12] incubator-joshua git commit: LOG scope is privatized

LOG scope is privatized 

Project: http://git-wip-us.apache.org/repos/asf/incubator-joshua/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-joshua/commit/4d04cc2c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-joshua/tree/4d04cc2c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-joshua/diff/4d04cc2c

Branch: refs/heads/JOSHUA-252
Commit: 4d04cc2c01669e3b93399758f54aae27e6e2d0ec
Parents: 9114a00
Author: Thamme Gowda <tg...@gmail.com>
Authored: Sat May 21 11:22:28 2016 -0700
Committer: Thamme Gowda <tg...@gmail.com>
Committed: Sat May 21 11:22:28 2016 -0700

----------------------------------------------------------------------
 src/main/java/org/apache/joshua/corpus/Vocabulary.java             | 2 +-
 src/main/java/org/apache/joshua/decoder/ArgsParser.java            | 2 +-
 src/main/java/org/apache/joshua/decoder/Decoder.java               | 2 +-
 src/main/java/org/apache/joshua/decoder/DecoderThread.java         | 2 +-
 src/main/java/org/apache/joshua/decoder/JoshuaConfiguration.java   | 2 +-
 src/main/java/org/apache/joshua/decoder/JoshuaDecoder.java         | 2 +-
 src/main/java/org/apache/joshua/decoder/Translation.java           | 2 +-
 src/main/java/org/apache/joshua/decoder/chart_parser/Cell.java     | 2 +-
 src/main/java/org/apache/joshua/decoder/chart_parser/Chart.java    | 2 +-
 src/main/java/org/apache/joshua/decoder/chart_parser/DotChart.java | 2 +-
 .../joshua/decoder/chart_parser/ManualConstraintsHandler.java      | 2 +-
 src/main/java/org/apache/joshua/decoder/ff/StatefulFF.java         | 2 +-
 src/main/java/org/apache/joshua/decoder/ff/lm/ArpaFile.java        | 2 +-
 .../org/apache/joshua/decoder/ff/lm/DefaultNGramLanguageModel.java | 2 +-
 .../decoder/ff/lm/bloomfilter_lm/BloomFilterLanguageModel.java     | 2 +-
 .../java/org/apache/joshua/decoder/ff/lm/buildin_lm/TrieLM.java    | 2 +-
 src/main/java/org/apache/joshua/decoder/ff/tm/AbstractGrammar.java | 2 +-
 .../java/org/apache/joshua/decoder/ff/tm/CreateGlueGrammar.java    | 2 +-
 src/main/java/org/apache/joshua/decoder/ff/tm/GrammarReader.java   | 2 +-
 src/main/java/org/apache/joshua/decoder/ff/tm/MonolingualRule.java | 2 +-
 .../org/apache/joshua/decoder/ff/tm/format/SamtFormatReader.java   | 2 +-
 .../joshua/decoder/ff/tm/hash_based/MemoryBasedBatchGrammar.java   | 2 +-
 .../java/org/apache/joshua/decoder/ff/tm/packed/PackedGrammar.java | 2 +-
 src/main/java/org/apache/joshua/decoder/hypergraph/HyperGraph.java | 2 +-
 src/main/java/org/apache/joshua/decoder/phrase/PhraseChart.java    | 2 +-
 src/main/java/org/apache/joshua/decoder/phrase/Stacks.java         | 2 +-
 src/main/java/org/apache/joshua/decoder/segment_file/Sentence.java | 2 +-
 src/main/java/org/apache/joshua/decoder/segment_file/Token.java    | 2 +-
 src/main/java/org/apache/joshua/lattice/Lattice.java               | 2 +-
 src/main/java/org/apache/joshua/metrics/BLEU.java                  | 2 +-
 src/main/java/org/apache/joshua/metrics/GradeLevelBLEU.java        | 2 +-
 src/main/java/org/apache/joshua/metrics/MinimumChangeBLEU.java     | 2 +-
 src/main/java/org/apache/joshua/metrics/Precis.java                | 2 +-
 src/main/java/org/apache/joshua/server/TcpServer.java              | 2 +-
 src/main/java/org/apache/joshua/tools/GrammarPacker.java           | 2 +-
 src/main/java/org/apache/joshua/tools/GrammarPackerCli.java        | 2 +-
 src/main/java/org/apache/joshua/tools/LabelPhrases.java            | 2 +-
 src/main/java/org/apache/joshua/util/Cache.java                    | 2 +-
 src/main/java/org/apache/joshua/util/CompareGrammars.java          | 2 +-
 .../java/org/apache/joshua/util/encoding/FeatureTypeAnalyzer.java  | 2 +-
 src/test/java/org/apache/joshua/packed/Benchmark.java              | 2 +-
 41 files changed, 41 insertions(+), 41 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/corpus/Vocabulary.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/corpus/Vocabulary.java b/src/main/java/org/apache/joshua/corpus/Vocabulary.java
index 9836286..42ce482 100644
--- a/src/main/java/org/apache/joshua/corpus/Vocabulary.java
+++ b/src/main/java/org/apache/joshua/corpus/Vocabulary.java
@@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory;
 
 public class Vocabulary {
 
-  public static final Logger LOG = LoggerFactory.getLogger(Vocabulary.class);
+  private static final Logger LOG = LoggerFactory.getLogger(Vocabulary.class);
   private final static ArrayList<NGramLanguageModel> LMs = new ArrayList<>();
 
   private static List<String> idToString;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/decoder/ArgsParser.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/ArgsParser.java b/src/main/java/org/apache/joshua/decoder/ArgsParser.java
index 529e9fe..f84d7d3 100644
--- a/src/main/java/org/apache/joshua/decoder/ArgsParser.java
+++ b/src/main/java/org/apache/joshua/decoder/ArgsParser.java
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
  */
 public class ArgsParser {
 
-  public static final Logger LOG = LoggerFactory.getLogger(ArgsParser.class);
+  private static final Logger LOG = LoggerFactory.getLogger(ArgsParser.class);
 
   private String configFile = null;
 

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/decoder/Decoder.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/Decoder.java b/src/main/java/org/apache/joshua/decoder/Decoder.java
index 43dc75e..7f03a74 100644
--- a/src/main/java/org/apache/joshua/decoder/Decoder.java
+++ b/src/main/java/org/apache/joshua/decoder/Decoder.java
@@ -88,7 +88,7 @@ import org.slf4j.LoggerFactory;
  */
 public class Decoder {
 
-  public static final Logger LOG = LoggerFactory.getLogger(Decoder.class);
+  private static final Logger LOG = LoggerFactory.getLogger(Decoder.class);
 
   private final JoshuaConfiguration joshuaConfiguration;
 

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/decoder/DecoderThread.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/DecoderThread.java b/src/main/java/org/apache/joshua/decoder/DecoderThread.java
index f04c3be..47b7eb5 100644
--- a/src/main/java/org/apache/joshua/decoder/DecoderThread.java
+++ b/src/main/java/org/apache/joshua/decoder/DecoderThread.java
@@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory;
  */
 
 public class DecoderThread extends Thread {
-  public static final Logger LOG = LoggerFactory.getLogger(DecoderThread.class);
+  private static final Logger LOG = LoggerFactory.getLogger(DecoderThread.class);
 
   private final JoshuaConfiguration joshuaConfiguration;
   /*

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/decoder/JoshuaConfiguration.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/JoshuaConfiguration.java b/src/main/java/org/apache/joshua/decoder/JoshuaConfiguration.java
index 964cdc9..1ea05b4 100644
--- a/src/main/java/org/apache/joshua/decoder/JoshuaConfiguration.java
+++ b/src/main/java/org/apache/joshua/decoder/JoshuaConfiguration.java
@@ -49,7 +49,7 @@ import org.slf4j.LoggerFactory;
  */
 public class JoshuaConfiguration {
 
-  public static final Logger LOG = LoggerFactory.getLogger(JoshuaConfiguration.class);
+  private static final Logger LOG = LoggerFactory.getLogger(JoshuaConfiguration.class);
 
   // whether to construct a StructuredTranslation object for each request instead of
   // printing to stdout. Used when the Decoder is used from Java directly.

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/decoder/JoshuaDecoder.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/JoshuaDecoder.java b/src/main/java/org/apache/joshua/decoder/JoshuaDecoder.java
index e29ef0a..0daec53 100644
--- a/src/main/java/org/apache/joshua/decoder/JoshuaDecoder.java
+++ b/src/main/java/org/apache/joshua/decoder/JoshuaDecoder.java
@@ -46,7 +46,7 @@ import org.slf4j.LoggerFactory;
  */
 public class JoshuaDecoder {
 
-  public static final Logger LOG = LoggerFactory.getLogger(JoshuaDecoder.class);
+  private static final Logger LOG = LoggerFactory.getLogger(JoshuaDecoder.class);
 
   // ===============================================================
   // Main

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/decoder/Translation.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/Translation.java b/src/main/java/org/apache/joshua/decoder/Translation.java
index b13b0f6..9ae1aaa 100644
--- a/src/main/java/org/apache/joshua/decoder/Translation.java
+++ b/src/main/java/org/apache/joshua/decoder/Translation.java
@@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory;
  */
 
 public class Translation {
-  public static final Logger LOG = LoggerFactory.getLogger(Translation.class);
+  private static final Logger LOG = LoggerFactory.getLogger(Translation.class);
   private Sentence source;
 
   /**

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/decoder/chart_parser/Cell.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/chart_parser/Cell.java b/src/main/java/org/apache/joshua/decoder/chart_parser/Cell.java
index 1ddea2c..10b9200 100644
--- a/src/main/java/org/apache/joshua/decoder/chart_parser/Cell.java
+++ b/src/main/java/org/apache/joshua/decoder/chart_parser/Cell.java
@@ -50,7 +50,7 @@ class Cell {
   // ===============================================================
   // Static fields
   // ===============================================================
-  public static final Logger LOG = LoggerFactory.getLogger(Cell.class);
+  private static final Logger LOG = LoggerFactory.getLogger(Cell.class);
 
 
   // The chart this cell belongs to

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/decoder/chart_parser/Chart.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/chart_parser/Chart.java b/src/main/java/org/apache/joshua/decoder/chart_parser/Chart.java
index a432fbe..65015a8 100644
--- a/src/main/java/org/apache/joshua/decoder/chart_parser/Chart.java
+++ b/src/main/java/org/apache/joshua/decoder/chart_parser/Chart.java
@@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory;
 
 public class Chart {
 
-  public static final Logger LOG = LoggerFactory.getLogger(Chart.class);
+  private static final Logger LOG = LoggerFactory.getLogger(Chart.class);
   private final JoshuaConfiguration config;
   // ===========================================================
   // Statistics

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/decoder/chart_parser/DotChart.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/chart_parser/DotChart.java b/src/main/java/org/apache/joshua/decoder/chart_parser/DotChart.java
index 70be6cd..907c469 100644
--- a/src/main/java/org/apache/joshua/decoder/chart_parser/DotChart.java
+++ b/src/main/java/org/apache/joshua/decoder/chart_parser/DotChart.java
@@ -62,7 +62,7 @@ class DotChart {
   // Static fields
   // ===============================================================
 
-  public static final Logger LOG = LoggerFactory.getLogger(DotChart.class);
+  private static final Logger LOG = LoggerFactory.getLogger(DotChart.class);
 
 
   // ===============================================================

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/decoder/chart_parser/ManualConstraintsHandler.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/chart_parser/ManualConstraintsHandler.java b/src/main/java/org/apache/joshua/decoder/chart_parser/ManualConstraintsHandler.java
index be70423..99cbf7f 100644
--- a/src/main/java/org/apache/joshua/decoder/chart_parser/ManualConstraintsHandler.java
+++ b/src/main/java/org/apache/joshua/decoder/chart_parser/ManualConstraintsHandler.java
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
 
 public class ManualConstraintsHandler {
 
-  public static final Logger LOG = LoggerFactory.getLogger(ManualConstraintsHandler.class);
+  private static final Logger LOG = LoggerFactory.getLogger(ManualConstraintsHandler.class);
 
   // TODO: each span only has one ConstraintSpan
   // contain spans that have LHS or RHS constraints (they are always hard)

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/decoder/ff/StatefulFF.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/ff/StatefulFF.java b/src/main/java/org/apache/joshua/decoder/ff/StatefulFF.java
index 05b9358..c1fc747 100644
--- a/src/main/java/org/apache/joshua/decoder/ff/StatefulFF.java
+++ b/src/main/java/org/apache/joshua/decoder/ff/StatefulFF.java
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
  */
 public abstract class StatefulFF extends FeatureFunction {
 
-  public static final Logger LOG = LoggerFactory.getLogger(StatefulFF.class);
+  private static final Logger LOG = LoggerFactory.getLogger(StatefulFF.class);
   /* Every stateful FF takes a unique index value and increments this. */
   static int GLOBAL_STATE_INDEX = 0;
 

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/decoder/ff/lm/ArpaFile.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/ff/lm/ArpaFile.java b/src/main/java/org/apache/joshua/decoder/ff/lm/ArpaFile.java
index 0052afc..57400de 100644
--- a/src/main/java/org/apache/joshua/decoder/ff/lm/ArpaFile.java
+++ b/src/main/java/org/apache/joshua/decoder/ff/lm/ArpaFile.java
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
  */ 
 public class ArpaFile implements Iterable<ArpaNgram> { 
 
-  public static final Logger LOG = LoggerFactory.getLogger(ArpaFile.class);
+  private static final Logger LOG = LoggerFactory.getLogger(ArpaFile.class);
 
   /** Regular expression representing a blank line. */ 
   public static final Regex BLANK_LINE  = new Regex("^\\s*$"); 

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/decoder/ff/lm/DefaultNGramLanguageModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/ff/lm/DefaultNGramLanguageModel.java b/src/main/java/org/apache/joshua/decoder/ff/lm/DefaultNGramLanguageModel.java
index 1191eac..93be1d9 100644
--- a/src/main/java/org/apache/joshua/decoder/ff/lm/DefaultNGramLanguageModel.java
+++ b/src/main/java/org/apache/joshua/decoder/ff/lm/DefaultNGramLanguageModel.java
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
  */
 public abstract class DefaultNGramLanguageModel implements NGramLanguageModel {
 
-  public static final Logger LOG = LoggerFactory.getLogger(DefaultNGramLanguageModel.class);
+  private static final Logger LOG = LoggerFactory.getLogger(DefaultNGramLanguageModel.class);
 
   protected final int ngramOrder;
   

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/decoder/ff/lm/bloomfilter_lm/BloomFilterLanguageModel.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/ff/lm/bloomfilter_lm/BloomFilterLanguageModel.java b/src/main/java/org/apache/joshua/decoder/ff/lm/bloomfilter_lm/BloomFilterLanguageModel.java
index 7d00f2f..35199cb 100644
--- a/src/main/java/org/apache/joshua/decoder/ff/lm/bloomfilter_lm/BloomFilterLanguageModel.java
+++ b/src/main/java/org/apache/joshua/decoder/ff/lm/bloomfilter_lm/BloomFilterLanguageModel.java
@@ -63,7 +63,7 @@ public class BloomFilterLanguageModel extends DefaultNGramLanguageModel implemen
   /**
    * The logger for this class.
    */
-  public static final Logger LOG = LoggerFactory.getLogger(BloomFilterLanguageModel.class);
+  private static final Logger LOG = LoggerFactory.getLogger(BloomFilterLanguageModel.class);
 
   /**
    * The Bloom filter data structure itself.

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/decoder/ff/lm/buildin_lm/TrieLM.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/ff/lm/buildin_lm/TrieLM.java b/src/main/java/org/apache/joshua/decoder/ff/lm/buildin_lm/TrieLM.java
index 68244ad..978dbe4 100644
--- a/src/main/java/org/apache/joshua/decoder/ff/lm/buildin_lm/TrieLM.java
+++ b/src/main/java/org/apache/joshua/decoder/ff/lm/buildin_lm/TrieLM.java
@@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory;
  */
 public class TrieLM extends AbstractLM { //DefaultNGramLanguageModel {
 
-  public static final Logger LOG = LoggerFactory.getLogger(TrieLM.class);
+  private static final Logger LOG = LoggerFactory.getLogger(TrieLM.class);
 
   /**
    * Node ID for the root node.

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/decoder/ff/tm/AbstractGrammar.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/ff/tm/AbstractGrammar.java b/src/main/java/org/apache/joshua/decoder/ff/tm/AbstractGrammar.java
index 3b8eb39..5fc3413 100644
--- a/src/main/java/org/apache/joshua/decoder/ff/tm/AbstractGrammar.java
+++ b/src/main/java/org/apache/joshua/decoder/ff/tm/AbstractGrammar.java
@@ -49,7 +49,7 @@ import org.slf4j.LoggerFactory;
 public abstract class AbstractGrammar implements Grammar {
 
   /** Logger for this class. */
-  public static final Logger LOG = LoggerFactory.getLogger(AbstractGrammar.class);
+  private static final Logger LOG = LoggerFactory.getLogger(AbstractGrammar.class);
   /**
    * Indicates whether the rules in this grammar have been sorted based on the latest feature
    * function values.

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/decoder/ff/tm/CreateGlueGrammar.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/ff/tm/CreateGlueGrammar.java b/src/main/java/org/apache/joshua/decoder/ff/tm/CreateGlueGrammar.java
index bbb1e57..ce1e7d1 100644
--- a/src/main/java/org/apache/joshua/decoder/ff/tm/CreateGlueGrammar.java
+++ b/src/main/java/org/apache/joshua/decoder/ff/tm/CreateGlueGrammar.java
@@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory;
 public class CreateGlueGrammar {
 
 
-  public static final Logger LOG = LoggerFactory.getLogger(CreateGlueGrammar.class);
+  private static final Logger LOG = LoggerFactory.getLogger(CreateGlueGrammar.class);
 
   private final Set<String> nonTerminalSymbols = new HashSet<>();
 

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/decoder/ff/tm/GrammarReader.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/ff/tm/GrammarReader.java b/src/main/java/org/apache/joshua/decoder/ff/tm/GrammarReader.java
index 77ee48e..43ca3c9 100644
--- a/src/main/java/org/apache/joshua/decoder/ff/tm/GrammarReader.java
+++ b/src/main/java/org/apache/joshua/decoder/ff/tm/GrammarReader.java
@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
  */
 public abstract class GrammarReader<R extends Rule> implements Iterable<R>, Iterator<R> {
 
-  public static final Logger LOG = LoggerFactory.getLogger(GrammarReader.class);
+  private static final Logger LOG = LoggerFactory.getLogger(GrammarReader.class);
 
   protected static String fieldDelimiter;
   protected static String nonTerminalRegEx;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/decoder/ff/tm/MonolingualRule.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/ff/tm/MonolingualRule.java b/src/main/java/org/apache/joshua/decoder/ff/tm/MonolingualRule.java
index 56bb01d..6c08019 100644
--- a/src/main/java/org/apache/joshua/decoder/ff/tm/MonolingualRule.java
+++ b/src/main/java/org/apache/joshua/decoder/ff/tm/MonolingualRule.java
@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
  */ 
 public class MonolingualRule extends Rule { 
 
-  public static final Logger LOG = LoggerFactory.getLogger(MonolingualRule.class);
+  private static final Logger LOG = LoggerFactory.getLogger(MonolingualRule.class);
 
   //=============================================================== 
   // Instance Fields 

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/decoder/ff/tm/format/SamtFormatReader.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/ff/tm/format/SamtFormatReader.java b/src/main/java/org/apache/joshua/decoder/ff/tm/format/SamtFormatReader.java
index c69d5d1..c265728 100644
--- a/src/main/java/org/apache/joshua/decoder/ff/tm/format/SamtFormatReader.java
+++ b/src/main/java/org/apache/joshua/decoder/ff/tm/format/SamtFormatReader.java
@@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory;
 
 public class SamtFormatReader extends GrammarReader<Rule> {
 
-  public static final Logger LOG = LoggerFactory.getLogger(SamtFormatReader.class);
+  private static final Logger LOG = LoggerFactory.getLogger(SamtFormatReader.class);
   private static final String samtNonTerminalMarkup;
 
   static {

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/decoder/ff/tm/hash_based/MemoryBasedBatchGrammar.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/ff/tm/hash_based/MemoryBasedBatchGrammar.java b/src/main/java/org/apache/joshua/decoder/ff/tm/hash_based/MemoryBasedBatchGrammar.java
index d159320..476e0d6 100644
--- a/src/main/java/org/apache/joshua/decoder/ff/tm/hash_based/MemoryBasedBatchGrammar.java
+++ b/src/main/java/org/apache/joshua/decoder/ff/tm/hash_based/MemoryBasedBatchGrammar.java
@@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory;
  */
 public class MemoryBasedBatchGrammar extends AbstractGrammar {
 
-  public static final Logger LOG = LoggerFactory.getLogger(MemoryBasedBatchGrammar.class);
+  private static final Logger LOG = LoggerFactory.getLogger(MemoryBasedBatchGrammar.class);
 
   // ===============================================================
   // Instance Fields

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/decoder/ff/tm/packed/PackedGrammar.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/ff/tm/packed/PackedGrammar.java b/src/main/java/org/apache/joshua/decoder/ff/tm/packed/PackedGrammar.java
index 22e5310..4a1dc70 100644
--- a/src/main/java/org/apache/joshua/decoder/ff/tm/packed/PackedGrammar.java
+++ b/src/main/java/org/apache/joshua/decoder/ff/tm/packed/PackedGrammar.java
@@ -104,7 +104,7 @@ import org.slf4j.LoggerFactory;
 
 public class PackedGrammar extends AbstractGrammar {
 
-  public static final Logger LOG = LoggerFactory.getLogger(PackedGrammar.class);
+  private static final Logger LOG = LoggerFactory.getLogger(PackedGrammar.class);
   public static final String VOCABULARY_FILENAME = "vocabulary";
 
   private EncoderConfiguration encoding;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/decoder/hypergraph/HyperGraph.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/hypergraph/HyperGraph.java b/src/main/java/org/apache/joshua/decoder/hypergraph/HyperGraph.java
index 850a8bb..5cf6bf8 100644
--- a/src/main/java/org/apache/joshua/decoder/hypergraph/HyperGraph.java
+++ b/src/main/java/org/apache/joshua/decoder/hypergraph/HyperGraph.java
@@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory;
  */
 public class HyperGraph {
 
-  public static final Logger LOG = LoggerFactory.getLogger(HyperGraph.class);
+  private static final Logger LOG = LoggerFactory.getLogger(HyperGraph.class);
 
   // pointer to goal HGNode
   public HGNode goalNode = null;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/decoder/phrase/PhraseChart.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/phrase/PhraseChart.java b/src/main/java/org/apache/joshua/decoder/phrase/PhraseChart.java
index 90a3cf6..35970b7 100644
--- a/src/main/java/org/apache/joshua/decoder/phrase/PhraseChart.java
+++ b/src/main/java/org/apache/joshua/decoder/phrase/PhraseChart.java
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
  */
 public class PhraseChart {
 
-  public static final Logger LOG = LoggerFactory.getLogger(PhraseChart.class);
+  private static final Logger LOG = LoggerFactory.getLogger(PhraseChart.class);
 
   private int sentence_length;
   private int max_source_phrase_length;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/decoder/phrase/Stacks.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/phrase/Stacks.java b/src/main/java/org/apache/joshua/decoder/phrase/Stacks.java
index c4665ba..ed3ff7c 100644
--- a/src/main/java/org/apache/joshua/decoder/phrase/Stacks.java
+++ b/src/main/java/org/apache/joshua/decoder/phrase/Stacks.java
@@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory;
 
 public class Stacks {
 
-  public static final Logger LOG = LoggerFactory.getLogger(Stacks.class);
+  private static final Logger LOG = LoggerFactory.getLogger(Stacks.class);
 
   // The list of stacks, grouped according to number of source words covered
   private List<Stack> stacks;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/decoder/segment_file/Sentence.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/segment_file/Sentence.java b/src/main/java/org/apache/joshua/decoder/segment_file/Sentence.java
index 0c36092..8a5fccf 100644
--- a/src/main/java/org/apache/joshua/decoder/segment_file/Sentence.java
+++ b/src/main/java/org/apache/joshua/decoder/segment_file/Sentence.java
@@ -53,7 +53,7 @@ import org.slf4j.LoggerFactory;
 
 public class Sentence {
 
-  public static final Logger LOG = LoggerFactory.getLogger(Sentence.class);
+  private static final Logger LOG = LoggerFactory.getLogger(Sentence.class);
 
   /* The sentence number. */
   public int id = -1;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/decoder/segment_file/Token.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/segment_file/Token.java b/src/main/java/org/apache/joshua/decoder/segment_file/Token.java
index 58a8696..8edbdaa 100644
--- a/src/main/java/org/apache/joshua/decoder/segment_file/Token.java
+++ b/src/main/java/org/apache/joshua/decoder/segment_file/Token.java
@@ -39,7 +39,7 @@ import org.slf4j.LoggerFactory;
  */
 public class Token {
 
-  public static final Logger LOG = LoggerFactory.getLogger(Token.class);
+  private static final Logger LOG = LoggerFactory.getLogger(Token.class);
 
   // The token without the annotations
   private String token; 

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/lattice/Lattice.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/lattice/Lattice.java b/src/main/java/org/apache/joshua/lattice/Lattice.java
index 18aecbb..18f285e 100644
--- a/src/main/java/org/apache/joshua/lattice/Lattice.java
+++ b/src/main/java/org/apache/joshua/lattice/Lattice.java
@@ -46,7 +46,7 @@ import org.slf4j.LoggerFactory;
  */
 public class Lattice<Value> implements Iterable<Node<Value>> {
 
-  public static final Logger LOG = LoggerFactory.getLogger(Lattice.class);
+  private static final Logger LOG = LoggerFactory.getLogger(Lattice.class);
 
   /**
    * True if there is more than one path through the lattice.

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/metrics/BLEU.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/metrics/BLEU.java b/src/main/java/org/apache/joshua/metrics/BLEU.java
index 2a039c1..e6bf04b 100644
--- a/src/main/java/org/apache/joshua/metrics/BLEU.java
+++ b/src/main/java/org/apache/joshua/metrics/BLEU.java
@@ -27,7 +27,7 @@ import java.util.Map;
 
 public class BLEU extends EvaluationMetric {
 
-  public static final Logger LOG = LoggerFactory.getLogger(BLEU.class);
+  private static final Logger LOG = LoggerFactory.getLogger(BLEU.class);
 
   // The maximum n-gram we care about
   private int maxGramLength;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/metrics/GradeLevelBLEU.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/metrics/GradeLevelBLEU.java b/src/main/java/org/apache/joshua/metrics/GradeLevelBLEU.java
index aaa14b2..e143572 100644
--- a/src/main/java/org/apache/joshua/metrics/GradeLevelBLEU.java
+++ b/src/main/java/org/apache/joshua/metrics/GradeLevelBLEU.java
@@ -30,7 +30,7 @@ import java.util.regex.Pattern;
 
 public class GradeLevelBLEU extends BLEU {
 
-  public static final Logger LOG = LoggerFactory.getLogger(GradeLevelBLEU.class);
+  private static final Logger LOG = LoggerFactory.getLogger(GradeLevelBLEU.class);
 
   // syllable pattern matches /C*V+/
   private static final Pattern syllable = Pattern.compile("([^aeiouy]*[aeiouy]+)");

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/metrics/MinimumChangeBLEU.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/metrics/MinimumChangeBLEU.java b/src/main/java/org/apache/joshua/metrics/MinimumChangeBLEU.java
index 72b1a31..6d19ba5 100644
--- a/src/main/java/org/apache/joshua/metrics/MinimumChangeBLEU.java
+++ b/src/main/java/org/apache/joshua/metrics/MinimumChangeBLEU.java
@@ -27,7 +27,7 @@ import org.slf4j.LoggerFactory;
 
 public class MinimumChangeBLEU extends BLEU {
 
-  public static final Logger LOG = LoggerFactory.getLogger(MinimumChangeBLEU.class);
+  private static final Logger LOG = LoggerFactory.getLogger(MinimumChangeBLEU.class);
 
   // we assume that the source for the paraphrasing run is
   // part of the set of references

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/metrics/Precis.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/metrics/Precis.java b/src/main/java/org/apache/joshua/metrics/Precis.java
index 94566ea..b2d852b 100644
--- a/src/main/java/org/apache/joshua/metrics/Precis.java
+++ b/src/main/java/org/apache/joshua/metrics/Precis.java
@@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory;
 // The metric re-uses most of the BLEU code
 public class Precis extends BLEU {
   
-  public static final Logger LOG = LoggerFactory.getLogger(Precis.class);
+  private static final Logger LOG = LoggerFactory.getLogger(Precis.class);
 
   private static final double REF_CR = -1.0;
 

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/server/TcpServer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/server/TcpServer.java b/src/main/java/org/apache/joshua/server/TcpServer.java
index 6e96791..f190f6c 100644
--- a/src/main/java/org/apache/joshua/server/TcpServer.java
+++ b/src/main/java/org/apache/joshua/server/TcpServer.java
@@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory;
  * all, and writes the resulting translations back out to the socket.
  */
 public class TcpServer {
-  public static final Logger LOG = LoggerFactory.getLogger(TcpServer.class);
+  private static final Logger LOG = LoggerFactory.getLogger(TcpServer.class);
   private final JoshuaConfiguration joshuaConfiguration;
   private Decoder decoder;
   private int port;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/tools/GrammarPacker.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/tools/GrammarPacker.java b/src/main/java/org/apache/joshua/tools/GrammarPacker.java
index 4669156..d80f467 100644
--- a/src/main/java/org/apache/joshua/tools/GrammarPacker.java
+++ b/src/main/java/org/apache/joshua/tools/GrammarPacker.java
@@ -46,7 +46,7 @@ import org.slf4j.LoggerFactory;
 
 public class GrammarPacker {
 
-  public static final Logger LOG = LoggerFactory.getLogger(GrammarPacker.class);
+  private static final Logger LOG = LoggerFactory.getLogger(GrammarPacker.class);
 
   // Size limit for slice in bytes.
   private static int DATA_SIZE_LIMIT = (int) (Integer.MAX_VALUE * 0.8);

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/tools/GrammarPackerCli.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/tools/GrammarPackerCli.java b/src/main/java/org/apache/joshua/tools/GrammarPackerCli.java
index 7c16829..c257b64 100644
--- a/src/main/java/org/apache/joshua/tools/GrammarPackerCli.java
+++ b/src/main/java/org/apache/joshua/tools/GrammarPackerCli.java
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
 
 public class GrammarPackerCli {
   
-  public static final Logger LOG = LoggerFactory.getLogger(GrammarPackerCli.class);
+  private static final Logger LOG = LoggerFactory.getLogger(GrammarPackerCli.class);
   
   // Input grammars to be packed (with a joint vocabulary)
   @Option(name = "--grammars", aliases = {"-g", "-i"}, handler = StringArrayOptionHandler.class, required = true, usage = "list of grammars to pack (jointly, i.e. they share the same vocabulary)")

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/tools/LabelPhrases.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/tools/LabelPhrases.java b/src/main/java/org/apache/joshua/tools/LabelPhrases.java
index b4b742e..69578f1 100644
--- a/src/main/java/org/apache/joshua/tools/LabelPhrases.java
+++ b/src/main/java/org/apache/joshua/tools/LabelPhrases.java
@@ -33,7 +33,7 @@ import org.slf4j.LoggerFactory;
  */
 public class LabelPhrases {
 
-  public static final Logger LOG = LoggerFactory.getLogger(LabelPhrases.class);
+  private static final Logger LOG = LoggerFactory.getLogger(LabelPhrases.class);
 
   /**
    * Main method.

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/util/Cache.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/Cache.java b/src/main/java/org/apache/joshua/util/Cache.java
index 56e835b..02ff07b 100644
--- a/src/main/java/org/apache/joshua/util/Cache.java
+++ b/src/main/java/org/apache/joshua/util/Cache.java
@@ -42,7 +42,7 @@ public class Cache<K, V> extends LinkedHashMap<K, V> {
   private static final long serialVersionUID = 6073387072740892061L;
 
   /** Logger for this class. */
-  public static final Logger LOG = LoggerFactory.getLogger(Cache.class);
+  private static final Logger LOG = LoggerFactory.getLogger(Cache.class);
   // ===============================================================
   // Constants
   // ===============================================================

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/util/CompareGrammars.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/CompareGrammars.java b/src/main/java/org/apache/joshua/util/CompareGrammars.java
index 19b0c82..2593ca1 100644
--- a/src/main/java/org/apache/joshua/util/CompareGrammars.java
+++ b/src/main/java/org/apache/joshua/util/CompareGrammars.java
@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
  */
 public class CompareGrammars {
 
-  public static final Logger LOG = LoggerFactory.getLogger(CompareGrammars.class);
+  private static final Logger LOG = LoggerFactory.getLogger(CompareGrammars.class);
 
   /**
    * Gets a set containing all unique instances of the specified field.

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/main/java/org/apache/joshua/util/encoding/FeatureTypeAnalyzer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/encoding/FeatureTypeAnalyzer.java b/src/main/java/org/apache/joshua/util/encoding/FeatureTypeAnalyzer.java
index 68622b9..715a9d9 100644
--- a/src/main/java/org/apache/joshua/util/encoding/FeatureTypeAnalyzer.java
+++ b/src/main/java/org/apache/joshua/util/encoding/FeatureTypeAnalyzer.java
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
 
 public class FeatureTypeAnalyzer {
 
-  public static final Logger LOG = LoggerFactory.getLogger(FeatureTypeAnalyzer.class);
+  private static final Logger LOG = LoggerFactory.getLogger(FeatureTypeAnalyzer.class);
 
   private ArrayList<FeatureType> types;
 

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/4d04cc2c/src/test/java/org/apache/joshua/packed/Benchmark.java
----------------------------------------------------------------------
diff --git a/src/test/java/org/apache/joshua/packed/Benchmark.java b/src/test/java/org/apache/joshua/packed/Benchmark.java
index 5fef146..41cf2a0 100644
--- a/src/test/java/org/apache/joshua/packed/Benchmark.java
+++ b/src/test/java/org/apache/joshua/packed/Benchmark.java
@@ -40,7 +40,7 @@ import java.util.Random;
 public class Benchmark {
 
   
-  public static final Logger LOG = LoggerFactory.getLogger(Benchmark.class);
+  private static final Logger LOG = LoggerFactory.getLogger(Benchmark.class);
 
   private IntBuffer intBuffer;
   private MappedByteBuffer byteBuffer;