lucenenet-commits mailing list archives

Author: synhershko
Date: Mon Aug 20 21:50:36 2012
New Revision: 1375256

URL: http://svn.apache.org/viewvc?rev=1375256&view=rev
Log:
LUCENE-4197 rename CachedDistanceValueSource

Added:
    incubator/lucene.net/trunk/src/contrib/Spatial/Util/ShapeFieldCacheDistanceValueSource.cs
      - copied, changed from r1375253, incubator/lucene.net/trunk/src/contrib/Spatial/Util/CachedDistanceValueSource.cs
Removed:
    incubator/lucene.net/trunk/src/contrib/Spatial/Util/CachedDistanceValueSource.cs
Modified:
    incubator/lucene.net/trunk/src/contrib/Spatial/Contrib.Spatial.csproj
    incubator/lucene.net/trunk/src/contrib/Spatial/Prefix/PrefixTreeStrategy.cs

Modified: incubator/lucene.net/trunk/src/contrib/Spatial/Contrib.Spatial.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Spatial/Contrib.Spatial.csproj?rev=1375256&r1=1375255&r2=1375256&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Spatial/Contrib.Spatial.csproj (original)
+++ incubator/lucene.net/trunk/src/contrib/Spatial/Contrib.Spatial.csproj Mon Aug 20 21:50:36
2012
@@ -146,7 +146,7 @@
     <Compile Include="Queries\UnsupportedSpatialOperation.cs" />
     <Compile Include="SpatialStrategy.cs" />
     <Compile Include="Util\Bits.cs" />
-    <Compile Include="Util\CachedDistanceValueSource.cs" />
+    <Compile Include="Util\ShapeFieldCacheDistanceValueSource.cs" />
     <Compile Include="Util\CachingDoubleValueSource.cs" />
     <Compile Include="Util\CompatibilityExtensions.cs" />
     <Compile Include="Util\FixedBitSet.cs" />

Modified: incubator/lucene.net/trunk/src/contrib/Spatial/Prefix/PrefixTreeStrategy.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Spatial/Prefix/PrefixTreeStrategy.cs?rev=1375256&r1=1375255&r2=1375256&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Spatial/Prefix/PrefixTreeStrategy.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Spatial/Prefix/PrefixTreeStrategy.cs Mon Aug 20
21:50:36 2012
@@ -156,7 +156,7 @@ namespace Lucene.Net.Spatial.Prefix
 		{
 			PointPrefixTreeFieldCacheProvider p = (PointPrefixTreeFieldCacheProvider)GetCacheProvider();
 			Point point = args.GetShape().GetCenter();
-			return new CachedDistanceValueSource(point, calc, p);
+			return new ShapeFieldCacheDistanceValueSource(point, calc, p);
 		}
 
 		public SpatialPrefixTree GetGrid()

Copied: incubator/lucene.net/trunk/src/contrib/Spatial/Util/ShapeFieldCacheDistanceValueSource.cs
(from r1375253, incubator/lucene.net/trunk/src/contrib/Spatial/Util/CachedDistanceValueSource.cs)
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Spatial/Util/ShapeFieldCacheDistanceValueSource.cs?p2=incubator/lucene.net/trunk/src/contrib/Spatial/Util/ShapeFieldCacheDistanceValueSource.cs&p1=incubator/lucene.net/trunk/src/contrib/Spatial/Util/CachedDistanceValueSource.cs&r1=1375253&r2=1375256&rev=1375256&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Spatial/Util/CachedDistanceValueSource.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Spatial/Util/ShapeFieldCacheDistanceValueSource.cs
Mon Aug 20 21:50:36 2012
@@ -26,13 +26,13 @@ namespace Lucene.Net.Spatial.Util
 	/// <summary>
 	/// An implementation of the Lucene ValueSource model to support spatial relevance ranking.
 	/// </summary>
-	public class CachedDistanceValueSource : ValueSource
+	public class ShapeFieldCacheDistanceValueSource : ValueSource
 	{
 		private readonly ShapeFieldCacheProvider<Point> provider;
 		private readonly DistanceCalculator calculator;
 		private readonly Point from;
 
-		public CachedDistanceValueSource(Point from, DistanceCalculator calc, ShapeFieldCacheProvider<Point>
provider)
+		public ShapeFieldCacheDistanceValueSource(Point from, DistanceCalculator calc, ShapeFieldCacheProvider<Point>
provider)
 		{
 			this.from = from;
 			this.provider = provider;
@@ -41,10 +41,10 @@ namespace Lucene.Net.Spatial.Util
 
 		public class CachedDistanceDocValues : DocValues
 		{
-			private readonly CachedDistanceValueSource enclosingInstance;
+			private readonly ShapeFieldCacheDistanceValueSource enclosingInstance;
 			private readonly ShapeFieldCache<Point> cache;
 
-			public CachedDistanceDocValues(ShapeFieldCache<Point> cache, CachedDistanceValueSource
enclosingInstance)
+			public CachedDistanceDocValues(ShapeFieldCache<Point> cache, ShapeFieldCacheDistanceValueSource
enclosingInstance)
 			{
 				this.enclosingInstance = enclosingInstance;
 				this.cache = cache;
@@ -91,7 +91,7 @@ namespace Lucene.Net.Spatial.Util
 		{
 			if (this == o) return true;
 
-			var that = o as CachedDistanceValueSource;
+			var that = o as ShapeFieldCacheDistanceValueSource;
 
 			if (that == null) return false;
 			if (calculator != null ? !calculator.Equals(that.calculator) : that.calculator != null)
return false;