Remove generic parameter from Box

imglib · Feb 7, 2018 · 2773f4d · 2773f4d
1 parent 32dd0ef
commit 2773f4d
Show file tree

Hide file tree

Showing 5 changed files with 66 additions and 63 deletions.
diff --git a/src/main/java/net/imglib2/roi/geom/real/AbstractWritableBox.java b/src/main/java/net/imglib2/roi/geom/real/AbstractWritableBox.java
@@ -98,7 +98,7 @@ public boolean equals( final Object obj )
 		if ( !( obj instanceof Box ) )
 			return false;
 
-		final Box< ? > b = ( Box< ? > ) obj;
+		final Box b = ( Box ) obj;
 		if ( b.numDimensions() != n || boundaryType() != b.boundaryType() )
 			return false;
 

diff --git a/src/main/java/net/imglib2/roi/geom/real/Box.java b/src/main/java/net/imglib2/roi/geom/real/Box.java
@@ -34,6 +34,7 @@
 
 package net.imglib2.roi.geom.real;
 
+import net.imglib2.RealLocalizable;
 import net.imglib2.roi.RealMaskRealInterval;
 
 /**
@@ -42,11 +43,11 @@
  *
  * @author Alison Walter
  */
-public interface Box< T > extends RealMaskRealInterval
+public interface Box extends RealMaskRealInterval
 {
 	/** Returns side length of Box in dimension d. */
 	double sideLength( int d );
 
 	/** Returns the center of the Box. */
-	T center();
+	RealLocalizable center();
 }
diff --git a/src/main/java/net/imglib2/roi/geom/real/WritableBox.java b/src/main/java/net/imglib2/roi/geom/real/WritableBox.java
@@ -41,8 +41,10 @@
  *
  * @author Alison Walter
  */
-public interface WritableBox extends Box< RealLocalizableRealPositionable >
+public interface WritableBox extends Box
 {
+	@Override
+	RealLocalizableRealPositionable center();
 
 	/** Updates the length of the side in dimension d. */
 	void setSideLength( int d, double length );