lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnas...@apache.org
Subject [7/7] git commit: Cleanup of codes, mostly SimpleText in this commit
Date Sun, 21 Sep 2014 16:53:33 GMT
Cleanup of codes, mostly SimpleText in this commit


Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/cf1df6be
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/cf1df6be
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/cf1df6be

Branch: refs/heads/master
Commit: cf1df6becb10be6b3958b4092483357ac18be288
Parents: 68c7f0c
Author: Prescott Nasser <pnasser@apache.org>
Authored: Sun Sep 21 09:47:02 2014 -0700
Committer: Prescott Nasser <pnasser@apache.org>
Committed: Sun Sep 21 09:47:02 2014 -0700

----------------------------------------------------------------------
 .../Intblock/FixedIntBlockIndexOutput.cs        |    8 +-
 .../Intblock/VariableIntBlockIndexInput.cs      |    8 +-
 .../Intblock/VariableIntBlockIndexOutput.cs     |    8 +-
 src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj  |    1 +
 .../Memory/DirectDocValuesConsumer.cs           |   28 +-
 .../Memory/DirectDocValuesFormat.cs             |   16 +-
 .../Memory/DirectDocValuesProducer.cs           |   40 +-
 .../Memory/DirectPostingsFormat.cs              |   50 +-
 .../Memory/FSTOrdPostingsFormat.cs              |   24 +-
 .../Memory/FSTOrdPulsing41PostingsFormat.cs     |   32 +-
 .../Memory/FSTOrdTermsReader.cs                 |   68 +-
 .../Memory/FSTOrdTermsWriter.cs                 |   48 +-
 .../Memory/FSTPostingsFormat.cs                 |   24 +-
 .../Memory/FSTPulsing41PostingsFormat.cs        |   32 +-
 src/Lucene.Net.Codecs/Memory/FSTTermOutputs.cs  |   14 +-
 src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs  |   62 +-
 src/Lucene.Net.Codecs/Memory/FSTTermsWriter.cs  |   46 +-
 .../Memory/MemoryDocValuesConsumer.cs           |   62 +-
 .../Memory/MemoryDocValuesFormat.cs             |   14 +-
 .../Memory/MemoryDocValuesProducer.cs           |   72 +-
 .../Memory/MemoryPostingsFormat.cs              |   72 +-
 src/Lucene.Net.Codecs/Sep/IntIndexInput.cs      |    4 +-
 src/Lucene.Net.Codecs/Sep/IntIndexOutput.cs     |    4 +-
 src/Lucene.Net.Codecs/Sep/IntStreamFactory.cs   |    6 +-
 src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs  |   42 +-
 src/Lucene.Net.Codecs/Sep/SepPostingsWriter.cs  |   30 +-
 src/Lucene.Net.Codecs/Sep/SepSkipListReader.cs  |    8 +-
 src/Lucene.Net.Codecs/Sep/SepSkipListWriter.cs  |    8 +-
 .../SimpleText/SimpleTextCodec.cs               |  131 +-
 .../SimpleText/SimpleTextDocValuesFormat.cs     |  235 +--
 .../SimpleText/SimpleTextDocValuesReader.cs     | 1257 +++++++++------
 .../SimpleText/SimpleTextDocValuesWriter.cs     |  896 ++++++-----
 .../SimpleText/SimpleTextFieldInfosFormat.cs    |   50 +-
 .../SimpleText/SimpleTextFieldInfosReader.cs    |  347 +++--
 .../SimpleText/SimpleTextFieldInfosWriter.cs    |  320 ++--
 .../SimpleText/SimpleTextFieldsReader.cs        | 1435 ++++++++++--------
 .../SimpleText/SimpleTextFieldsWriter.cs        |  367 ++---
 .../SimpleText/SimpleTextLiveDocsFormat.cs      |  397 ++---
 .../SimpleText/SimpleTextNormsFormat.cs         |  120 +-
 .../SimpleText/SimpleTextPostingsFormat.cs      |   90 +-
 .../SimpleText/SimpleTextSegmentInfoFormat.cs   |   54 +-
 .../SimpleText/SimpleTextSegmentInfoReader.cs   |  225 +--
 .../SimpleText/SimpleTextSegmentInfoWriter.cs   |  261 ++--
 .../SimpleText/SimpleTextStoredFieldsFormat.cs  |   54 +-
 .../SimpleText/SimpleTextStoredFieldsReader.cs  |  485 +++---
 .../SimpleText/SimpleTextStoredFieldsWriter.cs  |  403 ++---
 .../SimpleText/SimpleTextTermVectorsFormat.cs   |   55 +-
 .../SimpleText/SimpleTextTermVectorsReader.cs   | 1101 +++++++-------
 .../SimpleText/SimpleTextTermVectorsWriter.cs   |  411 ++---
 .../SimpleText/SimpleTextUtil.cs                |   58 +-
 src/Lucene.Net.Codecs/StringHelperClass.cs      |  119 ++
 src/Lucene.Net.Core/Search/MultiTermQuery.cs    |    2 +-
 src/Lucene.Net.Core/Store/Directory.cs          |   10 +-
 53 files changed, 5338 insertions(+), 4376 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf1df6be/src/Lucene.Net.Codecs/Intblock/FixedIntBlockIndexOutput.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Intblock/FixedIntBlockIndexOutput.cs b/src/Lucene.Net.Codecs/Intblock/FixedIntBlockIndexOutput.cs
index a83fd38..db74098 100644
--- a/src/Lucene.Net.Codecs/Intblock/FixedIntBlockIndexOutput.cs
+++ b/src/Lucene.Net.Codecs/Intblock/FixedIntBlockIndexOutput.cs
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.intblock;
+package codecs.intblock;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -23,9 +23,9 @@ package org.apache.lucene.codecs.intblock;
 
 import java.io.IOException;
 
