lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnas...@apache.org
Subject svn commit: r1364156 [1/2] - in /incubator/lucene.net/trunk: src/core/Document/ src/core/Index/ src/core/QueryParser/ src/core/Search/ src/core/Search/Payloads/ src/core/Search/Spans/ src/core/Store/ src/core/Support/ src/core/Util/ test/core/Index/ te...
Date Sat, 21 Jul 2012 19:14:59 GMT
Author: pnasser
Date: Sat Jul 21 19:14:57 2012
New Revision: 1364156

URL: http://svn.apache.org/viewvc?rev=1364156&view=rev
Log:
[LUCENENET-446] - Fixed many CLS compliance issues (renaming most variables to internalXXX, because _ is not CLS compliant)
- Removed declared but unused variables
- Removed several try/catch functions that simply re threw the exception
- Lucene.Net.Index.LogMergePolicy.internalCalibrateSizeByDeletes is default to true - per the TODO 3.0 note above it (I left the note in)

Modified:
    incubator/lucene.net/trunk/src/core/Document/AbstractField.cs
    incubator/lucene.net/trunk/src/core/Document/Field.cs
    incubator/lucene.net/trunk/src/core/Index/AbstractAllTermDocs.cs
    incubator/lucene.net/trunk/src/core/Index/ConcurrentMergeScheduler.cs
    incubator/lucene.net/trunk/src/core/Index/DirectoryReader.cs
    incubator/lucene.net/trunk/src/core/Index/DocumentsWriter.cs
    incubator/lucene.net/trunk/src/core/Index/FieldInfos.cs
    incubator/lucene.net/trunk/src/core/Index/FieldsReader.cs
    incubator/lucene.net/trunk/src/core/Index/FieldsWriter.cs
    incubator/lucene.net/trunk/src/core/Index/FreqProxTermsWriterPerField.cs
    incubator/lucene.net/trunk/src/core/Index/IndexWriter.cs
    incubator/lucene.net/trunk/src/core/Index/LogMergePolicy.cs
    incubator/lucene.net/trunk/src/core/Index/MultiReader.cs
    incubator/lucene.net/trunk/src/core/Index/ParallelReader.cs
    incubator/lucene.net/trunk/src/core/Index/Payload.cs
    incubator/lucene.net/trunk/src/core/Index/SegmentInfo.cs
    incubator/lucene.net/trunk/src/core/Index/SegmentInfos.cs
    incubator/lucene.net/trunk/src/core/Index/SegmentReader.cs
    incubator/lucene.net/trunk/src/core/Index/StoredFieldsWriter.cs
    incubator/lucene.net/trunk/src/core/Index/TermVectorsTermsWriter.cs
    incubator/lucene.net/trunk/src/core/QueryParser/QueryParser.cs
    incubator/lucene.net/trunk/src/core/QueryParser/QueryParserTokenManager.cs
    incubator/lucene.net/trunk/src/core/Search/ConstantScoreQuery.cs
    incubator/lucene.net/trunk/src/core/Search/DefaultSimilarity.cs
    incubator/lucene.net/trunk/src/core/Search/FieldCacheImpl.cs
    incubator/lucene.net/trunk/src/core/Search/FilterManager.cs
    incubator/lucene.net/trunk/src/core/Search/FilteredDocIdSetIterator.cs
    incubator/lucene.net/trunk/src/core/Search/FuzzyQuery.cs
    incubator/lucene.net/trunk/src/core/Search/MultiTermQuery.cs
    incubator/lucene.net/trunk/src/core/Search/Payloads/PayloadNearQuery.cs
    incubator/lucene.net/trunk/src/core/Search/Payloads/PayloadTermQuery.cs
    incubator/lucene.net/trunk/src/core/Search/SpanQueryFilter.cs
    incubator/lucene.net/trunk/src/core/Search/Spans/SpanNearQuery.cs
    incubator/lucene.net/trunk/src/core/Search/Spans/SpanTermQuery.cs
    incubator/lucene.net/trunk/src/core/Search/Spans/SpanWeight.cs
    incubator/lucene.net/trunk/src/core/Search/Spans/TermSpans.cs
    incubator/lucene.net/trunk/src/core/Search/TimeLimitingCollector.cs
    incubator/lucene.net/trunk/src/core/Search/TopDocsCollector.cs
    incubator/lucene.net/trunk/src/core/Search/TopFieldCollector.cs
    incubator/lucene.net/trunk/src/core/Search/TopScoreDocCollector.cs
    incubator/lucene.net/trunk/src/core/Search/WildcardQuery.cs
    incubator/lucene.net/trunk/src/core/Store/Directory.cs
    incubator/lucene.net/trunk/src/core/Store/FSDirectory.cs
    incubator/lucene.net/trunk/src/core/Store/FSLockFactory.cs
    incubator/lucene.net/trunk/src/core/Store/FileSwitchDirectory.cs
    incubator/lucene.net/trunk/src/core/Store/LockFactory.cs
    incubator/lucene.net/trunk/src/core/Store/MMapDirectory.cs
    incubator/lucene.net/trunk/src/core/Store/NativeFSLockFactory.cs
    incubator/lucene.net/trunk/src/core/Store/RAMDirectory.cs
    incubator/lucene.net/trunk/src/core/Store/RAMFile.cs
    incubator/lucene.net/trunk/src/core/Store/SimpleFSDirectory.cs
    incubator/lucene.net/trunk/src/core/Store/SimpleFSLockFactory.cs
    incubator/lucene.net/trunk/src/core/Support/Single.cs
    incubator/lucene.net/trunk/src/core/Util/OpenBitSet.cs
    incubator/lucene.net/trunk/src/core/Util/RamUsageEstimator.cs
    incubator/lucene.net/trunk/test/core/Index/TestFieldsReader.cs
    incubator/lucene.net/trunk/test/core/Index/TestIndexWriter.cs
    incubator/lucene.net/trunk/test/core/Search/TestBoolean2.cs
    incubator/lucene.net/trunk/test/core/Search/TestTopDocsCollector.cs
    incubator/lucene.net/trunk/test/core/Store/MockRAMDirectory.cs
    incubator/lucene.net/trunk/test/core/Store/TestBufferedIndexInput.cs

