royale-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From carlosrov...@apache.org
Subject [royale-asjs] 01/02: Revert "Organize and clean imports in Core lib and avoid warnings in IDEs due to missing COMPILE::SWF wrapper"
Date Tue, 13 Nov 2018 09:56:56 GMT
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

commit fb00ef789a41ffbca5503346ad3ef2d456dfc176
Author: Carlos Rovira <carlosrovira@apache.org>
AuthorDate: Tue Nov 13 10:56:02 2018 +0100

    Revert "Organize and clean imports in Core lib and avoid warnings in IDEs due to missing
COMPILE::SWF wrapper"
    
    This reverts commit 4a121216e6699d56bdd9943f12de0ba19c5a698c.
---
 .../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, 32 insertions(+), 39 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 753280c..f63db9c 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,15 +18,14 @@
 ////////////////////////////////////////////////////////////////////////////////
 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 7672594..bdea9c0 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,13 +23,11 @@ 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 7a9b493..2c03aed 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,9 +18,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.core
 {
-    COMPILE::SWF {
-        import flash.geom.Rectangle;
-    }
+    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 c063c87..f1ca0a8 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,10 +18,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 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 e6f59fc..144459f 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,10 +18,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 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 604c9a4..51492cf 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,11 +18,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 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 fef25bd..f472df1 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,15 +21,20 @@ 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.IEventDispatcher;
+    import org.apache.royale.events.utils.MouseEventConverter;
+	import org.apache.royale.events.EventDispatcher;
+    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 ec36055..adeac98 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,10 +18,11 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.core
 {
-    COMPILE::SWF
-	{
 	import flash.display.DisplayObject;
-	import flash.display.MovieClip;
+
+	COMPILE::SWF
+	{
+	    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 36b9d87..f9b966f 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.DisplayObject;
-    import flash.display.Shape;            
+        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 cbce8d5..c6422ea 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.DisplayObject;
-	import flash.display.Sprite;
+	    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 c2f6d51..27e68c6 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.display.DisplayObject;
-	import flash.text.TextField;
+	    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 d0b8e85..4f731dd 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 bfdd375..3770f33 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,10 +18,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 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 c778908..8e29f69 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
 {
-    COMPILE::SWF {
-    import flash.display.BitmapData;
-    import flash.utils.ByteArray;
-    }
+
+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 c7fabe5..6664c49 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,9 +18,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.utils
 {
-    COMPILE::SWF {
-    import flash.display.Graphics;
-    }
+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 3007b5b..2007d40 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,10 +18,9 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.utils.dbg
 {
-    COMPILE::SWF {
     import flash.utils.Dictionary;
     import flash.utils.getQualifiedClassName;
-    }
+    
     import org.apache.royale.core.IChild;
 
 	/**


Mime
View raw message