flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [40/43] git commit: [flex-asjs] [refs/heads/refactor-sprite] - clean build after moving UIBase out of Core
Date Wed, 02 Nov 2016 15:14:45 GMT
clean build after moving UIBase out of Core


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/069904ce
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/069904ce
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/069904ce

Branch: refs/heads/refactor-sprite
Commit: 069904ce6f7f7605f8e381df0d791987a8fd60af
Parents: 7a65d3d
Author: Alex Harui <aharui@apache.org>
Authored: Sat Oct 29 22:29:12 2016 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Tue Nov 1 08:02:15 2016 -0700

----------------------------------------------------------------------
 .../src/main/config/compile-js-config.xml       |  1 +
 .../src/main/config/compile-js-config.xml       |  1 +
 .../Basic/src/main/flex/BasicClasses.as         |  8 +++++++
 .../flex/org/apache/flex/core/Application.as    |  4 +++-
 .../org/apache/flex/core/SimpleApplication.as   |  4 +++-
 .../main/flex/org/apache/flex/core/UIBase.as    |  4 +++-
 .../projects/Core/src/main/flex/CoreClasses.as  | 12 +++++++++++
 .../src/main/config/compile-as-config.xml       |  1 +
 .../src/main/config/compile-as-config.xml       |  1 +
 .../Graphics/src/main/flex/GraphicsClasses.as   | 22 ++++++++++----------
 .../projects/HTML/src/main/flex/HTMLClasses.as  |  9 ++++++++
 .../flex/org/apache/flex/core/Application.as    |  4 +++-
 .../org/apache/flex/core/SimpleApplication.as   |  4 +++-
 .../main/flex/org/apache/flex/core/UIBase.as    |  4 ++--
 14 files changed, 61 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/069904ce/frameworks/js/FlexJS/projects/DragDropJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/DragDropJS/src/main/config/compile-js-config.xml
b/frameworks/js/FlexJS/projects/DragDropJS/src/main/config/compile-js-config.xml
index 10ea092..81a4671 100644
--- a/frameworks/js/FlexJS/projects/DragDropJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/DragDropJS/src/main/config/compile-js-config.xml
@@ -54,6 +54,7 @@
              if these swcs are on the external-library-path then their requires
              will not be listed -->
             <path-element>../../../../../libs/CoreJS.swc</path-element>
+            <path-element>../../../../../libs/HTMLJS.swc</path-element>
         </library-path>
         
         <namespaces>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/069904ce/frameworks/js/FlexJS/projects/GoogleMapsJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/GoogleMapsJS/src/main/config/compile-js-config.xml
b/frameworks/js/FlexJS/projects/GoogleMapsJS/src/main/config/compile-js-config.xml
index 2a1a3e4..93c4572 100644
--- a/frameworks/js/FlexJS/projects/GoogleMapsJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/GoogleMapsJS/src/main/config/compile-js-config.xml
@@ -58,6 +58,7 @@
              if these swcs are on the external-library-path then their requires
              will not be listed -->
             <path-element>../../../../../libs/CoreJS.swc</path-element>
+            <path-element>../../../../../libs/HTMLJS.swc</path-element>
         </library-path>
         
         <namespaces>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/069904ce/frameworks/projects/Basic/src/main/flex/BasicClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/BasicClasses.as b/frameworks/projects/Basic/src/main/flex/BasicClasses.as
index 2c1665b..e63e9de 100644
--- a/frameworks/projects/Basic/src/main/flex/BasicClasses.as
+++ b/frameworks/projects/Basic/src/main/flex/BasicClasses.as
@@ -189,6 +189,14 @@ internal class BasicClasses
     import org.apache.flex.core.SimpleApplication; SimpleApplication;
 	import org.apache.flex.svg.GraphicContainer; GraphicContainer;
 	import org.apache.flex.svg.DOMWrapper; DOMWrapper;
+	
+	import org.apache.flex.svg.GraphicShape; GraphicShape;
+	import org.apache.flex.svg.Rect; Rect;
+	import org.apache.flex.svg.Ellipse; Ellipse;
+	import org.apache.flex.svg.Circle; Circle;
+	import org.apache.flex.svg.Path; Path;
+	import org.apache.flex.svg.Text; Text;
+	import org.apache.flex.svg.CompoundGraphic; CompoundGraphic;
 
 
 	COMPILE::SWF

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/069904ce/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as
index ff6e5a6..85609cb 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as
@@ -21,7 +21,9 @@ package org.apache.flex.core
     import org.apache.flex.events.Event;
     import org.apache.flex.events.IEventDispatcher;
     import org.apache.flex.events.MouseEvent;
-    import org.apache.flex.events.utils.MouseEventConverter;
+	COMPILE::SWF {
+	    import org.apache.flex.events.utils.MouseEventConverter;
+	}
     import org.apache.flex.utils.MXMLDataInterpreter;
 	import org.apache.flex.utils.Timer;
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/069904ce/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/SimpleApplication.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/SimpleApplication.as
b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/SimpleApplication.as
index b824288..7a75863 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/SimpleApplication.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/SimpleApplication.as
@@ -33,7 +33,9 @@ package org.apache.flex.core
     import org.apache.flex.events.Event;
     import org.apache.flex.events.IEventDispatcher;
     import org.apache.flex.events.MouseEvent;