-import org.apache.lucene.codecs.sep.IntIndexOutput;
-import org.apache.lucene.store.DataOutput;
-import org.apache.lucene.store.IndexOutput;
+import codecs.sep.IntIndexOutput;
+import store.DataOutput;
+import store.IndexOutput;
 
 /** Abstract base class that writes fixed-size blocks of ints
  *  to an IndexOutput.  While this is a simple approach, a

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf1df6be/src/Lucene.Net.Codecs/Intblock/VariableIntBlockIndexInput.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Intblock/VariableIntBlockIndexInput.cs b/src/Lucene.Net.Codecs/Intblock/VariableIntBlockIndexInput.cs
index 85c711a..1ce9712 100644
--- a/src/Lucene.Net.Codecs/Intblock/VariableIntBlockIndexInput.cs
+++ b/src/Lucene.Net.Codecs/Intblock/VariableIntBlockIndexInput.cs
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.intblock;
+package codecs.intblock;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -23,9 +23,9 @@ package org.apache.lucene.codecs.intblock;
 
 import java.io.IOException;
 
-import org.apache.lucene.codecs.sep.IntIndexInput;
-import org.apache.lucene.store.DataInput;
-import org.apache.lucene.store.IndexInput;
+import codecs.sep.IntIndexInput;
+import store.DataInput;
+import store.IndexInput;
 
 // TODO: much of this can be shared code w/ the fixed case
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf1df6be/src/Lucene.Net.Codecs/Intblock/VariableIntBlockIndexOutput.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Intblock/VariableIntBlockIndexOutput.cs b/src/Lucene.Net.Codecs/Intblock/VariableIntBlockIndexOutput.cs
index 574b7f4..b76f69e 100644
--- a/src/Lucene.Net.Codecs/Intblock/VariableIntBlockIndexOutput.cs
+++ b/src/Lucene.Net.Codecs/Intblock/VariableIntBlockIndexOutput.cs
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.intblock;
+package codecs.intblock;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -23,9 +23,9 @@ package org.apache.lucene.codecs.intblock;
 
 import java.io.IOException;
 
-import org.apache.lucene.codecs.sep.IntIndexOutput;
-import org.apache.lucene.store.DataOutput;
-import org.apache.lucene.store.IndexOutput;
+import codecs.sep.IntIndexOutput;
+import store.DataOutput;
+import store.IndexOutput;
 
 // TODO: much of this can be shared code w/ the fixed case
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf1df6be/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj b/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj
index 06e1908..31340ae 100644
--- a/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj
+++ b/src/Lucene.Net.Codecs/Lucene.Net.Codecs.csproj
@@ -118,6 +118,7 @@
     <Compile Include="SimpleText\SimpleTextTermVectorsReader.cs" />
     <Compile Include="SimpleText\SimpleTextTermVectorsWriter.cs" />
     <Compile Include="SimpleText\SimpleTextUtil.cs" />
+    <Compile Include="StringHelperClass.cs" />
   </ItemGroup>
   <ItemGroup />
   <ItemGroup>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf1df6be/src/Lucene.Net.Codecs/Memory/DirectDocValuesConsumer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/DirectDocValuesConsumer.cs b/src/Lucene.Net.Codecs/Memory/DirectDocValuesConsumer.cs
index 2e7e013..ddddf6f 100644
--- a/src/Lucene.Net.Codecs/Memory/DirectDocValuesConsumer.cs
+++ b/src/Lucene.Net.Codecs/Memory/DirectDocValuesConsumer.cs
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.memory;
+package codecs.memory;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,20 +20,20 @@ package org.apache.lucene.codecs.memory;
 import java.io.IOException;
 import java.util.Iterator;
 
-import org.apache.lucene.codecs.CodecUtil;
-import org.apache.lucene.codecs.DocValuesConsumer;
-import org.apache.lucene.index.FieldInfo;
-import org.apache.lucene.index.IndexFileNames;
-import org.apache.lucene.index.SegmentWriteState;
-import org.apache.lucene.store.IndexOutput;
-import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.IOUtils;
+import codecs.CodecUtil;
+import codecs.DocValuesConsumer;
+import index.FieldInfo;
+import index.IndexFileNames;
+import index.SegmentWriteState;
+import store.IndexOutput;
+import util.BytesRef;
+import util.IOUtils;
 
-import static org.apache.lucene.codecs.memory.DirectDocValuesProducer.VERSION_CURRENT;
-import static org.apache.lucene.codecs.memory.DirectDocValuesProducer.BYTES;
-import static org.apache.lucene.codecs.memory.DirectDocValuesProducer.SORTED;
-import static org.apache.lucene.codecs.memory.DirectDocValuesProducer.SORTED_SET;
-import static org.apache.lucene.codecs.memory.DirectDocValuesProducer.NUMBER;
+import static codecs.memory.DirectDocValuesProducer.VERSION_CURRENT;
+import static codecs.memory.DirectDocValuesProducer.BYTES;
+import static codecs.memory.DirectDocValuesProducer.SORTED;
+import static codecs.memory.DirectDocValuesProducer.SORTED_SET;
+import static codecs.memory.DirectDocValuesProducer.NUMBER;
 
 /**
  * Writer for {@link DirectDocValuesFormat}

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf1df6be/src/Lucene.Net.Codecs/Memory/DirectDocValuesFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/DirectDocValuesFormat.cs b/src/Lucene.Net.Codecs/Memory/DirectDocValuesFormat.cs
index 1f89e43..fb98c99 100644
--- a/src/Lucene.Net.Codecs/Memory/DirectDocValuesFormat.cs
+++ b/src/Lucene.Net.Codecs/Memory/DirectDocValuesFormat.cs
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.memory;
+package codecs.memory;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -19,13 +19,13 @@ package org.apache.lucene.codecs.memory;
 
 import java.io.IOException;
 
-import org.apache.lucene.codecs.DocValuesConsumer;
-import org.apache.lucene.codecs.DocValuesFormat;
-import org.apache.lucene.codecs.DocValuesProducer;
-import org.apache.lucene.document.SortedSetDocValuesField; // javadocs
-import org.apache.lucene.index.SegmentReadState;
-import org.apache.lucene.index.SegmentWriteState;
-import org.apache.lucene.util.ArrayUtil;
+import codecs.DocValuesConsumer;
+import codecs.DocValuesFormat;
+import codecs.DocValuesProducer;
+import document.SortedSetDocValuesField; // javadocs
+import index.SegmentReadState;
+import index.SegmentWriteState;
+import util.ArrayUtil;
 
 /** In-memory docvalues format that does no (or very little)
  *  compression.  Indexed values are stored on disk, but

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf1df6be/src/Lucene.Net.Codecs/Memory/DirectDocValuesProducer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/DirectDocValuesProducer.cs b/src/Lucene.Net.Codecs/Memory/DirectDocValuesProducer.cs
index a95f384..6d63d5b 100644
--- a/src/Lucene.Net.Codecs/Memory/DirectDocValuesProducer.cs
+++ b/src/Lucene.Net.Codecs/Memory/DirectDocValuesProducer.cs
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.memory;
+package codecs.memory;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -22,25 +22,25 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.lucene.codecs.CodecUtil;
-import org.apache.lucene.codecs.DocValuesProducer;
-import org.apache.lucene.index.BinaryDocValues;
-import org.apache.lucene.index.CorruptIndexException;
-import org.apache.lucene.index.DocValues;
-import org.apache.lucene.index.FieldInfo;
-import org.apache.lucene.index.IndexFileNames;
-import org.apache.lucene.index.NumericDocValues;
-import org.apache.lucene.index.RandomAccessOrds;
-import org.apache.lucene.index.SegmentReadState;
-import org.apache.lucene.index.SortedDocValues;
-import org.apache.lucene.index.SortedSetDocValues;
-import org.apache.lucene.store.ChecksumIndexInput;
-import org.apache.lucene.store.IndexInput;
-import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.FixedBitSet;
-import org.apache.lucene.util.IOUtils;
-import org.apache.lucene.util.RamUsageEstimator;
+import codecs.CodecUtil;
+import codecs.DocValuesProducer;
+import index.BinaryDocValues;
+import index.CorruptIndexException;
+import index.DocValues;
+import index.FieldInfo;
+import index.IndexFileNames;
+import index.NumericDocValues;
+import index.RandomAccessOrds;
+import index.SegmentReadState;
+import index.SortedDocValues;
+import index.SortedSetDocValues;
+import store.ChecksumIndexInput;
+import store.IndexInput;
+import util.Bits;
+import util.BytesRef;
+import util.FixedBitSet;
+import util.IOUtils;
+import util.RamUsageEstimator;
 
 /**
  * Reader for {@link DirectDocValuesFormat}

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf1df6be/src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs b/src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs
index 5d90e98..c28a147 100644
--- a/src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs
+++ b/src/Lucene.Net.Codecs/Memory/DirectPostingsFormat.cs
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.memory;
+package codecs.memory;
 
 /**
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -24,30 +24,30 @@ import java.util.Iterator;
 import java.util.Map;
 import java.util.TreeMap;
 
-import org.apache.lucene.codecs.FieldsConsumer;
-import org.apache.lucene.codecs.FieldsProducer;
-import org.apache.lucene.codecs.PostingsFormat;
-import org.apache.lucene.codecs.lucene41.Lucene41PostingsFormat; // javadocs
-import org.apache.lucene.index.DocsAndPositionsEnum;
-import org.apache.lucene.index.DocsEnum;
-import org.apache.lucene.index.FieldInfo.IndexOptions;
-import org.apache.lucene.index.FieldInfo;
-import org.apache.lucene.index.Fields;
-import org.apache.lucene.index.OrdTermState;
-import org.apache.lucene.index.SegmentReadState;
-import org.apache.lucene.index.SegmentWriteState;
-import org.apache.lucene.index.TermState;
-import org.apache.lucene.index.Terms;
-import org.apache.lucene.index.TermsEnum;
-import org.apache.lucene.store.IOContext;
-import org.apache.lucene.store.RAMOutputStream;
-import org.apache.lucene.util.ArrayUtil;
-import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.RamUsageEstimator;
-import org.apache.lucene.util.automaton.CompiledAutomaton;
-import org.apache.lucene.util.automaton.RunAutomaton;
-import org.apache.lucene.util.automaton.Transition;
+import codecs.FieldsConsumer;
+import codecs.FieldsProducer;
+import codecs.PostingsFormat;
+import codecs.lucene41.Lucene41PostingsFormat; // javadocs
+import index.DocsAndPositionsEnum;
+import index.DocsEnum;
+import index.FieldInfo.IndexOptions;
+import index.FieldInfo;
+import index.Fields;
+import index.OrdTermState;
+import index.SegmentReadState;
+import index.SegmentWriteState;
+import index.TermState;
+import index.Terms;
+import index.TermsEnum;
+import store.IOContext;
+import store.RAMOutputStream;
+import util.ArrayUtil;
+import util.Bits;
+import util.BytesRef;
+import util.RamUsageEstimator;
+import util.automaton.CompiledAutomaton;
+import util.automaton.RunAutomaton;
+import util.automaton.Transition;
 
 // TODO: 
 //   - build depth-N prefix hash?

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf1df6be/src/Lucene.Net.Codecs/Memory/FSTOrdPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/FSTOrdPostingsFormat.cs b/src/Lucene.Net.Codecs/Memory/FSTOrdPostingsFormat.cs
index d8be831..0545afc 100644
--- a/src/Lucene.Net.Codecs/Memory/FSTOrdPostingsFormat.cs
+++ b/src/Lucene.Net.Codecs/Memory/FSTOrdPostingsFormat.cs
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.memory;
+package codecs.memory;
 
 
 /*
@@ -20,17 +20,17 @@ package org.apache.lucene.codecs.memory;
 
 import java.io.IOException;
 
-import org.apache.lucene.codecs.FieldsConsumer;
-import org.apache.lucene.codecs.FieldsProducer;
-import org.apache.lucene.codecs.PostingsFormat;
-import org.apache.lucene.codecs.PostingsReaderBase;
-import org.apache.lucene.codecs.PostingsWriterBase;
-import org.apache.lucene.codecs.lucene41.Lucene41PostingsWriter;
-import org.apache.lucene.codecs.lucene41.Lucene41PostingsReader;
-import org.apache.lucene.index.FieldInfo.IndexOptions;
-import org.apache.lucene.index.SegmentReadState;
-import org.apache.lucene.index.SegmentWriteState;
-import org.apache.lucene.util.IOUtils;
+import codecs.FieldsConsumer;
+import codecs.FieldsProducer;
+import codecs.PostingsFormat;
+import codecs.PostingsReaderBase;
+import codecs.PostingsWriterBase;
+import codecs.lucene41.Lucene41PostingsWriter;
+import codecs.lucene41.Lucene41PostingsReader;
+import index.FieldInfo.IndexOptions;
+import index.SegmentReadState;
+import index.SegmentWriteState;
+import util.IOUtils;
 
 /** 
  * FSTOrd term dict + Lucene41PBF

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf1df6be/src/Lucene.Net.Codecs/Memory/FSTOrdPulsing41PostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/FSTOrdPulsing41PostingsFormat.cs b/src/Lucene.Net.Codecs/Memory/FSTOrdPulsing41PostingsFormat.cs
index 257d2eb..acb5645 100644
--- a/src/Lucene.Net.Codecs/Memory/FSTOrdPulsing41PostingsFormat.cs
+++ b/src/Lucene.Net.Codecs/Memory/FSTOrdPulsing41PostingsFormat.cs
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.memory;
+package codecs.memory;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -19,21 +19,21 @@ package org.apache.lucene.codecs.memory;
 
 import java.io.IOException;
 
-import org.apache.lucene.codecs.FieldsConsumer;
-import org.apache.lucene.codecs.FieldsProducer;
-import org.apache.lucene.codecs.PostingsBaseFormat;
-import org.apache.lucene.codecs.PostingsFormat;
-import org.apache.lucene.codecs.PostingsReaderBase;
-import org.apache.lucene.codecs.PostingsWriterBase;
-import org.apache.lucene.codecs.lucene41.Lucene41PostingsWriter;
-import org.apache.lucene.codecs.lucene41.Lucene41PostingsReader;
-import org.apache.lucene.codecs.lucene41.Lucene41PostingsBaseFormat;
-import org.apache.lucene.codecs.lucene41.Lucene41PostingsFormat;
-import org.apache.lucene.codecs.pulsing.PulsingPostingsWriter;
-import org.apache.lucene.codecs.pulsing.PulsingPostingsReader;
-import org.apache.lucene.index.SegmentReadState;
-import org.apache.lucene.index.SegmentWriteState;
-import org.apache.lucene.util.IOUtils;
+import codecs.FieldsConsumer;
+import codecs.FieldsProducer;
+import codecs.PostingsBaseFormat;
+import codecs.PostingsFormat;
+import codecs.PostingsReaderBase;
+import codecs.PostingsWriterBase;
+import codecs.lucene41.Lucene41PostingsWriter;
+import codecs.lucene41.Lucene41PostingsReader;
+import codecs.lucene41.Lucene41PostingsBaseFormat;
+import codecs.lucene41.Lucene41PostingsFormat;
+import codecs.pulsing.PulsingPostingsWriter;
+import codecs.pulsing.PulsingPostingsReader;
+import index.SegmentReadState;
+import index.SegmentWriteState;
+import util.IOUtils;
 
 /** FSTOrd + Pulsing41
  *  @lucene.experimental */

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf1df6be/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs b/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs
index 67eaa6e..53d0d69 100644
--- a/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs
+++ b/src/Lucene.Net.Codecs/Memory/FSTOrdTermsReader.cs
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.memory;
+package codecs.memory;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -26,39 +26,39 @@ import java.util.Comparator;
 import java.util.Iterator;
 import java.util.TreeMap;
 
