Index: as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/PainterTest.as
===================================================================
--- as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/PainterTest.as (リビジョン 3506)
+++ as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/PainterTest.as (リビジョン 3525)
@@ -23,5 +23,5 @@
             pen.pixelHinting = false;
             pen.thickness = 8;
-            var cc:CanvasContext = newCanvasContext();
+            var cc:Painter = newPainter();
             cc.pen = pen;
             var fakedPen:Pen = FakePaintEngine.fakedPen;
@@ -40,5 +40,5 @@
             var x:int = 42;
             var y:int = 124;
-            var cc:CanvasContext = newCanvasContext();
+            var cc:Painter = newPainter();
             cc.moveTo(x, y);
             Assert.assertStrictlyEquals(x, FakePaintEngine.point.x);
@@ -50,5 +50,5 @@
         {
             var radius:Number = 3.14;
-            var cc:CanvasContext = newCanvasContext();
+            var cc:Painter = newPainter();
             cc.drawCircle(radius);
             Assert.assertStrictlyEquals(radius, FakePaintEngine.radius);
@@ -62,5 +62,5 @@
             var width:int = 256;
             var height:int = 512;
-            var cc:CanvasContext = newCanvasContext();
+            var cc:Painter = newPainter();
             cc.drawRect(x, y, width, height);
             Assert.assertStrictlyEquals(x, FakePaintEngine.rectangle.x);
@@ -77,5 +77,5 @@
             var width:int = 128;
             var height:int = 64;
-            var cc:CanvasContext = newCanvasContext();
+            var cc:Painter = newPainter();
             cc.drawEllipse(x, y, width, height);
             Assert.assertStrictlyEquals(x, FakePaintEngine.rectangle.x);
@@ -90,5 +90,5 @@
             var color:uint = uint.MAX_VALUE;
             var alpha:Number = 0.5;
-            var cc:CanvasContext = newCanvasContext();
+            var cc:Painter = newPainter();
             cc.beginFill(color, alpha);
             cc.endFill();
@@ -102,5 +102,5 @@
         {
             var child:DisplayObject;
-            var cc:CanvasContext = newCanvasContext();
+            var cc:Painter = newPainter();
             // 描写セッションの開始されると一時 Sprite が作成される
             // その為、上に現在のレイヤーが、下に描写バッファが入る
@@ -117,7 +117,7 @@
         }
         
-        private function newCanvasContext():CanvasContext
+        private function newPainter():Painter
         {
-            return new CanvasContext(1, 1, CanvasContext.PAINTER_LOG_VERSION, new FakePaintEngine());
+            return new Painter(1, 1, Painter.PAINTER_LOG_VERSION, new FakePaintEngine());
         }
     }
Index: as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/module/LineModuleTest.as
===================================================================
--- as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/module/LineModuleTest.as (リビジョン 3522)
+++ as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/module/LineModuleTest.as (リビジョン 3525)
@@ -3,6 +3,6 @@
     import org.flexunit.Assert;
     import org.libspark.gunyarapaint.framework.Recorder;
-    import org.libspark.gunyarapaint.framework.modules.DrawModuleFactory;
-    import org.libspark.gunyarapaint.framework.modules.IDrawable;
+    import org.libspark.gunyarapaint.framework.modules.CanvasModuleContext;
+    import org.libspark.gunyarapaint.framework.modules.ICanvasModule;
     import org.libspark.gunyarapaint.framework.modules.LineModule;
 
