チェンジセット 3527

差分発生行の前後
無視リスト:
コミット日時:
2010/03/12 01:57:21 (2 年前)
コミッタ:
hkrn
ログメッセージ:

removed FakeCanvasContext? and replaced FakePainter?'s implementation to it's one

ファイル:

凡例:

変更無し
追加
削除
更新
コピー
移動

  • as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/FakePainter.as

    r3457 r3527  
    99    public class FakePainter extends Painter 
    1010    { 
    11         public function FakePainter(width:int, height:int, engine:PaintEngine) 
     11        public function FakePainter() 
    1212        { 
    13             super(width, height, engine); 
    14             m_layers = new FakeLayerBitmapCollection(width, height); 
    1513            didComposite = false; 
    1614            didFloodFill = false; 
    …… 
    2220            layerAlpha = 0.0; 
    2321            layerBlendMode = BlendMode.NORMAL; 
     22            fakePaintEngine = new FakePaintEngine(); 
     23            super(1, 1, PAINTER_LOG_VERSION, fakePaintEngine); 
     24            m_layers = new FakeLayerBitmapCollection(1, 1); 
     25            m_didUndo = false; 
     26            m_didRedo = false; 
     27            m_didPushUndo = false; 
     28            m_didPushUndoIfNeed = false; 
     29        } 
     30         
     31        public override function undo():void 
     32        { 
     33            m_didUndo = true; 
     34        } 
     35         
     36        public override function redo():void 
     37        { 
     38            m_didRedo = true; 
     39        } 
     40         
     41        public override function pushUndo():void 
     42        { 
     43            m_didPushUndo = true; 
     44        } 
     45         
     46        public override function pushUndoIfNeed():void 
     47        { 
     48            m_didPushUndoIfNeed = true; 
    2449        } 
    2550         
    …… 
    6590        } 
    6691         
     92        public function get didUndo():Boolean 
     93        { 
     94            return m_didUndo; 
     95        } 
     96         
     97        public function get didRedo():Boolean 
     98        { 
     99            return m_didRedo; 
     100        } 
     101         
     102        public function get didPushUndo():Boolean 
     103        { 
     104            return m_didPushUndo; 
     105        } 
     106         
     107        public function get didPushUndoIfNeed():Boolean 
     108        { 
     109            return m_didPushUndoIfNeed; 
     110        } 
     111         
    67112        public override function set currentLayerAlpha(alpha:Number):void 
    68113        { 
    …… 
    84129        public static var layerAlpha:Number; 
    85130        public static var layerBlendMode:String; 
     131        public static var fakePaintEngine:FakePaintEngine; 
     132        private var m_didUndo:Boolean; 
     133        private var m_didRedo:Boolean; 
     134        private var m_didPushUndo:Boolean; 
     135        private var m_didPushUndoIfNeed:Boolean; 
    86136    } 
    87137} 

  • as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/PlayerTest.as

    r3506 r3527  
    4747        { 
    4848            var bytes:ByteArray = createLog("0.1.0"); 
    49             var canvas:Player = Player.load(bytes); 
    50             Assert.assertEquals(10, canvas.version); 
     49            var painter:Player = Player.load(bytes); 
     50            Assert.assertEquals(10, painter.version); 
    5151            // internal 参照なので、 オブジェクトを文字列化して比較する 
    52             // Assert.assertEquals("[object PainterV1]", canvas. + ""); 
     52            // Assert.assertEquals("[object PainterV1]", painter. + ""); 
    5353        } 
    5454         
    …… 
    5757        { 
    5858            var bytes:ByteArray = createLog("0.2.0"); 
    59             var canvas:Player = Player.load(bytes); 
    60             Assert.assertEquals(20, canvas.version); 
     59            var painter:Player = Player.load(bytes); 
     60            Assert.assertEquals(20, painter.version); 
    6161            // internal 参照なので、 オブジェクトを文字列化して比較する 
    62             // Assert.assertEquals("[object PainterV2]", canvas.painter + ""); 
     62            // Assert.assertEquals("[object PainterV2]", painter.painter + ""); 
    6363        } 
    6464         

  • as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/commands/BeginFillCommandTest.as

    r3457 r3527  
    66    import org.libspark.gunyarapaint.framework.commands.BeginFillCommand; 
    77    import org.libspark.gunyarapaint.framework.commands.ICommand; 
    8     import org.libspark.gunyarapaint.framework.FakeCanvasContext; 
     8    import org.libspark.gunyarapaint.framework.FakePainter; 
    99    import org.libspark.gunyarapaint.framework.FakePaintEngine; 
    1010 
    …… 
    2020            }; 
    2121            var command:ICommand = new BeginFillCommand(); 
    22             var canvas:FakeCanvasContext = new FakeCanvasContext(); 
     22            var painter:FakePainter = new FakePainter(); 
    2323            command.write(bytes, args); 
    2424            bytes.position = 0; 
    2525            Assert.assertEquals(BeginFillCommand.ID, bytes.readByte()); 
    2626            command.read(bytes); 
    27             command.execute(canvas); 
     27            command.execute(painter); 
    2828            Assert.assertEquals(args.alpha, FakePaintEngine.alpha); 
    2929            Assert.assertEquals(args.color, FakePaintEngine.color); 
    30             Assert.assertFalse(canvas.didPushUndo); 
     30            Assert.assertFalse(painter.didPushUndo); 
    3131        } 
    3232    } 

  • as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/commands/CompositeCommandTest.as

    r3506 r3527  
    66    import org.libspark.gunyarapaint.framework.commands.CompositeCommand; 
    77    import org.libspark.gunyarapaint.framework.commands.ICommand; 
    8     import org.libspark.gunyarapaint.framework.FakeCanvasContext; 
    9     import org.libspark.gunyarapaint.framework.FakeCanvasContext; 
     8    import org.libspark.gunyarapaint.framework.FakePainter; 
     9    import org.libspark.gunyarapaint.framework.FakePainter; 
    1010 
    1111    public class CompositeCommandTest 
    …… 
    1616            var bytes:ByteArray = new ByteArray(); 
    1717            var command:ICommand = new CompositeCommand(); 
    18             var canvas:FakeCanvasContext = new FakeCanvasContext(); 
     18            var painter:FakePainter = new FakePainter(); 
    1919            command.write(bytes, {}); 
    2020            bytes.position = 0; 
    2121            Assert.assertEquals(CompositeCommand.ID, bytes.readByte()); 
    2222            command.read(bytes); 
    23             command.execute(canvas); 
    24             Assert.assertTrue(FakeCanvasContext.didComposite); 
    25             Assert.assertTrue(FakeCanvasContext.didEndDrawing); 
    26             Assert.assertTrue(canvas.didPushUndo); 
     23            command.execute(painter); 
     24            Assert.assertTrue(FakePainter.didComposite); 
     25            Assert.assertTrue(FakePainter.didEndDrawing); 
     26            Assert.assertTrue(painter.didPushUndo); 
    2727        } 
    2828    } 

  • as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/commands/DrawCircleCommandTest.as

    r3457 r3527  
    66    import org.libspark.gunyarapaint.framework.commands.DrawCircleCommand; 
    77    import org.libspark.gunyarapaint.framework.commands.ICommand; 
    8     import org.libspark.gunyarapaint.framework.FakeCanvasContext; 
     8    import org.libspark.gunyarapaint.framework.FakePainter; 
    99    import org.libspark.gunyarapaint.framework.FakePaintEngine; 
    1010 
    …… 
    1616            var bytes:ByteArray = new ByteArray(); 
    1717            var command:ICommand = new DrawCircleCommand(); 
    18             var canvas:FakeCanvasContext = new FakeCanvasContext(); 
     18            var painter:FakePainter = new FakePainter(); 
    1919            var args:Object = { 
    2020                "radius": Math.PI 
    …… 
    2424            Assert.assertEquals(DrawCircleCommand.ID, bytes.readByte()); 
    2525            command.read(bytes); 
    26             command.execute(canvas); 
     26            command.execute(painter); 
    2727            Assert.assertEquals(args.radius, FakePaintEngine.radius); 
    28             Assert.assertFalse(canvas.didPushUndo); 
     28            Assert.assertFalse(painter.didPushUndo); 
    2929        } 
    3030    } 

  • as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/commands/EndFillComamndTest.as

    r3457 r3527  
    66    import org.libspark.gunyarapaint.framework.commands.EndFillCommand; 
    77    import org.libspark.gunyarapaint.framework.commands.ICommand; 
    8     import org.libspark.gunyarapaint.framework.FakeCanvasContext; 
     8    import org.libspark.gunyarapaint.framework.FakePainter; 
    99    import org.libspark.gunyarapaint.framework.FakePaintEngine; 
    1010 
    …… 
    1616            var bytes:ByteArray = new ByteArray(); 
    1717            var command:ICommand = new EndFillCommand(); 
    18             var canvas:FakeCanvasContext = new FakeCanvasContext(); 
     18            var painter:FakePainter = new FakePainter(); 
    1919            command.write(bytes, {}); 
    2020            bytes.position = 0; 
    2121            Assert.assertEquals(EndFillCommand.ID, bytes.readByte()); 
    2222            command.read(bytes); 
    23             command.execute(canvas); 
     23            command.execute(painter); 
    2424            Assert.assertTrue(FakePaintEngine.filled); 
    25             Assert.assertFalse(canvas.didPushUndo); 
     25            Assert.assertFalse(painter.didPushUndo); 
    2626        } 
    2727    } 

  • as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/commands/FloodFillCommandTest.as

    r3506 r3527  
    66    import org.libspark.gunyarapaint.framework.commands.FloodFillCommand; 
    77    import org.libspark.gunyarapaint.framework.commands.ICommand; 
    8     import org.libspark.gunyarapaint.framework.FakeCanvasContext; 
    9     import org.libspark.gunyarapaint.framework.FakeCanvasContext; 
     8    import org.libspark.gunyarapaint.framework.FakePainter; 
     9    import org.libspark.gunyarapaint.framework.FakePainter; 
    1010 
    1111    public class FloodFillCommandTest 
    …… 
    1616            var bytes:ByteArray = new ByteArray(); 
    1717            var command:ICommand = new FloodFillCommand(); 
    18             var canvas:FakeCanvasContext = new FakeCanvasContext(); 
     18            var painter:FakePainter = new FakePainter(); 
    1919            command.write(bytes, {}); 
    2020            bytes.position = 0; 
    2121            Assert.assertEquals(FloodFillCommand.ID, bytes.readByte()); 
    2222            command.read(bytes); 
    23             command.execute(canvas); 
    24             Assert.assertTrue(FakeCanvasContext.didFloodFill); 
    25             Assert.assertTrue(FakeCanvasContext.didEndDrawing); 
    26             Assert.assertTrue(canvas.didPushUndo); 
     23            command.execute(painter); 
     24            Assert.assertTrue(FakePainter.didFloodFill); 
     25            Assert.assertTrue(FakePainter.didEndDrawing); 
     26            Assert.assertTrue(painter.didPushUndo); 
    2727        } 
    2828    } 

  • as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/commands/HorizontalMirrorCommandTest.as

    r3506 r3527  
    66    import org.libspark.gunyarapaint.framework.commands.HorizontalMirrorCommand; 
    77    import org.libspark.gunyarapaint.framework.commands.ICommand; 
    8     import org.libspark.gunyarapaint.framework.FakeCanvasContext; 
    9     import org.libspark.gunyarapaint.framework.FakeCanvasContext; 
     8    import org.libspark.gunyarapaint.framework.FakePainter; 
     9    import org.libspark.gunyarapaint.framework.FakePainter; 
    1010 
    1111    public class HorizontalMirrorCommandTest 
    …… 
    1616            var bytes:ByteArray = new ByteArray(); 
    1717            var command:ICommand = new HorizontalMirrorCommand(); 
    18             var canvas:FakeCanvasContext = new FakeCanvasContext(); 
     18            var painter:FakePainter = new FakePainter(); 
    1919            var args:Object = { "index": 42 }; 
    2020            command.write(bytes, args); 
    …… 
    2222            Assert.assertEquals(HorizontalMirrorCommand.ID, bytes.readByte()); 
    2323            command.read(bytes); 
    24             command.execute(canvas); 
    25             Assert.assertEquals(args.index, FakeCanvasContext.layerIndex); 
    26             Assert.assertFalse(canvas.didPushUndo); 
     24            command.execute(painter); 
     25            Assert.assertEquals(args.index, FakePainter.layerIndex); 
     26            Assert.assertFalse(painter.didPushUndo); 
    2727        } 
    2828    } 

  • as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/commands/LineToCommandTest.as

    r3457 r3527  
    66    import org.libspark.gunyarapaint.framework.commands.ICommand; 
    77    import org.libspark.gunyarapaint.framework.commands.LineToCommand; 
    8     import org.libspark.gunyarapaint.framework.FakeCanvasContext; 
     8    import org.libspark.gunyarapaint.framework.FakePainter; 
    99    import org.libspark.gunyarapaint.framework.FakePaintEngine; 
    1010 
    …… 
    3838            var bytes:ByteArray = new ByteArray(); 
    3939            var command:LineToCommand = new LineToCommand(); 
    40             var canvas:FakeCanvasContext = new FakeCanvasContext(); 
     40            var painter:FakePainter = new FakePainter(); 
    4141            var args:Object = { "x": x, "y": y }; 
    4242            command.write(bytes, args); 
    …… 
    4848                Assert.assertEquals(LineToCommand.ID, byte); 
    4949            command.read(bytes); 
    50             command.execute(canvas); 
     50            command.execute(painter); 
    5151            Assert.assertEquals(args.x, FakePaintEngine.point.x); 
    5252            Assert.assertEquals(args.y, FakePaintEngine.point.y); 

  • as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/commands/MoveToCommandTest.as

    r3457 r3527  
    55    import org.flexunit.Assert; 
    66    import org.libspark.gunyarapaint.framework.commands.MoveToCommand; 
    7     import org.libspark.gunyarapaint.framework.FakeCanvasContext; 
     7    import org.libspark.gunyarapaint.framework.FakePainter; 
    88    import org.libspark.gunyarapaint.framework.FakePaintEngine; 
    99 
    …… 
    2828            var bytes:ByteArray = new ByteArray(); 
    2929            var command:MoveToCommand = new MoveToCommand(); 
    30             var canvas:FakeCanvasContext = new FakeCanvasContext(); 
     30            var painter:FakePainter = new FakePainter(); 
    3131            var args:Object = { "x": x, "y": y }; 
    3232            command.write(bytes, args); 
    …… 
    3838                Assert.assertEquals(MoveToCommand.ID, byte); 
    3939            command.read(bytes); 
    40             command.execute(canvas); 
     40            command.execute(painter); 
    4141            Assert.assertEquals(args.x, FakePaintEngine.point.x); 
    4242            Assert.assertEquals(args.y, FakePaintEngine.point.y); 

  • as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/commands/PenCommandTest.as

    r3457 r3527  
    99    import org.libspark.gunyarapaint.framework.commands.ICommand; 
    1010    import org.libspark.gunyarapaint.framework.commands.PenCommand; 
    11     import org.libspark.gunyarapaint.framework.FakeCanvasContext; 
     11    import org.libspark.gunyarapaint.framework.FakePainter; 
    1212    import org.libspark.gunyarapaint.framework.FakePaintEngine; 
    1313 
    …… 
    6666            var bytes:ByteArray = new ByteArray(); 
    6767            var command:ICommand = new PenCommand(); 
    68             var canvas:FakeCanvasContext = new FakeCanvasContext(); 
     68            var painter:FakePainter = new FakePainter(); 
    6969            var args:Object = { "type": type }; 
    7070            args[key] = value; 
    …… 
    7373            Assert.assertEquals(PenCommand.ID, bytes.readByte()); 
    7474            command.read(bytes); 
    75             command.execute(canvas); 
     75            command.execute(painter); 
    7676            Assert.assertEquals(args[key], FakePaintEngine.fakedPen[key]); 
    77             Assert.assertFalse(canvas.didPushUndo); 
     77            Assert.assertFalse(painter.didPushUndo); 
    7878        } 
    7979    } 

  • as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/commands/PixelCommandTest.as

    r3506 r3527  
    66    import org.libspark.gunyarapaint.framework.commands.ICommand; 
    77    import org.libspark.gunyarapaint.framework.commands.PixelCommand; 
    8     import org.libspark.gunyarapaint.framework.FakeCanvasContext; 
    9     import org.libspark.gunyarapaint.framework.FakeCanvasContext; 
     8    import org.libspark.gunyarapaint.framework.FakePainter; 
     9    import org.libspark.gunyarapaint.framework.FakePainter; 
    1010 
    1111    public class PixelCommandTest 
    …… 
    1616            var bytes:ByteArray = new ByteArray(); 
    1717            var command:ICommand = new PixelCommand(); 
    18             var canvas:FakeCanvasContext = new FakeCanvasContext(); 
     18            var painter:FakePainter = new FakePainter(); 
    1919            var args:Object = { "x": 1234, "y": 4321 }; 
    2020            command.write(bytes, args); 
    …… 
    2222            Assert.assertEquals(PixelCommand.ID, bytes.readByte()); 
    2323            command.read(bytes); 
    24             command.execute(canvas); 
    25             Assert.assertEquals(args.x, FakeCanvasContext.coordinate.x); 
    26             Assert.assertEquals(args.y, FakeCanvasContext.coordinate.y); 
    27             Assert.assertTrue(canvas.didPushUndo); 
     24            command.execute(painter); 
     25            Assert.assertEquals(args.x, FakePainter.coordinate.x); 
     26            Assert.assertEquals(args.y, FakePainter.coordinate.y); 
     27            Assert.assertTrue(painter.didPushUndo); 
    2828        } 
    2929    } 

  • as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/commands/RedoCommandTest.as

    r3457 r3527  
    66    import org.libspark.gunyarapaint.framework.commands.ICommand; 
    77    import org.libspark.gunyarapaint.framework.commands.RedoCommand; 
    8     import org.libspark.gunyarapaint.framework.FakeCanvasContext; 
     8    import org.libspark.gunyarapaint.framework.FakePainter; 
    99 
    1010    public class RedoCommandTest 
    …… 
    1515            var bytes:ByteArray = new ByteArray(); 
    1616            var command:ICommand = new RedoCommand(); 
    17             var canvas:FakeCanvasContext = new FakeCanvasContext(); 
     17            var painter:FakePainter = new FakePainter(); 
    1818            command.write(bytes, {}); 
    1919            bytes.position = 0; 
    2020            Assert.assertEquals(RedoCommand.ID, bytes.readByte()); 
    2121            command.read(bytes); 
    22             command.execute(canvas); 
    23             Assert.assertTrue(canvas.didRedo); 
     22            command.execute(painter); 
     23            Assert.assertTrue(painter.didRedo); 
    2424        } 
    2525    } 

  • as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/commands/UndoCommandTest.as

    r3457 r3527  
    66    import org.libspark.gunyarapaint.framework.commands.ICommand; 
    77    import org.libspark.gunyarapaint.framework.commands.UndoCommand; 
    8     import org.libspark.gunyarapaint.framework.FakeCanvasContext; 
     8    import org.libspark.gunyarapaint.framework.FakePainter; 
    99 
    1010    public class UndoCommandTest 
    …… 
    1515            var bytes:ByteArray = new ByteArray(); 
    1616            var command:ICommand = new UndoCommand(); 
    17             var canvas:FakeCanvasContext = new FakeCanvasContext(); 
     17            var painter:FakePainter = new FakePainter(); 
    1818            command.write(bytes, {}); 
    1919            bytes.position = 0; 
    2020            Assert.assertEquals(UndoCommand.ID, bytes.readByte()); 
    2121            command.read(bytes); 
    22             command.execute(canvas); 
    23             Assert.assertTrue(canvas.didUndo); 
     22            command.execute(painter); 
     23            Assert.assertTrue(painter.didUndo); 
    2424        } 
    2525    } 

  • as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/commands/VerticalMirrorCommandTest.as

    r3506 r3527  
    66    import org.libspark.gunyarapaint.framework.commands.ICommand; 
    77    import org.libspark.gunyarapaint.framework.commands.VerticalMirrorCommand; 
    8     import org.libspark.gunyarapaint.framework.FakeCanvasContext; 
    9     import org.libspark.gunyarapaint.framework.FakeCanvasContext; 
     8    import org.libspark.gunyarapaint.framework.FakePainter; 
     9    import org.libspark.gunyarapaint.framework.FakePainter; 
    1010 
    1111    public class VerticalMirrorCommandTest 
    …… 
    1616            var bytes:ByteArray = new ByteArray(); 
    1717            var command:ICommand = new VerticalMirrorCommand(); 
    18             var canvas:FakeCanvasContext = new FakeCanvasContext(); 
     18            var painter:FakePainter = new FakePainter(); 
    1919            var args:Object = { "index": 42 }; 
    2020            command.write(bytes, args); 
    …… 
    2222            Assert.assertEquals(VerticalMirrorCommand.ID, bytes.readByte()); 
    2323            command.read(bytes); 
    24             command.execute(canvas); 
    25             Assert.assertEquals(args.index, FakeCanvasContext.layerIndex); 
    26             Assert.assertFalse(canvas.didPushUndo); 
     24            command.execute(painter); 
     25            Assert.assertEquals(args.index, FakePainter.layerIndex); 
     26            Assert.assertFalse(painter.didPushUndo); 
    2727        } 
    2828    } 

  • as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/commands/layer/CopyLayerCommandTest.as

    r3457 r3527  
    66    import org.libspark.gunyarapaint.framework.commands.ICommand; 
    77    import org.libspark.gunyarapaint.framework.commands.layer.CopyLayerCommand; 
    8     import org.libspark.gunyarapaint.framework.FakeCanvasContext; 
     8    import org.libspark.gunyarapaint.framework.FakePainter; 
    99    import org.libspark.gunyarapaint.framework.FakeLayerBitmapCollection; 
    1010 
    …… 
    1616            var bytes:ByteArray = new ByteArray(); 
    1717            var command:ICommand = new CopyLayerCommand(); 
    18             var canvas:FakeCanvasContext = new FakeCanvasContext(); 
     18            var painter:FakePainter = new FakePainter(); 
    1919            command.write(bytes, {}); 
    2020            bytes.position = 0; 
    2121            Assert.assertEquals(CopyLayerCommand.ID, bytes.readByte()); 
    2222            command.read(bytes); 
    23             command.execute(canvas); 
     23            command.execute(painter); 
    2424            Assert.assertTrue(FakeLayerBitmapCollection.didCopyLayer); 
    25             Assert.assertTrue(canvas.didPushUndoIfNeed); 
     25            Assert.assertTrue(painter.didPushUndoIfNeed); 
    2626        } 
    2727    } 

  • as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/commands/layer/CreateLayerCommandTest.as

    r3457 r3527  
    66    import org.libspark.gunyarapaint.framework.commands.ICommand; 
    77    import org.libspark.gunyarapaint.framework.commands.layer.CreateLayerCommand; 
    8     import org.libspark.gunyarapaint.framework.FakeCanvasContext; 
     8    import org.libspark.gunyarapaint.framework.FakePainter; 
    99    import org.libspark.gunyarapaint.framework.FakeLayerBitmapCollection; 
    1010 
    …… 
    1616            var bytes:ByteArray = new ByteArray(); 
    1717            var command:ICommand = new CreateLayerCommand(); 
    18             var canvas:FakeCanvasContext = new FakeCanvasContext(); 
     18            var painter:FakePainter = new FakePainter(); 
    1919            command.write(bytes, {}); 
    2020            bytes.position = 0; 
    2121            Assert.assertEquals(CreateLayerCommand.ID, bytes.readByte()); 
    2222            command.read(bytes); 
    23             command.execute(canvas); 
     23            command.execute(painter); 
    2424            Assert.assertTrue(FakeLayerBitmapCollection.didAddLayer); 
    25             Assert.assertTrue(canvas.didPushUndoIfNeed); 
     25            Assert.assertTrue(painter.didPushUndoIfNeed); 
    2626        } 
    2727    } 

  • as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/commands/layer/MergeLayerCommandTest.as

    r3457 r3527  
    66    import org.libspark.gunyarapaint.framework.commands.ICommand; 
    77    import org.libspark.gunyarapaint.framework.commands.layer.MergeLayerCommand; 
    8     import org.libspark.gunyarapaint.framework.FakeCanvasContext; 
     8    import org.libspark.gunyarapaint.framework.FakePainter; 
    99    import org.libspark.gunyarapaint.framework.FakeLayerBitmapCollection; 
    1010 
    …… 
    1616            var bytes:ByteArray = new ByteArray(); 
    1717            var command:ICommand = new MergeLayerCommand(); 
    18             var canvas:FakeCanvasContext = new FakeCanvasContext(); 
     18            var painter:FakePainter = new FakePainter(); 
    1919            command.write(bytes, {}); 
    2020            bytes.position = 0; 
    2121            Assert.assertEquals(MergeLayerCommand.ID, bytes.readByte()); 
    2222            command.read(bytes); 
    23             command.execute(canvas); 
     23            command.execute(painter); 
    2424            Assert.assertTrue(FakeLayerBitmapCollection.didMergeLayer); 
    25             Assert.assertTrue(canvas.didPushUndoIfNeed); 
     25            Assert.assertTrue(painter.didPushUndoIfNeed); 
    2626        } 
    2727    } 

  • as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/commands/layer/RemoveLayerCommandTest.as

    r3457 r3527  
    66    import org.libspark.gunyarapaint.framework.commands.ICommand; 
    77    import org.libspark.gunyarapaint.framework.commands.layer.RemoveLayerCommand; 
    8     import org.libspark.gunyarapaint.framework.FakeCanvasContext; 
     8    import org.libspark.gunyarapaint.framework.FakePainter; 
    99    import org.libspark.gunyarapaint.framework.FakeLayerBitmapCollection; 
    1010 
    …… 
    1616            var bytes:ByteArray = new ByteArray(); 
    1717            var command:ICommand = new RemoveLayerCommand(); 
    18             var canvas:FakeCanvasContext = new FakeCanvasContext(); 
     18            var painter:FakePainter = new FakePainter(); 
    1919            command.write(bytes, {}); 
    2020            bytes.position = 0; 
    2121            Assert.assertEquals(RemoveLayerCommand.ID, bytes.readByte()); 
    2222            command.read(bytes); 
    23             command.execute(canvas); 
     23            command.execute(painter); 
    2424            Assert.assertTrue(FakeLayerBitmapCollection.didRemoveLayer); 
    25             Assert.assertTrue(canvas.didPushUndoIfNeed); 
     25            Assert.assertTrue(painter.didPushUndoIfNeed); 
    2626        } 
    2727    } 

  • as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/commands/layer/SetLayerAlphaCommandTest.as

    r3506 r3527  
    66    import org.libspark.gunyarapaint.framework.commands.ICommand; 
    77    import org.libspark.gunyarapaint.framework.commands.layer.SetLayerAlphaCommand; 
    8     import org.libspark.gunyarapaint.framework.FakeCanvasContext; 
    9     import org.libspark.gunyarapaint.framework.FakeCanvasContext; 
     8    import org.libspark.gunyarapaint.framework.FakePainter; 
     9    import org.libspark.gunyarapaint.framework.FakePainter; 
    1010 
    1111    public class SetLayerAlphaCommandTest 
    …… 
    1616            var bytes:ByteArray = new ByteArray(); 
    1717            var command:ICommand = new SetLayerAlphaCommand(); 
    18             var canvas:FakeCanvasContext = new FakeCanvasContext(); 
     18            var painter:FakePainter = new FakePainter(); 
    1919            var args:Object = { "alpha": 0.314 }; 
    2020            command.write(bytes, args); 
    …… 
    2222            Assert.assertEquals(SetLayerAlphaCommand.ID, bytes.readByte()); 
    2323            command.read(bytes); 
    24             command.execute(canvas); 
    25             Assert.assertEquals(args.alpha, FakeCanvasContext.layerAlpha); 
    26             Assert.assertTrue(canvas.didPushUndoIfNeed); 
     24            command.execute(painter); 
     25            Assert.assertEquals(args.alpha, FakePainter.layerAlpha); 
     26            Assert.assertTrue(painter.didPushUndoIfNeed); 
    2727        } 
    2828    } 

  • as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/commands/layer/SetLayerBlendModeCommandTest.as

    r3506 r3527  
    77    import org.libspark.gunyarapaint.framework.commands.ICommand; 
    88    import org.libspark.gunyarapaint.framework.commands.layer.SetLayerBlendModeCommand; 
    9     import org.libspark.gunyarapaint.framework.FakeCanvasContext; 
    10     import org.libspark.gunyarapaint.framework.FakeCanvasContext; 
     9    import org.libspark.gunyarapaint.framework.FakePainter; 
     10    import org.libspark.gunyarapaint.framework.FakePainter; 
    1111 
    1212    public class SetLayerBlendModeCommandTest 
    …… 
    1717            var bytes:ByteArray = new ByteArray(); 
    1818            var command:ICommand = new SetLayerBlendModeCommand(); 
    19             var canvas:FakeCanvasContext = new FakeCanvasContext(); 
     19            var painter:FakePainter = new FakePainter(); 
    2020            var args:Object = { "blendMode": BlendMode.ADD }; 
    2121            command.write(bytes, args); 
    …… 
    2323            Assert.assertEquals(SetLayerBlendModeCommand.ID, bytes.readByte()); 
    2424            command.read(bytes); 
    25             command.execute(canvas); 
    26             Assert.assertEquals(args.blendMode, FakeCanvasContext.layerBlendMode); 
    27             Assert.assertTrue(canvas.didPushUndoIfNeed); 
     25            command.execute(painter); 
     26            Assert.assertEquals(args.blendMode, FakePainter.layerBlendMode); 
     27            Assert.assertTrue(painter.didPushUndoIfNeed); 
    2828        } 
    2929    } 

  • as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/commands/layer/SetLayerIndexCommandTest.as

    r3506 r3527  
    66    import org.libspark.gunyarapaint.framework.commands.ICommand; 
    77    import org.libspark.gunyarapaint.framework.commands.layer.SetLayerIndexCommand; 
    8     import org.libspark.gunyarapaint.framework.FakeCanvasContext; 
    9     import org.libspark.gunyarapaint.framework.FakeCanvasContext; 
     8    import org.libspark.gunyarapaint.framework.FakePainter; 
     9    import org.libspark.gunyarapaint.framework.FakePainter; 
    1010 
    1111    public class SetLayerIndexCommandTest 
    …… 
    1616            var bytes:ByteArray = new ByteArray(); 
    1717            var command:ICommand = new SetLayerIndexCommand(); 
    18             var canvas:FakeCanvasContext = new FakeCanvasContext(); 
     18            var painter:FakePainter = new FakePainter(); 
    1919            var args:Object = { "index": 42 }; 
    2020            command.write(bytes, args); 
    …… 
    2222            Assert.assertEquals(SetLayerIndexCommand.ID, bytes.readByte()); 
    2323            command.read(bytes); 
    24             command.execute(canvas); 
    25             Assert.assertEquals(args.index, canvas.layers.currentIndex); 
    26             Assert.assertFalse(canvas.didPushUndoIfNeed); 
     24            command.execute(painter); 
     25            Assert.assertEquals(args.index, painter.layers.currentIndex); 
     26            Assert.assertFalse(painter.didPushUndoIfNeed); 
    2727        } 
    2828    } 

  • as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/commands/layer/SetLayerVisibleCommandTest.as

    r3506 r3527  
    66    import org.libspark.gunyarapaint.framework.commands.ICommand; 
    77    import org.libspark.gunyarapaint.framework.commands.layer.SetLayerVisibleCommand; 
    8     import org.libspark.gunyarapaint.framework.FakeCanvasContext; 
    9     import org.libspark.gunyarapaint.framework.FakeCanvasContext; 
     8    import org.libspark.gunyarapaint.framework.FakePainter; 
     9    import org.libspark.gunyarapaint.framework.FakePainter; 
    1010 
    1111    public class SetLayerVisibleCommandTest 
    …… 
    1616            var bytes:ByteArray = new ByteArray(); 
    1717            var command:ICommand = new SetLayerVisibleCommand(); 
    18             var canvas:FakeCanvasContext = new FakeCanvasContext(); 
     18            var painter:FakePainter = new FakePainter(); 
    1919            var args:Object = { "index": 0, "visible": false }; 
    2020            command.write(bytes, args); 
    …… 
    2222            Assert.assertEquals(SetLayerVisibleCommand.ID, bytes.readByte()); 
    2323            command.read(bytes); 
    24             command.execute(canvas); 
    25             //Assert.assertEquals(args.visible, FakeCanvasContext.layerBitmap.visible); 
    26             Assert.assertTrue(canvas.didPushUndoIfNeed); 
     24            command.execute(painter); 
     25            //Assert.assertEquals(args.visible, FakePainter.layerBitmap.visible); 
     26            Assert.assertTrue(painter.didPushUndoIfNeed); 
    2727        } 
    2828    } 

  • as3/gunyarapaint/branches/gunyarapaint/test/src/org/libspark/gunyarapaint/framework/commands/layer/SwapLayerCommandTest.as

    r3457 r3527  
    66    import org.libspark.gunyarapaint.framework.commands.ICommand; 
    77    import org.libspark.gunyarapaint.framework.commands.layer.SwapLayerCommand; 
    8     import org.libspark.gunyarapaint.framework.FakeCanvasContext; 
     8    import org.libspark.gunyarapaint.framework.FakePainter; 
    99    import org.libspark.gunyarapaint.framework.FakeLayerBitmapCollection; 
    1010 
    …… 
    1616            var bytes:ByteArray = new ByteArray(); 
    1717            var command:ICommand = new SwapLayerCommand(); 
    18             var canvas:FakeCanvasContext = new FakeCanvasContext(); 
     18            var painter:FakePainter = new FakePainter(); 
    1919            var args:Object = { "from": 42, "to": 24 }; 
    2020            command.write(bytes, args); 
    …… 
    2222            Assert.assertEquals(SwapLayerCommand.ID, bytes.readByte()); 
    2323            command.read(bytes); 
    24             command.execute(canvas); 
     24            command.execute(painter); 
    2525            Assert.assertEquals(args.from, FakeLayerBitmapCollection.didSwapLayerFrom); 
    2626            Assert.assertEquals(args.to, FakeLayerBitmapCollection.didSwapLayerTo); 
    27             Assert.assertTrue(canvas.didPushUndoIfNeed); 
     27            Assert.assertTrue(painter.didPushUndoIfNeed); 
    2828        } 
    2929    }