Author: synhershko
Date: Mon Aug 20 21:39:07 2012
New Revision: 1375235

URL: http://svn.apache.org/viewvc?rev=1375235&view=rev
Log:
Catching up on Spatial contrib (minor)

Added:
    incubator/lucene.net/trunk/test/contrib/Spatial/Vector/TestTwoDoublesStrategy.cs
      - copied, changed from r1375234, incubator/lucene.net/trunk/test/contrib/Spatial/Vector/TwoDoublesStrategyTestCase.cs
Removed:
    incubator/lucene.net/trunk/test/contrib/Spatial/Vector/TwoDoublesStrategyTestCase.cs
Modified:
    incubator/lucene.net/trunk/src/contrib/Spatial/Prefix/PrefixTreeStrategy.cs
    incubator/lucene.net/trunk/test/contrib/Spatial/Contrib.Spatial.Test.csproj
    incubator/lucene.net/trunk/test/contrib/Spatial/Prefix/BaseRecursivePrefixTreeStrategyTestCase.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=1375235&r1=1375234&r2=1375235&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:39:07 2012
@@ -90,7 +90,7 @@ namespace Lucene.Net.Spatial.Prefix
 
 			if (index)
 			{
-				// TYPE_UNSTORED is indexed and tokenized but not stored, and this is what this ctor returns
+				// TYPE_NOT_STORED is indexed and tokenized but not stored, and this is what this ctor returns
 				var f = new Field(fname, new CellTokenStream(cells.GetEnumerator()), Field.TermVector.NO);
 				f.OmitNorms = true;
 				return f;
@@ -100,7 +100,7 @@ namespace Lucene.Net.Spatial.Prefix
 		}
 
 		///* Indexed, tokenized, not stored. */
-		//public static final FieldType TYPE_UNSTORED = new FieldType();
+		//public static final FieldType TYPE_NOT_STORED = new FieldType();
 
 		///* Indexed, tokenized, stored. */
 		//public static final FieldType TYPE_STORED = new FieldType();

Modified: incubator/lucene.net/trunk/test/contrib/Spatial/Contrib.Spatial.Test.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Spatial/Contrib.Spatial.Test.csproj?rev=1375235&r1=1375234&r2=1375235&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Spatial/Contrib.Spatial.Test.csproj (original)
+++ incubator/lucene.net/trunk/test/contrib/Spatial/Contrib.Spatial.Test.csproj Mon Aug 20 21:39:07 2012
@@ -30,7 +30,8 @@
     <RootNamespace>Lucene.Net.Contrib.Spatial.Test</RootNamespace>
     <AssemblyName>Lucene.Net.Contrib.Spatial.Test</AssemblyName>
     <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags></FileUpgradeFlags>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation />
     <PublishUrl>publish\</PublishUrl>
@@ -130,7 +131,7 @@
     <Compile Include="TestTestFramework.cs" />
     <Compile Include="Various.cs" />
     <Compile Include="Vector\BaseTwoDoublesStrategyTestCase.cs" />
-    <Compile Include="Vector\TwoDoublesStrategyTestCase.cs" />
+    <Compile Include="Vector\TestTwoDoublesStrategy.cs" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.0">

Modified: incubator/lucene.net/trunk/test/contrib/Spatial/Prefix/BaseRecursivePrefixTreeStrategyTestCase.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Spatial/Prefix/BaseRecursivePrefixTreeStrategyTestCase.cs?rev=1375235&r1=1375234&r2=1375235&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Spatial/Prefix/BaseRecursivePrefixTreeStrategyTestCase.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Spatial/Prefix/BaseRecursivePrefixTreeStrategyTestCase.cs Mon Aug 20 21:39:07 2012
@@ -25,7 +25,6 @@ using NUnit.Framework;
 using Spatial4n.Core.Io.Samples;
 using Spatial4n.Core.Query;
 using Spatial4n.Core.Shapes;
-using Spatial4n.Core.Shapes.Impl;
 
 namespace Lucene.Net.Contrib.Spatial.Test.Prefix
 {

Copied: incubator/lucene.net/trunk/test/contrib/Spatial/Vector/TestTwoDoublesStrategy.cs (from r1375234, incubator/lucene.net/trunk/test/contrib/Spatial/Vector/TwoDoublesStrategyTestCase.cs)
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Spatial/Vector/TestTwoDoublesStrategy.cs?p2=incubator/lucene.net/trunk/test/contrib/Spatial/Vector/TestTwoDoublesStrategy.cs&p1=incubator/lucene.net/trunk/test/contrib/Spatial/Vector/TwoDoublesStrategyTestCase.cs&r1=1375234&r2=1375235&rev=1375235&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Spatial/Vector/TwoDoublesStrategyTestCase.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Spatial/Vector/TestTwoDoublesStrategy.cs Mon Aug 20 21:39:07 2012
@@ -19,7 +19,7 @@ using Spatial4n.Core.Context;
 
 namespace Lucene.Net.Contrib.Spatial.Test.Vector
 {
-	public class TwoDoublesStrategyTestCase : BaseTwoDoublesStrategyTestCase
+	public class TestTwoDoublesStrategy : BaseTwoDoublesStrategyTestCase
 	{
 		protected override SpatialContext getSpatialContext()
 		{