チェンジセット 3524: as3/gunyarapaint

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

renamed 5 classes

ファイル:

凡例:

変更無し
追加
削除
更新
コピー
移動
  • as3/gunyarapaint/branches/gunyarapaint/framework/.flexLibProperties

    r3471 r3524  
    11<?xml version="1.0" encoding="UTF-8" standalone="no"?> 
    22<flexLibProperties includeAllClasses="true" version="3"> 
    3   <includeClasses> 
    4     <classEntry path="org.libspark.gunyarapaint.framework.modules.DrawModuleFactory"/> 
    5   </includeClasses> 
     3  <includeClasses/> 
    64  <includeResources/> 
    75  <namespaceManifests/> 
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/CommandContext.as

    r3521 r3524  
    3030    /** 
    3131     * コマンドを管理する 
    32      * TODO: CommandContext という名前に変更する 
    3332     *  
    3433     */ 
    35     public class CommandCollection extends EventDispatcher 
     34    public class CommandContext extends EventDispatcher 
    3635    { 
    3736        public static const MAX_COMMANDS:uint = 256; 
    3837         
    39         public function CommandCollection() 
     38        public function CommandContext() 
    4039        { 
    4140            m_commands = new Vector.<ICommand>(MAX_COMMANDS, true); 
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/Painter.as

    r3521 r3524  
    1616     * 再生及び記録のための共通基盤 
    1717     *  
    18      * TODO: やっぱり Painter という名前にする 
    1918     */ 
    20     public class CanvasContext extends EventDispatcher 
     19    public class Painter extends EventDispatcher 
    2120    { 
    2221        /** 
     
    3837        public static const PAINTER_VERSION_STRING:String = "ver." + PAINTER_VERSION; 
    3938         
    40         public function CanvasContext(width:uint, height:uint, version:uint, paintEngine:PaintEngine) 
     39        public function Painter(width:uint, height:uint, version:uint, paintEngine:PaintEngine) 
    4140        { 
    4241            m_layers = new LayerBitmapCollection(width, height); 
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/Parser.as

    r3501 r3524  
    1818     *  
    1919     */ 
    20     public final class Parser extends CommandCollection 
     20    public final class Parser extends CommandContext 
    2121    { 
    2222        public static const EOH:uint = 26; 
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/Player.as

    r3511 r3524  
    1313     *  
    1414     */ 
    15     public final class Player extends CanvasContext 
     15    public final class Player extends Painter 
    1616    { 
    1717        public function Player(parser:Parser) 
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/Recorder.as

    r3511 r3524  
    1111     *  
    1212     */ 
    13     public final class Recorder extends CanvasContext 
     13    public final class Recorder extends Painter 
    1414    { 
    1515        /** 
     
    1919        public static const DEFAULT_UNDO_MAX:uint = 16; 
    2020         
    21         public function Recorder(width:uint, height:uint, bytes:ByteArray, commands:CommandCollection
     21        public function Recorder(width:uint, height:uint, bytes:ByteArray, commands:CommandContext
    2222        { 
    2323            m_bytes = bytes; 
     
    3737        { 
    3838            var bytes:ByteArray = new ByteArray(); 
    39             var commands:CommandCollection = new CommandCollection(); 
     39            var commands:CommandContext = new CommandContext(); 
    4040            var version:uint = PAINTER_LOG_VERSION; 
    4141            bytes.endian = Endian.BIG_ENDIAN; 
     
    6969        } 
    7070         
    71         private var m_command:CommandCollection
     71        private var m_command:CommandContext
    7272        private var m_bytes:ByteArray; 
    7373    } 
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/UndoStack.as

    r3506 r3524  
    1010    internal final class UndoStack 
    1111    { 
    12         public function UndoStack(painter:CanvasContext
     12        public function UndoStack(painter:Painter
    1313                                  size:uint = 16) 
    1414        { 
     
    2323        } 
    2424         
    25         public function undo(cc:CanvasContext):void 
     25        public function undo(painter:Painter):void 
    2626        { 
    2727            if (m_index === m_first) { 
     
    3434                m_index--; 
    3535            } 
    36             cc.restoreState(m_buffer[m_index]); 
     36            painter.restoreState(m_buffer[m_index]); 
    3737        } 
    3838         
    39         public function redo(cc:CanvasContext):void 
     39        public function redo(painter:Painter):void 
    4040        { 
    4141            if (m_index === m_last) { 
     
    4343            } 
    4444            m_index = (m_index + 1) % m_buffer.length; 
    45             cc.restoreState(m_buffer[m_index]); 
     45            painter.restoreState(m_buffer[m_index]); 
    4646        } 
    4747         
    48         public function push(painter:CanvasContext):void 
     48        public function push(painter:Painter):void 
    4949        { 
    5050            m_index = (m_index + 1) % m_buffer.length; 
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/BeginFillCommand.as

    r3505 r3524  
    33    import flash.utils.ByteArray; 
    44     
    5     import org.libspark.gunyarapaint.framework.CanvasContext
     5    import org.libspark.gunyarapaint.framework.Painter
    66     
    77    /** 
     
    3535        } 
    3636         
    37         public function execute(canvas:CanvasContext):void 
     37        public function execute(painter:Painter):void 
    3838        { 
    39             canvas.beginFill(m_color, m_alpha); 
     39            painter.beginFill(m_color, m_alpha); 
    4040        } 
    4141         
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/CompositeCommand.as

    r3505 r3524  
    33    import flash.utils.ByteArray; 
    44     
    5     import org.libspark.gunyarapaint.framework.CanvasContext
     5    import org.libspark.gunyarapaint.framework.Painter
    66     
    77    /** 
     
    2626        } 
    2727         
    28         public function execute(canvas:CanvasContext):void 
     28        public function execute(painter:Painter):void 
    2929        { 
    30             canvas.composite(); 
    31             canvas.pushUndo(); 
    32             canvas.stopDrawingSession(); 
     30            painter.composite(); 
     31            painter.pushUndo(); 
     32            painter.stopDrawingSession(); 
    3333        } 
    3434         
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/DrawCircleCommand.as

    r3505 r3524  
    33    import flash.utils.ByteArray; 
    44     
    5     import org.libspark.gunyarapaint.framework.CanvasContext
     5    import org.libspark.gunyarapaint.framework.Painter
    66     
    77    /** 
     
    3030        } 
    3131         
    32         public function execute(canvas:CanvasContext):void 
     32        public function execute(painter:Painter):void 
    3333        { 
    34             canvas.drawCircle(m_radius); 
     34            painter.drawCircle(m_radius); 
    3535        } 
    3636         
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/EndFillCommand.as

    r3505 r3524  
    33    import flash.utils.ByteArray; 
    44     
    5     import org.libspark.gunyarapaint.framework.CanvasContext
     5    import org.libspark.gunyarapaint.framework.Painter
    66     
    77    /** 
     
    2626        } 
    2727         
    28         public function execute(canvas:CanvasContext):void 
     28        public function execute(painter:Painter):void 
    2929        { 
    30             canvas.endFill(); 
     30            painter.endFill(); 
    3131        } 
    3232         
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/FloodFillCommand.as

    r3505 r3524  
    33    import flash.utils.ByteArray; 
    44     
    5     import org.libspark.gunyarapaint.framework.CanvasContext
     5    import org.libspark.gunyarapaint.framework.Painter
    66     
    77    /** 
     
    2626        } 
    2727         
    28         public function execute(canvas:CanvasContext):void 
     28        public function execute(painter:Painter):void 
    2929        { 
    30             canvas.floodFill(); 
    31             canvas.pushUndo(); 
    32             canvas.stopDrawingSession(); 
     30            painter.floodFill(); 
     31            painter.pushUndo(); 
     32            painter.stopDrawingSession(); 
    3333        } 
    3434         
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/HorizontalMirrorCommand.as

    r3505 r3524  
    33    import flash.utils.ByteArray; 
    44     
    5     import org.libspark.gunyarapaint.framework.CanvasContext
     5    import org.libspark.gunyarapaint.framework.Painter
    66     
    77    /** 
     
    3131        } 
    3232         
    33         public function execute(canvas:CanvasContext):void 
     33        public function execute(painter:Painter):void 
    3434        { 
    35             canvas.transformWithHorizontalMirrorAt(m_index); 
     35            painter.transformWithHorizontalMirrorAt(m_index); 
    3636        } 
    3737         
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/ICommand.as

    r3501 r3524  
    33    import flash.utils.ByteArray; 
    44     
    5     import org.libspark.gunyarapaint.framework.CanvasContext
     5    import org.libspark.gunyarapaint.framework.Painter
    66     
    77    /** 
     
    3131         * キャンバスに描写を実行する 
    3232         *  
    33          * @param canvas キャンバス 
     33         * @param painter キャンバス 
    3434         */ 
    35         function execute(canvas:CanvasContext):void; 
     35        function execute(painter:Painter):void; 
    3636         
    3737        /** 
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/LineToCommand.as

    r3505 r3524  
    33    import flash.utils.ByteArray; 
    44     
    5     import org.libspark.gunyarapaint.framework.CanvasContext
     5    import org.libspark.gunyarapaint.framework.Painter
    66     
    77    /** 
     
    6464        } 
    6565         
    66         public function execute(canvas:CanvasContext):void 
     66        public function execute(painter:Painter):void 
    6767        { 
    68             canvas.lineTo( 
     68            painter.lineTo( 
    6969                readCoordinate.x || writeCoordinate.x, 
    7070                readCoordinate.y || writeCoordinate.y 
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/MoveToCommand.as

    r3505 r3524  
    33    import flash.utils.ByteArray; 
    44     
    5     import org.libspark.gunyarapaint.framework.CanvasContext
     5    import org.libspark.gunyarapaint.framework.Painter
    66     
    77    /** 
     
    5454        } 
    5555         
    56         public function execute(canvas:CanvasContext):void 
     56        public function execute(painter:Painter):void 
    5757        { 
    58             canvas.moveTo( 
     58            painter.moveTo( 
    5959                readCoordinate.x || writeCoordinate.x, 
    6060                readCoordinate.y || writeCoordinate.y 
    6161            ); 
    62             canvas.startDrawingSession(); 
     62            painter.startDrawingSession(); 
    6363        } 
    6464         
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/PenCommand.as

    r3505 r3524  
    33    import flash.utils.ByteArray; 
    44     
    5     import org.libspark.gunyarapaint.framework.CanvasContext
     5    import org.libspark.gunyarapaint.framework.Painter
    66    import org.libspark.gunyarapaint.framework.Pen; 
    77     
     
    129129        } 
    130130         
    131         public function execute(canvas:CanvasContext):void 
     131        public function execute(painter:Painter):void 
    132132        { 
    133             canvas.pen = m_pen; 
     133            painter.pen = m_pen; 
    134134        } 
    135135         
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/PixelCommand.as

    r3505 r3524  
    33    import flash.utils.ByteArray; 
    44     
    5     import org.libspark.gunyarapaint.framework.CanvasContext
     5    import org.libspark.gunyarapaint.framework.Painter
    66     
    77    /** 
     
    3535        } 
    3636         
    37         public function execute(canvas:CanvasContext):void 
     37        public function execute(painter:Painter):void 
    3838        { 
    39             canvas.setPixel(m_x, m_y); 
    40             canvas.pushUndo(); 
     39            painter.setPixel(m_x, m_y); 
     40            painter.pushUndo(); 
    4141        } 
    4242         
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/RedoCommand.as

    r3501 r3524  
    33    import flash.utils.ByteArray; 
    44     
    5     import org.libspark.gunyarapaint.framework.CanvasContext
     5    import org.libspark.gunyarapaint.framework.Painter
    66     
    77    /** 
     
    2626        } 
    2727         
    28         public function execute(canvas:CanvasContext):void 
     28        public function execute(painter:Painter):void 
    2929        { 
    30             canvas.redo(); 
     30            painter.redo(); 
    3131        } 
    3232         
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/UndoCommand.as

    r3501 r3524  
    33    import flash.utils.ByteArray; 
    44     
    5     import org.libspark.gunyarapaint.framework.CanvasContext
     5    import org.libspark.gunyarapaint.framework.Painter
    66     
    77    /** 
     
    2626        } 
    2727         
    28         public function execute(canvas:CanvasContext):void 
     28        public function execute(painter:Painter):void 
    2929        { 
    30             canvas.undo(); 
     30            painter.undo(); 
    3131        } 
    3232         
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/VerticalMirrorCommand.as

    r3505 r3524  
    33    import flash.utils.ByteArray; 
    44     
    5     import org.libspark.gunyarapaint.framework.CanvasContext
     5    import org.libspark.gunyarapaint.framework.Painter
    66     
    77    /** 
     
    3131        } 
    3232         
    33         public function execute(canvas:CanvasContext):void 
     33        public function execute(painter:Painter):void 
    3434        { 
    35             canvas.transformWithVerticalMirrorAt(m_index); 
     35            painter.transformWithVerticalMirrorAt(m_index); 
    3636        } 
    3737         
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/layer/CopyLayerCommand.as

    r3505 r3524  
    33    import flash.utils.ByteArray; 
    44     
    5     import org.libspark.gunyarapaint.framework.CanvasContext
     5    import org.libspark.gunyarapaint.framework.Painter
    66    import org.libspark.gunyarapaint.framework.commands.ICommand; 
    77     
     
    2727        } 
    2828         
    29         public function execute(canvas:CanvasContext):void 
     29        public function execute(painter:Painter):void 
    3030        { 
    31             canvas.layers.copy(); 
    32             canvas.pushUndoIfNeed(); 
     31            painter.layers.copy(); 
     32            painter.pushUndoIfNeed(); 
    3333        } 
    3434         
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/layer/CreateLayerCommand.as

    r3505 r3524  
    33    import flash.utils.ByteArray; 
    44     
    5     import org.libspark.gunyarapaint.framework.CanvasContext
     5    import org.libspark.gunyarapaint.framework.Painter
    66    import org.libspark.gunyarapaint.framework.commands.ICommand; 
    77     
     
    2727        } 
    2828         
    29         public function execute(canvas:CanvasContext):void 
     29        public function execute(painter:Painter):void 
    3030        { 
    31             canvas.layers.add(); 
    32             canvas.pushUndoIfNeed(); 
     31            painter.layers.add(); 
     32            painter.pushUndoIfNeed(); 
    3333        } 
    3434         
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/layer/MergeLayerCommand.as

    r3505 r3524  
    33    import flash.utils.ByteArray; 
    44     
    5     import org.libspark.gunyarapaint.framework.CanvasContext
     5    import org.libspark.gunyarapaint.framework.Painter
    66    import org.libspark.gunyarapaint.framework.commands.ICommand; 
    77     
     
    2727        } 
    2828         
    29         public function execute(canvas:CanvasContext):void 
     29        public function execute(painter:Painter):void 
    3030        { 
    31             canvas.layers.merge(); 
    32             canvas.pushUndoIfNeed(); 
     31            painter.layers.merge(); 
     32            painter.pushUndoIfNeed(); 
    3333        } 
    3434         
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/layer/RemoveLayerCommand.as

    r3505 r3524  
    33    import flash.utils.ByteArray; 
    44     
    5     import org.libspark.gunyarapaint.framework.CanvasContext
     5    import org.libspark.gunyarapaint.framework.Painter
    66    import org.libspark.gunyarapaint.framework.commands.ICommand; 
    77     
     
    2727        } 
    2828         
    29         public function execute(canvas:CanvasContext):void 
     29        public function execute(painter:Painter):void 
    3030        { 
    31             canvas.layers.remove(); 
    32             canvas.pushUndoIfNeed(); 
     31            painter.layers.remove(); 
     32            painter.pushUndoIfNeed(); 
    3333        } 
    3434         
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/layer/SetLayerAlphaCommand.as

    r3505 r3524  
    33    import flash.utils.ByteArray; 
    44     
    5     import org.libspark.gunyarapaint.framework.CanvasContext
     5    import org.libspark.gunyarapaint.framework.Painter
    66    import org.libspark.gunyarapaint.framework.commands.ICommand; 
    77     
     
    3434        } 
    3535         
    36         public function execute(canvas:CanvasContext):void 
     36        public function execute(painter:Painter):void 
    3737        { 
    38             canvas.currentLayerAlpha = m_alpha; 
    39             canvas.pushUndoIfNeed(); 
     38            painter.currentLayerAlpha = m_alpha; 
     39            painter.pushUndoIfNeed(); 
    4040        } 
    4141         
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/layer/SetLayerBlendModeCommand.as

    r3505 r3524  
    44    import flash.utils.ByteArray; 
    55     
    6     import org.libspark.gunyarapaint.framework.CanvasContext
     6    import org.libspark.gunyarapaint.framework.Painter
    77    import org.libspark.gunyarapaint.framework.commands.ICommand; 
    88     
     
    3535        } 
    3636         
    37         public function execute(canvas:CanvasContext):void 
     37        public function execute(painter:Painter):void 
    3838        { 
    39             canvas.currentLayerBlendMode = m_blendMode; 
    40             canvas.pushUndoIfNeed(); 
     39            painter.currentLayerBlendMode = m_blendMode; 
     40            painter.pushUndoIfNeed(); 
    4141        } 
    4242         
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/layer/SetLayerIndexCommand.as

    r3505 r3524  
    33    import flash.utils.ByteArray; 
    44     
    5     import org.libspark.gunyarapaint.framework.CanvasContext
     5    import org.libspark.gunyarapaint.framework.Painter
    66    import org.libspark.gunyarapaint.framework.commands.ICommand; 
    77     
     
    3434        } 
    3535         
    36         public function execute(canvas:CanvasContext):void 
     36        public function execute(painter:Painter):void 
    3737        { 
    38             canvas.layers.currentIndex = m_index; 
     38            painter.layers.currentIndex = m_index; 
    3939        } 
    4040         
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/layer/SetLayerVisibleCommand.as

    r3505 r3524  
    33    import flash.utils.ByteArray; 
    44     
    5     import org.libspark.gunyarapaint.framework.CanvasContext
     5    import org.libspark.gunyarapaint.framework.Painter
    66    import org.libspark.gunyarapaint.framework.commands.ICommand; 
    77     
     
    3636        } 
    3737         
    38         public function execute(canvas:CanvasContext):void 
     38        public function execute(painter:Painter):void 
    3939        { 
    40             canvas.layers.at(m_index).visible = m_visible; 
    41             canvas.pushUndoIfNeed(); 
     40            painter.layers.at(m_index).visible = m_visible; 
     41            painter.pushUndoIfNeed(); 
    4242        } 
    4343         
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/commands/layer/SwapLayerCommand.as

    r3505 r3524  
    33    import flash.utils.ByteArray; 
    44     
    5     import org.libspark.gunyarapaint.framework.CanvasContext
     5    import org.libspark.gunyarapaint.framework.Painter
    66    import org.libspark.gunyarapaint.framework.commands.ICommand; 
    77     
     
    3636        } 
    3737         
    38         public function execute(canvas:CanvasContext):void 
     38        public function execute(painter:Painter):void 
    3939        { 
    40             canvas.layers.swap(m_from, m_to); 
    41             canvas.pushUndoIfNeed(); 
     40            painter.layers.swap(m_from, m_to); 
     41            painter.pushUndoIfNeed(); 
    4242        } 
    4343         
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/CanvasModule.as

    r3521 r3524  
    2121    import org.libspark.gunyarapaint.framework.errors.LockedLayerError; 
    2222 
    23     // CanvasModule 
    24     public class DrawModule 
     23    public class CanvasModule 
    2524    { 
    26         public function DrawModule(recorder:Recorder) 
     25        public function CanvasModule(recorder:Recorder) 
    2726        { 
    2827            m_recorder = recorder; 
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/CanvasModuleContext.as

    r3521 r3524  
    44 
    55    // TODO: CanvasModuleContext 
    6     public final class DrawModuleFactory 
     6    public final class CanvasModuleContext 
    77    { 
    8         public function DrawModuleFactory(recorder:Recorder) 
     8        public function CanvasModuleContext(recorder:Recorder) 
    99        { 
    1010            m_modules = {}; 
     
    2121        } 
    2222         
    23         public function add(module:IDrawable):void 
     23        public function add(module:ICanvasModule):void 
    2424        { 
    2525            m_modules[module.name] = module; 
    2626        } 
    2727         
    28         public function getModule(name:String):IDrawable 
     28        public function getModule(name:String):ICanvasModule 
    2929        { 
    3030            return m_modules[name]; 
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/CircleModule.as

    r3512 r3524  
    88    import org.libspark.gunyarapaint.framework.commands.MoveToCommand; 
    99     
    10     public final class CircleModule extends DrawModule implements IDrawable 
     10    public final class CircleModule extends CanvasModule implements ICanvasModule 
    1111    { 
    1212        public static const CIRCLE:String = "circle"; 
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/DropperModule.as

    r3512 r3524  
    44    import org.libspark.gunyarapaint.framework.commands.PenCommand; 
    55     
    6     public final class DropperModule extends DrawModule implements IDrawable 
     6    public final class DropperModule extends CanvasModule implements ICanvasModule 
    77    { 
    88        public static const DROPPER:String = "dropper"; 
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/EllipseModule.as

    r3512 r3524  
    33    import org.libspark.gunyarapaint.framework.Recorder; 
    44     
    5     public final class EllipseModule extends DrawModule implements IDrawable 
     5    public final class EllipseModule extends CanvasModule implements ICanvasModule 
    66    { 
    77        public static const ELLIPSE:String = "ellipse"; 
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/EraserModule.as

    r3512 r3524  
    33    import org.libspark.gunyarapaint.framework.Recorder; 
    44     
    5     public final class EraserModule extends DrawModule implements IDrawable 
     5    public final class EraserModule extends CanvasModule implements ICanvasModule 
    66    { 
    77        public static const ERASER:String = "eraser"; 
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/FloodFillModule.as

    r3512 r3524  
    55    import org.libspark.gunyarapaint.framework.commands.MoveToCommand; 
    66     
    7     public final class FloodFillModule extends DrawModule implements IDrawable 
     7    public final class FloodFillModule extends CanvasModule implements ICanvasModule 
    88    { 
    99        public static const FLOOD_FILL:String = "floodFill"; 
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/FreeHandModule.as

    r3512 r3524  
    1111    import org.libspark.gunyarapaint.framework.commands.PenCommand; 
    1212     
    13     public final class FreeHandModule extends DrawModule implements IDrawable 
     13    public final class FreeHandModule extends CanvasModule implements ICanvasModule 
    1414    { 
    1515        public static const FREE_HAND:String = "freeHand"; 
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/ICanvasModule.as

    r3521 r3524  
    55     * ICanvasModule 
    66     */ 
    7     public interface IDrawable 
     7    public interface ICanvasModule 
    88    { 
    99        /** 
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/LineModule.as

    r3512 r3524  
    66    import org.libspark.gunyarapaint.framework.commands.MoveToCommand; 
    77     
    8     public final class LineModule extends DrawModule implements IDrawable 
     8    public final class LineModule extends CanvasModule implements ICanvasModule 
    99    { 
    1010        public static const LINE:String = "line"; 
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/PixelModule.as

    r3512 r3524  
    44    import org.libspark.gunyarapaint.framework.commands.PixelCommand; 
    55     
    6     public final class PixelModule extends DrawModule implements IDrawable 
     6    public final class PixelModule extends CanvasModule implements ICanvasModule 
    77    { 
    88        public static const PIXEL:String = "pixel"; 
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/RectModule.as

    r3512 r3524  
    33    import org.libspark.gunyarapaint.framework.Recorder; 
    44     
    5     public final class RectModule extends DrawModule implements IDrawable 
     5    public final class RectModule extends CanvasModule implements ICanvasModule 
    66    { 
    77        public static const RECT:String = "rect"; 
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/modules/RoundRectModule.as

    r3512 r3524  
    33    import org.libspark.gunyarapaint.framework.Recorder; 
    44     
    5     public final class RoundRectModule extends DrawModule implements IDrawable 
     5    public final class RoundRectModule extends CanvasModule implements ICanvasModule 
    66    { 
    77        public static const ROUND_RECT:String = "roundRect"; 
  • as3/gunyarapaint/branches/gunyarapaint/framework/src/org/libspark/gunyarapaint/framework/ui/IApplication.as

    r3500 r3524  
    55    import org.libspark.gunyarapaint.framework.LayerBitmapCollection; 
    66    import org.libspark.gunyarapaint.framework.Pen; 
    7     import org.libspark.gunyarapaint.framework.modules.IDrawable; 
     7    import org.libspark.gunyarapaint.framework.modules.ICanvasModule; 
    88     
    99    /** 
     
    2323         *  
    2424         */ 
    25         function get module():IDrawable; 
     25        function get module():ICanvasModule; 
    2626         
    2727        /**