Modified: incubator/lucene.net/trunk/src/core/Document/AbstractField.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Document/AbstractField.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Document/AbstractField.cs (original)
+++ incubator/lucene.net/trunk/src/core/Document/AbstractField.cs Sat Jul 21 19:14:57 2012
@@ -32,25 +32,25 @@ namespace Lucene.Net.Documents
 	public abstract class AbstractField : IFieldable
 	{
 		
-		protected internal System.String name = "body";
+		protected internal System.String internalName = "body";
 		protected internal bool storeTermVector = false;
 		protected internal bool storeOffsetWithTermVector = false;
 		protected internal bool storePositionWithTermVector = false;
-		protected internal bool omitNorms = false;
-		protected internal bool isStored = false;
-		protected internal bool isIndexed = true;
-		protected internal bool isTokenized = true;
-		protected internal bool isBinary = false;
+		protected internal bool internalOmitNorms = false;
+		protected internal bool internalIsStored = false;
+		protected internal bool internalIsIndexed = true;
+		protected internal bool internalIsTokenized = true;
+		protected internal bool internalIsBinary = false;
 		protected internal bool lazy = false;
-		protected internal bool omitTermFreqAndPositions = false;
-		protected internal float boost = 1.0f;
+		protected internal bool internalOmitTermFreqAndPositions = false;
+		protected internal float internalBoost = 1.0f;
 		// the data object for all different kind of field values
 		protected internal System.Object fieldsData = null;
 		// pre-analyzed tokenStream for indexed fields
 		protected internal TokenStream tokenStream;
 		// length/offset for all primitive types
-		protected internal int binaryLength;
-		protected internal int binaryOffset;
+		protected internal int internalBinaryLength;
+		protected internal int internalbinaryOffset;
 		
 		protected internal AbstractField()
 		{
@@ -60,14 +60,14 @@ namespace Lucene.Net.Documents
 		{
 			if (name == null)
 				throw new System.NullReferenceException("name cannot be null");
-			this.name = StringHelper.Intern(name); // field names are interned
+			this.internalName = StringHelper.Intern(name); // field names are interned
 
-		    this.isStored = store.IsStored();
-		    this.isIndexed = index.IsIndexed();
-		    this.isTokenized = index.IsAnalyzed();
-		    this.omitNorms = index.OmitNorms();
+		    this.internalIsStored = store.IsStored();
+		    this.internalIsIndexed = index.IsIndexed();
+		    this.internalIsTokenized = index.IsAnalyzed();
+		    this.internalOmitNorms = index.OmitNorms();
 			
-			this.isBinary = false;
+			this.internalIsBinary = false;
 			
 			SetStoreTermVector(termVector);
 		}
@@ -86,8 +86,8 @@ namespace Lucene.Net.Documents
 	    /// </seealso>
 	    public virtual float Boost
 	    {
-	        get { return boost; }
-	        set { this.boost = value; }
+	        get { return internalBoost; }
+	        set { this.internalBoost = value; }
 	    }
 
 	    /// <summary>Returns the name of the field as an interned string.
@@ -95,7 +95,7 @@ namespace Lucene.Net.Documents
 	    /// </summary>
 	    public virtual string Name
 	    {
-	        get { return name; }
+	        get { return internalName; }
 	    }
 
 	    protected internal virtual void  SetStoreTermVector(Field.TermVector termVector)
@@ -111,7 +111,7 @@ namespace Lucene.Net.Documents
 	    /// </summary>
 	    public bool IsStored
 	    {
-	        get { return isStored; }
+	        get { return internalIsStored; }
 	    }
 
 	    /// <summary>True iff the value of the field is to be indexed, so that it may be
@@ -119,7 +119,7 @@ namespace Lucene.Net.Documents
 	    /// </summary>
 	    public bool IsIndexed
 	    {
-	        get { return isIndexed; }
+	        get { return internalIsIndexed; }
 	    }
 
 	    /// <summary>True iff the value of the field should be tokenized as text prior to
@@ -128,7 +128,7 @@ namespace Lucene.Net.Documents
 	    /// </summary>
 	    public bool IsTokenized
 	    {
-	        get { return isTokenized; }
+	        get { return internalIsTokenized; }
 	    }
 
 	    /// <summary>True iff the term or terms used to index this field are stored as a term
@@ -162,7 +162,7 @@ namespace Lucene.Net.Documents
 	    /// <summary>True iff the value of the filed is stored as binary </summary>
 	    public bool IsBinary
 	    {
-	        get { return isBinary; }
+	        get { return internalIsBinary; }
 	    }
 
 
@@ -179,7 +179,7 @@ namespace Lucene.Net.Documents
 
 	    public virtual byte[] GetBinaryValue(byte[] result)
 		{
-			if (isBinary || fieldsData is byte[])
+			if (internalIsBinary || fieldsData is byte[])
 				return (byte[]) fieldsData;
 			else
 				return null;
@@ -193,9 +193,9 @@ namespace Lucene.Net.Documents
 	    {
 	        get
 	        {
-	            if (isBinary)
+	            if (internalIsBinary)
 	            {
-	                return binaryLength;
+	                return internalBinaryLength;
 	            }
 	            return fieldsData is byte[] ? ((byte[]) fieldsData).Length : 0;
 	        }
@@ -207,14 +207,14 @@ namespace Lucene.Net.Documents
 	    /// <value> index of the first character in byte[] segment that represents this Field value </value>
 	    public virtual int BinaryOffset
 	    {
-	        get { return binaryOffset; }
+	        get { return internalbinaryOffset; }
 	    }
 
 	    /// <summary>True if norms are omitted for this indexed field </summary>
 	    public virtual bool OmitNorms
 	    {
-	        get { return omitNorms; }
-	        set { this.omitNorms = value; }
+	        get { return internalOmitNorms; }
+	        set { this.internalOmitNorms = value; }
 	    }
 
 	    /// <summary>Expert:
@@ -230,8 +230,8 @@ namespace Lucene.Net.Documents
 	    /// </summary>
 	    public virtual bool OmitTermFreqAndPositions
 	    {
-	        set { this.omitTermFreqAndPositions = value; }
-	        get { return omitTermFreqAndPositions; }
+	        set { this.internalOmitTermFreqAndPositions = value; }
+	        get { return internalOmitTermFreqAndPositions; }
 	    }
 
 	    public virtual bool IsLazy
@@ -243,17 +243,17 @@ namespace Lucene.Net.Documents
 		public override System.String ToString()
 		{
 			System.Text.StringBuilder result = new System.Text.StringBuilder();
-			if (isStored)
+			if (internalIsStored)
 			{
 				result.Append("stored");
 			}
-			if (isIndexed)
+			if (internalIsIndexed)
 			{
 				if (result.Length > 0)
 					result.Append(",");
 				result.Append("indexed");
 			}
-			if (isTokenized)
+			if (internalIsTokenized)
 			{
 				if (result.Length > 0)
 					result.Append(",");
@@ -277,17 +277,17 @@ namespace Lucene.Net.Documents
 					result.Append(",");
 				result.Append("termVectorPosition");
 			}
-			if (isBinary)
+			if (internalIsBinary)
 			{
 				if (result.Length > 0)
 					result.Append(",");
 				result.Append("binary");
 			}
-			if (omitNorms)
+			if (internalOmitNorms)
 			{
 				result.Append(",omitNorms");
 			}
-			if (omitTermFreqAndPositions)
+			if (internalOmitTermFreqAndPositions)
 			{
 				result.Append(",omitTermFreqAndPositions");
 			}
@@ -296,7 +296,7 @@ namespace Lucene.Net.Documents
 				result.Append(",lazy");
 			}
 			result.Append('<');
-			result.Append(name);
+			result.Append(internalName);
 			result.Append(':');
 			
 			if (fieldsData != null && lazy == false)

Modified: incubator/lucene.net/trunk/src/core/Document/Field.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Document/Field.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Document/Field.cs (original)
+++ incubator/lucene.net/trunk/src/core/Document/Field.cs Sat Jul 21 19:14:57 2012
@@ -175,7 +175,7 @@ namespace Lucene.Net.Documents
         /// </summary>
         public void  SetValue(System.String value_Renamed)
         {
-            if (isBinary)
+            if (internalIsBinary)
             {
                 throw new System.ArgumentException("cannot set a String value on a binary field");
             }
@@ -185,11 +185,11 @@ namespace Lucene.Net.Documents
         /// <summary>Expert: change the value of this field.  See <a href="#setValue(java.lang.String)">setValue(String)</a>. </summary>
         public void  SetValue(System.IO.TextReader value_Renamed)
         {
-            if (isBinary)
+            if (internalIsBinary)
             {
                 throw new System.ArgumentException("cannot set a Reader value on a binary field");
             }
-            if (isStored)
+            if (internalIsStored)
             {
                 throw new System.ArgumentException("cannot set a Reader value on a stored field");
             }
@@ -199,25 +199,25 @@ namespace Lucene.Net.Documents
         /// <summary>Expert: change the value of this field.  See <a href="#setValue(java.lang.String)">setValue(String)</a>. </summary>
         public void  SetValue(byte[] value_Renamed)
         {
-            if (!isBinary)
+            if (!internalIsBinary)
             {
                 throw new System.ArgumentException("cannot set a byte[] value on a non-binary field");
             }
             fieldsData = value_Renamed;
-            binaryLength = value_Renamed.Length;
-            binaryOffset = 0;
+            internalBinaryLength = value_Renamed.Length;
+            internalbinaryOffset = 0;
         }
         
         /// <summary>Expert: change the value of this field.  See <a href="#setValue(java.lang.String)">setValue(String)</a>. </summary>
         public void  SetValue(byte[] value_Renamed, int offset, int length)
         {
-            if (!isBinary)
+            if (!internalIsBinary)
             {
                 throw new System.ArgumentException("cannot set a byte[] value on a non-binary field");
             }
             fieldsData = value_Renamed;
-            binaryLength = length;
-            binaryOffset = offset;
+            internalBinaryLength = length;
+            internalbinaryOffset = offset;
         }
         
         /// <summary>Expert: sets the token stream to be used for indexing and causes isIndexed() and isTokenized() to return true.
@@ -225,8 +225,8 @@ namespace Lucene.Net.Documents
         /// </summary>
         public void  SetTokenStream(TokenStream tokenStream)
         {
-            this.isIndexed = true;
-            this.isTokenized = true;
+            this.internalIsIndexed = true;
+            this.internalIsTokenized = true;
             this.tokenStream = tokenStream;
         }
         
@@ -318,22 +318,22 @@ namespace Lucene.Net.Documents
             // field names are optionally interned
                 name = StringHelper.Intern(name);
             
-            this.name = name;
+            this.internalName = name;
             
             this.fieldsData = value_Renamed;
 
-            this.isStored = store.IsStored();
+            this.internalIsStored = store.IsStored();
 
-            this.isIndexed = index.IsIndexed();
-            this.isTokenized = index.IsAnalyzed();
-            this.omitNorms = index.OmitNorms();
+            this.internalIsIndexed = index.IsIndexed();
+            this.internalIsTokenized = index.IsAnalyzed();
+            this.internalOmitNorms = index.OmitNorms();
 
             if (index == Index.NO)
             {
-                this.omitTermFreqAndPositions = false;
+                this.internalOmitTermFreqAndPositions = false;
             }
             
-            this.isBinary = false;
+            this.internalIsBinary = false;
             
             SetStoreTermVector(termVector);
         }
@@ -373,15 +373,15 @@ namespace Lucene.Net.Documents
             if (reader == null)
                 throw new System.NullReferenceException("reader cannot be null");
             
-            this.name = StringHelper.Intern(name); // field names are interned
+            this.internalName = StringHelper.Intern(name); // field names are interned
             this.fieldsData = reader;
             
-            this.isStored = false;
+            this.internalIsStored = false;
             
-            this.isIndexed = true;
-            this.isTokenized = true;
+            this.internalIsIndexed = true;
+            this.internalIsTokenized = true;
             
-            this.isBinary = false;
+            this.internalIsBinary = false;
             
             SetStoreTermVector(termVector);
         }
@@ -423,16 +423,16 @@ namespace Lucene.Net.Documents
             if (tokenStream == null)
                 throw new System.NullReferenceException("tokenStream cannot be null");
             
-            this.name = StringHelper.Intern(name); // field names are interned
+            this.internalName = StringHelper.Intern(name); // field names are interned
             this.fieldsData = null;
             this.tokenStream = tokenStream;
             
-            this.isStored = false;
+            this.internalIsStored = false;
             
-            this.isIndexed = true;
-            this.isTokenized = true;
+            this.internalIsIndexed = true;
+            this.internalIsTokenized = true;
             
-            this.isBinary = false;
+            this.internalIsBinary = false;
             
             SetStoreTermVector(termVector);
         }
@@ -474,21 +474,21 @@ namespace Lucene.Net.Documents
             if (value_Renamed == null)
                 throw new System.ArgumentException("value cannot be null");
             
-            this.name = StringHelper.Intern(name); // field names are interned
+            this.internalName = StringHelper.Intern(name); // field names are interned
             fieldsData = value_Renamed;
             
             if (store == Store.NO)
                 throw new System.ArgumentException("binary values can't be unstored");
 
-            isStored = store.IsStored();
-            isIndexed = false;
-            isTokenized = false;
-            omitTermFreqAndPositions = false;
-            omitNorms = true;
-            
-            isBinary = true;
-            binaryLength = length;
-            binaryOffset = offset;
+            internalIsStored = store.IsStored();
+            internalIsIndexed = false;
+            internalIsTokenized = false;
+            internalOmitTermFreqAndPositions = false;
+            internalOmitNorms = true;
+            
+            internalIsBinary = true;
+            internalBinaryLength = length;
+            internalbinaryOffset = offset;
             
             SetStoreTermVector(TermVector.NO);
         }

Modified: incubator/lucene.net/trunk/src/core/Index/AbstractAllTermDocs.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/AbstractAllTermDocs.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/AbstractAllTermDocs.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/AbstractAllTermDocs.cs Sat Jul 21 19:14:57 2012
@@ -33,7 +33,7 @@ namespace Lucene.Net.Index
     public abstract class AbstractAllTermDocs : TermDocs
     {
         protected int maxDoc;
-        protected int _doc = -1;
+        protected int internalDoc = -1;
 
         protected AbstractAllTermDocs(int maxDoc)
         {
@@ -44,7 +44,7 @@ namespace Lucene.Net.Index
         {
             if (term == null)
             {
-                _doc = -1;
+                internalDoc = -1;
             }
             else
             {
@@ -59,7 +59,7 @@ namespace Lucene.Net.Index
 
         public int Doc
         {
-            get { return _doc; }
+            get { return internalDoc; }
         }
 
         public int Freq
@@ -69,36 +69,36 @@ namespace Lucene.Net.Index
 
         public bool Next()
         {
-            return SkipTo(_doc + 1);
+            return SkipTo(internalDoc + 1);
         }
 
         public int Read(int[] docs, int[] freqs)
         {
             int length = docs.Length;
             int i = 0;
-            while (i < length && _doc < maxDoc)
+            while (i < length && internalDoc < maxDoc)
             {
-                if (!IsDeleted(_doc))
+                if (!IsDeleted(internalDoc))
                 {
-                    docs[i] = _doc;
+                    docs[i] = internalDoc;
                     freqs[i] = 1;
                     ++i;
                 }
-                _doc++;
+                internalDoc++;
             }
             return i;
         }
 
         public bool SkipTo(int target)
         {
-            _doc = target;
-            while (_doc < maxDoc)
+            internalDoc = target;
+            while (internalDoc < maxDoc)
             {
-                if (!IsDeleted(_doc))
+                if (!IsDeleted(internalDoc))
                 {
                     return true;
                 }
-                _doc++;
+                internalDoc++;
             }
             return false;
         }

Modified: incubator/lucene.net/trunk/src/core/Index/ConcurrentMergeScheduler.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/ConcurrentMergeScheduler.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/ConcurrentMergeScheduler.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/ConcurrentMergeScheduler.cs Sat Jul 21 19:14:57 2012
@@ -157,18 +157,8 @@ namespace Lucene.Net.Index
 							Message("    " + i + ": " + mergeThreads[i]);
 					}
 					
-					try
-					{
-						System.Threading.Monitor.Wait(this);
-					}
-					catch (System.Threading.ThreadInterruptedException ie)
-					{
-                        //// In 3.0 we will change this to throw
-                        //// InterruptedException instead
-                        //SupportClass.ThreadClass.Current().Interrupt();
-                        //throw new System.SystemException(ie.Message, ie);
-					    throw;
-					}
+					System.Threading.Monitor.Wait(this);
+					
 				}
 			}
 		}
@@ -244,18 +234,10 @@ namespace Lucene.Net.Index
 						{
 							if (Verbose())
 								Message("    too many merge threads running; stalling...");
-							try
-							{
-								System.Threading.Monitor.Wait(this);
-							}
-							catch (System.Threading.ThreadInterruptedException ie)
-							{
-                                //// In 3.0 we will change this to throw
-                                //// InterruptedException instead
-                                //SupportClass.ThreadClass.Current().Interrupt();
-                                //throw new System.SystemException(ie.Message, ie);
-							    throw;
-							}
+							
+                            System.Threading.Monitor.Wait(this);
+							
+							
 						}
 						
 						if (Verbose())
@@ -355,12 +337,12 @@ namespace Lucene.Net.Index
 				{
 					Priority = (System.Threading.ThreadPriority) pri;
 				}
-				catch (System.NullReferenceException npe)
+				catch (System.NullReferenceException)
 				{
 					// Strangely, Sun's JDK 1.5 on Linux sometimes
 					// throws NPE out of here...
 				}
-				catch (System.Security.SecurityException se)
+				catch (System.Security.SecurityException)
 				{
 					// Ignore this because we will still run fine with
 					// normal thread priority
@@ -441,24 +423,15 @@ namespace Lucene.Net.Index
 		/// </summary>
 		protected internal virtual void  HandleMergeException(System.Exception exc)
 		{
-			try
-			{
-				// When an exception is hit during merge, IndexWriter
-				// removes any partial files and then allows another
-				// merge to run.  If whatever caused the error is not
-				// transient then the exception will keep happening,
-				// so, we sleep here to avoid saturating CPU in such
-				// cases:
-				System.Threading.Thread.Sleep(new System.TimeSpan((System.Int64) 10000 * 250));
-			}
-			catch (System.Threading.ThreadInterruptedException ie)
-			{
-                //SupportClass.ThreadClass.Current().Interrupt();
-                //// In 3.0 this will throw InterruptedException
-                //throw new System.SystemException(ie.Message, ie);
-			    throw;
-			}
-			throw new MergePolicy.MergeException(exc, dir);
+			// When an exception is hit during merge, IndexWriter
+			// removes any partial files and then allows another
+			// merge to run.  If whatever caused the error is not
+			// transient then the exception will keep happening,
+			// so, we sleep here to avoid saturating CPU in such
+			// cases:
+			System.Threading.Thread.Sleep(new System.TimeSpan((System.Int64) 10000 * 250));
+			
+            throw new MergePolicy.MergeException(exc, dir);
 		}
 		
 		internal static bool anyExceptions = false;

Modified: incubator/lucene.net/trunk/src/core/Index/DirectoryReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/DirectoryReader.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/DirectoryReader.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/DirectoryReader.cs Sat Jul 21 19:14:57 2012
@@ -85,7 +85,7 @@ namespace Lucene.Net.Index
                 return Enclosing_Instance.DoReopen(infos, false, openReadOnly);
             }
         }
-        protected internal Directory directory;
+        protected internal Directory internalDirectory;
         protected internal bool readOnly;
         
         internal IndexWriter writer;
@@ -120,7 +120,7 @@ namespace Lucene.Net.Index
         /// <summary>Construct reading the named set of readers. </summary>
         internal DirectoryReader(Directory directory, SegmentInfos sis, IndexDeletionPolicy deletionPolicy, bool readOnly, int termInfosIndexDivisor)
         {
-            this.directory = directory;
+            this.internalDirectory = directory;
             this.readOnly = readOnly;
             this.segmentInfos = sis;
             this.deletionPolicy = deletionPolicy;
@@ -158,7 +158,7 @@ namespace Lucene.Net.Index
                             {
                                 readers[i].Close();
                             }
-                            catch (System.Exception ignore)
+                            catch (System.Exception)
                             {
                                 // keep going - we want to clean up as much as possible
                             }
@@ -173,7 +173,7 @@ namespace Lucene.Net.Index
         // Used by near real-time search
         internal DirectoryReader(IndexWriter writer, SegmentInfos infos, int termInfosIndexDivisor)
         {
-            this.directory = writer.Directory;
+            this.internalDirectory = writer.Directory;
             this.readOnly = true;
             segmentInfos = infos;
             segmentInfosStart = (SegmentInfos) infos.Clone();
@@ -182,7 +182,7 @@ namespace Lucene.Net.Index
             {
                 // We assume that this segments_N was previously
                 // properly sync'd:
-                synced.UnionWith(infos.Files(directory, true));
+                synced.UnionWith(infos.Files(internalDirectory, true));
             }
             
             // IndexWriter synchronizes externally before calling
@@ -216,7 +216,7 @@ namespace Lucene.Net.Index
                             {
                                 readers[upto].Close();
                             }
-                            catch (System.Exception ignore)
+                            catch (System.Exception)
                             {
                                 // keep going - we want to clean up as much as possible
                             }
@@ -242,7 +242,7 @@ namespace Lucene.Net.Index
         internal DirectoryReader(Directory directory, SegmentInfos infos, SegmentReader[] oldReaders, int[] oldStarts,
                                  System.Collections.Generic.IDictionary<string,byte[]> oldNormsCache, bool readOnly, bool doClone, int termInfosIndexDivisor)
         {
-            this.directory = directory;
+            this.internalDirectory = directory;
             this.readOnly = readOnly;
             this.segmentInfos = infos;
             this.termInfosIndexDivisor = termInfosIndexDivisor;
@@ -340,7 +340,7 @@ namespace Lucene.Net.Index
                                         newReaders[i].DecRef();
                                     }
                                 }
-                                catch (System.IO.IOException ignore)
+                                catch (System.IO.IOException)
                                 {
                                     // keep going - we want to clean up as much as possible
                                 }
@@ -409,7 +409,7 @@ namespace Lucene.Net.Index
 
             if (!readOnly)
             {
-                maxIndexVersion = SegmentInfos.ReadCurrentVersion(directory);
+                maxIndexVersion = SegmentInfos.ReadCurrentVersion(internalDirectory);
             }
         }
         
@@ -550,7 +550,7 @@ namespace Lucene.Net.Index
                 }
                 else
                 {
-                    if (directory != commit.Directory)
+                    if (internalDirectory != commit.Directory)
                         throw new System.IO.IOException("the specified commit does not match the specified Directory");
                     if (segmentInfos != null && commit.SegmentsFileName.Equals(segmentInfos.GetCurrentSegmentFileName()))
                     {
@@ -566,7 +566,7 @@ namespace Lucene.Net.Index
                     }
                 }
 
