I may be misreading this commit, but IMO, other than SparkRoyale, no other SWC should have dependencies on mx packages.
My 2 cents, -Alex On 1/30/20, 9:08 AM, "[email protected]" <[email protected]> wrote: This is an automated email from the ASF dual-hosted git repository. carlosrovira pushed a commit to branch develop in repository https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitbox.apache.org%2Frepos%2Fasf%2Froyale-asjs.git&data=02%7C01%7Caharui%40adobe.com%7Cab25da29e7564854025208d7a5a6f7c4%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637160008858204818&sdata=xzvyb6ODRUsLVF4lUSZvZB2gYu7q7ZUSjVaUj6A%2Bbk4%3D&reserved=0 The following commit(s) were added to refs/heads/develop by this push: new 3209e52 shared-object: Move LSO to Storage since is not flex 3209e52 is described below commit 3209e52d831c8121a1a86f08a86088bde0fa4911 Author: Carlos Rovira <[email protected]> AuthorDate: Thu Jan 30 18:07:36 2020 +0100 shared-object: Move LSO to Storage since is not flex --- .../MXRoyale/src/main/royale/MXRoyaleClasses.as | 2 - .../Network/src/main/royale/NetworkClasses.as | 2 + .../src/main/royale/mx/events/NetStatusEvent.as | 220 ++++++++++----------- frameworks/projects/Storage/pom.xml | 14 ++ .../Storage/src/main/royale/StorageClasses.as | 3 + .../org/apache/royale/storage}/SharedObject.as | 9 +- .../royale/storage}/SharedObjectFlushStatus.as | 12 +- .../org/apache/royale/storage}/SharedObjectJSON.as | 8 +- 8 files changed, 143 insertions(+), 127 deletions(-) diff --git a/frameworks/projects/MXRoyale/src/main/royale/MXRoyaleClasses.as b/frameworks/projects/MXRoyale/src/main/royale/MXRoyaleClasses.as index e519b85..428850a 100644 --- a/frameworks/projects/MXRoyale/src/main/royale/MXRoyaleClasses.as +++ b/frameworks/projects/MXRoyale/src/main/royale/MXRoyaleClasses.as @@ -184,8 +184,6 @@ internal class MXRoyaleClasses import mx.formatters.NumberBaseRoundType; NumberBaseRoundType; import mx.formatters.CurrencyFormatter; CurrencyFormatter; import mx.events.CalendarLayoutChangeEvent; CalendarLayoutChangeEvent; - import mx.net.SharedObject; SharedObject; - import mx.net.SharedObjectJSON; SharedObjectJSON; import mx.modules.ModuleManager; ModuleManager; import mx.events.DragEvent; DragEvent; import mx.formatters.DateBase; DateBase; diff --git a/frameworks/projects/Network/src/main/royale/NetworkClasses.as b/frameworks/projects/Network/src/main/royale/NetworkClasses.as index 4bd645b..a30dfd8 100644 --- a/frameworks/projects/Network/src/main/royale/NetworkClasses.as +++ b/frameworks/projects/Network/src/main/royale/NetworkClasses.as @@ -45,6 +45,8 @@ package import org.apache.royale.net.remoting.messages.RoyaleClient; RoyaleClient; import org.apache.royale.net.remoting.amf.AMFBinaryData; AMFBinaryData; + + import mx.events.NetStatusEvent; NetStatusEvent; // import org.apache.royale.reflection.registerClassAlias; // //RpcClassAliasInitializer diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/events/NetStatusEvent.as b/frameworks/projects/Network/src/main/royale/mx/events/NetStatusEvent.as similarity index 96% rename from frameworks/projects/MXRoyale/src/main/royale/mx/events/NetStatusEvent.as rename to frameworks/projects/Network/src/main/royale/mx/events/NetStatusEvent.as index 63f3f5e..63a88fb 100644 --- a/frameworks/projects/MXRoyale/src/main/royale/mx/events/NetStatusEvent.as +++ b/frameworks/projects/Network/src/main/royale/mx/events/NetStatusEvent.as @@ -1,110 +1,110 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// Licensed to the Apache Software Foundation (ASF) under one or more -// contributor license agreements. See the NOTICE file distributed with -// this work for additional information regarding copyright ownership. -// The ASF licenses this file to You under the Apache License, Version 2.0 -// (the "License"); you may not use this file except in compliance with -// the License. You may obtain a copy of the License at -// -// https://nam04.safelinks.protection.outlook.com/?url=http%3A%2F%2Fwww.apache.org%2Flicenses%2FLICENSE-2.0&data=02%7C01%7Caharui%40adobe.com%7Cab25da29e7564854025208d7a5a6f7c4%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637160008858204818&sdata=phCQvRfKnpUBwIgKKHA8CfcREo%2F9LUcoloC8UVoA%2B1s%3D&reserved=0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -//////////////////////////////////////////////////////////////////////////////// - -package mx.events -{ -COMPILE::SWF -{ -import flash.events.NetStatusEvent; -} -/* import mx.events.Event;*/ -import org.apache.royale.events.Event; -import org.apache.royale.events.IRoyaleEvent; - -/** - * - * - * @langversion 3.0 - * @playerversion Flash 9 - * @playerversion AIR 1.1 - * @productversion Royale 0.9.3 - * @royalesuppresspublicvarwarning - */ -COMPILE::SWF -public class NetStatusEvent extends flash.events.NetStatusEvent -{ - public function NetStatusEvent(type:String, bubbles:Boolean = false, - cancelable:Boolean = false, info:Object = null - ) - { - super(type, bubbles, cancelable,info); - } -} - -/** - * Represents event objects that are dispatched when focus changes. - * - * @see mx.core.UIComponent - * - * @langversion 3.0 - * @playerversion Flash 9 - * @playerversion AIR 1.1 - * @productversion Royale 0.9.3 - * @royalesuppresspublicvarwarning - */ -COMPILE::JS -public class NetStatusEvent extends org.apache.royale.events.Event -{ - /* include "../core/Version.as"; */ - public static const NET_STATUS:String = "netStatus"; - - //-------------------------------------------------------------------------- - // - // Class constants - // - //-------------------------------------------------------------------------- - - - //-------------------------------------------------------------------------- - // - // Constructor - // - //-------------------------------------------------------------------------- - - /** - * Constructor. - * - * @param type The event type; indicates the action that caused the event. - * - * @param bubbles Specifies whether the event can bubble - * up the display list hierarchy. - * - * @param cancelable Specifies whether the behavior - * associated with the event can be prevented. - * - * @langversion 3.0 - * @playerversion Flash 9 - * @playerversion AIR 1.1 - * @productversion Royale 0.9.3 - */ - public function NetStatusEvent(type:String, bubbles:Boolean = false, - cancelable:Boolean = false, info:Object = null - ) - { - super(type, bubbles, cancelable); - this.info = info; - } - - - public var info:Object; - - -} - -} +//////////////////////////////////////////////////////////////////////////////// +// +// Licensed to the Apache Software Foundation (ASF) under one or more +// contributor license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright ownership. +// The ASF licenses this file to You under the Apache License, Version 2.0 +// (the "License"); you may not use this file except in compliance with +// the License. You may obtain a copy of the License at +// +// https://nam04.safelinks.protection.outlook.com/?url=http%3A%2F%2Fwww.apache.org%2Flicenses%2FLICENSE-2.0&data=02%7C01%7Caharui%40adobe.com%7Cab25da29e7564854025208d7a5a6f7c4%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C0%7C637160008858214807&sdata=%2F0g0QfYKyhmpxiG3XpYxixzgnGi9pr6iwbhVgUk%2BbT4%3D&reserved=0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +// +//////////////////////////////////////////////////////////////////////////////// + +package mx.events +{ +COMPILE::SWF +{ +import flash.events.NetStatusEvent; +} +/* import mx.events.Event;*/ +import org.apache.royale.events.Event; +import org.apache.royale.events.IRoyaleEvent; + +/** + * + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Royale 0.9.3 + * @royalesuppresspublicvarwarning + */ +COMPILE::SWF +public class NetStatusEvent extends flash.events.NetStatusEvent +{ + public function NetStatusEvent(type:String, bubbles:Boolean = false, + cancelable:Boolean = false, info:Object = null + ) + { + super(type, bubbles, cancelable,info); + } +} + +/** + * Represents event objects that are dispatched when focus changes. + * + * @see mx.core.UIComponent + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Royale 0.9.3 + * @royalesuppresspublicvarwarning + */ +COMPILE::JS +public class NetStatusEvent extends org.apache.royale.events.Event +{ + /* include "../core/Version.as"; */ + public static const NET_STATUS:String = "netStatus"; + + //-------------------------------------------------------------------------- + // + // Class constants + // + //-------------------------------------------------------------------------- + + + //-------------------------------------------------------------------------- + // + // Constructor + // + //-------------------------------------------------------------------------- + + /** + * Constructor. + * + * @param type The event type; indicates the action that caused the event. + * + * @param bubbles Specifies whether the event can bubble + * up the display list hierarchy. + * + * @param cancelable Specifies whether the behavior + * associated with the event can be prevented. + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Royale 0.9.3 + */ + public function NetStatusEvent(type:String, bubbles:Boolean = false, + cancelable:Boolean = false, info:Object = null + ) + { + super(type, bubbles, cancelable); + this.info = info; + } + + + public var info:Object; + + +} + +} diff --git a/frameworks/projects/Storage/pom.xml b/frameworks/projects/Storage/pom.xml index e532c40..9c33af9 100644 --- a/frameworks/projects/Storage/pom.xml +++ b/frameworks/projects/Storage/pom.xml @@ -71,6 +71,13 @@ <type>swc</type> <classifier>js</classifier> </dependency> + <dependency> + <groupId>org.apache.royale.framework</groupId> + <artifactId>Network</artifactId> + <version>0.9.7-SNAPSHOT</version> + <type>swc</type> + <classifier>js</classifier> + </dependency> <dependency> <groupId>org.apache.royale.typedefs</groupId> @@ -93,6 +100,13 @@ <type>swc</type> <classifier>swf</classifier> </dependency> + <dependency> + <groupId>org.apache.royale.framework</groupId> + <artifactId>Network</artifactId> + <version>0.9.7-SNAPSHOT</version> + <type>swc</type> + <classifier>swf</classifier> + </dependency> </dependencies> </profile> </profiles> diff --git a/frameworks/projects/Storage/src/main/royale/StorageClasses.as b/frameworks/projects/Storage/src/main/royale/StorageClasses.as index 3955508..f1633de 100644 --- a/frameworks/projects/Storage/src/main/royale/StorageClasses.as +++ b/frameworks/projects/Storage/src/main/royale/StorageClasses.as @@ -27,6 +27,9 @@ package */ internal class StorageClasses { + import org.apache.royale.storage.SharedObject; SharedObject; + import org.apache.royale.storage.SharedObjectJSON; SharedObjectJSON; + import org.apache.royale.storage.LocalStorage; LocalStorage; import org.apache.royale.storage.providers.LocalStorageProvider; LocalStorageProvider; diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/net/SharedObject.as b/frameworks/projects/Storage/src/main/royale/org/apache/royale/storage/SharedObject.as similarity index 96% rename from frameworks/projects/MXRoyale/src/main/royale/mx/net/SharedObject.as rename to frameworks/projects/Storage/src/main/royale/org/apache/royale/storage/SharedObject.as index b6dd889..5c57c1f 100644 --- a/frameworks/projects/MXRoyale/src/main/royale/mx/net/SharedObject.as +++ b/frameworks/projects/Storage/src/main/royale/org/apache/royale/storage/SharedObject.as @@ -17,9 +17,8 @@ // //////////////////////////////////////////////////////////////////////////////// -package mx.net +package org.apache.royale.storage { - COMPILE::SWF { import flash.net.SharedObject; @@ -43,17 +42,17 @@ package mx.net private static const map:Object = {}; private static var unlocked:Boolean; - public static function getLocal(name:String, localPath:String = null, secure:Boolean = false):mx.net.SharedObject + public static function getLocal(name:String, localPath:String = null, secure:Boolean = false):org.apache.royale.storage.SharedObject { var pathKey:String = localPath == null ? '$null$' : localPath; COMPILE::JS { localPath = pathKey; } - var cached:mx.net.SharedObject = map[pathKey + '::' + name]; + var cached:org.apache.royale.storage.SharedObject = map[pathKey + '::' + name]; if (!cached) { unlocked = true; - cached = new mx.net.SharedObject(); + cached = new org.apache.royale.storage.SharedObject(); unlocked = false; map[pathKey + '::' + name] = cached; cached.setName(name); diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/net/SharedObjectFlushStatus.as b/frameworks/projects/Storage/src/main/royale/org/apache/royale/storage/SharedObjectFlushStatus.as similarity index 84% rename from frameworks/projects/MXRoyale/src/main/royale/mx/net/SharedObjectFlushStatus.as rename to frameworks/projects/Storage/src/main/royale/org/apache/royale/storage/SharedObjectFlushStatus.as index 0e73f78..778ac23 100644 --- a/frameworks/projects/MXRoyale/src/main/royale/mx/net/SharedObjectFlushStatus.as +++ b/frameworks/projects/Storage/src/main/royale/org/apache/royale/storage/SharedObjectFlushStatus.as @@ -17,16 +17,16 @@ // //////////////////////////////////////////////////////////////////////////////// -package mx.net +package org.apache.royale.storage { /** * This class is not available for reflection in the javascript target * @royalesuppressexport */ public class SharedObjectFlushStatus -{ - public static const PENDING:String = "pending"; - public static const FLUSHED:String = "flushed"; - public static const FAILED:String = "failed"; -} + { + public static const PENDING:String = "pending"; + public static const FLUSHED:String = "flushed"; + public static const FAILED:String = "failed"; + } } diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/net/SharedObjectJSON.as b/frameworks/projects/Storage/src/main/royale/org/apache/royale/storage/SharedObjectJSON.as similarity index 96% rename from frameworks/projects/MXRoyale/src/main/royale/mx/net/SharedObjectJSON.as rename to frameworks/projects/Storage/src/main/royale/org/apache/royale/storage/SharedObjectJSON.as index 232fa31..4a5918b 100644 --- a/frameworks/projects/MXRoyale/src/main/royale/mx/net/SharedObjectJSON.as +++ b/frameworks/projects/Storage/src/main/royale/org/apache/royale/storage/SharedObjectJSON.as @@ -17,7 +17,7 @@ // //////////////////////////////////////////////////////////////////////////////// -package mx.net +package org.apache.royale.storage { COMPILE::SWF @@ -40,17 +40,17 @@ package mx.net private static const map:Object = {}; private static var unlocked:Boolean; - public static function getLocal(name:String, localPath:String = null, secure:Boolean = false):mx.net.SharedObjectJSON + public static function getLocal(name:String, localPath:String = null, secure:Boolean = false):org.apache.royale.storage.SharedObjectJSON { var pathKey:String = localPath == null ? '$null$' : localPath; COMPILE::JS { localPath = pathKey; } - var cached:mx.net.SharedObjectJSON = map[pathKey + '::' + name]; + var cached:org.apache.royale.storage.SharedObjectJSON = map[pathKey + '::' + name]; if (!cached) { unlocked = true; - cached = new mx.net.SharedObjectJSON(); + cached = new org.apache.royale.storage.SharedObjectJSON(); unlocked = false; map[pathKey + '::' + name] = cached; cached.setName(name);
