From 9a774c430c65453317e447e17bf117a7d2a8f1cb Mon Sep 17 00:00:00 2001
From: Olivia Ytterbrink <olivia.ytterbrink@neotechnology.com>
Date: Tue, 16 Jan 2018 12:07:51 +0100
Subject: [PATCH] Cleaned up superclass

---
 .../spatial/index/curves/HilbertSpaceFillingCurve2D.java | 8 +++++++-
 .../spatial/index/curves/HilbertSpaceFillingCurve3D.java | 8 +++++++-
 .../gis/spatial/index/curves/SpaceFillingCurve.java      | 7 -------
 .../spatial/index/curves/ZOrderSpaceFillingCurve2D.java  | 9 +++++----
 4 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/community/spatial-index/src/main/java/org/neo4j/gis/spatial/index/curves/HilbertSpaceFillingCurve2D.java b/community/spatial-index/src/main/java/org/neo4j/gis/spatial/index/curves/HilbertSpaceFillingCurve2D.java
index 3122e63e9214..855a3e397d58 100644
--- a/community/spatial-index/src/main/java/org/neo4j/gis/spatial/index/curves/HilbertSpaceFillingCurve2D.java
+++ b/community/spatial-index/src/main/java/org/neo4j/gis/spatial/index/curves/HilbertSpaceFillingCurve2D.java
@@ -59,7 +59,7 @@ public char direction( int end )
             }
         }
 
-        public String name()
+        String name()
         {
             return String.valueOf( direction( npointValues[1] ) );
         }
@@ -74,6 +74,12 @@ public CurveRule childAt( int npoint )
         {
             return children[npoint];
         }
+
+        @Override
+        public String toString()
+        {
+            return name();
+        }
     }
 
     private static HashMap<String,HilbertCurve2D> curves = new LinkedHashMap<>();
diff --git a/community/spatial-index/src/main/java/org/neo4j/gis/spatial/index/curves/HilbertSpaceFillingCurve3D.java b/community/spatial-index/src/main/java/org/neo4j/gis/spatial/index/curves/HilbertSpaceFillingCurve3D.java
index bdef0b6dbbba..add953ad53e8 100644
--- a/community/spatial-index/src/main/java/org/neo4j/gis/spatial/index/curves/HilbertSpaceFillingCurve3D.java
+++ b/community/spatial-index/src/main/java/org/neo4j/gis/spatial/index/curves/HilbertSpaceFillingCurve3D.java
@@ -108,7 +108,7 @@ private char direction( int start, int end )
             }
         }
 
-        public String name()
+        String name()
         {
             return String.valueOf( direction( npointValues[0], npointValues[1] ) ) + direction( npointValues[1], npointValues[2] ) +
                     direction( npointValues[0], npointValues[length() - 1] );
@@ -209,6 +209,12 @@ public CurveRule childAt( int npoint )
             }
             return children[npoint];
         }
+
+        @Override
+        public String toString()
+        {
+            return name();
+        }
     }
 
     static HashMap<String,HilbertCurve3D> curves = new LinkedHashMap<>();
diff --git a/community/spatial-index/src/main/java/org/neo4j/gis/spatial/index/curves/SpaceFillingCurve.java b/community/spatial-index/src/main/java/org/neo4j/gis/spatial/index/curves/SpaceFillingCurve.java
index 708dce1fc3d9..2fc9ac12f056 100644
--- a/community/spatial-index/src/main/java/org/neo4j/gis/spatial/index/curves/SpaceFillingCurve.java
+++ b/community/spatial-index/src/main/java/org/neo4j/gis/spatial/index/curves/SpaceFillingCurve.java
@@ -65,13 +65,6 @@ int indexForNPoint( int npoint )
         }
 
         abstract CurveRule childAt( int npoint );
-
-        abstract String name();
-
-        public String toString()
-        {
-            return name();
-        }
     }
 
     private final Envelope range;
diff --git a/community/spatial-index/src/main/java/org/neo4j/gis/spatial/index/curves/ZOrderSpaceFillingCurve2D.java b/community/spatial-index/src/main/java/org/neo4j/gis/spatial/index/curves/ZOrderSpaceFillingCurve2D.java
index 5c2f994cccfe..787b4d03c146 100644
--- a/community/spatial-index/src/main/java/org/neo4j/gis/spatial/index/curves/ZOrderSpaceFillingCurve2D.java
+++ b/community/spatial-index/src/main/java/org/neo4j/gis/spatial/index/curves/ZOrderSpaceFillingCurve2D.java
@@ -36,15 +36,16 @@ private ZOrderCurve2D( int... npointValues )
             assert npointValues[0] == 1 && npointValues[3] == 2;
         }
 
-        public String name()
+        @Override
+        public CurveRule childAt( int npoint )
         {
-            return "Z";
+            return this;
         }
 
         @Override
-        public CurveRule childAt( int npoint )
+        public String toString()
         {
-            return this;
+            return "Z";
         }
     }