-                return (IndexReader)new AnonymousFindSegmentsFile(directory, openReadOnly, this).Run(commit);
+                return (IndexReader)new AnonymousFindSegmentsFile(internalDirectory, openReadOnly, this).Run(commit);
             }
         }
 
@@ -597,11 +597,11 @@ namespace Lucene.Net.Index
                 DirectoryReader reader;
                 if (openReadOnly)
                 {
-                    reader = new ReadOnlyDirectoryReader(directory, infos, subReaders, starts, normsCache, doClone, termInfosIndexDivisor);
+                    reader = new ReadOnlyDirectoryReader(internalDirectory, infos, subReaders, starts, normsCache, doClone, termInfosIndexDivisor);
                 }
                 else
                 {
-                    reader = new DirectoryReader(directory, infos, subReaders, starts, normsCache, false, doClone, termInfosIndexDivisor);
+                    reader = new DirectoryReader(internalDirectory, infos, subReaders, starts, normsCache, false, doClone, termInfosIndexDivisor);
                 }
                 return reader;
             }
@@ -885,7 +885,7 @@ namespace Lucene.Net.Index
                 
                 if (this.writeLock == null)
                 {
-                    Lock writeLock = directory.MakeLock(IndexWriter.WRITE_LOCK_NAME);
+                    Lock writeLock = internalDirectory.MakeLock(IndexWriter.WRITE_LOCK_NAME);
                     if (!writeLock.Obtain(IndexWriter.WRITE_LOCK_TIMEOUT))
                     // obtain write lock
                     {
@@ -896,7 +896,7 @@ namespace Lucene.Net.Index
                     // we have to check whether index has changed since this reader was opened.
                     // if so, this reader is no longer valid for
                     // deletion
-                    if (SegmentInfos.ReadCurrentVersion(directory) > maxIndexVersion)
+                    if (SegmentInfos.ReadCurrentVersion(internalDirectory) > maxIndexVersion)
                     {
                         stale = true;
                         this.writeLock.Release();
@@ -921,7 +921,7 @@ namespace Lucene.Net.Index
                 segmentInfos.UserData = commitUserData;
                 // Default deleter (for backwards compatibility) is
                 // KeepOnlyLastCommitDeleter:
-                IndexFileDeleter deleter = new IndexFileDeleter(directory, deletionPolicy == null?new KeepOnlyLastCommitDeletionPolicy():deletionPolicy, segmentInfos, null, null, synced);
+                IndexFileDeleter deleter = new IndexFileDeleter(internalDirectory, deletionPolicy == null?new KeepOnlyLastCommitDeletionPolicy():deletionPolicy, segmentInfos, null, null, synced);
 
                 segmentInfos.UpdateGeneration(deleter.LastSegmentInfos);
 
@@ -936,17 +936,17 @@ namespace Lucene.Net.Index
                         subReaders[i].Commit();
 
                     // Sync all files we just wrote
-                    foreach(string fileName in segmentInfos.Files(directory, false))
+                    foreach(string fileName in segmentInfos.Files(internalDirectory, false))
                     {
                         if(!synced.Contains(fileName))
                         {
-                            System.Diagnostics.Debug.Assert(directory.FileExists(fileName));
-                            directory.Sync(fileName);
+                            System.Diagnostics.Debug.Assert(internalDirectory.FileExists(fileName));
+                            internalDirectory.Sync(fileName);
                             synced.Add(fileName);
                         }   
                     }
                     
-                    segmentInfos.Commit(directory);
+                    segmentInfos.Commit(internalDirectory);
                     success = true;
                 }
                 finally
@@ -1018,7 +1018,7 @@ namespace Lucene.Net.Index
             if (writer == null || writer.IsClosed())
             {
                 // we loaded SegmentInfos from the directory
-                return SegmentInfos.ReadCurrentVersion(directory) == segmentInfos.Version;
+                return SegmentInfos.ReadCurrentVersion(internalDirectory) == segmentInfos.Version;
             }
             else
             {
@@ -1085,7 +1085,7 @@ namespace Lucene.Net.Index
             // Don't ensureOpen here -- in certain cases, when a
             // cloned/reopened reader needs to commit, it may call
             // this method on the closed original reader
-            return directory;
+            return internalDirectory;
         }
 
         public override int TermInfosIndexDivisor
@@ -1099,7 +1099,7 @@ namespace Lucene.Net.Index
         /// </summary>
         public override IndexCommit IndexCommit
         {
-            get { return new ReaderCommit(segmentInfos, directory); }
+            get { return new ReaderCommit(segmentInfos, internalDirectory); }
         }
 
         /// <seealso cref="Lucene.Net.Index.IndexReader.ListCommits">
@@ -1131,7 +1131,7 @@ namespace Lucene.Net.Index
                         // segments_N is corrupt
                         sis.Read(dir, fileName);
                     }
-                    catch (System.IO.FileNotFoundException fnfe)
+                    catch (System.IO.FileNotFoundException)
                     {
                         // LUCENE-948: on NFS (and maybe others), if
                         // you have writers switching back and forth

Modified: incubator/lucene.net/trunk/src/core/Index/DocumentsWriter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/DocumentsWriter.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/DocumentsWriter.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/DocumentsWriter.cs Sat Jul 21 19:14:57 2012
@@ -618,7 +618,7 @@ namespace Lucene.Net.Index
 						{
 							abortedFiles = OpenFiles();
 						}
-						catch (System.Exception t)
+						catch (System.Exception)
 						{
 							abortedFiles = null;
 						}
@@ -632,7 +632,7 @@ namespace Lucene.Net.Index
 							{
 								threadStates[i].consumer.Abort();
 							}
-							catch (System.Exception t)
+							catch (System.Exception)
 							{
 							}
 						
@@ -640,7 +640,7 @@ namespace Lucene.Net.Index
 						{
 							consumer.Abort();
 						}
-						catch (System.Exception t)
+						catch (System.Exception)
 						{
 						}
 						
@@ -693,18 +693,7 @@ namespace Lucene.Net.Index
 				pauseThreads++;
 				while (!AllThreadsIdle())
 				{
-					try
-					{
-						System.Threading.Monitor.Wait(this);
-					}
-					catch (System.Threading.ThreadInterruptedException ie)
-					{
-                        //// In 3.0 we will change this to throw
-                        //// InterruptedException instead
-                        //SupportClass.ThreadClass.Current().Interrupt();
-                        //throw new System.SystemException(ie.Message, ie);
-					    throw;
-					}
+					System.Threading.Monitor.Wait(this);
 				}
 				
 				return aborting;
@@ -1156,18 +1145,7 @@ namespace Lucene.Net.Index
 				
 				while (!closed && ((state != null && !state.isIdle) || pauseThreads != 0 || flushPending || aborting))
 				{
-					try
-					{
-						System.Threading.Monitor.Wait(this);
-					}
-					catch (System.Threading.ThreadInterruptedException ie)
-					{
-					    throw;
-					    //// In 3.0 we will change this to throw
-					    //// InterruptedException instead
-					    //SupportClass.ThreadClass.Current().Interrupt();
-					    //throw new System.SystemException(ie.Message, ie);
-					}
+					System.Threading.Monitor.Wait(this);
 				}
 				
 				if (closed)
@@ -1465,7 +1443,7 @@ namespace Lucene.Net.Index
 						{
 							docWriter.Abort();
 						}
-						catch (System.Exception t)
+						catch (System.Exception)
 						{
 						}
 					
@@ -1504,18 +1482,7 @@ namespace Lucene.Net.Index
 			{
 				do 
 				{
-					try
-					{
-						System.Threading.Monitor.Wait(this);
-					}
-					catch (System.Threading.ThreadInterruptedException ie)
-					{
-					    throw;
-					    //// In 3.0 we will change this to throw
-					    //// InterruptedException instead
-					    //SupportClass.ThreadClass.Current().Interrupt();
-					    //throw new System.SystemException(ie.Message, ie);
-					}
+					System.Threading.Monitor.Wait(this);
 				}
 				while (!waitQueue.DoResume());
 			}

Modified: incubator/lucene.net/trunk/src/core/Index/FieldInfos.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/FieldInfos.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/FieldInfos.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/FieldInfos.cs Sat Jul 21 19:14:57 2012
@@ -77,7 +77,7 @@ namespace Lucene.Net.Index
 				{
 					Read(input, name);
 				}
-				catch (System.IO.IOException ioe)
+				catch (System.IO.IOException)
 				{
 					if (format == FORMAT_PRE)
 					{
@@ -94,7 +94,7 @@ namespace Lucene.Net.Index
 						{
 							Read(input, name);
 						}
-						catch (System.Exception t)
+						catch (System.Exception)
                         {
                             // Ignore any new exception & set to throw original IOE
 						    rethrow = true;

Modified: incubator/lucene.net/trunk/src/core/Index/FieldsReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/FieldsReader.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/FieldsReader.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/FieldsReader.cs Sat Jul 21 19:14:57 2012
@@ -473,9 +473,9 @@ namespace Lucene.Net.Index
 				InitBlock(enclosingInstance);
 				this.toRead = toRead;
 				this.pointer = pointer;
-				this.isBinary = isBinary;
+				this.internalIsBinary = isBinary;
 				if (isBinary)
-					binaryLength = toRead;
+					internalBinaryLength = toRead;
 				lazy = true;
 			    this.isCompressed = isCompressed;
 			}
@@ -485,9 +485,9 @@ namespace Lucene.Net.Index
 				InitBlock(enclosingInstance);
 				this.toRead = toRead;
 				this.pointer = pointer;
-				this.isBinary = isBinary;
+				this.internalIsBinary = isBinary;
 				if (isBinary)
-					binaryLength = toRead;
+					internalBinaryLength = toRead;
 				lazy = true;
 			    this.isCompressed = isCompressed;
 			}
@@ -538,7 +538,7 @@ namespace Lucene.Net.Index
 		        get
 		        {
 		            Enclosing_Instance.EnsureOpen();
-		            if (isBinary)
+		            if (internalIsBinary)
 		                return null;
 		            else
 		            {
@@ -614,7 +614,7 @@ namespace Lucene.Net.Index
 			{
 				Enclosing_Instance.EnsureOpen();
 				
-				if (isBinary)
+				if (internalIsBinary)
 				{
 					if (fieldsData == null)
 					{
@@ -647,8 +647,8 @@ namespace Lucene.Net.Index
 							throw new FieldReaderException(e);
 						}
 						
-						binaryOffset = 0;
-						binaryLength = toRead;
+						internalbinaryOffset = 0;
+						internalBinaryLength = toRead;
 					}
 					
 					return (byte[]) fieldsData;

Modified: incubator/lucene.net/trunk/src/core/Index/FieldsWriter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/FieldsWriter.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/FieldsWriter.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/FieldsWriter.cs Sat Jul 21 19:14:57 2012
@@ -76,7 +76,7 @@ namespace Lucene.Net.Index
 					{
 						Dispose();
 					}
-					catch (System.Exception t)
+					catch (System.Exception)
 					{
 						// Suppress so we keep throwing the original exception
 					}
@@ -84,7 +84,7 @@ namespace Lucene.Net.Index
 					{
 						d.DeleteFile(fieldsName);
 					}
-					catch (System.Exception t)
+					catch (System.Exception)
 					{
 						// Suppress so we keep throwing the original exception
 					}
@@ -107,14 +107,14 @@ namespace Lucene.Net.Index
 					{
 						Dispose();
 					}
-					catch (System.IO.IOException ioe)
+					catch (System.IO.IOException)
 					{
 					}
 					try
 					{
 						d.DeleteFile(fieldsName);
 					}
-					catch (System.Exception t)
+					catch (System.Exception)
 					{
 						// Suppress so we keep throwing the original exception
 					}
@@ -122,7 +122,7 @@ namespace Lucene.Net.Index
 					{
 						d.DeleteFile(indexName);
 					}
-					catch (System.Exception t)
+					catch (System.Exception)
 					{
 						// Suppress so we keep throwing the original exception
 					}
@@ -187,7 +187,7 @@ namespace Lucene.Net.Index
 						}
 					}
 				}
-				catch (System.IO.IOException ioe)
+				catch (System.IO.IOException)
 				{
 					try
 					{
@@ -203,7 +203,7 @@ namespace Lucene.Net.Index
 							}
 						}
 					}
-					catch (System.IO.IOException ioe2)
+					catch (System.IO.IOException)
 					{
 						// Ignore so we throw only first IOException hit
 					}

Modified: incubator/lucene.net/trunk/src/core/Index/FreqProxTermsWriterPerField.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/FreqProxTermsWriterPerField.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/FreqProxTermsWriterPerField.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/FreqProxTermsWriterPerField.cs Sat Jul 21 19:14:57 2012
@@ -109,11 +109,11 @@ namespace Lucene.Net.Index
 				payload = payloadAttribute.Payload;
 			}
 			
-			if (payload != null && payload.length > 0)
+			if (payload != null && payload.internalLength > 0)
 			{
 				termsHashPerField.WriteVInt(1, (proxCode << 1) | 1);
-				termsHashPerField.WriteVInt(1, payload.length);
-				termsHashPerField.WriteBytes(1, payload.data, payload.offset, payload.length);
+				termsHashPerField.WriteVInt(1, payload.internalLength);
+				termsHashPerField.WriteBytes(1, payload.data, payload.internalOffset, payload.internalLength);
 				hasPayloads = true;
 			}
 			else

Modified: incubator/lucene.net/trunk/src/core/Index/IndexWriter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/IndexWriter.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/IndexWriter.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/IndexWriter.cs Sat Jul 21 19:14:57 2012
@@ -1333,7 +1333,7 @@ namespace Lucene.Net.Index
                     {
                         writeLock.Release();
                     }
-                    catch (Exception t)
+                    catch (Exception)
                     {
                         // don't mask the original exception
                     }
@@ -5051,7 +5051,7 @@ namespace Lucene.Net.Index
                             {
                                 readerPool.Release(merge.readers[i], false);
                             }
-                            catch (Exception t)
+                            catch (Exception)
                             {
                             }
                             merge.readers[i] = null;
@@ -5063,7 +5063,7 @@ namespace Lucene.Net.Index
                             {
                                 merge.readersClone[i].Close();
                             }
-                            catch (Exception t)
+                            catch (Exception)
                             {
                             }
                             // This was a private clone and we had the
@@ -5489,18 +5489,8 @@ namespace Lucene.Net.Index
 						// previously syncing failed to appear in synced
 							return false;
 						else
-							try
-							{
-								System.Threading.Monitor.Wait(synced);
-							}
-							catch (System.Threading.ThreadInterruptedException ie)
-							{
-                                //// In 3.0 we will change this to throw
-                                //// InterruptedException instead
-                                //SupportClass.ThreadClass.Current().Interrupt();
-                                //throw new System.SystemException(ie.Message, ie);
-							    throw;
-							}
+							System.Threading.Monitor.Wait(synced);
+							
 					}
 				}
 				return true;
