Return-Path: 
 <lucene-net-commits-return-2082-apmail-lucene-lucene-net-commits-archive=lucene.apache.org@lucene.apache.org>
X-Original-To: apmail-lucene-lucene-net-commits-archive@www.apache.org
Delivered-To: apmail-lucene-lucene-net-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 4287471E
	for <apmail-lucene-lucene-net-commits-archive@www.apache.org>;
 Mon, 20 Aug 2012 21:51:24 +0000 (UTC)
Received: (qmail 34988 invoked by uid 500); 20 Aug 2012 21:51:24 -0000
Delivered-To: apmail-lucene-lucene-net-commits-archive@lucene.apache.org
Received: (qmail 34954 invoked by uid 500); 20 Aug 2012 21:51:24 -0000
Mailing-List: contact lucene-net-commits-help@lucene.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:lucene-net-commits-help@lucene.apache.org>
List-Unsubscribe: <mailto:lucene-net-commits-unsubscribe@lucene.apache.org>
List-Post: <mailto:lucene-net-commits@lucene.apache.org>
List-Id: <lucene-net-commits.lucene.apache.org>
Reply-To: lucene-net-dev@lucene.apache.org
Delivered-To: mailing list lucene-net-commits@lucene.apache.org
Received: (qmail 34939 invoked by uid 99); 20 Aug 2012 21:51:24 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Aug 2012 21:51:24 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Aug 2012 21:51:21 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 369E323888FE;
	Mon, 20 Aug 2012 21:50:37 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1375256 - in
 /incubator/lucene.net/trunk/src/contrib/Spatial:
 Contrib.Spatial.csproj Prefix/PrefixTreeStrategy.cs
 Util/CachedDistanceValueSource.cs Util/ShapeFieldCacheDistanceValueSource.cs
Date: Mon, 20 Aug 2012 21:50:37 -0000
To: lucene-net-commits@lucene.apache.org
From: synhershko@apache.org
X-Mailer: svnmailer-1.0.8-patched
Message-Id: <20120820215037.369E323888FE@eris.apache.org>

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;