-    import org.apache.flex.events.utils.MouseEventConverter;
+	COMPILE::SWF {
+	    import org.apache.flex.events.utils.MouseEventConverter;
+	}
     import org.apache.flex.utils.MXMLDataInterpreter;
     
     /**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/069904ce/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as
index ff25bd0..300b008 100644
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/UIBase.as
@@ -29,7 +29,9 @@ package org.apache.flex.core
 	import org.apache.flex.events.IEventDispatcher;
 	import org.apache.flex.events.MouseEvent;
 	import org.apache.flex.events.ValueChangeEvent;
-	import org.apache.flex.events.utils.MouseEventConverter;
+	COMPILE::SWF {
+	    import org.apache.flex.events.utils.MouseEventConverter;
+	}
 	
 	/**
 	 *  Set a different class for click events so that

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/069904ce/frameworks/projects/Core/src/main/flex/CoreClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Core/src/main/flex/CoreClasses.as b/frameworks/projects/Core/src/main/flex/CoreClasses.as
index 6be1c0b..f34684e 100644
--- a/frameworks/projects/Core/src/main/flex/CoreClasses.as
+++ b/frameworks/projects/Core/src/main/flex/CoreClasses.as
@@ -69,6 +69,7 @@ internal class CoreClasses
     import org.apache.flex.core.ILayoutChild; ILayoutChild;
 	import org.apache.flex.core.ILayoutHost; ILayoutHost;
     import org.apache.flex.core.IListPresentationModel; IListPresentationModel;
+	import org.apache.flex.core.IMeasurementBead; IMeasurementBead;
     import org.apache.flex.core.IPanelModel; IPanelModel;
     import org.apache.flex.core.IParent; IParent;
     import org.apache.flex.core.IParentIUIBase; IParentIUIBase;
@@ -104,6 +105,11 @@ internal class CoreClasses
     import org.apache.flex.events.EventDispatcher; EventDispatcher;
     import org.apache.flex.events.IEventDispatcher; IEventDispatcher;
 	import org.apache.flex.events.MouseEvent; MouseEvent;
+	COMPILE::SWF
+	{
+	    import org.apache.flex.core.StageProxy; StageProxy;
+		import org.apache.flex.events.utils.MouseEventConverter; MouseEventConverter;
+	}
 	import org.apache.flex.events.DetailEvent; DetailEvent;
 	import org.apache.flex.events.ValueEvent; ValueEvent;
     import org.apache.flex.events.utils.MouseUtils; MouseUtils;
@@ -163,6 +169,12 @@ internal class CoreClasses
     import org.apache.flex.utils.CSSUtils; CSSUtils;
 
     import org.apache.flex.utils.Proxy; Proxy;
+    import org.apache.flex.core.HTMLElementWrapper; HTMLElementWrapper;
+	
+	COMPILE::JS
+	{
+	    import org.apache.flex.core.IFlexJSElement; IFlexJSElement;
+	}
 }
 
 }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/069904ce/frameworks/projects/DragDrop/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/DragDrop/src/main/config/compile-as-config.xml b/frameworks/projects/DragDrop/src/main/config/compile-as-config.xml
index 87f20cb..a4892e2 100644
--- a/frameworks/projects/DragDrop/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/DragDrop/src/main/config/compile-as-config.xml
@@ -24,6 +24,7 @@
         <external-library-path>
             <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
             <path-element>../../../../../libs/Core.swc</path-element>
+            <path-element>../../../../../libs/HTML.swc</path-element>
         </external-library-path>
         
 		<mxml>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/069904ce/frameworks/projects/GoogleMaps/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/GoogleMaps/src/main/config/compile-as-config.xml b/frameworks/projects/GoogleMaps/src/main/config/compile-as-config.xml
index e94188a..4d1d74a 100644
--- a/frameworks/projects/GoogleMaps/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/GoogleMaps/src/main/config/compile-as-config.xml
@@ -24,6 +24,7 @@
         <external-library-path>
             <path-element>${env.AIR_HOME}/frameworks/libs/air/airglobal.swc</path-element>
             <path-element>../../../../../libs/Core.swc</path-element>
+            <path-element>../../../../../libs/HTML.swc</path-element>
         </external-library-path>
         
 		<mxml>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/069904ce/frameworks/projects/Graphics/src/main/flex/GraphicsClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Graphics/src/main/flex/GraphicsClasses.as b/frameworks/projects/Graphics/src/main/flex/GraphicsClasses.as
index 6d7125b..a65ab50 100644
--- a/frameworks/projects/Graphics/src/main/flex/GraphicsClasses.as
+++ b/frameworks/projects/Graphics/src/main/flex/GraphicsClasses.as
@@ -28,18 +28,8 @@ package
 internal class GraphicsClasses
 {	
 
-	import org.apache.flex.svg.GraphicShape; GraphicShape;
-	import org.apache.flex.svg.Rect; Rect;
-	import org.apache.flex.svg.Ellipse; Ellipse;
-	import org.apache.flex.svg.Circle; Circle;
-	import org.apache.flex.svg.Image; Image;
-	import org.apache.flex.svg.BinaryImage; BinaryImage;
-	import org.apache.flex.svg.beads.ImageView; ImageView;
-	import org.apache.flex.svg.Path; Path;
 	import org.apache.flex.graphics.SolidColor; SolidColor;
 	import org.apache.flex.graphics.SolidColorStroke; SolidColorStroke;
-	import org.apache.flex.svg.Text; Text;
-	import org.apache.flex.svg.CompoundGraphic; CompoundGraphic;
 	import org.apache.flex.svg.TransformBead; TransformBead;
 	import org.apache.flex.svg.ClipBead; ClipBead;
 	import org.apache.flex.svg.LinearGradient; LinearGradient;
@@ -48,8 +38,18 @@ internal class GraphicsClasses
 	import org.apache.flex.graphics.LineTo; LineTo;
 	import org.apache.flex.graphics.MoveTo; MoveTo;
 	import org.apache.flex.graphics.PathBuilder; PathBuilder;
+	COMPILE::SWF
+	{
+		import org.apache.flex.graphics.utils.PathHelper; PathHelper;
+	}
 	import org.apache.flex.graphics.QuadraticCurve; QuadraticCurve;
-	
+	import org.apache.flex.graphics.ICircle; ICircle;
+	import org.apache.flex.graphics.ICompoundGraphic; ICompoundGraphic;
+	import org.apache.flex.graphics.IEllipse; IEllipse;
+	import org.apache.flex.graphics.IPath; IPath;
+	import org.apache.flex.graphics.IRect; IRect;
+	import org.apache.flex.graphics.IText; IText;
+		
 }
 
 }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/069904ce/frameworks/projects/HTML/src/main/flex/HTMLClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/HTMLClasses.as b/frameworks/projects/HTML/src/main/flex/HTMLClasses.as
index 33177bb..b1714ff 100644
--- a/frameworks/projects/HTML/src/main/flex/HTMLClasses.as
+++ b/frameworks/projects/HTML/src/main/flex/HTMLClasses.as
@@ -192,6 +192,15 @@ internal class HTMLClasses
 	import org.apache.flex.svg.GraphicContainer; GraphicContainer;
 	import org.apache.flex.svg.DOMWrapper; DOMWrapper;
 	
+	import org.apache.flex.svg.GraphicShape; GraphicShape;
+	import org.apache.flex.svg.Rect; Rect;
+	import org.apache.flex.svg.Ellipse; Ellipse;
+	import org.apache.flex.svg.Circle; Circle;
+	import org.apache.flex.svg.Path; Path;
+	import org.apache.flex.svg.Text; Text;
+	import org.apache.flex.svg.CompoundGraphic; CompoundGraphic;
+
+	
 	COMPILE::SWF
 	{
 		import org.apache.flex.html.beads.HRuleView; HRuleView;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/069904ce/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/Application.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/Application.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/Application.as
index 0a9c69a..f8cbe01 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/Application.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/Application.as
@@ -21,7 +21,9 @@ package org.apache.flex.core
     import org.apache.flex.events.Event;
     import org.apache.flex.events.IEventDispatcher;
     import org.apache.flex.events.MouseEvent;
-    import org.apache.flex.events.utils.MouseEventConverter;
+	COMPILE::SWF {
+	    import org.apache.flex.events.utils.MouseEventConverter;
+	}
     import org.apache.flex.utils.MXMLDataInterpreter;
     import org.apache.flex.utils.Timer;
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/069904ce/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/SimpleApplication.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/SimpleApplication.as
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/SimpleApplication.as
index 770d0b2..7198323 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/SimpleApplication.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/SimpleApplication.as
@@ -33,7 +33,9 @@ package org.apache.flex.core
     import org.apache.flex.events.Event;
     import org.apache.flex.events.IEventDispatcher;
     import org.apache.flex.events.MouseEvent;
-    import org.apache.flex.events.utils.MouseEventConverter;
+	COMPILE::SWF {
+	    import org.apache.flex.events.utils.MouseEventConverter;
+	}
     import org.apache.flex.utils.MXMLDataInterpreter;
     
 	/**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/069904ce/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/UIBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/UIBase.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/UIBase.as
index 0e4a988..ca01f54 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/UIBase.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/UIBase.as
@@ -29,9 +29,9 @@ package org.apache.flex.core
 	import org.apache.flex.events.IEventDispatcher;
 	import org.apache.flex.events.MouseEvent;
 	import org.apache.flex.events.ValueChangeEvent;
-	import org.apache.flex.events.utils.MouseEventConverter;
 	COMPILE::SWF {
-	import flash.display.InteractiveObject;
+	    import flash.display.InteractiveObject;
+	    import org.apache.flex.events.utils.MouseEventConverter;
 	}
 	
 	/**


Mime
View raw message