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 97cb962 Revert "shared-object: Move LSO to Storage since is not flex"
97cb962 is described below
commit 97cb9621a4c1d21f9dc9881a3507efec9e693a76
Author: Carlos Rovira <carlosrov...@apache.org>
AuthorDate: Thu Jan 30 18:35:50 2020 +0100
Revert "shared-object: Move LSO to Storage since is not flex"
This reverts commit 3209e52d831c8121a1a86f08a86088bde0fa4911.
---
.../MXRoyale/src/main/royale/MXRoyaleClasses.as | 2 +
.../src/main/royale/mx/events/NetStatusEvent.as | 220 ++++++++++-----------
.../src/main/royale/mx/net}/SharedObject.as | 9 +-
.../main/royale/mx/net}/SharedObjectFlushStatus.as | 12 +-
.../src/main/royale/mx/net}/SharedObjectJSON.as | 8 +-
.../Network/src/main/royale/NetworkClasses.as | 2 -
frameworks/projects/Storage/pom.xml | 14 --
.../Storage/src/main/royale/StorageClasses.as | 3 -
8 files changed, 127 insertions(+), 143 deletions(-)
diff --git a/frameworks/projects/MXRoyale/src/main/royale/MXRoyaleClasses.as
b/frameworks/projects/MXRoyale/src/main/royale/MXRoyaleClasses.as
index 428850a..e519b85 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/MXRoyaleClasses.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/MXRoyaleClasses.as
@@ -184,6 +184,8 @@ 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/mx/events/NetStatusEvent.as
b/frameworks/projects/MXRoyale/src/main/royale/mx/events/NetStatusEvent.as
similarity index 96%
rename from
frameworks/projects/Network/src/main/royale/mx/events/NetStatusEvent.as
rename to
frameworks/projects/MXRoyale/src/main/royale/mx/events/NetStatusEvent.as
index 63a88fb..63f3f5e 100644
--- a/frameworks/projects/Network/src/main/royale/mx/events/NetStatusEvent.as
+++ b/frameworks/projects/MXRoyale/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
-//
-// http://www.apache.org/licenses/LICENSE-2.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
+//
+// http://www.apache.org/licenses/LICENSE-2.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/src/main/royale/org/apache/royale/storage/SharedObject.as
b/frameworks/projects/MXRoyale/src/main/royale/mx/net/SharedObject.as
similarity index 96%
rename from
frameworks/projects/Storage/src/main/royale/org/apache/royale/storage/SharedObject.as
rename to frameworks/projects/MXRoyale/src/main/royale/mx/net/SharedObject.as
index 5c57c1f..b6dd889 100644
---
a/frameworks/projects/Storage/src/main/royale/org/apache/royale/storage/SharedObject.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/net/SharedObject.as
@@ -17,8 +17,9 @@
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.storage
+package mx.net
{
+
COMPILE::SWF
{
import flash.net.SharedObject;
@@ -42,17 +43,17 @@ package org.apache.royale.storage
private static const map:Object = {};
private static var unlocked:Boolean;
- public static function getLocal(name:String, localPath:String = null,
secure:Boolean = false):org.apache.royale.storage.SharedObject
+ public static function getLocal(name:String, localPath:String = null,
secure:Boolean = false):mx.net.SharedObject
{
var pathKey:String = localPath == null ? '$null$' : localPath;
COMPILE::JS {
localPath = pathKey;
}
- var cached:org.apache.royale.storage.SharedObject = map[pathKey +
'::' + name];
+ var cached:mx.net.SharedObject = map[pathKey + '::' + name];
if (!cached)
{
unlocked = true;
- cached = new org.apache.royale.storage.SharedObject();
+ cached = new mx.net.SharedObject();
unlocked = false;
map[pathKey + '::' + name] = cached;
cached.setName(name);
diff --git
a/frameworks/projects/Storage/src/main/royale/org/apache/royale/storage/SharedObjectFlushStatus.as
b/frameworks/projects/MXRoyale/src/main/royale/mx/net/SharedObjectFlushStatus.as
similarity index 84%
rename from
frameworks/projects/Storage/src/main/royale/org/apache/royale/storage/SharedObjectFlushStatus.as
rename to
frameworks/projects/MXRoyale/src/main/royale/mx/net/SharedObjectFlushStatus.as
index 778ac23..0e73f78 100644
---
a/frameworks/projects/Storage/src/main/royale/org/apache/royale/storage/SharedObjectFlushStatus.as
+++
b/frameworks/projects/MXRoyale/src/main/royale/mx/net/SharedObjectFlushStatus.as
@@ -17,16 +17,16 @@
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.storage
+package mx.net
{
/**
* 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/Storage/src/main/royale/org/apache/royale/storage/SharedObjectJSON.as
b/frameworks/projects/MXRoyale/src/main/royale/mx/net/SharedObjectJSON.as
similarity index 96%
rename from
frameworks/projects/Storage/src/main/royale/org/apache/royale/storage/SharedObjectJSON.as
rename to
frameworks/projects/MXRoyale/src/main/royale/mx/net/SharedObjectJSON.as
index 4a5918b..232fa31 100644
---
a/frameworks/projects/Storage/src/main/royale/org/apache/royale/storage/SharedObjectJSON.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/net/SharedObjectJSON.as
@@ -17,7 +17,7 @@
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.storage
+package mx.net
{
COMPILE::SWF
@@ -40,17 +40,17 @@ package org.apache.royale.storage
private static const map:Object = {};
private static var unlocked:Boolean;
- public static function getLocal(name:String, localPath:String = null,
secure:Boolean = false):org.apache.royale.storage.SharedObjectJSON
+ public static function getLocal(name:String, localPath:String = null,
secure:Boolean = false):mx.net.SharedObjectJSON
{
var pathKey:String = localPath == null ? '$null$' : localPath;
COMPILE::JS {
localPath = pathKey;
}
- var cached:org.apache.royale.storage.SharedObjectJSON =
map[pathKey + '::' + name];
+ var cached:mx.net.SharedObjectJSON = map[pathKey + '::' + name];
if (!cached)
{
unlocked = true;
- cached = new org.apache.royale.storage.SharedObjectJSON();
+ cached = new mx.net.SharedObjectJSON();
unlocked = false;
map[pathKey + '::' + name] = cached;
cached.setName(name);
diff --git a/frameworks/projects/Network/src/main/royale/NetworkClasses.as
b/frameworks/projects/Network/src/main/royale/NetworkClasses.as
index a30dfd8..4bd645b 100644
--- a/frameworks/projects/Network/src/main/royale/NetworkClasses.as
+++ b/frameworks/projects/Network/src/main/royale/NetworkClasses.as
@@ -45,8 +45,6 @@ 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/Storage/pom.xml
b/frameworks/projects/Storage/pom.xml
index 9c33af9..e532c40 100644
--- a/frameworks/projects/Storage/pom.xml
+++ b/frameworks/projects/Storage/pom.xml
@@ -71,13 +71,6 @@
<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>
@@ -100,13 +93,6 @@
<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 f1633de..3955508 100644
--- a/frameworks/projects/Storage/src/main/royale/StorageClasses.as
+++ b/frameworks/projects/Storage/src/main/royale/StorageClasses.as
@@ -27,9 +27,6 @@ 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;