-import org.apache.lucene.codecs.BlockTermState;
-import org.apache.lucene.codecs.CodecUtil;
-import org.apache.lucene.codecs.FieldsProducer;
-import org.apache.lucene.codecs.PostingsReaderBase;
-import org.apache.lucene.codecs.memory.FSTTermsReader.TermsReader;
-import org.apache.lucene.index.CorruptIndexException;
-import org.apache.lucene.index.DocsAndPositionsEnum;
-import org.apache.lucene.index.DocsEnum;
-import org.apache.lucene.index.FieldInfo.IndexOptions;
-import org.apache.lucene.index.FieldInfo;
-import org.apache.lucene.index.FieldInfos;
-import org.apache.lucene.index.IndexFileNames;
-import org.apache.lucene.index.SegmentInfo;
-import org.apache.lucene.index.SegmentReadState;
-import org.apache.lucene.index.TermState;
-import org.apache.lucene.index.Terms;
-import org.apache.lucene.index.TermsEnum;
-import org.apache.lucene.store.ByteArrayDataInput;
-import org.apache.lucene.store.ChecksumIndexInput;
-import org.apache.lucene.store.IndexInput;
-import org.apache.lucene.util.ArrayUtil;
-import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.IOUtils;
-import org.apache.lucene.util.RamUsageEstimator;
-import org.apache.lucene.util.automaton.ByteRunAutomaton;
-import org.apache.lucene.util.automaton.CompiledAutomaton;
-import org.apache.lucene.util.fst.BytesRefFSTEnum.InputOutput;
-import org.apache.lucene.util.fst.BytesRefFSTEnum;
-import org.apache.lucene.util.fst.FST;
-import org.apache.lucene.util.fst.Outputs;
-import org.apache.lucene.util.fst.PositiveIntOutputs;
-import org.apache.lucene.util.fst.Util;
+import codecs.BlockTermState;
+import codecs.CodecUtil;
+import codecs.FieldsProducer;
+import codecs.PostingsReaderBase;
+import codecs.memory.FSTTermsReader.TermsReader;
+import index.CorruptIndexException;
+import index.DocsAndPositionsEnum;
+import index.DocsEnum;
+import index.FieldInfo.IndexOptions;
+import index.FieldInfo;
+import index.FieldInfos;
+import index.IndexFileNames;
+import index.SegmentInfo;
+import index.SegmentReadState;
+import index.TermState;
+import index.Terms;
+import index.TermsEnum;
+import store.ByteArrayDataInput;
+import store.ChecksumIndexInput;
+import store.IndexInput;
+import util.ArrayUtil;
+import util.Bits;
+import util.BytesRef;
+import util.IOUtils;
+import util.RamUsageEstimator;
+import util.automaton.ByteRunAutomaton;
+import util.automaton.CompiledAutomaton;
+import util.fst.BytesRefFSTEnum.InputOutput;
+import util.fst.BytesRefFSTEnum;
+import util.fst.FST;
+import util.fst.Outputs;
+import util.fst.PositiveIntOutputs;
+import util.fst.Util;
 
 /** 
  * FST-based terms dictionary reader.

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf1df6be/src/Lucene.Net.Codecs/Memory/FSTOrdTermsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/FSTOrdTermsWriter.cs b/src/Lucene.Net.Codecs/Memory/FSTOrdTermsWriter.cs
index 33997fd..76d0092 100644
--- a/src/Lucene.Net.Codecs/Memory/FSTOrdTermsWriter.cs
+++ b/src/Lucene.Net.Codecs/Memory/FSTOrdTermsWriter.cs
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.memory;
+package codecs.memory;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -22,29 +22,29 @@ import java.util.List;
 import java.util.ArrayList;
 import java.util.Comparator;
 
-import org.apache.lucene.index.FieldInfo.IndexOptions;
-import org.apache.lucene.index.FieldInfo;
-import org.apache.lucene.index.FieldInfos;
-import org.apache.lucene.index.IndexFileNames;
-import org.apache.lucene.index.SegmentWriteState;
-import org.apache.lucene.store.DataOutput;
-import org.apache.lucene.store.IndexOutput;
-import org.apache.lucene.store.RAMOutputStream;
-import org.apache.lucene.util.ArrayUtil;
-import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.IOUtils;
-import org.apache.lucene.util.IntsRef;
-import org.apache.lucene.util.fst.Builder;
-import org.apache.lucene.util.fst.FST;
-import org.apache.lucene.util.fst.PositiveIntOutputs;
-import org.apache.lucene.util.fst.Util;
-import org.apache.lucene.codecs.BlockTermState;
-import org.apache.lucene.codecs.PostingsWriterBase;
-import org.apache.lucene.codecs.PostingsConsumer;
-import org.apache.lucene.codecs.FieldsConsumer;
-import org.apache.lucene.codecs.TermsConsumer;
-import org.apache.lucene.codecs.TermStats;
-import org.apache.lucene.codecs.CodecUtil;
+import index.FieldInfo.IndexOptions;
+import index.FieldInfo;
+import index.FieldInfos;
+import index.IndexFileNames;
+import index.SegmentWriteState;
+import store.DataOutput;
+import store.IndexOutput;
+import store.RAMOutputStream;
+import util.ArrayUtil;
+import util.BytesRef;
+import util.IOUtils;
+import util.IntsRef;
+import util.fst.Builder;
+import util.fst.FST;
+import util.fst.PositiveIntOutputs;
+import util.fst.Util;
+import codecs.BlockTermState;
+import codecs.PostingsWriterBase;
+import codecs.PostingsConsumer;
+import codecs.FieldsConsumer;
+import codecs.TermsConsumer;
+import codecs.TermStats;
+import codecs.CodecUtil;
 
 /** 
  * FST-based term dict, using ord as FST output.

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf1df6be/src/Lucene.Net.Codecs/Memory/FSTPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/FSTPostingsFormat.cs b/src/Lucene.Net.Codecs/Memory/FSTPostingsFormat.cs
index 5a54abd..c5ea2f1 100644
--- a/src/Lucene.Net.Codecs/Memory/FSTPostingsFormat.cs
+++ b/src/Lucene.Net.Codecs/Memory/FSTPostingsFormat.cs
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.memory;
+package codecs.memory;
 
 
 /*
@@ -20,17 +20,17 @@ package org.apache.lucene.codecs.memory;
 
 import java.io.IOException;
 
-import org.apache.lucene.codecs.FieldsConsumer;
-import org.apache.lucene.codecs.FieldsProducer;
-import org.apache.lucene.codecs.PostingsFormat;
-import org.apache.lucene.codecs.PostingsReaderBase;
-import org.apache.lucene.codecs.PostingsWriterBase;
-import org.apache.lucene.codecs.lucene41.Lucene41PostingsWriter;
-import org.apache.lucene.codecs.lucene41.Lucene41PostingsReader;
-import org.apache.lucene.index.FieldInfo.IndexOptions;
-import org.apache.lucene.index.SegmentReadState;
-import org.apache.lucene.index.SegmentWriteState;
-import org.apache.lucene.util.IOUtils;
+import codecs.FieldsConsumer;
+import codecs.FieldsProducer;
+import codecs.PostingsFormat;
+import codecs.PostingsReaderBase;
+import codecs.PostingsWriterBase;
+import codecs.lucene41.Lucene41PostingsWriter;
+import codecs.lucene41.Lucene41PostingsReader;
+import index.FieldInfo.IndexOptions;
+import index.SegmentReadState;
+import index.SegmentWriteState;
+import util.IOUtils;
 
 /**
  * FST term dict + Lucene41PBF

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf1df6be/src/Lucene.Net.Codecs/Memory/FSTPulsing41PostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/FSTPulsing41PostingsFormat.cs b/src/Lucene.Net.Codecs/Memory/FSTPulsing41PostingsFormat.cs
index 74c4296..0db3cbd 100644
--- a/src/Lucene.Net.Codecs/Memory/FSTPulsing41PostingsFormat.cs
+++ b/src/Lucene.Net.Codecs/Memory/FSTPulsing41PostingsFormat.cs
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.memory;
+package codecs.memory;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -19,21 +19,21 @@ package org.apache.lucene.codecs.memory;
 
 import java.io.IOException;
 
-import org.apache.lucene.codecs.FieldsConsumer;
-import org.apache.lucene.codecs.FieldsProducer;
-import org.apache.lucene.codecs.PostingsBaseFormat;
-import org.apache.lucene.codecs.PostingsFormat;
-import org.apache.lucene.codecs.PostingsReaderBase;
-import org.apache.lucene.codecs.PostingsWriterBase;
-import org.apache.lucene.codecs.lucene41.Lucene41PostingsWriter;
-import org.apache.lucene.codecs.lucene41.Lucene41PostingsReader;
-import org.apache.lucene.codecs.lucene41.Lucene41PostingsBaseFormat;
-import org.apache.lucene.codecs.lucene41.Lucene41PostingsFormat;
-import org.apache.lucene.codecs.pulsing.PulsingPostingsWriter;
-import org.apache.lucene.codecs.pulsing.PulsingPostingsReader;
-import org.apache.lucene.index.SegmentReadState;
-import org.apache.lucene.index.SegmentWriteState;
-import org.apache.lucene.util.IOUtils;
+import codecs.FieldsConsumer;
+import codecs.FieldsProducer;
+import codecs.PostingsBaseFormat;
+import codecs.PostingsFormat;
+import codecs.PostingsReaderBase;
+import codecs.PostingsWriterBase;
+import codecs.lucene41.Lucene41PostingsWriter;
+import codecs.lucene41.Lucene41PostingsReader;
+import codecs.lucene41.Lucene41PostingsBaseFormat;
+import codecs.lucene41.Lucene41PostingsFormat;
+import codecs.pulsing.PulsingPostingsWriter;
+import codecs.pulsing.PulsingPostingsReader;
+import index.SegmentReadState;
+import index.SegmentWriteState;
+import util.IOUtils;
 
 /** FST + Pulsing41, test only, since
  *  FST does no delta encoding here!

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf1df6be/src/Lucene.Net.Codecs/Memory/FSTTermOutputs.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/FSTTermOutputs.cs b/src/Lucene.Net.Codecs/Memory/FSTTermOutputs.cs
index e0a91e8..55a2bd6 100644
--- a/src/Lucene.Net.Codecs/Memory/FSTTermOutputs.cs
+++ b/src/Lucene.Net.Codecs/Memory/FSTTermOutputs.cs
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.memory;
+package codecs.memory;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,12 +20,12 @@ package org.apache.lucene.codecs.memory;
 import java.io.IOException;
 import java.util.Arrays;
 
-import org.apache.lucene.index.FieldInfo;
-import org.apache.lucene.index.FieldInfo.IndexOptions;
-import org.apache.lucene.store.DataInput;
-import org.apache.lucene.store.DataOutput;
-import org.apache.lucene.util.fst.Outputs;
-import org.apache.lucene.util.LongsRef;
+import index.FieldInfo;
+import index.FieldInfo.IndexOptions;
+import store.DataInput;
+import store.DataOutput;
+import util.fst.Outputs;
+import util.LongsRef;
 
 /**
  * An FST {@link Outputs} implementation for 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf1df6be/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs b/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs
index e38bb59..da1d517 100644
--- a/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs
+++ b/src/Lucene.Net.Codecs/Memory/FSTTermsReader.cs
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.memory;
+package codecs.memory;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -25,36 +25,36 @@ import java.util.Comparator;
 import java.util.Iterator;
 import java.util.TreeMap;
 
-import org.apache.lucene.codecs.BlockTermState;
-import org.apache.lucene.codecs.CodecUtil;
-import org.apache.lucene.codecs.FieldsProducer;
-import org.apache.lucene.codecs.PostingsReaderBase;
-import org.apache.lucene.index.CorruptIndexException;
-import org.apache.lucene.index.DocsAndPositionsEnum;
-import org.apache.lucene.index.DocsEnum;
-import org.apache.lucene.index.FieldInfo.IndexOptions;
-import org.apache.lucene.index.FieldInfo;
-import org.apache.lucene.index.FieldInfos;
-import org.apache.lucene.index.IndexFileNames;
-import org.apache.lucene.index.SegmentInfo;
-import org.apache.lucene.index.SegmentReadState;
-import org.apache.lucene.index.TermState;
-import org.apache.lucene.index.Terms;
-import org.apache.lucene.index.TermsEnum;
-import org.apache.lucene.store.ByteArrayDataInput;
-import org.apache.lucene.store.IndexInput;
-import org.apache.lucene.util.ArrayUtil;
-import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.IOUtils;
-import org.apache.lucene.util.RamUsageEstimator;
-import org.apache.lucene.util.automaton.ByteRunAutomaton;
-import org.apache.lucene.util.automaton.CompiledAutomaton;
-import org.apache.lucene.util.fst.BytesRefFSTEnum.InputOutput;
-import org.apache.lucene.util.fst.BytesRefFSTEnum;
-import org.apache.lucene.util.fst.FST;
-import org.apache.lucene.util.fst.Outputs;
-import org.apache.lucene.util.fst.Util;
+import codecs.BlockTermState;
+import codecs.CodecUtil;
+import codecs.FieldsProducer;
+import codecs.PostingsReaderBase;
+import index.CorruptIndexException;
+import index.DocsAndPositionsEnum;
+import index.DocsEnum;
+import index.FieldInfo.IndexOptions;
+import index.FieldInfo;
+import index.FieldInfos;
+import index.IndexFileNames;
+import index.SegmentInfo;
+import index.SegmentReadState;
+import index.TermState;
+import index.Terms;
+import index.TermsEnum;
+import store.ByteArrayDataInput;
+import store.IndexInput;
+import util.ArrayUtil;
+import util.Bits;
+import util.BytesRef;
+import util.IOUtils;
+import util.RamUsageEstimator;
+import util.automaton.ByteRunAutomaton;
+import util.automaton.CompiledAutomaton;
+import util.fst.BytesRefFSTEnum.InputOutput;
+import util.fst.BytesRefFSTEnum;
+import util.fst.FST;
+import util.fst.Outputs;
+import util.fst.Util;
 
 /**
  * FST-based terms dictionary reader.

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf1df6be/src/Lucene.Net.Codecs/Memory/FSTTermsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/FSTTermsWriter.cs b/src/Lucene.Net.Codecs/Memory/FSTTermsWriter.cs
index 367b83d..4b587b7 100644
--- a/src/Lucene.Net.Codecs/Memory/FSTTermsWriter.cs
+++ b/src/Lucene.Net.Codecs/Memory/FSTTermsWriter.cs
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.memory;
+package codecs.memory;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -22,28 +22,28 @@ import java.util.List;
 import java.util.ArrayList;
 import java.util.Comparator;
 
-import org.apache.lucene.index.FieldInfo.IndexOptions;
-import org.apache.lucene.index.FieldInfo;
-import org.apache.lucene.index.FieldInfos;
-import org.apache.lucene.index.IndexFileNames;
-import org.apache.lucene.index.SegmentWriteState;
-import org.apache.lucene.store.DataOutput;
-import org.apache.lucene.store.IndexOutput;
-import org.apache.lucene.store.RAMOutputStream;
-import org.apache.lucene.util.ArrayUtil;
-import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.IOUtils;
-import org.apache.lucene.util.IntsRef;
-import org.apache.lucene.util.fst.Builder;
-import org.apache.lucene.util.fst.FST;
-import org.apache.lucene.util.fst.Util;
-import org.apache.lucene.codecs.BlockTermState;
-import org.apache.lucene.codecs.PostingsWriterBase;
-import org.apache.lucene.codecs.PostingsConsumer;
-import org.apache.lucene.codecs.FieldsConsumer;
-import org.apache.lucene.codecs.TermsConsumer;
-import org.apache.lucene.codecs.TermStats;
-import org.apache.lucene.codecs.CodecUtil;
+import index.FieldInfo.IndexOptions;
+import index.FieldInfo;
+import index.FieldInfos;
+import index.IndexFileNames;
+import index.SegmentWriteState;
+import store.DataOutput;
+import store.IndexOutput;
+import store.RAMOutputStream;
+import util.ArrayUtil;
+import util.BytesRef;
+import util.IOUtils;
+import util.IntsRef;
+import util.fst.Builder;
+import util.fst.FST;
+import util.fst.Util;
+import codecs.BlockTermState;
+import codecs.PostingsWriterBase;
+import codecs.PostingsConsumer;
+import codecs.FieldsConsumer;
+import codecs.TermsConsumer;
+import codecs.TermStats;
+import codecs.CodecUtil;
 
 /**
  * FST-based term dict, using metadata as FST output.

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf1df6be/src/Lucene.Net.Codecs/Memory/MemoryDocValuesConsumer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/MemoryDocValuesConsumer.cs b/src/Lucene.Net.Codecs/Memory/MemoryDocValuesConsumer.cs
index e8026df..285c243 100644
--- a/src/Lucene.Net.Codecs/Memory/MemoryDocValuesConsumer.cs
+++ b/src/Lucene.Net.Codecs/Memory/MemoryDocValuesConsumer.cs
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.memory;
+package codecs.memory;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -23,37 +23,37 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import org.apache.lucene.codecs.CodecUtil;
-import org.apache.lucene.codecs.DocValuesConsumer;
-import org.apache.lucene.index.FieldInfo;
-import org.apache.lucene.index.IndexFileNames;
-import org.apache.lucene.index.SegmentWriteState;
-import org.apache.lucene.store.ByteArrayDataOutput;
-import org.apache.lucene.store.IndexOutput;
-import org.apache.lucene.util.ArrayUtil;
-import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.IOUtils;
-import org.apache.lucene.util.IntsRef;
-import org.apache.lucene.util.MathUtil;
-import org.apache.lucene.util.fst.Builder;
-import org.apache.lucene.util.fst.FST.INPUT_TYPE;
-import org.apache.lucene.util.fst.FST;
-import org.apache.lucene.util.fst.PositiveIntOutputs;
-import org.apache.lucene.util.fst.Util;
-import org.apache.lucene.util.packed.BlockPackedWriter;
-import org.apache.lucene.util.packed.MonotonicBlockPackedWriter;
-import org.apache.lucene.util.packed.PackedInts.FormatAndBits;
-import org.apache.lucene.util.packed.PackedInts;
+import codecs.CodecUtil;
+import codecs.DocValuesConsumer;
+import index.FieldInfo;
+import index.IndexFileNames;
+import index.SegmentWriteState;
+import store.ByteArrayDataOutput;
+import store.IndexOutput;
+import util.ArrayUtil;
+import util.BytesRef;
+import util.IOUtils;
+import util.IntsRef;
+import util.MathUtil;
+import util.fst.Builder;
+import util.fst.FST.INPUT_TYPE;
+import util.fst.FST;
+import util.fst.PositiveIntOutputs;
+import util.fst.Util;
+import util.packed.BlockPackedWriter;
+import util.packed.MonotonicBlockPackedWriter;
+import util.packed.PackedInts.FormatAndBits;
+import util.packed.PackedInts;
 
-import static org.apache.lucene.codecs.memory.MemoryDocValuesProducer.VERSION_CURRENT;
-import static org.apache.lucene.codecs.memory.MemoryDocValuesProducer.BLOCK_SIZE;
-import static org.apache.lucene.codecs.memory.MemoryDocValuesProducer.BYTES;
-import static org.apache.lucene.codecs.memory.MemoryDocValuesProducer.NUMBER;
-import static org.apache.lucene.codecs.memory.MemoryDocValuesProducer.FST;
-import static org.apache.lucene.codecs.memory.MemoryDocValuesProducer.DELTA_COMPRESSED;
-import static org.apache.lucene.codecs.memory.MemoryDocValuesProducer.GCD_COMPRESSED;
-import static org.apache.lucene.codecs.memory.MemoryDocValuesProducer.TABLE_COMPRESSED;
-import static org.apache.lucene.codecs.memory.MemoryDocValuesProducer.UNCOMPRESSED;
+import static codecs.memory.MemoryDocValuesProducer.VERSION_CURRENT;
+import static codecs.memory.MemoryDocValuesProducer.BLOCK_SIZE;
+import static codecs.memory.MemoryDocValuesProducer.BYTES;
+import static codecs.memory.MemoryDocValuesProducer.NUMBER;
+import static codecs.memory.MemoryDocValuesProducer.FST;
+import static codecs.memory.MemoryDocValuesProducer.DELTA_COMPRESSED;
+import static codecs.memory.MemoryDocValuesProducer.GCD_COMPRESSED;
+import static codecs.memory.MemoryDocValuesProducer.TABLE_COMPRESSED;
+import static codecs.memory.MemoryDocValuesProducer.UNCOMPRESSED;
 
 /**
  * Writer for {@link MemoryDocValuesFormat}

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf1df6be/src/Lucene.Net.Codecs/Memory/MemoryDocValuesFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/MemoryDocValuesFormat.cs b/src/Lucene.Net.Codecs/Memory/MemoryDocValuesFormat.cs
index efc1aba..34b360c 100644
--- a/src/Lucene.Net.Codecs/Memory/MemoryDocValuesFormat.cs
+++ b/src/Lucene.Net.Codecs/Memory/MemoryDocValuesFormat.cs
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.memory;
+package codecs.memory;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -19,12 +19,12 @@ package org.apache.lucene.codecs.memory;
 
 import java.io.IOException;
 
-import org.apache.lucene.codecs.DocValuesConsumer;
-import org.apache.lucene.codecs.DocValuesProducer;
-import org.apache.lucene.codecs.DocValuesFormat;
-import org.apache.lucene.index.SegmentReadState;
-import org.apache.lucene.index.SegmentWriteState;
-import org.apache.lucene.util.packed.PackedInts;
+import codecs.DocValuesConsumer;
+import codecs.DocValuesProducer;
+import codecs.DocValuesFormat;
+import index.SegmentReadState;
+import index.SegmentWriteState;
+import util.packed.PackedInts;
 
 /** In-memory docvalues format */
 public class MemoryDocValuesFormat extends DocValuesFormat {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf1df6be/src/Lucene.Net.Codecs/Memory/MemoryDocValuesProducer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/MemoryDocValuesProducer.cs b/src/Lucene.Net.Codecs/Memory/MemoryDocValuesProducer.cs
index ce004b4..015a1af 100644
--- a/src/Lucene.Net.Codecs/Memory/MemoryDocValuesProducer.cs
+++ b/src/Lucene.Net.Codecs/Memory/MemoryDocValuesProducer.cs
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.memory;
+package codecs.memory;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -23,41 +23,41 @@ import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.apache.lucene.codecs.CodecUtil;
-import org.apache.lucene.codecs.DocValuesProducer;
-import org.apache.lucene.index.BinaryDocValues;
-import org.apache.lucene.index.CorruptIndexException;
-import org.apache.lucene.index.DocValues;
-import org.apache.lucene.index.DocsAndPositionsEnum;
-import org.apache.lucene.index.DocsEnum;
-import org.apache.lucene.index.FieldInfo;
-import org.apache.lucene.index.FieldInfos;
-import org.apache.lucene.index.IndexFileNames;
-import org.apache.lucene.index.NumericDocValues;
-import org.apache.lucene.index.SegmentReadState;
-import org.apache.lucene.index.SortedDocValues;
-import org.apache.lucene.index.SortedSetDocValues;
-import org.apache.lucene.index.TermsEnum;
-import org.apache.lucene.store.ByteArrayDataInput;
-import org.apache.lucene.store.ChecksumIndexInput;
-import org.apache.lucene.store.IndexInput;
-import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.FixedBitSet;
-import org.apache.lucene.util.IOUtils;
-import org.apache.lucene.util.IntsRef;
-import org.apache.lucene.util.PagedBytes;
-import org.apache.lucene.util.RamUsageEstimator;
-import org.apache.lucene.util.fst.BytesRefFSTEnum;
-import org.apache.lucene.util.fst.BytesRefFSTEnum.InputOutput;
-import org.apache.lucene.util.fst.FST;
-import org.apache.lucene.util.fst.FST.Arc;
-import org.apache.lucene.util.fst.FST.BytesReader;
-import org.apache.lucene.util.fst.PositiveIntOutputs;
-import org.apache.lucene.util.fst.Util;
-import org.apache.lucene.util.packed.BlockPackedReader;
-import org.apache.lucene.util.packed.MonotonicBlockPackedReader;
-import org.apache.lucene.util.packed.PackedInts;
+import codecs.CodecUtil;
+import codecs.DocValuesProducer;
+import index.BinaryDocValues;
+import index.CorruptIndexException;
+import index.DocValues;
+import index.DocsAndPositionsEnum;
+import index.DocsEnum;
+import index.FieldInfo;
+import index.FieldInfos;
+import index.IndexFileNames;
+import index.NumericDocValues;
+import index.SegmentReadState;
+import index.SortedDocValues;
+import index.SortedSetDocValues;
+import index.TermsEnum;
+import store.ByteArrayDataInput;
+import store.ChecksumIndexInput;
+import store.IndexInput;
+import util.Bits;
+import util.BytesRef;
+import util.FixedBitSet;
+import util.IOUtils;
+import util.IntsRef;
+import util.PagedBytes;
+import util.RamUsageEstimator;
+import util.fst.BytesRefFSTEnum;
+import util.fst.BytesRefFSTEnum.InputOutput;
+import util.fst.FST;
+import util.fst.FST.Arc;
+import util.fst.FST.BytesReader;
+import util.fst.PositiveIntOutputs;
+import util.fst.Util;
+import util.packed.BlockPackedReader;
+import util.packed.MonotonicBlockPackedReader;
+import util.packed.PackedInts;
 
 /**
  * Reader for {@link MemoryDocValuesFormat}

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf1df6be/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs b/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs
index ae5abca..90e4a53 100644
--- a/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs
+++ b/src/Lucene.Net.Codecs/Memory/MemoryPostingsFormat.cs
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.memory;
+package codecs.memory;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -25,41 +25,41 @@ import java.util.Map;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
-import org.apache.lucene.codecs.CodecUtil;
-import org.apache.lucene.codecs.FieldsConsumer;
-import org.apache.lucene.codecs.FieldsProducer;
-import org.apache.lucene.codecs.PostingsConsumer;
-import org.apache.lucene.codecs.PostingsFormat;
-import org.apache.lucene.codecs.TermStats;
-import org.apache.lucene.codecs.TermsConsumer;
-import org.apache.lucene.index.DocsAndPositionsEnum;
-import org.apache.lucene.index.DocsEnum;
-import org.apache.lucene.index.FieldInfo.IndexOptions;
-import org.apache.lucene.index.FieldInfo;
-import org.apache.lucene.index.FieldInfos;
-import org.apache.lucene.index.IndexFileNames;
-import org.apache.lucene.index.SegmentReadState;
-import org.apache.lucene.index.SegmentWriteState;
-import org.apache.lucene.index.Terms;
-import org.apache.lucene.index.TermsEnum;
-import org.apache.lucene.store.ByteArrayDataInput;
-import org.apache.lucene.store.ChecksumIndexInput;
-import org.apache.lucene.store.IOContext;
-import org.apache.lucene.store.IndexInput;
-import org.apache.lucene.store.IndexOutput;
-import org.apache.lucene.store.RAMOutputStream;
-import org.apache.lucene.util.ArrayUtil;
-import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.IOUtils;
-import org.apache.lucene.util.IntsRef;
-import org.apache.lucene.util.RamUsageEstimator;
-import org.apache.lucene.util.fst.Builder;
-import org.apache.lucene.util.fst.ByteSequenceOutputs;
-import org.apache.lucene.util.fst.BytesRefFSTEnum;
-import org.apache.lucene.util.fst.FST;
-import org.apache.lucene.util.fst.Util;
-import org.apache.lucene.util.packed.PackedInts;
+import codecs.CodecUtil;
+import codecs.FieldsConsumer;
+import codecs.FieldsProducer;
+import codecs.PostingsConsumer;
+import codecs.PostingsFormat;
+import codecs.TermStats;
+import codecs.TermsConsumer;
+import index.DocsAndPositionsEnum;
+import index.DocsEnum;
+import index.FieldInfo.IndexOptions;
+import index.FieldInfo;
+import index.FieldInfos;
+import index.IndexFileNames;
+import index.SegmentReadState;
+import index.SegmentWriteState;
+import index.Terms;
+import index.TermsEnum;
+import store.ByteArrayDataInput;
+import store.ChecksumIndexInput;
+import store.IOContext;
+import store.IndexInput;
+import store.IndexOutput;
+import store.RAMOutputStream;
+import util.ArrayUtil;
+import util.Bits;
+import util.BytesRef;
+import util.IOUtils;
+import util.IntsRef;
+import util.RamUsageEstimator;
+import util.fst.Builder;
+import util.fst.ByteSequenceOutputs;
+import util.fst.BytesRefFSTEnum;
+import util.fst.FST;
+import util.fst.Util;
+import util.packed.PackedInts;
 
 // TODO: would be nice to somehow allow this to act like
 // InstantiatedIndex, by never writing to disk; ie you write

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf1df6be/src/Lucene.Net.Codecs/Sep/IntIndexInput.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Sep/IntIndexInput.cs b/src/Lucene.Net.Codecs/Sep/IntIndexInput.cs
index ebe0d27..057b25b 100644
--- a/src/Lucene.Net.Codecs/Sep/IntIndexInput.cs
+++ b/src/Lucene.Net.Codecs/Sep/IntIndexInput.cs
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.sep;
+package codecs.sep;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,7 +20,7 @@ package org.apache.lucene.codecs.sep;
 import java.io.Closeable;
 import java.io.IOException;
 
-import org.apache.lucene.store.DataInput;
+import store.DataInput;
 
 /** Defines basic API for writing ints to an IndexOutput.
  *  IntBlockCodec interacts with this API. @see

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf1df6be/src/Lucene.Net.Codecs/Sep/IntIndexOutput.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Sep/IntIndexOutput.cs b/src/Lucene.Net.Codecs/Sep/IntIndexOutput.cs
index 3f608d5..b5fe3f9 100644
--- a/src/Lucene.Net.Codecs/Sep/IntIndexOutput.cs
+++ b/src/Lucene.Net.Codecs/Sep/IntIndexOutput.cs
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.sep;
+package codecs.sep;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,7 +20,7 @@ package org.apache.lucene.codecs.sep;
 // TODO: we may want tighter integration w/ IndexOutput --
 // may give better perf:
 
-import org.apache.lucene.store.DataOutput;
+import store.DataOutput;
 
 import java.io.IOException;
 import java.io.Closeable;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf1df6be/src/Lucene.Net.Codecs/Sep/IntStreamFactory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Sep/IntStreamFactory.cs b/src/Lucene.Net.Codecs/Sep/IntStreamFactory.cs
index a6d42ba..8e23a76 100644
--- a/src/Lucene.Net.Codecs/Sep/IntStreamFactory.cs
+++ b/src/Lucene.Net.Codecs/Sep/IntStreamFactory.cs
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.sep;
+package codecs.sep;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -17,8 +17,8 @@ package org.apache.lucene.codecs.sep;
  * limitations under the License.
  */
 
-import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.IOContext;
+import store.Directory;
+import store.IOContext;
 
 import java.io.IOException;
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf1df6be/src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs b/src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs
index 3aa45fa..e7b09e4 100644
--- a/src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs
+++ b/src/Lucene.Net.Codecs/Sep/SepPostingsReader.cs
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.sep;
+package codecs.sep;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -19,26 +19,26 @@ package org.apache.lucene.codecs.sep;
 
 import java.io.IOException;
 
-import org.apache.lucene.codecs.BlockTermState;
-import org.apache.lucene.codecs.CodecUtil;
-import org.apache.lucene.codecs.PostingsReaderBase;
-import org.apache.lucene.index.DocsAndPositionsEnum;
-import org.apache.lucene.index.DocsEnum;
-import org.apache.lucene.index.FieldInfo.IndexOptions;
-import org.apache.lucene.index.FieldInfo;
-import org.apache.lucene.index.FieldInfos;
-import org.apache.lucene.index.IndexFileNames;
-import org.apache.lucene.index.SegmentInfo;
-import org.apache.lucene.index.TermState;
-import org.apache.lucene.store.ByteArrayDataInput;
-import org.apache.lucene.store.DataInput;
-import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.IOContext;
-import org.apache.lucene.store.IndexInput;
-import org.apache.lucene.util.ArrayUtil;
-import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.IOUtils;
+import codecs.BlockTermState;
+import codecs.CodecUtil;
+import codecs.PostingsReaderBase;
+import index.DocsAndPositionsEnum;
+import index.DocsEnum;
+import index.FieldInfo.IndexOptions;
+import index.FieldInfo;
+import index.FieldInfos;
+import index.IndexFileNames;
+import index.SegmentInfo;
+import index.TermState;
+import store.ByteArrayDataInput;
+import store.DataInput;
+import store.Directory;
+import store.IOContext;
+import store.IndexInput;
+import util.ArrayUtil;
+import util.Bits;
+import util.BytesRef;
+import util.IOUtils;
 
 /** Concrete class that reads the current doc/freq/skip
  *  postings format.    

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf1df6be/src/Lucene.Net.Codecs/Sep/SepPostingsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Sep/SepPostingsWriter.cs b/src/Lucene.Net.Codecs/Sep/SepPostingsWriter.cs
index ced150e..eba7022 100644
--- a/src/Lucene.Net.Codecs/Sep/SepPostingsWriter.cs
+++ b/src/Lucene.Net.Codecs/Sep/SepPostingsWriter.cs
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.sep;
+package codecs.sep;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -19,20 +19,20 @@ package org.apache.lucene.codecs.sep;
 
 import java.io.IOException;
 
-import org.apache.lucene.codecs.BlockTermState;
-import org.apache.lucene.codecs.CodecUtil;
-import org.apache.lucene.codecs.PostingsWriterBase;
-import org.apache.lucene.index.CorruptIndexException;
-import org.apache.lucene.index.DocsEnum;
-import org.apache.lucene.index.FieldInfo;
-import org.apache.lucene.index.FieldInfo.IndexOptions;
-import org.apache.lucene.index.IndexFileNames;
-import org.apache.lucene.index.SegmentWriteState;
-import org.apache.lucene.store.DataOutput;
-import org.apache.lucene.store.IndexOutput;
-import org.apache.lucene.store.RAMOutputStream;
-import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.IOUtils;
+import codecs.BlockTermState;
+import codecs.CodecUtil;
+import codecs.PostingsWriterBase;
+import index.CorruptIndexException;
+import index.DocsEnum;
+import index.FieldInfo;
+import index.FieldInfo.IndexOptions;
+import index.IndexFileNames;
+import index.SegmentWriteState;
+import store.DataOutput;
+import store.IndexOutput;
+import store.RAMOutputStream;
+import util.BytesRef;
+import util.IOUtils;
 
 /** Writes frq to .frq, docs to .doc, pos to .pos, payloads
  *  to .pyl, skip data to .skp

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf1df6be/src/Lucene.Net.Codecs/Sep/SepSkipListReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Sep/SepSkipListReader.cs b/src/Lucene.Net.Codecs/Sep/SepSkipListReader.cs
index df6dda1..aee9180 100644
--- a/src/Lucene.Net.Codecs/Sep/SepSkipListReader.cs
+++ b/src/Lucene.Net.Codecs/Sep/SepSkipListReader.cs
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.sep;
+package codecs.sep;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,9 +20,9 @@ package org.apache.lucene.codecs.sep;
 import java.io.IOException;
 import java.util.Arrays;
 
-import org.apache.lucene.store.IndexInput;
-import org.apache.lucene.codecs.MultiLevelSkipListReader;
-import org.apache.lucene.index.FieldInfo.IndexOptions;
+import store.IndexInput;
+import codecs.MultiLevelSkipListReader;
+import index.FieldInfo.IndexOptions;
 
 /**
  * Implements the skip list reader for the default posting list format

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf1df6be/src/Lucene.Net.Codecs/Sep/SepSkipListWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/Sep/SepSkipListWriter.cs b/src/Lucene.Net.Codecs/Sep/SepSkipListWriter.cs
index 7ace983..b4ba4cf 100644
--- a/src/Lucene.Net.Codecs/Sep/SepSkipListWriter.cs
+++ b/src/Lucene.Net.Codecs/Sep/SepSkipListWriter.cs
@@ -1,4 +1,4 @@
-package org.apache.lucene.codecs.sep;
+package codecs.sep;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
@@ -20,9 +20,9 @@ package org.apache.lucene.codecs.sep;
 import java.io.IOException;
 import java.util.Arrays;
 
-import org.apache.lucene.store.IndexOutput;
-import org.apache.lucene.codecs.MultiLevelSkipListWriter;
-import org.apache.lucene.index.FieldInfo.IndexOptions;
+import store.IndexOutput;
+import codecs.MultiLevelSkipListWriter;
+import index.FieldInfo.IndexOptions;
 
 // TODO: -- skip data should somehow be more local to the
 // particular stream (doc, freq, pos, payload)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf1df6be/src/Lucene.Net.Codecs/SimpleText/SimpleTextCodec.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextCodec.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextCodec.cs
index a26ed0e..d173137 100644
--- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextCodec.cs
+++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextCodec.cs
@@ -1,6 +1,4 @@
-package org.apache.lucene.codecs.simpletext;
-
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -17,73 +15,70 @@ package org.apache.lucene.codecs.simpletext;
  * limitations under the License.
  */
 
-import org.apache.lucene.codecs.Codec;
-import org.apache.lucene.codecs.FieldInfosFormat;
-import org.apache.lucene.codecs.LiveDocsFormat;
-import org.apache.lucene.codecs.PostingsFormat;
-import org.apache.lucene.codecs.SegmentInfoFormat;
-import org.apache.lucene.codecs.DocValuesFormat;
-import org.apache.lucene.codecs.NormsFormat;
-import org.apache.lucene.codecs.StoredFieldsFormat;
-import org.apache.lucene.codecs.TermVectorsFormat;
+namespace Lucene.Net.Codecs.SimpleText
+{
 
-/**
- * plain text index format.
- * <p>
- * <b><font color="red">FOR RECREATIONAL USE ONLY</font></B>
- * @lucene.experimental
- */
-public final class SimpleTextCodec extends Codec {
-  private final PostingsFormat postings = new SimpleTextPostingsFormat();
-  private final StoredFieldsFormat storedFields = new SimpleTextStoredFieldsFormat();
-  private final SegmentInfoFormat segmentInfos = new SimpleTextSegmentInfoFormat();
-  private final FieldInfosFormat fieldInfosFormat = new SimpleTextFieldInfosFormat();
-  private final TermVectorsFormat vectorsFormat = new SimpleTextTermVectorsFormat();
-  private final NormsFormat normsFormat = new SimpleTextNormsFormat();
-  private final LiveDocsFormat liveDocs = new SimpleTextLiveDocsFormat();
-  private final DocValuesFormat dvFormat = new SimpleTextDocValuesFormat();
-  
-  public SimpleTextCodec() {
-    super("SimpleText");
-  }
-  
-  @Override
-  public PostingsFormat postingsFormat() {
-    return postings;
-  }
+	/// <summary>
+	/// plain text index format.
+	/// <para>
+	/// <b><font color="red">FOR RECREATIONAL USE ONLY</font></B>
+	/// @lucene.experimental
+	/// </para>
+	/// </summary>
+	public sealed class SimpleTextCodec : Codec
+	{
+	  private readonly PostingsFormat _postings = new SimpleTextPostingsFormat();
+	  private readonly StoredFieldsFormat _storedFields = new SimpleTextStoredFieldsFormat();
+	  private readonly SegmentInfoFormat _segmentInfos = new SimpleTextSegmentInfoFormat();
+	  private readonly FieldInfosFormat _fieldInfosFormatRenamed = new SimpleTextFieldInfosFormat();
+	  private readonly TermVectorsFormat _vectorsFormat = new SimpleTextTermVectorsFormat();
+	  private readonly NormsFormat _normsFormatRenamed = new SimpleTextNormsFormat();
+	  private readonly LiveDocsFormat _liveDocs = new SimpleTextLiveDocsFormat();
+	  private readonly DocValuesFormat _dvFormat = new SimpleTextDocValuesFormat();
+
+	  public SimpleTextCodec() : base("SimpleText")
+	  {
+	  }
+
+	  public override PostingsFormat PostingsFormat()
+	  {
+		return _postings;
+	  }
+
+	  public override StoredFieldsFormat StoredFieldsFormat()
+	  {
+		return _storedFields;
+	  }
+
+	  public override TermVectorsFormat TermVectorsFormat()
+	  {
+		return _vectorsFormat;
+	  }
+
+	  public override FieldInfosFormat FieldInfosFormat()
+	  {
+		return _fieldInfosFormatRenamed;
+	  }
+
+	  public override SegmentInfoFormat SegmentInfoFormat()
+	  {
+		return _segmentInfos;
+	  }
 
-  @Override
-  public StoredFieldsFormat storedFieldsFormat() {
-    return storedFields;
-  }
-  
-  @Override
-  public TermVectorsFormat termVectorsFormat() {
-    return vectorsFormat;
-  }
-  
-  @Override
-  public FieldInfosFormat fieldInfosFormat() {
-    return fieldInfosFormat;
-  }
+	  public override NormsFormat NormsFormat()
+	  {
+		return _normsFormatRenamed;
+	  }
 
-  @Override
-  public SegmentInfoFormat segmentInfoFormat() {
-    return segmentInfos;
-  }
+	  public override LiveDocsFormat LiveDocsFormat()
+	  {
+		return _liveDocs;
+	  }
 
-  @Override
-  public NormsFormat normsFormat() {
-    return normsFormat;
-  }
-  
-  @Override
-  public LiveDocsFormat liveDocsFormat() {
-    return liveDocs;
-  }
+	  public override DocValuesFormat DocValuesFormat()
+	  {
+		return _dvFormat;
+	  }
+	}
 
-  @Override
-  public DocValuesFormat docValuesFormat() {
-    return dvFormat;
-  }
-}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf1df6be/src/Lucene.Net.Codecs/SimpleText/SimpleTextDocValuesFormat.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Codecs/SimpleText/SimpleTextDocValuesFormat.cs b/src/Lucene.Net.Codecs/SimpleText/SimpleTextDocValuesFormat.cs
index 83dd776..fdbda1d 100644
--- a/src/Lucene.Net.Codecs/SimpleText/SimpleTextDocValuesFormat.cs
+++ b/src/Lucene.Net.Codecs/SimpleText/SimpleTextDocValuesFormat.cs
@@ -1,6 +1,4 @@
-package org.apache.lucene.codecs.simpletext;
-
-/*
+/*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
@@ -17,121 +15,124 @@ package org.apache.lucene.codecs.simpletext;
  * limitations under the License.
  */
 
-import java.io.IOException;
+namespace Lucene.Net.Codecs.SimpleText
+{
 
-import org.apache.lucene.codecs.DocValuesConsumer;
-import org.apache.lucene.codecs.DocValuesProducer;
-import org.apache.lucene.codecs.DocValuesFormat;
-import org.apache.lucene.index.SegmentReadState;
-import org.apache.lucene.index.SegmentWriteState;
+	using SegmentReadState = Index.SegmentReadState;
+	using SegmentWriteState = Index.SegmentWriteState;
 
-/**
- * plain text doc values format.
- * <p>
- * <b><font color="red">FOR RECREATIONAL USE ONLY</font></B>
- * <p>
- * the .dat file contains the data.
- *  for numbers this is a "fixed-width" file, for example a single byte range:
- *  <pre>
- *  field myField
- *    type NUMERIC
- *    minvalue 0
- *    pattern 000
- *  005
- *  T
- *  234
- *  T
- *  123
- *  T
- *  ...
- *  </pre>
- *  so a document's value (delta encoded from minvalue) can be retrieved by 
- *  seeking to startOffset + (1+pattern.length()+2)*docid. The extra 1 is the newline. 
- *  The extra 2 is another newline and 'T' or 'F': true if the value is real, false if missing.
- *  
- *  for bytes this is also a "fixed-width" file, for example:
- *  <pre>
- *  field myField
- *    type BINARY
- *    maxlength 6
- *    pattern 0
- *  length 6
- *  foobar[space][space]
- *  T
- *  length 3
- *  baz[space][space][space][space][space]
- *  T
- *  ...
- *  </pre>
- *  so a doc's value can be retrieved by seeking to startOffset + (9+pattern.length+maxlength+2)*doc
- *  the extra 9 is 2 newlines, plus "length " itself.
- *  the extra 2 is another newline and 'T' or 'F': true if the value is real, false if missing.
- *  
- *  for sorted bytes this is a fixed-width file, for example:
- *  <pre>
- *  field myField
- *    type SORTED
- *    numvalues 10
- *    maxLength 8
- *    pattern 0
- *    ordpattern 00
- *  length 6
- *  foobar[space][space]
- *  length 3
- *  baz[space][space][space][space][space]
- *  ...
- *  03
- *  06
- *  01
- *  10
- *  ...
- *  </pre>
- *  so the "ord section" begins at startOffset + (9+pattern.length+maxlength)*numValues.
- *  a document's ord can be retrieved by seeking to "ord section" + (1+ordpattern.length())*docid
- *  an ord's value can be retrieved by seeking to startOffset + (9+pattern.length+maxlength)*ord
- *  
- *  for sorted set this is a fixed-width file very similar to the SORTED case, for example:
- *  <pre>
- *  field myField
- *    type SORTED_SET
- *    numvalues 10
- *    maxLength 8
- *    pattern 0
- *    ordpattern XXXXX
- *  length 6
- *  foobar[space][space]
- *  length 3
- *  baz[space][space][space][space][space]
- *  ...
- *  0,3,5   
- *  1,2
- *  
- *  10
- *  ...
- *  </pre>
- *  so the "ord section" begins at startOffset + (9+pattern.length+maxlength)*numValues.
- *  a document's ord list can be retrieved by seeking to "ord section" + (1+ordpattern.length())*docid
- *  this is a comma-separated list, and its padded with spaces to be fixed width. so trim() and split() it.
- *  and beware the empty string!
- *  an ord's value can be retrieved by seeking to startOffset + (9+pattern.length+maxlength)*ord
- *   
- *  the reader can just scan this file when it opens, skipping over the data blocks
- *  and saving the offset/etc for each field. 
- *  @lucene.experimental
- */
-public class SimpleTextDocValuesFormat extends DocValuesFormat {
-  
-  public SimpleTextDocValuesFormat() {
-    super("SimpleText");
-  }
+    /// <summary>
+    /// plain text doc values format.
+    /// <para>
+    /// <b><font color="red">FOR RECREATIONAL USE ONLY</font></B>
+    /// </para>
+    /// <para>
+    /// the .dat file contains the data.
+    ///  for numbers this is a "fixed-width" file, for example a single byte range:
+    ///  <pre>
+    ///  field myField
+    ///    type NUMERIC
+    ///    minvalue 0
+    ///    pattern 000
+    ///  005
+    ///  T
+    ///  234
+    ///  T
+    ///  123
+    ///  T
+    ///  ...
+    ///  </pre>
+    ///  so a document's value (delta encoded from minvalue) can be retrieved by 
+    ///  seeking to startOffset + (1+pattern.length()+2)*docid. The extra 1 is the newline. 
+    ///  The extra 2 is another newline and 'T' or 'F': true if the value is real, false if missing.
+    ///  
+    ///  for bytes this is also a "fixed-width" file, for example:
+    ///  <pre>
+    ///  field myField
+    ///    type BINARY
+    ///    maxlength 6
+    ///    pattern 0
+    ///  length 6
+    ///  foobar[space][space]
+    ///  T
+    ///  length 3
+    ///  baz[space][space][space][space][space]
+    ///  T
+    ///  ...
+    ///  </pre>
+    ///  so a doc's value can be retrieved by seeking to startOffset + (9+pattern.length+maxlength+2)*doc
+    ///  the extra 9 is 2 newlines, plus "length " itself.
+    ///  the extra 2 is another newline and 'T' or 'F': true if the value is real, false if missing.
+    ///  
+    ///  for sorted bytes this is a fixed-width file, for example:
+    ///  <pre>
+    ///  field myField
+    ///    type SORTED
+    ///    numvalues 10
+    ///    maxLength 8
+    ///    pattern 0
+    ///    ordpattern 00
+    ///  length 6
+    ///  foobar[space][space]
+    ///  length 3
+    ///  baz[space][space][space][space][space]
+    ///  ...
+    ///  03
+    ///  06
+    ///  01
+    ///  10
+    ///  ...
+    ///  </pre>
+    ///  so the "ord section" begins at startOffset + (9+pattern.length+maxlength)*numValues.
+    ///  a document's ord can be retrieved by seeking to "ord section" + (1+ordpattern.length())*docid
+    ///  an ord's value can be retrieved by seeking to startOffset + (9+pattern.length+maxlength)*ord
+    ///  
+    ///  for sorted set this is a fixed-width file very similar to the SORTED case, for example:
+    ///  <pre>
+    ///  field myField
+    ///    type SORTED_SET
+    ///    numvalues 10
+    ///    maxLength 8
+    ///    pattern 0
+    ///    ordpattern XXXXX
+    ///  length 6
+    ///  foobar[space][space]
+    ///  length 3
+    ///  baz[space][space][space][space][space]
+    ///  ...
+    ///  0,3,5   
+    ///  1,2
+    ///  
+    ///  10
+    ///  ...
+    ///  </pre>
+    ///  so the "ord section" begins at startOffset + (9+pattern.length+maxlength)*numValues.
+    ///  a document's ord list can be retrieved by seeking to "ord section" + (1+ordpattern.length())*docid
+    ///  this is a comma-separated list, and its padded with spaces to be fixed width. so trim() and split() it.
+    ///  and beware the empty string!
+    ///  an ord's value can be retrieved by seeking to startOffset + (9+pattern.length+maxlength)*ord
+    ///   
+    ///  the reader can just scan this file when it opens, skipping over the data blocks
+    ///  and saving the offset/etc for each field. 
+    ///  @lucene.experimental
+    /// </para>
+    /// </summary>
+    public class SimpleTextDocValuesFormat : DocValuesFormat
+    {
+
+        public SimpleTextDocValuesFormat() : base("SimpleText")
+        {
+        }
+
+        public override DocValuesConsumer FieldsConsumer(SegmentWriteState state)
+        {
+            return new SimpleTextDocValuesWriter(state, "dat");
+        }
+        public override DocValuesProducer FieldsProducer(SegmentReadState state)
+        {
+            return new SimpleTextDocValuesReader(state, "dat");
+        }
 
-  @Override
-  public DocValuesConsumer fieldsConsumer(SegmentWriteState state)  {
-    return new SimpleTextDocValuesWriter(state, "dat");
-  }
+    }
 
-  @Override
-  public DocValuesProducer fieldsProducer(SegmentReadState state)  {
-    return new SimpleTextDocValuesReader(state, "dat");
-  }
-}
+}
\ No newline at end of file


Mime
View raw message