This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 4a12121 Organize and clean imports in Core lib and avoid warnings in
IDEs due to missing COMPILE::SWF wrapper
4a12121 is described below
commit 4a121216e6699d56bdd9943f12de0ba19c5a698c
Author: Carlos Rovira <carlosrov...@apache.org>
AuthorDate: Sun Nov 11 20:09:56 2018 +0100
Organize and clean imports in Core lib and avoid warnings in IDEs due to
missing COMPILE::SWF wrapper
---
.../Core/src/main/royale/org/apache/royale/core/CSSShape.as | 5 +++--
.../Core/src/main/royale/org/apache/royale/core/CSSSprite.as | 4 +++-
.../Core/src/main/royale/org/apache/royale/core/IBorderModel.as | 4 +++-
.../Core/src/main/royale/org/apache/royale/core/StageProxy.as | 3 ++-
.../main/royale/org/apache/royale/core/StyleableCSSTextField.as | 3 ++-
.../Core/src/main/royale/org/apache/royale/core/UIButtonBase.as | 3 +++
.../main/royale/org/apache/royale/core/UIHTMLElementWrapper.as | 9 ++-------
.../src/main/royale/org/apache/royale/core/WrappedMovieClip.as | 7 +++----
.../Core/src/main/royale/org/apache/royale/core/WrappedShape.as | 4 ++--
.../Core/src/main/royale/org/apache/royale/core/WrappedSprite.as | 4 ++--
.../src/main/royale/org/apache/royale/core/WrappedTextField.as | 4 ++--
.../royale/org/apache/royale/events/utils/MouseEventConverter.as | 2 +-
.../src/main/royale/org/apache/royale/utils/CSSBorderUtils.as | 3 ++-
.../Core/src/main/royale/org/apache/royale/utils/PNGEncoder.as | 8 ++++----
.../src/main/royale/org/apache/royale/utils/SolidBorderUtil.as | 5 +++--
.../src/main/royale/org/apache/royale/utils/dbg/DOMPathUtil.as | 3 ++-
16 files changed, 39 insertions(+), 32 deletions(-)
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/CSSShape.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/CSSShape.as
index f63db9c..753280c 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/CSSShape.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/CSSShape.as
@@ -18,14 +18,15 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.core
{
+ COMPILE::SWF {
import flash.display.DisplayObject;
import flash.display.Graphics;
import flash.display.Shape;
-
+ import org.apache.royale.utils.CSSBorderUtils;
+ }
import org.apache.royale.core.IChild;
import org.apache.royale.events.Event;
import org.apache.royale.events.EventDispatcher;
- import org.apache.royale.utils.CSSBorderUtils;
/**
* The Border class is a class used internally by many
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/CSSSprite.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/CSSSprite.as
index bdea9c0..7672594 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/CSSSprite.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/CSSSprite.as
@@ -23,11 +23,13 @@ package org.apache.royale.core
import flash.display.Graphics;
import flash.display.Sprite;
}
+ COMPILE::SWF {
+ import org.apache.royale.utils.CSSBorderUtils;
+ }
import org.apache.royale.core.IChild;
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
- import org.apache.royale.utils.CSSBorderUtils;
/**
* The Border class is a class used internally by many
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IBorderModel.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IBorderModel.as
index 2c03aed..7a9b493 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IBorderModel.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/IBorderModel.as
@@ -18,7 +18,9 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.core
{
- import flash.geom.Rectangle;
+ COMPILE::SWF {
+ import flash.geom.Rectangle;
+ }
/**
* The IBorderModel interface is the basic interface for a data model for
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/StageProxy.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/StageProxy.as
index f1ca0a8..c063c87 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/StageProxy.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/StageProxy.as
@@ -18,9 +18,10 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.core
{
+ COMPILE::SWF {
import flash.display.Stage;
import flash.events.Event;
-
+ }
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/StyleableCSSTextField.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/StyleableCSSTextField.as
index 144459f..e6f59fc 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/StyleableCSSTextField.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/StyleableCSSTextField.as
@@ -18,9 +18,10 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.core
{
+ COMPILE::SWF {
import flash.display.DisplayObjectContainer;
import flash.text.Font;
-
+ }
import org.apache.royale.core.IStyleableObject;
import org.apache.royale.events.Event;
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/UIButtonBase.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/UIButtonBase.as
index 51492cf..604c9a4 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/UIButtonBase.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/UIButtonBase.as
@@ -18,8 +18,11 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.core
{
+ COMPILE::SWF
+ {
import flash.display.DisplayObject;
import flash.display.SimpleButton;
+ }
import org.apache.royale.core.IBead;
import org.apache.royale.core.IBeadModel;
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/UIHTMLElementWrapper.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/UIHTMLElementWrapper.as
index f472df1..fef25bd 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/UIHTMLElementWrapper.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/UIHTMLElementWrapper.as
@@ -21,20 +21,15 @@ package org.apache.royale.core
COMPILE::SWF
{
import flash.display.DisplayObject;
- import flash.display.DisplayObjectContainer;
+ import flash.display.DisplayObjectContainer;
import flash.display.SimpleButton;
}
import org.apache.royale.core.IBead;
import org.apache.royale.core.IBeadModel;
- import org.apache.royale.core.IMeasurementBead;
- import org.apache.royale.core.IStrand;
- import org.apache.royale.core.IUIBase;
import org.apache.royale.core.ValuesManager;
import org.apache.royale.events.Event;
- import org.apache.royale.events.utils.MouseEventConverter;
- import org.apache.royale.events.EventDispatcher;
- import org.apache.royale.events.IEventDispatcher;
+ import org.apache.royale.events.IEventDispatcher;
//--------------------------------------
// Events
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/WrappedMovieClip.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/WrappedMovieClip.as
index adeac98..ec36055 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/WrappedMovieClip.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/WrappedMovieClip.as
@@ -18,11 +18,10 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.core
{
- import flash.display.DisplayObject;
-
- COMPILE::SWF
+ COMPILE::SWF
{
- import flash.display.MovieClip;
+ import flash.display.DisplayObject;
+ import flash.display.MovieClip;
}
COMPILE::SWF
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/WrappedShape.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/WrappedShape.as
index f9b966f..36b9d87 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/WrappedShape.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/WrappedShape.as
@@ -18,11 +18,11 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.core
{
- import flash.display.DisplayObject;
COMPILE::SWF
{
- import flash.display.Shape;
+ import flash.display.DisplayObject;
+ import flash.display.Shape;
}
COMPILE::SWF
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/WrappedSprite.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/WrappedSprite.as
index c6422ea..cbce8d5 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/WrappedSprite.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/WrappedSprite.as
@@ -18,11 +18,11 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.core
{
- import flash.display.DisplayObject;
COMPILE::SWF
{
- import flash.display.Sprite;
+ import flash.display.DisplayObject;
+ import flash.display.Sprite;
}
COMPILE::SWF
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/WrappedTextField.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/WrappedTextField.as
index 27e68c6..c2f6d51 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/core/WrappedTextField.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/core/WrappedTextField.as
@@ -18,11 +18,11 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.core
{
- import flash.display.DisplayObject;
COMPILE::SWF
{
- import flash.text.TextField;
+ import flash.display.DisplayObject;
+ import flash.text.TextField;
}
COMPILE::SWF
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/events/utils/MouseEventConverter.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/events/utils/MouseEventConverter.as
index 4f731dd..d0b8e85 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/events/utils/MouseEventConverter.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/events/utils/MouseEventConverter.as
@@ -22,10 +22,10 @@ package org.apache.royale.events.utils
import flash.events.Event;
import flash.events.IEventDispatcher;
import flash.events.MouseEvent;
+ import org.apache.royale.events.utils.IHandlesOriginalEvent;
}
import org.apache.royale.events.MouseEvent;
- import org.apache.royale.events.utils.IHandlesOriginalEvent;
/**
* Mouse events conversion.
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/CSSBorderUtils.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/CSSBorderUtils.as
index 3770f33..bfdd375 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/CSSBorderUtils.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/CSSBorderUtils.as
@@ -18,9 +18,10 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.utils
{
+ COMPILE::SWF {
import flash.display.DisplayObject;
import flash.display.Graphics;
-
+ }
import org.apache.royale.core.ValuesManager;
/**
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/PNGEncoder.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/PNGEncoder.as
index 8e29f69..c778908 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/PNGEncoder.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/PNGEncoder.as
@@ -19,10 +19,10 @@
package org.apache.royale.utils
{
-
-import flash.display.BitmapData;
-import flash.utils.ByteArray;
-
+ COMPILE::SWF {
+ import flash.display.BitmapData;
+ import flash.utils.ByteArray;
+ }
/**
* The PNGEncoder class converts raw bitmap images into encoded
* images using Portable Network Graphics (PNG) lossless compression.
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/SolidBorderUtil.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/SolidBorderUtil.as
index 6664c49..c7fabe5 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/SolidBorderUtil.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/SolidBorderUtil.as
@@ -18,8 +18,9 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.utils
{
-import flash.display.Graphics;
-
+ COMPILE::SWF {
+ import flash.display.Graphics;
+ }
/**
* The SolidBorderUtil class is a utility class that draws a solid color
diff --git
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/dbg/DOMPathUtil.as
b/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/dbg/DOMPathUtil.as
index 2007d40..3007b5b 100644
---
a/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/dbg/DOMPathUtil.as
+++
b/frameworks/projects/Core/src/main/royale/org/apache/royale/utils/dbg/DOMPathUtil.as
@@ -18,9 +18,10 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.utils.dbg
{
+ COMPILE::SWF {
import flash.utils.Dictionary;
import flash.utils.getQualifiedClassName;
-
+ }
import org.apache.royale.core.IChild;
/**