@@ -5517,18 +5507,8 @@ namespace Lucene.Net.Index
 				// falls to be called, we wait for at most 1 second
 				// and then return so caller can check if wait
 				// conditions are satisified:
-				try
-				{
-					System.Threading.Monitor.Wait(this, TimeSpan.FromMilliseconds(1000));
-				}
-				catch (System.Threading.ThreadInterruptedException ie)
-				{
-                    //// In 3.0 we will change this to throw
-                    //// InterruptedException instead
-                    //SupportClass.ThreadClass.Current().Interrupt();
-                    //throw new System.SystemException(ie.Message, ie);
-				    throw;
-				}
+				System.Threading.Monitor.Wait(this, TimeSpan.FromMilliseconds(1000));
+				
 			}
 		}
 		

Modified: incubator/lucene.net/trunk/src/core/Index/LogMergePolicy.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/LogMergePolicy.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/LogMergePolicy.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/LogMergePolicy.cs Sat Jul 21 19:14:57 2012
@@ -71,10 +71,10 @@ namespace Lucene.Net.Index
 		internal long maxMergeSize;
 		internal int maxMergeDocs = DEFAULT_MAX_MERGE_DOCS;
 
-        protected double noCFSRatio = DEFAULT_NO_CFS_RATIO;
+        protected double internalNoCFSRatio = DEFAULT_NO_CFS_RATIO;
 		
 		/* TODO 3.0: change this default to true */
