Skip to content

Commit

Permalink
organize imports
Browse files Browse the repository at this point in the history
  • Loading branch information
@joshtynjala
joshtynjala committed Dec 7, 2015
1 parent d765ecc commit 6f1f827
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 25 deletions.
1 change: 0 additions & 1 deletion source/feathers/controls/DateTimeSpinner.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ package feathers.controls
import feathers.data.ListCollection;
import feathers.layout.HorizontalLayout;
import feathers.skins.IStyleProvider;
import feathers.utils.math.clamp;
import feathers.utils.math.roundDownToNearest;
import feathers.utils.math.roundUpToNearest;

Expand Down
1 change: 0 additions & 1 deletion source/feathers/controls/TextInput.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ package feathers.controls
{
import feathers.core.FeathersControl;
import feathers.core.IFeathersControl;
import feathers.core.IFocusDisplayObject;
import feathers.core.IMultilineTextEditor;
import feathers.core.INativeFocusOwner;
import feathers.core.IStateContext;
Expand Down
1 change: 0 additions & 1 deletion source/feathers/controls/ToggleButton.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ accordance with the terms of the accompanying license agreement.
package feathers.controls
{
import feathers.core.IGroupedToggle;
import feathers.core.IToggle;
import feathers.core.PropertyProxy;
import feathers.core.ToggleGroup;
import feathers.events.FeathersEventType;
Expand Down
3 changes: 0 additions & 3 deletions source/feathers/controls/popups/BottomDrawerPopUpContentManager.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,8 @@ package feathers.controls.popups

import starling.animation.Transitions;
import starling.animation.Tween;

import starling.core.Starling;

import starling.display.DisplayObject;
import starling.display.DisplayObjectContainer;
import starling.display.Stage;
import starling.events.Event;
import starling.events.EventDispatcher;
Expand Down
1 change: 0 additions & 1 deletion source/feathers/controls/renderers/BaseDefaultItemRenderer.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ package feathers.controls.renderers
import feathers.controls.ImageLoader;
import feathers.controls.Scroller;
import feathers.controls.ToggleButton;
import feathers.controls.text.BitmapFontTextRenderer;
import feathers.core.FeathersControl;
import feathers.core.IFeathersControl;
import feathers.core.IFocusContainer;
Expand Down
1 change: 0 additions & 1 deletion source/feathers/layout/VerticalLayout.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ package feathers.layout
{
import feathers.core.IFeathersControl;
import feathers.core.IValidating;
import feathers.layout.ILayoutDisplayObject;

import flash.errors.IllegalOperationError;
import flash.geom.Point;
Expand Down
1 change: 0 additions & 1 deletion source/feathers/media/SeekSlider.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ package feathers.media
import feathers.skins.IStyleProvider;

import starling.display.DisplayObject;

import starling.events.Event;

/**
Expand Down
7 changes: 3 additions & 4 deletions source/feathers/media/SoundPlayer.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ package feathers.media
import feathers.skins.IStyleProvider;

import flash.errors.IllegalOperationError;

import flash.events.ErrorEvent;
import flash.events.IOErrorEvent;
import flash.events.ProgressEvent;
Expand Down Expand Up @@ -554,7 +553,7 @@ package feathers.media
}
this._soundChannel = this._sound.play(this._currentTime * 1000, 0, this._soundTransform);
this._soundChannel.addEventListener(flash.events.Event.SOUND_COMPLETE, soundChannel_soundCompleteHandler);
this.addEventListener(Event.ENTER_FRAME, soundPlayer_enterFrameHandler);
this.addEventListener(starling.events.Event.ENTER_FRAME, soundPlayer_enterFrameHandler);
}

/**
Expand All @@ -567,7 +566,7 @@ package feathers.media
//this could be null when seeking
return;
}
this.removeEventListener(Event.ENTER_FRAME, soundPlayer_enterFrameHandler);
this.removeEventListener(starling.events.Event.ENTER_FRAME, soundPlayer_enterFrameHandler);
this._soundChannel.stop();
this._soundChannel.removeEventListener(flash.events.Event.SOUND_COMPLETE, soundChannel_soundCompleteHandler);
this._soundChannel = null;
Expand Down Expand Up @@ -645,7 +644,7 @@ package feathers.media
/**
* @private
*/
protected function soundPlayer_enterFrameHandler(event:Event):void
protected function soundPlayer_enterFrameHandler(event:starling.events.Event):void
{
this._currentTime = this._soundChannel.position / 1000;
this.dispatchEventWith(MediaPlayerEventType.CURRENT_TIME_CHANGE);
Expand Down
24 changes: 12 additions & 12 deletions source/feathers/media/VideoPlayer.as
View file
Original file line number Diff line number Diff line change
Expand Up @@ -950,7 +950,7 @@ package feathers.media
//resume(), so we need to manually add the ENTER_FRAME listener.
//there's no need to seek. we're resuming from where the video
//was paused.
this.addEventListener(starling.events.Event.ENTER_FRAME, videoPlayer_enterFrameHandler);
this.addEventListener(Event.ENTER_FRAME, videoPlayer_enterFrameHandler);
this._netStream.resume();
}
else
Expand All @@ -977,7 +977,7 @@ package feathers.media
{
throw new IllegalOperationError(NO_VIDEO_SOURCE_PAUSE_ERROR);
}
this.removeEventListener(starling.events.Event.ENTER_FRAME, videoPlayer_enterFrameHandler);
this.removeEventListener(Event.ENTER_FRAME, videoPlayer_enterFrameHandler);
this._netStream.pause();
}

Expand Down Expand Up @@ -1020,7 +1020,7 @@ package feathers.media
/**
* @private
*/
protected function videoPlayer_enterFrameHandler(event:starling.events.Event):void
protected function videoPlayer_enterFrameHandler(event:Event):void
{
this._currentTime = this._netStream.time;
this.dispatchEventWith(MediaPlayerEventType.CURRENT_TIME_CHANGE);
Expand All @@ -1029,7 +1029,7 @@ package feathers.media
/**
* @private
*/
protected function videoPlayer_progress_enterFrameHandler(event:starling.events.Event):void
protected function videoPlayer_progress_enterFrameHandler(event:Event):void
{
var newBytesTotal:Number = this._netStream.bytesTotal;
if(newBytesTotal > 0)
Expand All @@ -1052,7 +1052,7 @@ package feathers.media
}
if(newBytesLoaded === newBytesTotal)
{
this.removeEventListener(starling.events.Event.ENTER_FRAME, videoPlayer_progress_enterFrameHandler);
this.removeEventListener(Event.ENTER_FRAME, videoPlayer_progress_enterFrameHandler);
}
}
}
Expand All @@ -1077,7 +1077,7 @@ package feathers.media
{
this._isWaitingForTextureReady = false;
//the texture is ready to be displayed
this.dispatchEventWith(starling.events.Event.READY);
this.dispatchEventWith(Event.READY);
var bytesTotal:Number = this._netStream.bytesTotal;
if(this._bytesTotal === 0 && bytesTotal > 0)
{
Expand All @@ -1086,7 +1086,7 @@ package feathers.media
this.dispatchEventWith(MediaPlayerEventType.LOAD_PROGRESS, false, this._bytesLoaded / bytesTotal);
if(this._bytesLoaded !== this._bytesTotal)
{
this.addEventListener(starling.events.Event.ENTER_FRAME, videoPlayer_progress_enterFrameHandler);
this.addEventListener(Event.ENTER_FRAME, videoPlayer_progress_enterFrameHandler);
}
}
}
Expand Down Expand Up @@ -1140,7 +1140,7 @@ package feathers.media
//paused when restoring lost context, but we need to
//temporarily start playing the NetStream in order to
//restore the video texture.
this.addEventListener(starling.events.Event.ENTER_FRAME, videoPlayer_enterFrameHandler);
this.addEventListener(Event.ENTER_FRAME, videoPlayer_enterFrameHandler);
}
else
{
Expand All @@ -1166,7 +1166,7 @@ package feathers.media
//a listener being called every frame for no reason. on iOS,
//context loss resets the NetStream time to 0, and we need
//to keep the current time so that we can seek back.
this.removeEventListener(starling.events.Event.ENTER_FRAME, videoPlayer_enterFrameHandler);
this.removeEventListener(Event.ENTER_FRAME, videoPlayer_enterFrameHandler);

//on iOS, when context is lost, the NetStream will stop
//automatically, and the time property will be reset to 0.
Expand All @@ -1181,7 +1181,7 @@ package feathers.media
//set this flag after calling stop() because stopping
//will seek to the beginning and may check for the flag.
this._hasPlayedToEnd = true;
this.dispatchEventWith(starling.events.Event.COMPLETE);
this.dispatchEventWith(Event.COMPLETE);
}
break;
}
Expand All @@ -1191,7 +1191,7 @@ package feathers.media
/**
* @private
*/
override protected function mediaPlayer_addedHandler(event:starling.events.Event):void
override protected function mediaPlayer_addedHandler(event:Event):void
{
if(this._ignoreDisplayListEvents)
{
Expand All @@ -1203,7 +1203,7 @@ package feathers.media
/**
* @private
*/
override protected function mediaPlayer_removedHandler(event:starling.events.Event):void
override protected function mediaPlayer_removedHandler(event:Event):void
{
if(this._ignoreDisplayListEvents)
{
Expand Down

0 comments on commit 6f1f827

Please sign in to comment.