You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ds...@apache.org on 2012/07/06 21:51:11 UTC

svn commit: r1358382 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/spatial/ lucene/spatial/src/java/org/apache/lucene/spatial/query/SpatialArgs.java

Author: dsmiley
Date: Fri Jul  6 19:51:11 2012
New Revision: 1358382

URL: http://svn.apache.org/viewvc?rev=1358382&view=rev
Log:
LUCENE-4197 SpatialArgs.toString() shouldnt be overloaded with a ctx – not needed for its purpose.

Modified:
    lucene/dev/branches/branch_4x/   (props changed)
    lucene/dev/branches/branch_4x/lucene/   (props changed)
    lucene/dev/branches/branch_4x/lucene/spatial/   (props changed)
    lucene/dev/branches/branch_4x/lucene/spatial/src/java/org/apache/lucene/spatial/query/SpatialArgs.java

Modified: lucene/dev/branches/branch_4x/lucene/spatial/src/java/org/apache/lucene/spatial/query/SpatialArgs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/spatial/src/java/org/apache/lucene/spatial/query/SpatialArgs.java?rev=1358382&r1=1358381&r2=1358382&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/spatial/src/java/org/apache/lucene/spatial/query/SpatialArgs.java (original)
+++ lucene/dev/branches/branch_4x/lucene/spatial/src/java/org/apache/lucene/spatial/query/SpatialArgs.java Fri Jul  6 19:51:11 2012
@@ -17,8 +17,6 @@ package org.apache.lucene.spatial.query;
  * limitations under the License.
  */
 
-import com.spatial4j.core.context.SpatialContext;
-import com.spatial4j.core.context.simple.SimpleSpatialContext;
 import com.spatial4j.core.exception.InvalidSpatialArgument;
 import com.spatial4j.core.shape.Shape;
 
@@ -55,10 +53,11 @@ public class SpatialArgs {
     }
   }
 
-  public String toString(SpatialContext context) {
+  @Override
+  public String toString() {
     StringBuilder str = new StringBuilder();
     str.append(operation.getName()).append('(');
-    str.append(context.toString(shape));
+    str.append(shape.toString());
     if (min != null) {
       str.append(" min=").append(min);
     }
@@ -70,11 +69,6 @@ public class SpatialArgs {
     return str.toString();
   }
 
-  @Override
-  public String toString() {
-    return toString(SimpleSpatialContext.GEO_KM);
-  }
-
   //------------------------------------------------
   // Getters & Setters
   //------------------------------------------------