-		protected internal bool calibrateSizeByDeletes = false;
+		protected internal bool internalCalibrateSizeByDeletes = true;
 		
 		private bool useCompoundFile = true;
 		private bool useCompoundDocStore = true;
@@ -90,14 +90,14 @@ namespace Lucene.Net.Index
 
 	    public double NoCFSRatio
 	    {
-	        get { return noCFSRatio; }
+	        get { return internalNoCFSRatio; }
 	        set
 	        {
 	            if (value < 0.0 || value > 1.0)
 	            {
 	                throw new ArgumentException("noCFSRatio must be 0.0 to 1.0 inclusive; got " + value);
 	            }
-	            this.noCFSRatio = value;
+	            this.internalNoCFSRatio = value;
 	        }
 	    }
 
@@ -184,15 +184,15 @@ namespace Lucene.Net.Index
 	    /// </summary>
 	    public virtual bool CalibrateSizeByDeletes
 	    {
-	        set { this.calibrateSizeByDeletes = value; }
-	        get { return calibrateSizeByDeletes; }
+	        set { this.internalCalibrateSizeByDeletes = value; }
+	        get { return internalCalibrateSizeByDeletes; }
 	    }
 
 	    abstract protected internal long Size(SegmentInfo info);
 		
 		protected internal virtual long SizeDocs(SegmentInfo info)
 		{
-			if (calibrateSizeByDeletes)
+			if (internalCalibrateSizeByDeletes)
 			{
 				int delCount = writer.NumDeletedDocs(info);
 				return (info.docCount - (long) delCount);
@@ -206,7 +206,7 @@ namespace Lucene.Net.Index
 		protected internal virtual long SizeBytes(SegmentInfo info)
 		{
 			long byteSize = info.SizeInBytes();
-			if (calibrateSizeByDeletes)
+			if (internalCalibrateSizeByDeletes)
 			{
 				int delCount = writer.NumDeletedDocs(info);
 				float delRatio = (info.docCount <= 0?0.0f:((float) delCount / (float) info.docCount));
@@ -244,7 +244,7 @@ namespace Lucene.Net.Index
 		{
 			bool hasDeletions = writer.NumDeletedDocs(info) > 0;
 			return !hasDeletions && !info.HasSeparateNorms() && info.dir == writer.Directory &&
-                (info.GetUseCompoundFile() == useCompoundFile || noCFSRatio < 1.0);
+                (info.GetUseCompoundFile() == useCompoundFile || internalNoCFSRatio < 1.0);
 		}
 		
 		/// <summary>Returns the merges necessary to optimize the index.
@@ -530,7 +530,7 @@ namespace Lucene.Net.Index
             {
                 doCFS = false;
             }
-            else if (noCFSRatio == 1.0)
+            else if (internalNoCFSRatio == 1.0)
             {
                 doCFS = true;
             }
@@ -547,7 +547,7 @@ namespace Lucene.Net.Index
                     mergeSize += Size(info);
                 }
 
-                doCFS = mergeSize <= noCFSRatio * totSize;
+                doCFS = mergeSize <= internalNoCFSRatio * totSize;
             }
 
             return new OneMerge(infosToMerge, doCFS);

Modified: incubator/lucene.net/trunk/src/core/Index/MultiReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/MultiReader.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/MultiReader.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/MultiReader.cs Sat Jul 21 19:14:57 2012
@@ -187,7 +187,7 @@ namespace Lucene.Net.Index
                             {
                                 newSubReaders[i].Close();
                             }
-                            catch (System.IO.IOException ignore)
+                            catch (System.IO.IOException)
                             {
                                 // keep going - we want to clean up as much as possible
                             }

Modified: incubator/lucene.net/trunk/src/core/Index/ParallelReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/ParallelReader.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/ParallelReader.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/ParallelReader.cs Sat Jul 21 19:14:57 2012
@@ -212,7 +212,7 @@ namespace Lucene.Net.Index
 							{
 								r.Close();
 							}
-							catch (System.IO.IOException ignore)
+							catch (System.IO.IOException)
 							{
 								// keep going - we want to clean up as much as possible
 							}

Modified: incubator/lucene.net/trunk/src/core/Index/Payload.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/Payload.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/Payload.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/Payload.cs Sat Jul 21 19:14:57 2012
@@ -41,10 +41,10 @@ namespace Lucene.Net.Index
 		protected internal byte[] data;
 		
 		/// <summary>the offset within the byte array </summary>
-		protected internal int offset;
+		protected internal int internalOffset;
 		
 		/// <summary>the length of the payload data </summary>
-		protected internal int length;
+		protected internal int internalLength;
 		
 		/// <summary>Creates an empty payload and does not allocate a byte array. </summary>
 		public Payload()
@@ -81,8 +81,8 @@ namespace Lucene.Net.Index
 				throw new System.ArgumentException();
 			}
 			this.data = data;
-			this.offset = offset;
-			this.length = length;
+			this.internalOffset = offset;
+			this.internalLength = length;
 		}
 
 	    /// <summary> Sets this payloads data. 
@@ -92,8 +92,8 @@ namespace Lucene.Net.Index
 		public virtual void  SetData(byte[] value, int offset, int length)
 		{
 			this.data = value;
-			this.offset = offset;
-			this.length = length;
+			this.internalOffset = offset;
+			this.internalLength = length;
 		}
 
 	    /// <summary> Gets or sets a reference to the underlying byte array
@@ -115,21 +115,21 @@ namespace Lucene.Net.Index
 	    /// <summary> Returns the offset in the underlying byte array </summary>
 	    public virtual int Offset
 	    {
-	        get { return this.offset; }
+	        get { return this.internalOffset; }
 	    }
 
 	    /// <summary> Returns the length of the payload data. </summary>
 	    public virtual int Length
 	    {
-	        get { return this.length; }
+	        get { return this.internalLength; }
 	    }
 
 	    /// <summary> Returns the byte at the given index.</summary>
 		public virtual byte ByteAt(int index)
 		{
-			if (0 <= index && index < this.length)
+			if (0 <= index && index < this.internalLength)
 			{
-				return this.data[this.offset + index];
+				return this.data[this.internalOffset + index];
 			}
 			throw new System. IndexOutOfRangeException("Index of bound " + index);
 		}
