チェンジセット 3528

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

following framework changes

ファイル:

凡例:

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

  • as3/gunyarapaint/branches/gunyarapaint/compat/src/gunyarapaint.as

    r3523 r3528  
    2323import org.libspark.gunyarapaint.framework.events.CommandEvent; 
    2424import org.libspark.gunyarapaint.framework.events.UndoEvent; 
    25 import org.libspark.gunyarapaint.framework.modules.DrawModuleFactory; 
     25import org.libspark.gunyarapaint.framework.modules.CanvasModuleContext; 
    2626import org.libspark.gunyarapaint.framework.modules.DropperModule; 
    2727import org.libspark.gunyarapaint.framework.modules.FreeHandModule; 
    28 import org.libspark.gunyarapaint.framework.modules.IDrawable; 
     28import org.libspark.gunyarapaint.framework.modules.ICanvasModule; 
    2929import org.libspark.nicopedia.Com; 
    3030 
    3131private var m_recorder:Recorder; 
    32 private var m_factory:DrawModuleFactory; 
    33 private var m_module:IDrawable; 
     32private var m_context:CanvasModuleContext; 
     33private var m_module:ICanvasModule; 
    3434private var m_commit:uint; 
    3535 
    …… 
    5858public function setModule(value:String):void 
    5959{ 
    60     m_module = m_factory.getModule(value); 
    61 } 
    62  
    63 public function get module():IDrawable 
     60    m_module = m_context.getModule(value); 
     61} 
     62 
     63public function get module():ICanvasModule 
    6464{ 
    6565    return m_module; 
    …… 
    129129     
    130130    m_recorder = Recorder.create(width, height, undoBufferSize); 
    131     m_factory = new DrawModuleFactory(m_recorder); 
    132     m_module = m_factory.getModule(FreeHandModule.FREE_HAND); 
     131    m_context = new CanvasModuleContext(m_recorder); 
     132    m_module = m_context.getModule(FreeHandModule.FREE_HAND); 
    133133    m_commit = 0; 
    134134     
    …… 
    137137    m_recorder.addEventListener(UndoEvent.REDO, onChangeUndo); 
    138138    m_recorder.addEventListener(UndoEvent.PUSH, onChangeUndo); 
    139     m_factory.add(new MovingCanvasModule(m_recorder, gpCanvasWindow)); 
     139    m_context.add(new MovingCanvasModule(m_recorder, gpCanvasWindow)); 
    140140} 
    141141 

  • as3/gunyarapaint/branches/gunyarapaint/compat/src/org/libspark/gunyarapaint/controls/MovingCanvasModule.as

    r3523 r3528  
    22{ 
    33    import org.libspark.gunyarapaint.framework.Recorder; 
    4     import org.libspark.gunyarapaint.framework.modules.IDrawable; 
    5     import org.libspark.gunyarapaint.framework.modules.DrawModule; 
     4    import org.libspark.gunyarapaint.framework.modules.ICanvasModule; 
     5    import org.libspark.gunyarapaint.framework.modules.CanvasModule; 
    66     
    7     public final class MovingCanvasModule extends DrawModule implements IDrawable 
     7    public final class MovingCanvasModule extends CanvasModule implements ICanvasModule 
    88    { 
    99        public static const MOVING_CANVAS:String = "movingCanvas"; 

  • as3/gunyarapaint/branches/gunyarapaint/compat/src/org/libspark/gunyarapaint/controls/PenDetailWindowControl.mxml

    r3523 r3528  
    1515            import org.libspark.gunyarapaint.framework.Pen; 
    1616            import org.libspark.gunyarapaint.framework.modules.CircleModule; 
    17             import org.libspark.gunyarapaint.framework.modules.DrawModuleFactory; 
     17            import org.libspark.gunyarapaint.framework.modules.CanvasModuleContext; 
    1818            import org.libspark.gunyarapaint.framework.modules.DropperModule; 
    19             import org.libspark.gunyarapaint.framework.modules.EraserModule; 
    2019            import org.libspark.gunyarapaint.framework.modules.FloodFillModule; 
    2120            import org.libspark.gunyarapaint.framework.modules.FreeHandModule; 
    …… 
    3837                } 
    3938                else if (eraserButton.selected) { 
    40                     pen = EraserModule.ERASER; 
     39                    pen = LineModule.LINE; 
    4140                    IApplication(Application.application).module.blendMode = BlendMode.ERASE; 
    4241                } 
    …… 
    212211                    currentState = "none"; 
    213212                else { 
    214                     pen = EraserModule.ERASER; 
     213                    pen = LineModule.LINE; 
    215214                    IApplication(Application.application).module.blendMode = BlendMode.ERASE; 
    216215                }