@@ -13,6 +13,6 @@
         {
             var recorder:Recorder = Recorder.create(1, 1, 1);
-            var context:DrawModuleFactory = new DrawModuleFactory(recorder);
-            var module:IDrawable = context.getModule(LineModule.LINE);
+            var context:CanvasModuleContext = new CanvasModuleContext(recorder);
+            var module:ICanvasModule = context.getModule(LineModule.LINE);
             Assert.assertTrue(module is LineModule);
             Assert.assertEquals(module.name, LineModule.LINE);
Index: as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/module/FloodFillModuleTest.as
===================================================================
--- as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/module/FloodFillModuleTest.as (リビジョン 3522)
+++ as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/module/FloodFillModuleTest.as (リビジョン 3525)
@@ -3,7 +3,7 @@
     import org.flexunit.Assert;
     import org.libspark.gunyarapaint.framework.Recorder;
-    import org.libspark.gunyarapaint.framework.modules.DrawModuleFactory;
+    import org.libspark.gunyarapaint.framework.modules.CanvasModuleContext;
     import org.libspark.gunyarapaint.framework.modules.FloodFillModule;
-    import org.libspark.gunyarapaint.framework.modules.IDrawable;
+    import org.libspark.gunyarapaint.framework.modules.ICanvasModule;
 
     public class FloodFillModuleTest
@@ -13,6 +13,6 @@
         {
             var recorder:Recorder = Recorder.create(1, 1, 1);
-            var context:DrawModuleFactory = new DrawModuleFactory(recorder);
-            var module:IDrawable = context.getModule(FloodFillModule.FLOOD_FILL);
+            var context:CanvasModuleContext = new CanvasModuleContext(recorder);
+            var module:ICanvasModule = context.getModule(FloodFillModule.FLOOD_FILL);
             Assert.assertTrue(module is FloodFillModule);
             Assert.assertEquals(module.name, FloodFillModule.FLOOD_FILL);
Index: as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/module/DropperModuleTest.as
===================================================================
--- as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/module/DropperModuleTest.as (リビジョン 3522)
+++ as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/module/DropperModuleTest.as (リビジョン 3525)
@@ -3,7 +3,7 @@
     import org.flexunit.Assert;
     import org.libspark.gunyarapaint.framework.Recorder;
-    import org.libspark.gunyarapaint.framework.modules.DrawModuleFactory;
+    import org.libspark.gunyarapaint.framework.modules.CanvasModuleContext;
     import org.libspark.gunyarapaint.framework.modules.DropperModule;
-    import org.libspark.gunyarapaint.framework.modules.IDrawable;
+    import org.libspark.gunyarapaint.framework.modules.ICanvasModule;
 
     public final class DropperModuleTest
@@ -13,6 +13,6 @@
         {
             var recorder:Recorder = Recorder.create(1, 1, 1);
-            var context:DrawModuleFactory = new DrawModuleFactory(recorder);
-            var module:IDrawable = context.getModule(DropperModule.DROPPER);
+            var context:CanvasModuleContext = new CanvasModuleContext(recorder);
+            var module:ICanvasModule = context.getModule(DropperModule.DROPPER);
             Assert.assertTrue(module is DropperModule);
             Assert.assertEquals(module.name, DropperModule.DROPPER);
Index: as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/module/FreeHandModuleTest.as
===================================================================
--- as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/module/FreeHandModuleTest.as (リビジョン 3522)
+++ as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/module/FreeHandModuleTest.as (リビジョン 3525)
@@ -3,7 +3,7 @@
     import org.flexunit.Assert;
     import org.libspark.gunyarapaint.framework.Recorder;
-    import org.libspark.gunyarapaint.framework.modules.DrawModuleFactory;
+    import org.libspark.gunyarapaint.framework.modules.CanvasModuleContext;
     import org.libspark.gunyarapaint.framework.modules.FreeHandModule;
-    import org.libspark.gunyarapaint.framework.modules.IDrawable;
+    import org.libspark.gunyarapaint.framework.modules.ICanvasModule;
 
     public class FreeHandModuleTest
@@ -13,6 +13,6 @@
         {
             var recorder:Recorder = Recorder.create(1, 1, 1);
-            var context:DrawModuleFactory = new DrawModuleFactory(recorder);
-            var module:IDrawable = context.getModule(FreeHandModule.FREE_HAND);
+            var context:CanvasModuleContext = new CanvasModuleContext(recorder);
+            var module:ICanvasModule = context.getModule(FreeHandModule.FREE_HAND);
             Assert.assertTrue(module is FreeHandModule);
             Assert.assertEquals(module.name, FreeHandModule.FREE_HAND);
Index: as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/module/EllipseModuleTest.as
===================================================================
--- as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/module/EllipseModuleTest.as (リビジョン 3522)
+++ as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/module/EllipseModuleTest.as (リビジョン 3525)
@@ -3,7 +3,7 @@
     import org.flexunit.Assert;
     import org.libspark.gunyarapaint.framework.Recorder;
-    import org.libspark.gunyarapaint.framework.modules.DrawModuleFactory;
+    import org.libspark.gunyarapaint.framework.modules.CanvasModuleContext;
     import org.libspark.gunyarapaint.framework.modules.EllipseModule;
-    import org.libspark.gunyarapaint.framework.modules.IDrawable;
+    import org.libspark.gunyarapaint.framework.modules.ICanvasModule;
 
     public final class EllipseModuleTest
@@ -13,6 +13,6 @@
         {
             var recorder:Recorder = Recorder.create(1, 1, 1);
-            var context:DrawModuleFactory = new DrawModuleFactory(recorder);
-            var module:IDrawable = context.getModule(EllipseModule.ELLIPSE);
+            var context:CanvasModuleContext = new CanvasModuleContext(recorder);
+            var module:ICanvasModule = context.getModule(EllipseModule.ELLIPSE);
             Assert.assertTrue(module is EllipseModule);
             Assert.assertEquals(module.name, EllipseModule.ELLIPSE);
Index: as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/module/RectModuleTest.as
===================================================================
--- as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/module/RectModuleTest.as (リビジョン 3522)
+++ as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/module/RectModuleTest.as (リビジョン 3525)
@@ -3,6 +3,6 @@
     import org.flexunit.Assert;
     import org.libspark.gunyarapaint.framework.Recorder;
-    import org.libspark.gunyarapaint.framework.modules.DrawModuleFactory;
-    import org.libspark.gunyarapaint.framework.modules.IDrawable;
+    import org.libspark.gunyarapaint.framework.modules.CanvasModuleContext;
+    import org.libspark.gunyarapaint.framework.modules.ICanvasModule;
     import org.libspark.gunyarapaint.framework.modules.RectModule;
 
@@ -13,6 +13,6 @@
         {
             var recorder:Recorder = Recorder.create(1, 1, 1);
-            var context:DrawModuleFactory = new DrawModuleFactory(recorder);
-            var module:IDrawable = context.getModule(RectModule.RECT);
+            var context:CanvasModuleContext = new CanvasModuleContext(recorder);
+            var module:ICanvasModule = context.getModule(RectModule.RECT);
             Assert.assertTrue(module is RectModule);
             Assert.assertEquals(module.name, RectModule.RECT);
Index: as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/module/CircleModuleTest.as
===================================================================
--- as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/module/CircleModuleTest.as (リビジョン 3522)
+++ as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/module/CircleModuleTest.as (リビジョン 3525)
@@ -3,7 +3,7 @@
     import org.flexunit.Assert;
     import org.libspark.gunyarapaint.framework.Recorder;
+    import org.libspark.gunyarapaint.framework.modules.CanvasModuleContext;
     import org.libspark.gunyarapaint.framework.modules.CircleModule;
-    import org.libspark.gunyarapaint.framework.modules.DrawModuleFactory;
-    import org.libspark.gunyarapaint.framework.modules.IDrawable;
+    import org.libspark.gunyarapaint.framework.modules.ICanvasModule;
 
     public final class CircleModuleTest
@@ -13,6 +13,6 @@
         {
             var recorder:Recorder = Recorder.create(1, 1, 1);
-            var context:DrawModuleFactory = new DrawModuleFactory(recorder);
-            var module:IDrawable = context.getModule(CircleModule.CIRCLE);
+            var context:CanvasModuleContext = new CanvasModuleContext(recorder);
+            var module:ICanvasModule = context.getModule(CircleModule.CIRCLE);
             Assert.assertTrue(module is CircleModule);
             Assert.assertEquals(module.name, CircleModule.CIRCLE);
Index: as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/module/EraserModuleTest.as
===================================================================
--- as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/module/EraserModuleTest.as (リビジョン 3522)
+++ as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/module/EraserModuleTest.as (リビジョン 3525)
@@ -3,7 +3,7 @@
     import org.flexunit.Assert;
     import org.libspark.gunyarapaint.framework.Recorder;
-    import org.libspark.gunyarapaint.framework.modules.DrawModuleFactory;
+    import org.libspark.gunyarapaint.framework.modules.CanvasModuleContext;
     import org.libspark.gunyarapaint.framework.modules.EraserModule;
-    import org.libspark.gunyarapaint.framework.modules.IDrawable;
+    import org.libspark.gunyarapaint.framework.modules.ICanvasModule;
 
     public final class EraserModuleTest
@@ -13,6 +13,6 @@
         {
             var recorder:Recorder = Recorder.create(1, 1, 1);
-            var context:DrawModuleFactory = new DrawModuleFactory(recorder);
-            var module:IDrawable = context.getModule(EraserModule.ERASER);
+            var context:CanvasModuleContext = new CanvasModuleContext(recorder);
+            var module:ICanvasModule = context.getModule(EraserModule.ERASER);
             Assert.assertTrue(module is EraserModule);
             Assert.assertEquals(module.name, EraserModule.ERASER);
Index: as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/module/PixelModuleTest.as
===================================================================
--- as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/module/PixelModuleTest.as (リビジョン 3522)
+++ as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/module/PixelModuleTest.as (リビジョン 3525)
@@ -3,6 +3,6 @@
     import org.flexunit.Assert;
     import org.libspark.gunyarapaint.framework.Recorder;
-    import org.libspark.gunyarapaint.framework.modules.DrawModuleFactory;
-    import org.libspark.gunyarapaint.framework.modules.IDrawable;
+    import org.libspark.gunyarapaint.framework.modules.CanvasModuleContext;
+    import org.libspark.gunyarapaint.framework.modules.ICanvasModule;
     import org.libspark.gunyarapaint.framework.modules.PixelModule;
 
@@ -13,6 +13,6 @@
         {
             var recorder:Recorder = Recorder.create(1, 1, 1);
-            var context:DrawModuleFactory = new DrawModuleFactory(recorder);
-            var module:IDrawable = context.getModule(PixelModule.PIXEL);
+            var context:CanvasModuleContext = new CanvasModuleContext(recorder);
+            var module:ICanvasModule = context.getModule(PixelModule.PIXEL);
             Assert.assertTrue(module is PixelModule);
             Assert.assertEquals(module.name, PixelModule.PIXEL);
Index: as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/module/RoundRectModuleTest.as
===================================================================
--- as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/module/RoundRectModuleTest.as (リビジョン 3522)
+++ as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/module/RoundRectModuleTest.as (リビジョン 3525)
@@ -3,6 +3,6 @@
     import org.flexunit.Assert;
     import org.libspark.gunyarapaint.framework.Recorder;
-    import org.libspark.gunyarapaint.framework.modules.DrawModuleFactory;
-    import org.libspark.gunyarapaint.framework.modules.IDrawable;
+    import org.libspark.gunyarapaint.framework.modules.CanvasModuleContext;
+    import org.libspark.gunyarapaint.framework.modules.ICanvasModule;
     import org.libspark.gunyarapaint.framework.modules.RoundRectModule;
 
@@ -13,6 +13,6 @@
         {
             var recorder:Recorder = Recorder.create(1, 1, 1);
-            var context:DrawModuleFactory = new DrawModuleFactory(recorder);
-            var module:IDrawable = context.getModule(RoundRectModule.ROUND_RECT);
+            var context:CanvasModuleContext = new CanvasModuleContext(recorder);
+            var module:ICanvasModule = context.getModule(RoundRectModule.ROUND_RECT);
             Assert.assertTrue(module is RoundRectModule);
             Assert.assertEquals(module.name, RoundRectModule.ROUND_RECT);
Index: as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/FakeCommand.as
===================================================================
--- as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/FakeCommand.as (リビジョン 3489)
+++ as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/FakeCommand.as (リビジョン 3525)
@@ -29,5 +29,5 @@
         }
         
-        public function execute(canvas:CanvasContext):void
+        public function execute(painter:Painter):void
         {
             didExecute = true;
Index: as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/RecorderTest.as
===================================================================
--- as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/RecorderTest.as (リビジョン 3506)
+++ as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/RecorderTest.as (リビジョン 3525)
@@ -22,5 +22,5 @@
         public function commitCommand():void
         {
-            var commands:CommandCollection = new CommandCollection();
+            var commands:CommandContext = new CommandContext();
             var bytes:ByteArray = new ByteArray();
             var recorder:Recorder = new Recorder(1, 1, bytes, commands);
Index: as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/FakeCanvasContext.as
===================================================================
--- as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/FakeCanvasContext.as (リビジョン 3506)
+++ as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/FakeCanvasContext.as (リビジョン 3525)
@@ -4,5 +4,5 @@
     import flash.geom.Point;
     
-    public class FakeCanvasContext extends CanvasContext
+    public class FakeCanvasContext extends Painter
     {
         public function FakeCanvasContext()