@@ -137,8 +137,8 @@ namespace Lucene.Net.Index
 		/// <summary> Allocates a new byte array, copies the payload data into it and returns it. </summary>
 		public virtual byte[] ToByteArray()
 		{
-			byte[] retArray = new byte[this.length];
-			Array.Copy(this.data, this.offset, retArray, 0, this.length);
+			byte[] retArray = new byte[this.internalLength];
+			Array.Copy(this.data, this.internalOffset, retArray, 0, this.internalLength);
 			return retArray;
 		}
 		
@@ -151,11 +151,11 @@ namespace Lucene.Net.Index
 		/// </param>
 		public virtual void  CopyTo(byte[] target, int targetOffset)
 		{
-			if (this.length > target.Length + targetOffset)
+			if (this.internalLength > target.Length + targetOffset)
 			{
 				throw new System.IndexOutOfRangeException();
 			}
-			Array.Copy(this.data, this.offset, target, targetOffset, this.length);
+			Array.Copy(this.data, this.internalOffset, target, targetOffset, this.internalLength);
 		}
 		
 		/// <summary> Clones this payload by creating a copy of the underlying
@@ -168,7 +168,7 @@ namespace Lucene.Net.Index
 				// Start with a shallow copy of data
 				Payload clone = (Payload) base.MemberwiseClone();
 				// Only copy the part of data that belongs to this Payload
-				if (offset == 0 && length == data.Length)
+				if (internalOffset == 0 && internalLength == data.Length)
 				{
 					// It is the whole thing, so just clone it.
 					clone.data = new byte[data.Length];
@@ -178,7 +178,7 @@ namespace Lucene.Net.Index
 				{
 					// Just get the part
 					clone.data = this.ToByteArray();
-					clone.offset = 0;
+					clone.internalOffset = 0;
 				}
 				return clone;
 			}
@@ -195,10 +195,10 @@ namespace Lucene.Net.Index
 			if (obj is Payload)
 			{
 				Payload other = (Payload) obj;
-				if (length == other.length)
+				if (internalLength == other.internalLength)
 				{
-					for (int i = 0; i < length; i++)
-						if (data[offset + i] != other.data[other.offset + i])
+					for (int i = 0; i < internalLength; i++)
+						if (data[internalOffset + i] != other.data[other.internalOffset + i])
 							return false;
 					return true;
 				}
@@ -211,7 +211,7 @@ namespace Lucene.Net.Index
 		
 		public override int GetHashCode()
 		{
-			return ArrayUtil.HashCode(data, offset, offset + length);
+			return ArrayUtil.HashCode(data, internalOffset, internalOffset + internalLength);
 		}
 	}
 }
\ No newline at end of file

Modified: incubator/lucene.net/trunk/src/core/Index/SegmentInfo.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/SegmentInfo.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/SegmentInfo.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/SegmentInfo.cs Sat Jul 21 19:14:57 2012
@@ -837,7 +837,7 @@ namespace Lucene.Net.Index
 				else
 					cfs = "C";
 			}
-			catch (System.IO.IOException ioe)
+			catch (System.IO.IOException)
 			{
 				cfs = "?";
 			}

Modified: incubator/lucene.net/trunk/src/core/Index/SegmentInfos.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/SegmentInfos.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/SegmentInfos.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/SegmentInfos.cs Sat Jul 21 19:14:57 2012
@@ -180,7 +180,7 @@ namespace Lucene.Net.Index
 			{
 				return GetCurrentSegmentGeneration(directory.ListAll());
 			}
-			catch (NoSuchDirectoryException nsde)
+			catch (NoSuchDirectoryException)
 			{
 				return - 1;
 			}
@@ -416,7 +416,7 @@ namespace Lucene.Net.Index
 					{
 						segnOutput.Close();
 					}
-					catch (System.Exception t)
+					catch (System.Exception)
 					{
 						// Suppress so we keep throwing the original exception
 					}
@@ -426,7 +426,7 @@ namespace Lucene.Net.Index
 						// the index:
 						directory.DeleteFile(segmentFileName);
 					}
-					catch (System.Exception t)
+					catch (System.Exception)
 					{
 						// Suppress so we keep throwing the original exception
 					}
@@ -674,7 +674,7 @@ namespace Lucene.Net.Index
 										}
 									}
 								}
-								catch (System.IO.IOException err2)
+								catch (System.IO.IOException)
 								{
 									// will retry
 								}
@@ -683,18 +683,10 @@ namespace Lucene.Net.Index
 									genInput.Close();
 								}
 							}
-							try
-							{
-								System.Threading.Thread.Sleep(new System.TimeSpan((System.Int64) 10000 * Lucene.Net.Index.SegmentInfos.defaultGenFileRetryPauseMsec));
-							}
-							catch (System.Threading.ThreadInterruptedException ie)
-							{
-                                //// In 3.0 we will change this to throw
-                                //// InterruptedException instead
-                                //SupportClass.ThreadClass.Current().Interrupt();
-                                //throw new System.SystemException(ie.Message, ie);
-							    throw;
-							}
+							
+                            System.Threading.Thread.Sleep(new System.TimeSpan((System.Int64) 10000 * Lucene.Net.Index.SegmentInfos.defaultGenFileRetryPauseMsec));
+							
+							
 						}
 						
 						Lucene.Net.Index.SegmentInfos.Message(IndexFileNames.SEGMENTS_GEN + " check: genB=" + genB);
@@ -847,7 +839,7 @@ namespace Lucene.Net.Index
 				{
 					pendingSegnOutput.Close();
 				}
-				catch (System.Exception t)
+				catch (System.Exception)
 				{
 					// Suppress so we keep throwing the original exception
 					// in our caller
@@ -860,7 +852,7 @@ namespace Lucene.Net.Index
 					System.String segmentFileName = IndexFileNames.FileNameFromGeneration(IndexFileNames.SEGMENTS, "", generation);
 					dir.DeleteFile(segmentFileName);
 				}
-				catch (System.Exception t)
+				catch (System.Exception)
 				{
 					// Suppress so we keep throwing the original exception
 					// in our caller
@@ -950,7 +942,7 @@ namespace Lucene.Net.Index
 					{
 						dir.DeleteFile(fileName);
 					}
-					catch (System.Exception t)
+					catch (System.Exception)
 					{
 						// Suppress so we keep throwing the original exception
 					}
@@ -973,7 +965,7 @@ namespace Lucene.Net.Index
 					genOutput.Close();
 				}
 			}
-			catch (System.Exception t)
+			catch (System.Exception)
 			{
 				// It's OK if we fail to write this file since it's
 				// used only as one of the retry fallbacks.

Modified: incubator/lucene.net/trunk/src/core/Index/SegmentReader.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/SegmentReader.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/SegmentReader.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/SegmentReader.cs Sat Jul 21 19:14:57 2012
@@ -757,7 +757,7 @@ namespace Lucene.Net.Index
                         {
                             enclosingInstance.Directory().DeleteFile(normFileName);
                         }
-                        catch (Exception t)
+                        catch (Exception)
                         {
                             // suppress this so we keep throwing the
                             // original exception
@@ -1052,7 +1052,7 @@ namespace Lucene.Net.Index
                         {
                             Directory().DeleteFile(delFileName);
                         }
-                        catch (Exception t)
+                        catch (Exception)
                         {
                             // suppress this so we keep throwing the
                             // original exception

Modified: incubator/lucene.net/trunk/src/core/Index/StoredFieldsWriter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/StoredFieldsWriter.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/StoredFieldsWriter.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/StoredFieldsWriter.cs Sat Jul 21 19:14:57 2012
@@ -154,7 +154,7 @@ namespace Lucene.Net.Index
 					{
 						fieldsWriter.Dispose();
 					}
-					catch (System.Exception t)
+					catch (System.Exception)
 					{
 					}
 					fieldsWriter = null;

Modified: incubator/lucene.net/trunk/src/core/Index/TermVectorsTermsWriter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Index/TermVectorsTermsWriter.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Index/TermVectorsTermsWriter.cs (original)
+++ incubator/lucene.net/trunk/src/core/Index/TermVectorsTermsWriter.cs Sat Jul 21 19:14:57 2012
@@ -261,7 +261,7 @@ namespace Lucene.Net.Index
 				{
 					tvx.Close();
 				}
-				catch (System.Exception t)
+				catch (System.Exception)
 				{
 				}
 				tvx = null;
@@ -272,7 +272,7 @@ namespace Lucene.Net.Index
 				{
 					tvd.Close();
 				}
-				catch (System.Exception t)
+				catch (System.Exception)
 				{
 				}
 				tvd = null;
@@ -283,7 +283,7 @@ namespace Lucene.Net.Index
 				{
 					tvf.Close();
 				}
-				catch (System.Exception t)
+				catch (System.Exception)
 				{
 				}
 				tvf = null;

Modified: incubator/lucene.net/trunk/src/core/QueryParser/QueryParser.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/QueryParser/QueryParser.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/QueryParser/QueryParser.cs (original)
+++ incubator/lucene.net/trunk/src/core/QueryParser/QueryParser.cs Sat Jul 21 19:14:57 2012
@@ -1409,7 +1409,7 @@ namespace Lucene.Net.QueryParsers
                     float f = Single.Parse(boost.image);
                     q.Boost = f;
                 }
-                catch (Exception ignored)
+                catch (Exception)
                 {
                 }
             }
@@ -1669,7 +1669,7 @@ namespace Lucene.Net.QueryParsers
                         {
                             s = (int)Single.Parse(fuzzySlop.image.Substring(1));
                         }
-                        catch (Exception ignored)
+                        catch (Exception)
                         {
                         }
                     }
@@ -1688,7 +1688,7 @@ namespace Lucene.Net.QueryParsers
                 {
                     f = Single.Parse(boost.image);
                 }
