From 9a285f18aba0df23d58711d1ebe6b5fe3d363182 Mon Sep 17 00:00:00 2001
From: Jason Long <jason@long.name>
Date: Fri, 9 Jan 2015 22:46:59 -0500
Subject: [PATCH] TileImage: s/drawTo/drawFragment

---
 src/micropolisj/build_tool/Animation.java |  4 ++--
 src/micropolisj/build_tool/MakeTiles.java |  4 ++--
 src/micropolisj/graphics/TileImage.java   | 22 +++++++++++++++-------
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/src/micropolisj/build_tool/Animation.java b/src/micropolisj/build_tool/Animation.java
index e11c0ce..38b1ab4 100644
--- a/src/micropolisj/build_tool/Animation.java
+++ b/src/micropolisj/build_tool/Animation.java
@@ -86,9 +86,9 @@ class Animation extends TileImage
 	}
 
 	@Override
-	public void drawTo(Graphics2D gr, int destX, int destY, int srcX, int srcY)
+	public void drawFragment(Graphics2D gr, int destX, int destY, int srcX, int srcY)
 	{
 		// Warning: drawing without considering the animation
-		getDefaultImage().drawTo(gr, destX, destY, srcX, srcY);
+		getDefaultImage().drawFragment(gr, destX, destY, srcX, srcY);
 	}
 }
diff --git a/src/micropolisj/build_tool/MakeTiles.java b/src/micropolisj/build_tool/MakeTiles.java
index cd30195..ba212f6 100644
--- a/src/micropolisj/build_tool/MakeTiles.java
+++ b/src/micropolisj/build_tool/MakeTiles.java
@@ -112,7 +112,7 @@ public class MakeTiles
 		}
 
 		@Override
-		public void drawTo(Graphics2D gr, int destX, int destY, int srcX, int srcY) { throw new UnsupportedOperationException(); }
+		public void drawFragment(Graphics2D gr, int destX, int destY, int srcX, int srcY) { throw new UnsupportedOperationException(); }
 	}
 
 	static class Composer
@@ -239,7 +239,7 @@ public class MakeTiles
 			assert dest instanceof ComposeFrame;
 
 			ComposeFrame f = (ComposeFrame) dest;
-			f.refImage.drawTo(c.getGr(f), f.offsetX, f.offsetY, 0, 0);
+			f.refImage.drawTo(c.getGr(f), f.offsetX, f.offsetY);
 		}
 	}
 
diff --git a/src/micropolisj/graphics/TileImage.java b/src/micropolisj/graphics/TileImage.java
index e6e1dbb..156b0c0 100644
--- a/src/micropolisj/graphics/TileImage.java
+++ b/src/micropolisj/graphics/TileImage.java
@@ -7,7 +7,15 @@ public abstract class TileImage
 {
 	public static final int STD_SIZE = 16;
 
-	public abstract void drawTo(Graphics2D gr, int destX, int destY, int srcX, int srcY);
+	/**
+	 * Draws a part of this tile image to the given graphics context.
+	 */
+	public abstract void drawFragment(Graphics2D gr, int destX, int destY, int srcX, int srcY);
+
+	public final void drawTo(Graphics2D gr, int destX, int destY)
+	{
+		this.drawFragment(gr, destX, destY, 0, 0);
+	}
 
 	public static class TileImageLayer extends TileImage
 	{
@@ -21,12 +29,12 @@ public abstract class TileImage
 		}
 
 		@Override
-		public void drawTo(Graphics2D gr, int destX, int destY, int srcX, int srcY)
+		public void drawFragment(Graphics2D gr, int destX, int destY, int srcX, int srcY)
 		{
 			if (below != null) {
-				below.drawTo(gr, destX, destY, srcX, srcY);
+				below.drawFragment(gr, destX, destY, srcX, srcY);
 			}
-			above.drawTo(gr, destX, destY, srcX, srcY);
+			above.drawFragment(gr, destX, destY, srcX, srcY);
 		}
 	}
 
@@ -42,9 +50,9 @@ public abstract class TileImage
 		}
 
 		@Override
-		public void drawTo(Graphics2D gr, int destX, int destY, int srcX, int srcY)
+		public void drawFragment(Graphics2D gr, int destX, int destY, int srcX, int srcY)
 		{
-			source.drawTo(gr, destX, destY, srcX+offsetX, srcY+offsetY);
+			source.drawFragment(gr, destX, destY, srcX+offsetX, srcY+offsetY);
 		}
 	}
 
@@ -65,7 +73,7 @@ public abstract class TileImage
 		}
 
 		@Override
-		public void drawTo(Graphics2D gr, int destX, int destY, int srcX, int srcY)
+		public void drawFragment(Graphics2D gr, int destX, int destY, int srcX, int srcY)
 		{
 			srcX = srcX * basisSize / STD_SIZE;
 			srcY = srcY * basisSize / STD_SIZE;