You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by sy...@apache.org on 2015/01/06 04:46:31 UTC

[15/18] lucenenet git commit: Cleanup

Cleanup


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

Branch: refs/heads/master
Commit: 3b37fac9965653f2730a5c457a1580ab414e5fa9
Parents: fbabfe9
Author: Itamar Syn-Hershko <it...@code972.com>
Authored: Mon Jan 5 19:06:08 2015 +0200
Committer: Itamar Syn-Hershko <it...@code972.com>
Committed: Mon Jan 5 19:06:08 2015 +0200

----------------------------------------------------------------------
 src/Lucene.Net.Core/Index/SegmentInfos.cs        |  2 +-
 src/Lucene.Net.Core/Store/BaseDirectory.cs       | 12 ++++++------
 src/Lucene.Net.Core/Store/FileSwitchDirectory.cs |  2 +-
 src/Lucene.Net.Tests/core/Store/TestDirectory.cs |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3b37fac9/src/Lucene.Net.Core/Index/SegmentInfos.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/SegmentInfos.cs b/src/Lucene.Net.Core/Index/SegmentInfos.cs
index c4e29ca..9ce4466 100644
--- a/src/Lucene.Net.Core/Index/SegmentInfos.cs
+++ b/src/Lucene.Net.Core/Index/SegmentInfos.cs
@@ -824,7 +824,7 @@ namespace Lucene.Net.Index
 
             /// <summary>
             /// Sole constructor. </summary>
-            public FindSegmentsFile(Directory directory)
+            protected FindSegmentsFile(Directory directory)
             {
                 this.Directory = directory;
             }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3b37fac9/src/Lucene.Net.Core/Store/BaseDirectory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/BaseDirectory.cs b/src/Lucene.Net.Core/Store/BaseDirectory.cs
index 120c072..7db2d6b 100644
--- a/src/Lucene.Net.Core/Store/BaseDirectory.cs
+++ b/src/Lucene.Net.Core/Store/BaseDirectory.cs
@@ -29,7 +29,7 @@ namespace Lucene.Net.Store
         /// Holds the LockFactory instance (implements locking for
         /// this Directory instance).
         /// </summary>
-        protected internal LockFactory LockFactory_Renamed;
+        protected internal LockFactory _lockFactory;
 
         /// <summary>
         /// Sole constructor. </summary>
@@ -40,14 +40,14 @@ namespace Lucene.Net.Store
 
         public override Lock MakeLock(string name)
         {
-            return LockFactory_Renamed.MakeLock(name);
+            return _lockFactory.MakeLock(name);
         }
 
         public override void ClearLock(string name)
         {
-            if (LockFactory_Renamed != null)
+            if (_lockFactory != null)
             {
-                LockFactory_Renamed.ClearLock(name);
+                _lockFactory.ClearLock(name);
             }
         }
 
@@ -56,12 +56,12 @@ namespace Lucene.Net.Store
             set
             {
                 Debug.Assert(value != null);
-                this.LockFactory_Renamed = value;
+                this._lockFactory = value;
                 value.LockPrefix = this.LockID;
             }
             get
             {
-                return this.LockFactory_Renamed;
+                return this._lockFactory;
             }
         }
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3b37fac9/src/Lucene.Net.Core/Store/FileSwitchDirectory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Store/FileSwitchDirectory.cs b/src/Lucene.Net.Core/Store/FileSwitchDirectory.cs
index d986444..0e4468f 100644
--- a/src/Lucene.Net.Core/Store/FileSwitchDirectory.cs
+++ b/src/Lucene.Net.Core/Store/FileSwitchDirectory.cs
@@ -46,7 +46,7 @@ namespace Lucene.Net.Store
             this.PrimaryDir_Renamed = primaryDir;
             this.SecondaryDir_Renamed = secondaryDir;
             this.DoClose = doClose;
-            this.LockFactory_Renamed = primaryDir.LockFactory;
+            this._lockFactory = primaryDir.LockFactory;
         }
 
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3b37fac9/src/Lucene.Net.Tests/core/Store/TestDirectory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Store/TestDirectory.cs b/src/Lucene.Net.Tests/core/Store/TestDirectory.cs
index c518c04..9ea4097 100644
--- a/src/Lucene.Net.Tests/core/Store/TestDirectory.cs
+++ b/src/Lucene.Net.Tests/core/Store/TestDirectory.cs
@@ -172,7 +172,7 @@ namespace Lucene.Net.Store
                 largeBuffer[i] = (byte)i; // automatically loops with modulo
             }
 
-            FSDirectory[] dirs = new FSDirectory[] { new SimpleFSDirectory(path, null), new NIOFSDirectory(path, null), new MMapDirectory(path, null) };
+            var dirs = new FSDirectory[] { new SimpleFSDirectory(path, null), new NIOFSDirectory(path, null), new MMapDirectory(path, null) };
 
             for (int i = 0; i < dirs.Length; i++)
             {