チェンジセット 1179

差分発生行の前後
無視リスト:
コミット日時:
2008/08/27 18:22:26 (4 ヶ月前)
コミッタ:
tasuku
ログメッセージ:

r1180@poppop (orig r129): tasuku | 2008-08-27 16:04:03 +0900
gunyarapaint -> org.libspark.gunyarapaint


ファイル:

凡例:

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

  • as3/gunyarapaint/trunk/gunyarapaint/src/gplogplayer.mxml

    r1126 r1179  
    1515  <![CDATA[ 
    1616  import flash.events.Event; 
    17   import gunyarapaint.Com; 
    18   import gunyarapaint.entities.GPLogger; 
    19   import gunyarapaint.controls.GPCanvas; 
    20   import gunyarapaint.utils.MiscUtils; 
     17  import org.libspark.gunyarapaint.Com; 
     18  import org.libspark.gunyarapaint.entities.GPLogger; 
     19  import org.libspark.gunyarapaint.controls.GPCanvas; 
     20  import org.libspark.gunyarapaint.utils.MiscUtils; 
    2121 
    2222  import mx.controls.Alert; 
    …… 
    2424  import mx.events.SliderEvent; 
    2525  import mx.managers.PopUpManager; 
    26    
     26 
    2727  private var comm:Com; 
    2828  private var oelog:ByteArray; 
    …… 
    4040  public function init():void { 
    4141    this.enabled = false; 
    42      
     42 
    4343    // for debug 
    4444    if (debugOekakiId != 0) { 
    …… 
    4949      commDebug.addEventListener('completeGetData', function(evt:Event):void { debugCheckPng = commDebug.getData();}); 
    5050    } 
    51      
     51 
    5252    if (parameters['oelogUrl']) { 
    5353      var url:String = parameters['oelogUrl']; 
    …… 
    7272  private function getDataHandler(evt:Event):void { 
    7373    if (oelog) { 
    74       baseImg = Bitmap(comm.getContent()).bitmapData;     
     74      baseImg = Bitmap(comm.getContent()).bitmapData; 
    7575      play(); 
    7676    } else { 
    …… 
    8282      } else { 
    8383        play(); 
    84       }     
     84      } 
    8585    } 
    8686  } 
    87    
    88   private var logcan:gunyarapaint.controls.GPCanvas; 
     87 
     88  private var logcan:org.libspark.gunyarapaint.controls.GPCanvas; 
    8989  private var logger:GPLogger; 
    90    
     90 
    9191  private function createLogCan():void { 
    9292    logger = new GPLogger(oelog); 
    …… 
    108108    this.enabled = true; 
    109109  } 
    110    
     110 
    111111  private function playSpeedHSliderHandler(evt:SliderEvent):void { 
    112112    if (logcan) { 
    …… 
    114114    } 
    115115  } 
    116    
     116 
    117117  private function playButtonHandler(evt:Event):void { 
    118118    play(); 
    119119  } 
    120    
     120 
    121121  private function refButtonHandler(evt:Event):void { 
    122122    if (debugCheckPng) { 
    …… 
    128128    } 
    129129  } 
    130    
     130 
    131131  private function play():void { 
    132132    playButton.enabled = false; 
    …… 
    135135    logger.play(logcan, playSpeedHSlider.value); 
    136136  } 
    137      
     137 
    138138  private function completePlayLogHandler(evt:Event):void { 
    139     playButton.enabled = true;     
     139    playButton.enabled = true; 
    140140  } 
    141    
     141 
    142142  private function checkImage():void { 
    143143    if (MiscUtils.compareObject( 

  • as3/gunyarapaint/trunk/gunyarapaint/src/gunyarapaint.as

    r1178 r1179  
    55import flash.ui.Keyboard; 
    66 
    7 import gunyarapaint.Com; 
    8 import gunyarapaint.controls.GPCanvas; 
    9 import gunyarapaint.controls.GPPasswordWindowControl; 
    10 import gunyarapaint.entities.GPLogger; 
    11 import gunyarapaint.entities.GPPen; 
    12 import gunyarapaint.utils.MiscUtils; 
     7import org.libspark.gunyarapaint.Com; 
     8import org.libspark.gunyarapaint.controls.GPCanvas; 
     9import org.libspark.gunyarapaint.controls.GPPasswordWindowControl; 
     10import org.libspark.gunyarapaint.entities.GPLogger; 
     11import org.libspark.gunyarapaint.entities.GPPen; 
     12import org.libspark.gunyarapaint.utils.MiscUtils; 
    1313 
    1414import mx.controls.Alert; 

  • as3/gunyarapaint/trunk/gunyarapaint/src/gunyarapaint.mxml

    r1178 r1179  
    22<mx:Application 
    33  xmlns:mx="http://www.adobe.com/2006/mxml" 
    4   xmlns:gpcontrol="gunyarapaint.controls.*" 
     4  xmlns:gpcontrol="org.libspark.gunyarapaint.controls.*" 
    55  layout="absolute" width="688" height="548" 
    66  creationComplete="init()" 

  • as3/gunyarapaint/trunk/gunyarapaint/src/org/libspark/gunyarapaint/controls/CheckBoxEditor.as

    r1154 r1179  
    1 package gunyarapaint.controls 
     1package org.libspark.gunyarapaint.controls 
    22{ 
    33  import mx.controls.CheckBox; 
    …… 
    1717        var col:DataGridListData = DataGridListData(listData); 
    1818        selected = (_ownerData[col.dataField] == 'on'); 
    19          
     19 
    2020        updateCheckText(); 
    2121        dispatchEvent(new FlexEvent(FlexEvent.DATA_CHANGE)); 

  • as3/gunyarapaint/trunk/gunyarapaint/src/org/libspark/gunyarapaint/controls/ComboBoxEditor.as

    r1128 r1179  
    1 package gunyarapaint.controls 
     1package org.libspark.gunyarapaint.controls 
    22{ 
    33  import mx.controls.ComboBox; 

  • as3/gunyarapaint/trunk/gunyarapaint/src/org/libspark/gunyarapaint/controls/GPCanvas.as

    r1175 r1179  
    1 package gunyarapaint.controls 
     1package org.libspark.gunyarapaint.controls 
    22{ 
    33  import com.adobe.images.PNGEncoder; 
    …… 
    1212  import flash.utils.ByteArray; 
    1313   
    14   import gunyarapaint.entities.GPLayerArray; 
    15   import gunyarapaint.entities.GPLogger; 
    16   import gunyarapaint.entities.GPPen; 
    17   import gunyarapaint.entities.GPUndoBuffer; 
     14  import org.libspark.gunyarapaint.entities.GPLayerArray; 
     15  import org.libspark.gunyarapaint.entities.GPLogger; 
     16  import org.libspark.gunyarapaint.entities.GPPen; 
     17  import org.libspark.gunyarapaint.entities.GPUndoBuffer; 
    1818   
    1919  import mx.core.UIComponent; 

  • as3/gunyarapaint/trunk/gunyarapaint/src/org/libspark/gunyarapaint/controls/GPCanvasWindowControl.as

    r1167 r1179  
    1 package gunyarapaint.controls 
     1package org.libspark.gunyarapaint.controls 
    22{ 
    33  import flash.display.BitmapData; 
    44  import flash.geom.Point; 
    55   
    6   import gunyarapaint.entities.GPLogger; 
    7   import gunyarapaint.entities.GPPen; 
    8    
    9   import gunyarapaint.utils.ComponentResizer; 
     6  import org.libspark.gunyarapaint.entities.GPLogger; 
     7  import org.libspark.gunyarapaint.entities.GPPen; 
     8  import org.libspark.gunyarapaint.utils.ComponentResizer; 
    109   
    1110  import mx.containers.HBox; 
    …… 
    4039      this.verticalScrollPolicy = 'off'; 
    4140 
    42            this.addEventListener(ResizeEvent.RESIZE, resizeHandler); 
     41      this.addEventListener(ResizeEvent.RESIZE, resizeHandler); 
    4342 
    4443      ComponentResizer.addResize(this, new Point(100, 100)); 
    …… 
    4645     
    4746    private function resizeHandler(evt:ResizeEvent):void { 
    48            // スクロールバー 
     47      // スクロールバー 
    4948 
    5049      /* 
    …… 
    5756    private var scrollDragStartPoint:Point; 
    5857     
    59        public function createCanvas(width:uint, height:uint, undoBufferSize:uint, logger:GPLogger, baseData:BitmapData, pen:GPPen):GPCanvas { 
    60          if (!_canvas) { 
     58    public function createCanvas(width:uint, height:uint, undoBufferSize:uint, logger:GPLogger, baseData:BitmapData, pen:GPPen):GPCanvas { 
     59      if (!_canvas) { 
    6160        _canvas = new GPCanvas(width, height, undoBufferSize, logger, baseData, pen); 
    6261        //_canvas.setStyle('borderColor', 0x000000); 
    …… 
    8281        _container.verticalScrollPolicy = 'off'; 
    8382 
    84            hScrollBar = new HScrollBar(); 
    85            vScrollBar = new VScrollBar(); 
    86            hScrollBar.height = ScrollBar.THICKNESS; 
     83        hScrollBar = new HScrollBar(); 
     84        vScrollBar = new VScrollBar(); 
     85        hScrollBar.height = ScrollBar.THICKNESS; 
    8786        vScrollBar.width = ScrollBar.THICKNESS; 
    88            hScrollBar.move(0, height); 
    89            vScrollBar.move(width, 0); 
    90            hScrollBar.addEventListener(ScrollEvent.SCROLL, hScrollHandler); 
     87        hScrollBar.move(0, height); 
     88        vScrollBar.move(width, 0); 
     89        hScrollBar.addEventListener(ScrollEvent.SCROLL, hScrollHandler); 
    9190        vScrollBar.addEventListener(ScrollEvent.SCROLL, vScrollHandler); 
    92            hScrollBar.lineScrollSize = 1; 
    93            vScrollBar.lineScrollSize = 1; 
     91        hScrollBar.lineScrollSize = 1; 
     92        vScrollBar.lineScrollSize = 1; 
    9493 
    9594        _container.addChild(_canvas); 
    …… 
    160159      return _canvas; 
    161160    } 
    162        
    163        public function set pen(pen:GPPen):void { 
    164          _canvas.pen = pen; 
    165          pen.canvasWindow = this; 
    166        } 
     161         
     162    public function set pen(pen:GPPen):void { 
     163      _canvas.pen = pen; 
     164      pen.canvasWindow = this; 
     165    } 
    167166 
    168167    public function set statusText(value:String):void { 

  • as3/gunyarapaint/trunk/gunyarapaint/src/org/libspark/gunyarapaint/controls/GPLayerWindowControl.mxml

    r1178 r1179  
    1010    dragEnabled="true" dropEnabled="true"> 
    1111    <mx:columns> 
    12       <mx:DataGridColumn editable="true" headerText="目" dataField="showCheck" itemRenderer="gunyarapaint.controls.CheckBoxEditor" rendererIsEditor="true" width="20"/> 
    13       <mx:DataGridColumn headerText="ロ" dataField="lockCheck" itemRenderer="gunyarapaint.controls.CheckBoxEditor" rendererIsEditor="true" width="20"/> 
    14       <!--mx:DataGridColumn headerText="マ" dataField="maskCheck" itemRenderer="gunyarapaint.controls.CheckBoxEditor" rendererIsEditor="true" width="20"/--> 
     12      <mx:DataGridColumn editable="true" headerText="目" dataField="showCheck" itemRenderer="org.libspark.gunyarapaint.controls.CheckBoxEditor" rendererIsEditor="true" width="20"/> 
     13      <mx:DataGridColumn headerText="ロ" dataField="lockCheck" itemRenderer="org.libspark.gunyarapaint.controls.CheckBoxEditor" rendererIsEditor="true" width="20"/> 
     14      <!--mx:DataGridColumn headerText="マ" dataField="maskCheck" itemRenderer="org.libspark.gunyarapaint.controls.CheckBoxEditor" rendererIsEditor="true" width="20"/--> 
    1515      <mx:DataGridColumn headerText="レイヤ名" dataField="name"/> 
    1616    </mx:columns> 

  • as3/gunyarapaint/trunk/gunyarapaint/src/org/libspark/gunyarapaint/controls/GPLayerWindowControlScript.as

    r1175 r1179  
    1 import gunyarapaint.controls.GPCanvas; 
    2 import gunyarapaint.entities.GPLayerArray; 
    3 import gunyarapaint.utils.ComponentResizer; 
     1import org.libspark.gunyarapaint.controls.GPCanvas; 
     2import org.libspark.gunyarapaint.entities.GPLayerArray; 
     3import org.libspark.gunyarapaint.utils.ComponentResizer; 
    44 
    55import mx.collections.ArrayCollection; 

  • as3/gunyarapaint/trunk/gunyarapaint/src/org/libspark/gunyarapaint/controls/GPPasswordWindowControl.mxml

    r1178 r1179  
    66  <mx:Script> 
    77  import flash.system.System; 
    8   import gunyarapaint.controls.GPCanvas; 
     8  import org.libspark.gunyarapaint.controls.GPCanvas; 
    99  import mx.managers.PopUpManager; 
    1010  import mx.core.Application; 

  • as3/gunyarapaint/trunk/gunyarapaint/src/org/libspark/gunyarapaint/controls/PenDetailControlScript.as

    r1176 r1179  
    1 import gunyarapaint.entities.GPPen; 
     1import org.libspark.gunyarapaint.entities.GPPen; 
    22 
    33import mx.containers.GridItem; 
    …… 
    1818import flash.display.Graphics; 
    1919import flash.display.DisplayObject; 
    20 import gunyarapaint.controls.GPCanvas; 
     20import org.libspark.gunyarapaint.controls.GPCanvas; 
    2121import flash.events.Event; 
    2222mx.core.IFlexDisplayObject; // for not erase 
    …… 
    262262  } 
    263263 
    264        this.dispatchEvent(new Event('changePen')); 
     264  this.dispatchEvent(new Event('changePen')); 
    265265} 
    266266 

  • as3/gunyarapaint/trunk/gunyarapaint/src/org/libspark/gunyarapaint/controls/PenDetailWindowControl.mxml

    r1140 r1179  
    44  </ns1:PenDetailControl> 
    55  <mx:Script> 
    6   import gunyarapaint.entities.GPPen; 
     6  import org.libspark.gunyarapaint.entities.GPPen; 
    77  public function get pen():GPPen { 
    88    return penDetail.pen; 

  • as3/gunyarapaint/trunk/gunyarapaint/src/org/libspark/gunyarapaint/entities/GPLayer.as

    r1171 r1179  
    1 package gunyarapaint.entities 
     1package org.libspark.gunyarapaint.entities 
    22{ 
    33  import flash.display.Bitmap; 
    …… 
    1818    private var _alpha:Number; 
    1919    private var _name:String; 
    20      
     20 
    2121    private var _width:uint, _height:uint; 
    2222 
    2323    private var _bitmapData:BitmapData; 
    2424    private var _bitmap:Bitmap; 
    25      
     25 
    2626    private var _colorTransform:ColorTransform; // for layer alpha 
    2727 
    2828    public function GPLayer(source:BitmapData, width:uint, height:uint, index:uint, 
    29                             show:Boolean = true, lock:Boolean = false, mask:Boolean = false,  
     29                            show:Boolean = true, lock:Boolean = false, mask:Boolean = false, 
    3030                            blendMode:String = 'normal' /* flash.display.BlendMode.NORMAL*/, 
    3131                            alpha:Number = 1.0, 
    …… 
    5252      } 
    5353    } 
    54      
     54 
    5555    public function clone():GPLayer { 
    5656      return new GPLayer(_bitmapData, _width, _height, _index, _show, _lock, _mask, _blendMode, _alpha, _name); 

  • as3/gunyarapaint/trunk/gunyarapaint/src/org/libspark/gunyarapaint/entities/GPLayerArray.as

    r1177 r1179  
    1 package gunyarapaint.entities 
     1package org.libspark.gunyarapaint.entities 
    22{ 
    33  import flash.display.BitmapData; 
    …… 
    1010  import flash.geom.Rectangle; 
    1111   
    12   import gunyarapaint.controls.GPCanvas; 
     12  import org.libspark.gunyarapaint.controls.GPCanvas; 
    1313   
    1414  import mx.controls.Alert; 

  • as3/gunyarapaint/trunk/gunyarapaint/src/org/libspark/gunyarapaint/entities/GPLogger.as

    r1178 r1179  
    1 package gunyarapaint.entities 
     1package org.libspark.gunyarapaint.entities 
    22{ 
    33  import flash.display.BitmapData; 
    …… 
    55  import flash.utils.ByteArray; 
    66   
    7   import gunyarapaint.controls.GPCanvas; 
     7  import org.libspark.gunyarapaint.controls.GPCanvas; 
    88   
    99  import mx.controls.Alert; 
    …… 
    283283    // ログ関係のローカル変数 
    284284    private var _playCanvas:GPCanvas; 
    285        private var playLogIntervalId:uint; 
    286        private var _playSpeed:uint; 
    287  
    288        public function set playSpeed(speed:uint):void { 
    289          _playSpeed = speed; 
    290        } 
     285    private var playLogIntervalId:uint; 
     286    private var _playSpeed:uint; 
     287 
     288    public function set playSpeed(speed:uint):void { 
     289      _playSpeed = speed; 
     290    } 
    291291 
    292292    public function play(canvas:GPCanvas, speed:uint):void { 
    293293      _playCanvas = canvas; 
    294294      _playSpeed = speed; 
    295          playLogIntervalId = flash.utils.setInterval(playNext, 50); 
    296     } 
    297  
    298        private function playNext():void { 
     295      playLogIntervalId = flash.utils.setInterval(playNext, 50); 
     296    } 
     297 
     298    private function playNext():void { 
    299299      var preAction:uint = GPLogger.ACTION_NONE; // for avoid version 0.0.1 bug...◆ 
    300          for (var i:uint = 0; i < _playSpeed; i++) { 
     300      for (var i:uint = 0; i < _playSpeed; i++) { 
    301301        var a:Array; 
    302302        var isBreak:Boolean = false; 
    …… 
    445445          break; 
    446446        } 
    447          } 
    448        } 
     447      } 
     448    } 
    449449     
    450450    public function read():Array { 

  • as3/gunyarapaint/trunk/gunyarapaint/src/org/libspark/gunyarapaint/entities/GPPen.as

    r1173 r1179  
    1 package gunyarapaint.entities 
     1package org.libspark.gunyarapaint.entities 
    22{ 
    33  import flash.display.BlendMode; 
    …… 
    1010  import flash.geom.Point; 
    1111   
    12   import gunyarapaint.controls.GPCanvas; 
    13   import gunyarapaint.controls.GPCanvasWindowControl; 
    14   import gunyarapaint.controls.PenDetailControl; 
     12  import org.libspark.gunyarapaint.controls.GPCanvas; 
     13  import org.libspark.gunyarapaint.controls.GPCanvasWindowControl; 
     14  import org.libspark.gunyarapaint.controls.PenDetailControl; 
    1515   
    1616  import mx.controls.Alert; 

  • as3/gunyarapaint/trunk/gunyarapaint/src/org/libspark/gunyarapaint/entities/GPUndoBuffer.as

    r1171 r1179  
    1 package gunyarapaint.entities 
     1package org.libspark.gunyarapaint.entities 
    22{ 
    33  import flash.display.BitmapData; 

  • as3/gunyarapaint/trunk/gunyarapaint/src/org/libspark/gunyarapaint/utils/ComponentResizer.as

    r1167 r1179  
    1 package gunyarapaint.utils 
     1package org.libspark.gunyarapaint.utils 
    22{ 
    33 
    …… 
    99  import mx.core.UIComponent; 
    1010  import mx.managers.CursorManager; 
    11    
    12   public class ComponentResizer{ 
    13      
     11 
     12  public class ComponentResizer { 
    1413    /* 
    1514    private static var resizeCursor:Class; 
    …… 
    2928    private static const CONST_MODE_TOP:Number = 4; 
    3029    private static const CONST_MODE_BOTTOM:Number = 8; 
    31     private static const CONST_MODE_MOVE:Number = 11;     
    32      
     30    private static const CONST_MODE_MOVE:Number = 11; 
     31 
    3332    private static var resizeTarget:UIComponent; 
    3433    private static var resizeMode:Number = 0; 
    …… 
    3635    private static var _resizeAreaMargin:Number = 4; 
    3736 
    38     private static var resizeRect:Rectangle;     
     37    private static var resizeRect:Rectangle; 
    3938    private static var oldRect:Rectangle; 
    4039    private static var oldPoint:Point; 
    41      
     40 
    4241    private static var rubberBand:UIComponent; 
    4342 
    …… 
    4645     * @param target リサイズさせるUIComponentです。 
    4746     * @param minSize リサイズ可能な最小サイズをPointで指定します。 
    48      *  
    49      */     
     47     * 
     48     */ 
    5049    public static function addResize(target:UIComponent, minSize:Point):void{ 
    51              
    5250      target.setStyle("resizer_minSize", minSize); 
    5351      target.setStyle("resizer_isPopUp", target.isPopUp); 
    …… 
    5553      target.addEventListener(MouseEvent.MOUSE_MOVE, onMouseMove); 
    5654      target.addEventListener(MouseEvent.MOUSE_OUT, onMouseOut); 
    57              
    58     } 
    59      
    60     /** 
    61      * リサイズ機能を無効にします。  
     55    } 
     56 
     57    /** 
     58     * リサイズ機能を無効にします。 
    6259     * @param target リサイズ機能を無効にするUIComponentです。 
    63      *  
    64      */     
     60     * 
     61     */ 
    6562    public static function removeResize(target:UIComponent):void{ 
    6663      target.removeEventListener(MouseEvent.MOUSE_DOWN, onMouseDown); 
    …… 
    6865      target.removeEventListener(MouseEvent.MOUSE_OUT, onMouseOut); 
    6966    } 
    70      
    71     /** 
    72      * リサイズ中のオブジェクトがある場合trueを返します。  
    73      * @return  
    74      *  
    75      */     
     67 
     68    /** 
     69     * リサイズ中のオブジェクトがある場合trueを返します。 
     70     * @return 
     71     * 
     72     */ 
    7673    public static function get isResizing():Boolean{ 
    7774      return _isResizing; 
    …… 
    8178     * ドラッグ可能なエリアをオブジェクト端からの距離で指定します。 
    8279     * @param value 
    83      *  
    84      */     
     80     * 
     81     */ 
    8582    public static function set resizeAreaMargin(value:Number):void{ 
    8683      _resizeAreaMargin = value; 
    …… 
    8986      return _resizeAreaMargin; 
    9087    } 
    91          
     88 
    9289    private static function onMouseDown(event:MouseEvent):void{ 
    93        
    9490      if (event.currentTarget.rotation != 0) { 
    9591        // 回転してたらやめる 
    …… 
    10096      Application.application.parent.addEventListener(MouseEvent.MOUSE_MOVE, resize); 
    10197 
    102        
    10398      if(resizeMode != CONST_MODE_NONE){ 
    104          
    10599        resizeTarget = UIComponent(event.currentTarget); 
    106100        resizeRect = new Rectangle(resizeTarget.x, 
    107101                      resizeTarget.y, 
    108102                      resizeTarget.width, 
    109                       resizeTarget.height);         
     103                      resizeTarget.height); 
    110104 
    111105        oldRect = resizeRect.clone(); 
    112         oldPoint = new Point(event.stageX,event.stageY);  
    113  
    114         rubberBand = new UIComponent();         
     106        oldPoint = new Point(event.stageX,event.stageY); 
     107 
     108        rubberBand = new UIComponent(); 
    115109        Application.application.parent.addChild(rubberBand); 
    116110        drawRubberBand(rubberBand,resizeTarget,resizeRect); 
    …… 
    122116        resizeMode = CONST_MODE_MOVE; 
    123117      } 
    124     }     
     118    } 
    125119    private static function onMouseUp(event:MouseEvent):void{ 
    126120 
    127121      Application.application.parent.removeEventListener(MouseEvent.MOUSE_UP, onMouseUp); 
    128122      Application.application.parent.removeEventListener(MouseEvent.MOUSE_MOVE, resize); 
    129  
    130123 
    131124      _isResizing = false; 
    …… 
    140133      resizeTarget = null; 
    141134    } 
    142      
     135 
    143136    private static function onMouseMove(event:MouseEvent):void{ 
    144        
    145137      if (event.currentTarget.rotation != 0) { 
    146138        // 回転してたらやめる 
    147139        return; 
    148140      } 
    149        
     141 
    150142      var target:UIComponent = UIComponent(event.currentTarget); 
    151143      var point:Point = target.localToGlobal(new Point()); 
    152        
     144 
    153145      _isResizing = true; 
    154        
     146 
    155147      if(!resizeTarget){ 
    156148        var posX:Number = event.stageX; 
    157149        var posY:Number = event.stageY; 
    158         if(posX >= (point.x + target.width - _resizeAreaMargin) &&  
     150        if(posX >= (point.x + target.width - _resizeAreaMargin) && 
    159151          posY >= (point.y + target.height - _resizeAreaMargin)){ 
    160152 
    161           //changeCursor(CONST_CUR_LEFT_OBLIQUE, -6, -6);  
     153          //changeCursor(CONST_CUR_LEFT_OBLIQUE, -6, -6); 
    162154          resizeMode = CONST_MODE_RIGHT | CONST_MODE_BOTTOM; 
    163155 
    164         }else if(posX <= (point.x + _resizeAreaMargin) &&  
     156        }else if(posX <= (point.x + _resizeAreaMargin) && 
    165157              posY <= (point.y + _resizeAreaMargin)){ 
    166158 
    …… 
    207199 
    208200        } 
    209          
     201 
    210202        if(target.getStyle("resizer_isPopUp")){ 
    211203 
    …… 
    217209        } 
    218210      } 
    219        
    220     } 
    221      
     211    } 
     212 
    222213    private static function onMouseOut(event:MouseEvent):void{ 
    223214      if (event.currentTarget.rotation != 0) { 
    …… 
    231222      } 
    232223    } 
    233      
     224 
    234225    private static function resize(event:MouseEvent):void{ 
    235        
     226 
    236227      if(resizeTarget){ 
    237          
    238228        var sizeX:Number = event.stageX - oldPoint.x; 
    239229        var sizeY:Number = event.stageY - oldPoint.y; 
    240          
    241230        var minSize:Point = Point(resizeTarget.getStyle("resizer_minSize")); 
    242231 
    …… 
    280269        drawRubberBand(rubberBand,resizeTarget,resizeRect); 
    281270        event.updateAfterEvent(); 
    282          
    283       } 
    284        
     271      } 
    285272    } 
    286273 
    …… 
    291278        if(curClass){ 
    292279          CursorManager.setCursor(curClass,2, offX, offY); 
    293         }               
     280        } 
    294281        resizeCursor = curClass; 
    295282      } 
    296283      */ 
    297        
    298284    } 
    299285    private static function drawRubberBand(rubberBandObj:UIComponent,baseObj:UIComponent,rect:Rectangle):void{ 
    300286 
    301287      var point:Point = baseObj.localToGlobal(new Point(rect.x-baseObj.x,rect.y-baseObj.y)); 
    302        
    303        
     288 
    304289      rubberBandObj.x = point.x; 
    305290      rubberBandObj.y = point.y; 

  • as3/gunyarapaint/trunk/gunyarapaint/src/org/libspark/gunyarapaint/utils/MiscUtils.as

    r1117 r1179  
    1 package gunyarapaint.utils 
     1package org.libspark.gunyarapaint.utils 
    22{ 
    33  import flash.utils.ByteArray; 

  • as3/gunyarapaint/trunk/picokakiko/src/picokakiko.as

    r1099 r1179  
    11import flash.events.Event; 
    22 
    3 import gunyarapaint.Com; 
     3import org.libspark.gunyarapaint.Com; 
    44 
    55import mx.controls.Alert; 
    …… 
    8181  if (messageTextArea.text == '') { 
    8282    Alert.show('書き込みが空です。曲のタイトルなどの情報を書き込んでください。', ALERT_TITLE); 
    83     return;       
     83    return; 
    8484  } 
    8585  if (mml.text == '') { 

  • as3/gunyarapaint/trunk/picokakiko/src/picokakiko.mxml

    r1102 r1179  
    3232  <mx:Button id="playButton" label="ピコ再生" x="10" y="356"/> 
    3333  <mx:Button id="stopButton" label="ピコ止め" x="85" y="356" enabled="false"/> 
    34   <mx:HSlider  
     34  <mx:HSlider 
    3535    id="hSlider" minimum="0" maximum="127" value="100" 
    3636              dataTipPlacement="top" tickColor="black" snapInterval="1" 

  • as3/gunyarapaint/trunk/picokakiko/src/picoplayer.mxml

    r1102 r1179  
    1212  <![CDATA[ 
    1313  import flash.events.Event; 
    14   import gunyarapaint.Com; 
     14  import org.libspark.gunyarapaint.Com; 
    1515 
    1616  import mx.events.FlexEvent; 
    17   import mx.managers.PopUpManager;   
    18    
     17  import mx.managers.PopUpManager; 
     18 
    1919  private var comm:Com; 
    2020  private var mml:String; 
    …… 
    3939    } 
    4040    mml_player.addEventListener('compileComplete', playerCompileCompleteHandler); 
    41    
     41 
    4242    playButton.addEventListener(FlexEvent.BUTTON_DOWN, playButtonHandler); 
    4343    stopButton.addEventListener(FlexEvent.BUTTON_DOWN, stopButtonHandler); 
    …… 
    4949    play(); 
    5050  } 
    51    
     51 
    5252  private function playerCompileCompleteHandler(evt:Event):void { 
    5353    stopButton.enabled = true; 
    5454  } 
    55    
     55 
    5656  private function playButtonHandler(evt:Event):void { 
    5757    play(); 
    5858  } 
    59    
     59 
    6060  private function play():void { 
    6161    playButton.enabled = false; 
    62     mml_player.play(mml);     
     62    mml_player.play(mml); 
    6363  } 
    64    
     64 
    6565  private function stopButtonHandler(evt:Event):void { 
    6666    mml_player.stop(); 
    6767    playButton.enabled = true; 
    68     stopButton.enabled = false;     
     68    stopButton.enabled = false; 
    6969  } 
    70    
     70 
    7171  private function postPicoButtonHandler(evt:Event):void { 
    7272    Com.redirectPicoForm(postUrl, mmlId);