-                catch (Exception ignored)
+                catch (Exception)
                 {
                     /* Should this be handled somehow? (defaults to "no boost", if
                      * boost number is invalid)
@@ -1715,7 +1715,7 @@ namespace Lucene.Net.QueryParsers
             {
                 return !Jj_3_1();
             }
-            catch (LookaheadSuccess ls)
+            catch (LookaheadSuccess)
             {
                 return true;
             }
@@ -2052,7 +2052,7 @@ namespace Lucene.Net.QueryParsers
                         p = p.next;
                     } while (p != null);
                 }
-                catch (LookaheadSuccess ls)
+                catch (LookaheadSuccess)
                 {
                 }
             }

Modified: incubator/lucene.net/trunk/src/core/QueryParser/QueryParserTokenManager.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/QueryParser/QueryParserTokenManager.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/QueryParser/QueryParserTokenManager.cs (original)
+++ incubator/lucene.net/trunk/src/core/QueryParser/QueryParserTokenManager.cs Sat Jul 21 19:14:57 2012
@@ -1405,7 +1405,7 @@ namespace Lucene.Net.QueryParsers
 				{
 					input_stream.ReadChar(); input_stream.Backup(1);
 				}
-				catch (System.IO.IOException e1)
+				catch (System.IO.IOException)
 				{
 					EOFSeen = true;
 					error_after = curPos <= 1?"":input_stream.Image;

Modified: incubator/lucene.net/trunk/src/core/Search/ConstantScoreQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/ConstantScoreQuery.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/ConstantScoreQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/ConstantScoreQuery.cs Sat Jul 21 19:14:57 2012
@@ -28,17 +28,17 @@ namespace Lucene.Net.Search
 	[Serializable]
 	public class ConstantScoreQuery:Query
 	{
-		protected internal Filter filter;
+		protected internal Filter internalFilter;
 		
 		public ConstantScoreQuery(Filter filter)
 		{
-			this.filter = filter;
+			this.internalFilter = filter;
 		}
 
 	    /// <summary>Returns the encapsulated filter </summary>
 	    public virtual Filter Filter
 	    {
-	        get { return filter; }
+	        get { return internalFilter; }
 	    }
 
 	    public override Query Rewrite(IndexReader reader)
@@ -115,7 +115,7 @@ namespace Lucene.Net.Search
 				
 				if (exists)
 				{
-					result.Description = "ConstantScoreQuery(" + Enclosing_Instance.filter + "), product of:";
+					result.Description = "ConstantScoreQuery(" + Enclosing_Instance.internalFilter + "), product of:";
 					result.Value = queryWeight;
 					System.Boolean tempAux = true;
 					result.Match = tempAux;
@@ -124,7 +124,7 @@ namespace Lucene.Net.Search
 				}
 				else
 				{
-					result.Description = "ConstantScoreQuery(" + Enclosing_Instance.filter + ") doesn't match id " + doc;
+					result.Description = "ConstantScoreQuery(" + Enclosing_Instance.internalFilter + ") doesn't match id " + doc;
 					result.Value = 0;
 					System.Boolean tempAux2 = false;
 					result.Match = tempAux2;
@@ -156,7 +156,7 @@ namespace Lucene.Net.Search
 			{
 				InitBlock(enclosingInstance);
 				theScore = w.Value;
-				DocIdSet docIdSet = Enclosing_Instance.filter.GetDocIdSet(reader);
+				DocIdSet docIdSet = Enclosing_Instance.internalFilter.GetDocIdSet(reader);
 				if (docIdSet == null)
 				{
 					docIdSetIterator = DocIdSet.EMPTY_DOCIDSET.Iterator();
@@ -204,7 +204,7 @@ namespace Lucene.Net.Search
 		/// <summary>Prints a user-readable version of this query. </summary>
 		public override System.String ToString(System.String field)
 		{
-			return "ConstantScore(" + filter.ToString() + (Boost == 1.0?")":"^" + Boost);
+			return "ConstantScore(" + internalFilter.ToString() + (Boost == 1.0?")":"^" + Boost);
 		}
 		
 		/// <summary>Returns true if <c>o</c> is equal to this. </summary>
@@ -215,21 +215,21 @@ namespace Lucene.Net.Search
 			if (!(o is ConstantScoreQuery))
 				return false;
 			ConstantScoreQuery other = (ConstantScoreQuery) o;
-			return this.Boost == other.Boost && filter.Equals(other.filter);
+			return this.Boost == other.Boost && internalFilter.Equals(other.internalFilter);
 		}
 		
 		/// <summary>Returns a hash code value for this object. </summary>
 		public override int GetHashCode()
 		{
 			// Simple add is OK since no existing filter hashcode has a float component.
-			return filter.GetHashCode() + BitConverter.ToInt32(BitConverter.GetBytes(Boost), 0);
+			return internalFilter.GetHashCode() + BitConverter.ToInt32(BitConverter.GetBytes(Boost), 0);
         }
 
 		override public System.Object Clone()
 		{
             // {{Aroush-1.9}} is this all that we need to clone?!
             ConstantScoreQuery clone = (ConstantScoreQuery)base.Clone();
-            clone.filter = (Filter)this.filter;
+            clone.internalFilter = (Filter)this.internalFilter;
             return clone;
         }
 	}

Modified: incubator/lucene.net/trunk/src/core/Search/DefaultSimilarity.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/DefaultSimilarity.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/DefaultSimilarity.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/DefaultSimilarity.cs Sat Jul 21 19:14:57 2012
@@ -40,7 +40,7 @@ namespace Lucene.Net.Search
 		public override float ComputeNorm(System.String field, FieldInvertState state)
 		{
 			int numTerms;
-			if (discountOverlaps)
+			if (internalDiscountOverlaps)
 				numTerms = state.Length - state.NumOverlap;
 			else
 				numTerms = state.Length;
@@ -86,7 +86,7 @@ namespace Lucene.Net.Search
 	    /// <seealso cref="SetDiscountOverlaps">
         /// </seealso>
         // Default false
-        protected internal bool discountOverlaps;
+        protected internal bool internalDiscountOverlaps;
 
 	    /// <summary>Determines whether overlap tokens (Tokens with
 	    /// 0 position increment) are ignored when computing
@@ -101,8 +101,8 @@ namespace Lucene.Net.Search
 	    /// </seealso>
 	    public virtual bool DiscountOverlaps
 	    {
-	        get { return discountOverlaps; }
-	        set { discountOverlaps = value; }
+	        get { return internalDiscountOverlaps; }
+	        set { internalDiscountOverlaps = value; }
 	    }
 	}
 }
\ No newline at end of file

Modified: incubator/lucene.net/trunk/src/core/Search/FieldCacheImpl.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/FieldCacheImpl.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/FieldCacheImpl.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/FieldCacheImpl.cs Sat Jul 21 19:14:57 2012
@@ -368,7 +368,7 @@ namespace Lucene.Net.Search
                     }
                     while (termEnum.Next());
                 }
-                catch (StopFillCacheException stop)
+                catch (StopFillCacheException)
                 {
                 }
                 finally
@@ -427,7 +427,7 @@ namespace Lucene.Net.Search
                     }
                     while (termEnum.Next());
                 }
-                catch (StopFillCacheException stop)
+                catch (StopFillCacheException)
                 {
                 }
                 finally
@@ -469,7 +469,7 @@ namespace Lucene.Net.Search
                     {
                         return wrapper.GetInts(reader, field, Lucene.Net.Search.FieldCache_Fields.DEFAULT_INT_PARSER);
                     }
-                    catch (System.FormatException ne)
+                    catch (System.FormatException)
                     {
                         return wrapper.GetInts(reader, field, Lucene.Net.Search.FieldCache_Fields.NUMERIC_UTILS_INT_PARSER);
                     }
@@ -496,7 +496,7 @@ namespace Lucene.Net.Search
                     }
                     while (termEnum.Next());
                 }
-                catch (StopFillCacheException stop)
+                catch (StopFillCacheException)
                 {
                 }
                 finally
@@ -543,7 +543,7 @@ namespace Lucene.Net.Search
                     {
                         return wrapper.GetFloats(reader, field, Lucene.Net.Search.FieldCache_Fields.DEFAULT_FLOAT_PARSER);
                     }
-                    catch (System.FormatException ne)
+                    catch (System.FormatException)
                     {
                         return wrapper.GetFloats(reader, field, Lucene.Net.Search.FieldCache_Fields.NUMERIC_UTILS_FLOAT_PARSER);
                     }
@@ -570,7 +570,7 @@ namespace Lucene.Net.Search
                     }
                     while (termEnum.Next());
                 }
-                catch (StopFillCacheException stop)
+                catch (StopFillCacheException)
                 {
                 }
                 finally
@@ -615,7 +615,7 @@ namespace Lucene.Net.Search
                     {
                         return wrapper.GetLongs(reader, field, Lucene.Net.Search.FieldCache_Fields.DEFAULT_LONG_PARSER);
                     }
-                    catch (System.FormatException ne)
+                    catch (System.FormatException)
                     {
                         return wrapper.GetLongs(reader, field, Lucene.Net.Search.FieldCache_Fields.NUMERIC_UTILS_LONG_PARSER);
                     }
@@ -642,7 +642,7 @@ namespace Lucene.Net.Search
                     }
                     while (termEnum.Next());
                 }
-                catch (StopFillCacheException stop)
+                catch (StopFillCacheException)
                 {
                 }
                 finally
@@ -687,7 +687,7 @@ namespace Lucene.Net.Search
                     {
                         return wrapper.GetDoubles(reader, field, Lucene.Net.Search.FieldCache_Fields.DEFAULT_DOUBLE_PARSER);
                     }
-                    catch (System.FormatException ne)
+                    catch (System.FormatException)
                     {
                         return wrapper.GetDoubles(reader, field, Lucene.Net.Search.FieldCache_Fields.NUMERIC_UTILS_DOUBLE_PARSER);
                     }
@@ -714,7 +714,7 @@ namespace Lucene.Net.Search
                     }
                     while (termEnum.Next());
                 }
-                catch (StopFillCacheException stop)
+                catch (StopFillCacheException)
                 {
                 }
                 finally

Modified: incubator/lucene.net/trunk/src/core/Search/FilterManager.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/FilterManager.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/FilterManager.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/FilterManager.cs Sat Jul 21 19:14:57 2012
@@ -51,7 +51,7 @@ namespace Lucene.Net.Search
 		/// <summary>Cache cleaning frequency </summary>
 		protected internal long cleanSleepTime;
 		/// <summary>Cache cleaner that runs in a separate thread </summary>
-		protected internal FilterCleaner _filterCleaner;
+		protected internal FilterCleaner internalFilterCleaner;
 
 	    private static readonly object _staticSyncObj = new object();
 	    public static FilterManager Instance
@@ -72,8 +72,8 @@ namespace Lucene.Net.Search
 			cacheCleanSize = DEFAULT_CACHE_CLEAN_SIZE; // Let the cache get to 100 items
 			cleanSleepTime = DEFAULT_CACHE_SLEEP_TIME; // 10 minutes between cleanings
 			
-			_filterCleaner = new FilterCleaner(this);
-			ThreadClass fcThread = new ThreadClass(new System.Threading.ThreadStart(_filterCleaner.Run));
+			internalFilterCleaner = new FilterCleaner(this);
+			ThreadClass fcThread = new ThreadClass(new System.Threading.ThreadStart(internalFilterCleaner.Run));
 			// setto be a Daemon so it doesn't have to be stopped
 			fcThread.IsBackground = true;
 			fcThread.Start();
@@ -194,14 +194,8 @@ namespace Lucene.Net.Search
                         sortedFilterItems.Clear();
 					}
 					// take a nap
-					try
-					{
-                        System.Threading.Thread.Sleep(new System.TimeSpan((System.Int64)10000 * this.manager.cleanSleepTime));
-					}
-					catch (System.Threading.ThreadInterruptedException ie)
-					{
-					    throw;
-					}
+					System.Threading.Thread.Sleep(new System.TimeSpan((System.Int64)10000 * this.manager.cleanSleepTime));
+					
 				}
 			}
 		}

Modified: incubator/lucene.net/trunk/src/core/Search/FilteredDocIdSetIterator.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/FilteredDocIdSetIterator.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/FilteredDocIdSetIterator.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/FilteredDocIdSetIterator.cs Sat Jul 21 19:14:57 2012
@@ -27,7 +27,7 @@ namespace Lucene.Net.Search
 	/// </summary>
 	public abstract class FilteredDocIdSetIterator:DocIdSetIterator
 	{
-		protected internal DocIdSetIterator _innerIter;
+		protected internal DocIdSetIterator internalInnerIter;
 		private int doc;
 		
 		/// <summary> Constructor.</summary>
@@ -39,7 +39,7 @@ namespace Lucene.Net.Search
 			{
 				throw new System.ArgumentException("null iterator");
 			}
-			_innerIter = innerIter;
+			internalInnerIter = innerIter;
 			doc = - 1;
 		}
 		
@@ -59,7 +59,7 @@ namespace Lucene.Net.Search
 		
 		public override int NextDoc()
 		{
-			while ((doc = _innerIter.NextDoc()) != NO_MORE_DOCS)
+			while ((doc = internalInnerIter.NextDoc()) != NO_MORE_DOCS)
 			{
 				if (Match(doc))
 				{
@@ -71,7 +71,7 @@ namespace Lucene.Net.Search
 		
 		public override int Advance(int target)
 		{
-			doc = _innerIter.Advance(target);
+			doc = internalInnerIter.Advance(target);
 			if (doc != NO_MORE_DOCS)
 			{
 				if (Match(doc))
@@ -80,7 +80,7 @@ namespace Lucene.Net.Search
 				}
 				else
 				{
-					while ((doc = _innerIter.NextDoc()) != NO_MORE_DOCS)
+					while ((doc = internalInnerIter.NextDoc()) != NO_MORE_DOCS)
 					{
 						if (Match(doc))
 						{

Modified: incubator/lucene.net/trunk/src/core/Search/FuzzyQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/FuzzyQuery.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/FuzzyQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/FuzzyQuery.cs Sat Jul 21 19:14:57 2012
@@ -88,7 +88,7 @@ namespace Lucene.Net.Search
 			
 			this.minimumSimilarity = minimumSimilarity;
 			this.prefixLength = prefixLength;
-			rewriteMethod = SCORING_BOOLEAN_QUERY_REWRITE;
+			internalRewriteMethod = SCORING_BOOLEAN_QUERY_REWRITE;
 		}
 
         /// <summary> Calls <see cref="FuzzyQuery(Index.Term, float)">FuzzyQuery(term, minimumSimilarity, 0)</see>.</summary>

Modified: incubator/lucene.net/trunk/src/core/Search/MultiTermQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/MultiTermQuery.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/MultiTermQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/MultiTermQuery.cs Sat Jul 21 19:14:57 2012
@@ -76,7 +76,7 @@ namespace Lucene.Net.Search
 				return Lucene.Net.Search.MultiTermQuery.CONSTANT_SCORE_AUTO_REWRITE_DEFAULT;
 			}
 		}
-		protected internal RewriteMethod rewriteMethod = CONSTANT_SCORE_AUTO_REWRITE_DEFAULT;
+		protected internal RewriteMethod internalRewriteMethod = CONSTANT_SCORE_AUTO_REWRITE_DEFAULT;
 		[NonSerialized]
 		internal int numberOfTerms = 0;
 
@@ -408,7 +408,7 @@ namespace Lucene.Net.Search
 		
 		public override Query Rewrite(IndexReader reader)
 		{
-			return rewriteMethod.Rewrite(reader, this);
+			return internalRewriteMethod.Rewrite(reader, this);
 		}
 		
 	    /// <summary> Sets the rewrite method to be used when executing the
@@ -417,8 +417,8 @@ namespace Lucene.Net.Search
 	    /// </summary>
 	    public virtual RewriteMethod RewriteMethod
 	    {
-            get { return rewriteMethod; }
-	        set { rewriteMethod = value; }
+            get { return internalRewriteMethod; }
+	        set { internalRewriteMethod = value; }
 	    }
 
 	    //@Override
@@ -428,7 +428,7 @@ namespace Lucene.Net.Search
 			int result = 1;
 			result = prime * result + System.Convert.ToInt32(Boost);
 			result = prime * result;
-			result += rewriteMethod.GetHashCode();
+			result += internalRewriteMethod.GetHashCode();
 			return result;
 		}
 		
@@ -444,7 +444,7 @@ namespace Lucene.Net.Search
 			MultiTermQuery other = (MultiTermQuery) obj;
 			if (System.Convert.ToInt32(Boost) != System.Convert.ToInt32(other.Boost))
 				return false;
-			if (!rewriteMethod.Equals(other.rewriteMethod))
+			if (!internalRewriteMethod.Equals(other.internalRewriteMethod))
 			{
 				return false;
 			}

Modified: incubator/lucene.net/trunk/src/core/Search/Payloads/PayloadNearQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/Payloads/PayloadNearQuery.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/Payloads/PayloadNearQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/Payloads/PayloadNearQuery.cs Sat Jul 21 19:14:57 2012
@@ -78,7 +78,7 @@ namespace Lucene.Net.Search.Payloads
 			{
 				newClauses[i] = clauses[i];
 			}
-			PayloadNearQuery boostingNearQuery = new PayloadNearQuery(newClauses, slop, inOrder);
+			PayloadNearQuery boostingNearQuery = new PayloadNearQuery(newClauses, internalSlop, inOrder);
 			boostingNearQuery.Boost = Boost;
 			return boostingNearQuery;
 		}
@@ -98,7 +98,7 @@ namespace Lucene.Net.Search.Payloads
 				}
 			}
 			buffer.Append("], ");
-			buffer.Append(slop);
+			buffer.Append(internalSlop);
 			buffer.Append(", ");
 			buffer.Append(inOrder);
 			buffer.Append(")");
@@ -166,7 +166,7 @@ namespace Lucene.Net.Search.Payloads
 
 			public override Scorer Scorer(IndexReader reader, bool scoreDocsInOrder, bool topScorer)
 			{
-				return new PayloadNearSpanScorer(enclosingInstance, query.GetSpans(reader), this, similarity, reader.Norms(query.Field));
+				return new PayloadNearSpanScorer(enclosingInstance, internalQuery.GetSpans(reader), this, similarity, reader.Norms(internalQuery.Field));
 			}
 		}
 		

Modified: incubator/lucene.net/trunk/src/core/Search/Payloads/PayloadTermQuery.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/core/Search/Payloads/PayloadTermQuery.cs?rev=1364156&r1=1364155&r2=1364156&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/core/Search/Payloads/PayloadTermQuery.cs (original)
+++ incubator/lucene.net/trunk/src/core/Search/Payloads/PayloadTermQuery.cs Sat Jul 21 19:14:57 2012
@@ -91,7 +91,7 @@ namespace Lucene.Net.Search.Payloads
 			
 			public override Scorer Scorer(IndexReader reader, bool scoreDocsInOrder, bool topScorer)
 			{
-				return new PayloadTermSpanScorer(this, (TermSpans) query.GetSpans(reader), this, similarity, reader.Norms(query.Field));
+				return new PayloadTermSpanScorer(this, (TermSpans) internalQuery.GetSpans(reader), this, similarity, reader.Norms(internalQuery.Field));
 			}
 			
 			protected internal class PayloadTermSpanScorer:SpanScorer
@@ -150,7 +150,7 @@ namespace Lucene.Net.Search.Payloads
 					if (positions.IsPayloadAvailable)
 					{
 						payload = positions.GetPayload(payload, 0);
-						payloadScore = Enclosing_Instance.Enclosing_Instance.function.CurrentScore(doc, Enclosing_Instance.Enclosing_Instance.term.Field, spans.Start(), spans.End(), payloadsSeen, payloadScore, similarity.ScorePayload(doc, Enclosing_Instance.Enclosing_Instance.term.Field, spans.Start(), spans.End(), payload, 0, positions.PayloadLength));
+						payloadScore = Enclosing_Instance.Enclosing_Instance.function.CurrentScore(doc, Enclosing_Instance.Enclosing_Instance.internalTerm.Field, spans.Start(), spans.End(), payloadsSeen, payloadScore, similarity.ScorePayload(doc, Enclosing_Instance.Enclosing_Instance.internalTerm.Field, spans.Start(), spans.End(), payload, 0, positions.PayloadLength));
 						payloadsSeen++;
 					}
 					else
@@ -196,7 +196,7 @@ namespace Lucene.Net.Search.Payloads
                 [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate")]
                 protected internal virtual float GetPayloadScore()
 				{
-					return Enclosing_Instance.Enclosing_Instance.function.DocScore(doc, Enclosing_Instance.Enclosing_Instance.term.Field, payloadsSeen, payloadScore);
+					return Enclosing_Instance.Enclosing_Instance.function.DocScore(doc, Enclosing_Instance.Enclosing_Instance.internalTerm.Field, payloadsSeen, payloadScore);
 				}
 				
 				protected internal override Explanation Explain(int doc)



Mime
View raw message