Sorry about that.

Before this commit the build was failing. That was due to the fact that there 
were two different Container classes and mixed up references.

I’m out of time for today. If you don’t get to this before Saturday night, I’ll 
look at this then.

Harbs

> On Jun 1, 2018, at 6:13 PM, Carlos Rovira <[email protected]> wrote:
> 
> Harbs,
> 
> this commit is making the examples fail. I recommend you tu pass maven on
> examples folder to ensure that nothing is break
> 
> /Users/carlosrovira/Dev/Royale/Source/royale-asjs/
> examples/Flat-0.9.3-SNAPSHOT-swf.swc:defaults.css(176): col: 17 Error:
> org.apache.royale.html.beads.ContainerView is not defined.
> 
> 
> 
> /Users/carlosrovira/Dev/Royale/Source/royale-asjs/
> examples/Flat-0.9.3-SNAPSHOT-swf.swc:defaults.css(176): col: 17 Error:
> org.apache.royale.html.beads.ContainerView is not defined.
> 
> 
> 
> /Users/carlosrovira/Dev/Royale/Source/royale-asjs/
> examples/Flat-0.9.3-SNAPSHOT-swf.swc:defaults.css(176): col: 17 Error:
> org.apache.royale.html.beads.ContainerView is not defined.
> 
> 
> 
> /Users/carlosrovira/Dev/Royale/Source/royale-asjs/
> examples/Flat-0.9.3-SNAPSHOT-swf.swc:defaults.css(585): col: 17 Error:
> org.apache.royale.html.supportClasses.ContainerContentArea is not defined.
> 
> 
> 
> /Users/carlosrovira/Dev/Royale/Source/royale-asjs/
> examples/Flat-0.9.3-SNAPSHOT-swf.swc:defaults.css(585): col: 17 Error:
> org.apache.royale.html.supportClasses.ContainerContentArea is not defined.
> 
> 
> 
> /Users/carlosrovira/Dev/Royale/Source/royale-asjs/
> examples/Flat-0.9.3-SNAPSHOT-swf.swc:defaults.css(585): col: 17 Error:
> org.apache.royale.html.supportClasses.ContainerContentArea is not defined.
> 
> 
> 
> /Users/carlosrovira/Dev/Royale/Source/royale-asjs/
> examples/Flat-0.9.3-SNAPSHOT-js.swc:defaults.css(176): col: 17 Error:
> org.apache.royale.html.beads.ContainerView is not defined.
> 
> 
> 
> /Users/carlosrovira/Dev/Royale/Source/royale-asjs/
> examples/Flat-0.9.3-SNAPSHOT-js.swc:defaults.css(176): col: 17 Error:
> org.apache.royale.html.beads.ContainerView is not defined.
> 
> 
> 
> [*INFO*]
> *------------------------------------------------------------------------*
> 
> [*INFO*] *Reactor Summary:*
> 
> [*INFO*]
> 
> [*INFO*] Apache Royale: Examples 0.9.3-SNAPSHOT ............. *SUCCESS* [
> 2.399 s]
> 
> [*INFO*] Apache Royale: Examples: Example-Tests ............. *SUCCESS* [
> 1.125 s]
> 
> [*INFO*] Apache Royale: Examples: Express ................... *SUCCESS* [
> 0.657 s]
> 
> [*INFO*] Apache Royale: Examples: Express: DataBindingExample *SUCCESS* [
> 6.412 s]
> 
> [*INFO*] Apache Royale: Examples: Express: DataGridExample .. *SUCCESS* [
> 3.155 s]
> 
> [*INFO*] Apache Royale: Examples: Express: GitHubCommitLogViewer *SUCCESS*
> [  2.595 s]
> 
> [*INFO*] Apache Royale: Examples: Royale .................... *SUCCESS* [
> 0.631 s]
> 
> [*INFO*] Apache Royale: Examples: Royale: AccordionExample .. *SUCCESS* [
> 2.184 s]
> 
> [*INFO*] Apache Royale: Examples: Royale: AlertExample ...... *SUCCESS* [
> 1.908 s]
> 
> [*INFO*] Apache Royale: Examples: Royale: ASDoc ............. *SUCCESS* [
> 3.421 s]
> 
> [*INFO*] Apache Royale: Examples: Royale: ChartExample ...... *SUCCESS* [
> 2.378 s]
> 
> [*INFO*] Apache Royale: Examples: Royale: CordovaCameraExample *SUCCESS* [
> 1.843 s]
> 
> [*INFO*] Apache Royale: Examples: Royale: CreateJSExample ... *SUCCESS* [
> 1.775 s]
> 
> [*INFO*] Apache Royale: Examples: Royale: DataBindingExample  *SUCCESS* [
> 2.023 s]
> 
> [*INFO*] Apache Royale: Examples: Royale: DataBindingExample_as *SUCCESS*
> [  1.891 s]
> 
> [*INFO*] Apache Royale: Examples: Royale: DataBindingExample_Flat *FAILURE*
> [  1.468 s]
> 
> [*INFO*] Apache Royale: Examples: Royale: DataBindingExampleWithLayout
> *SKIPPED*
> 
> [*INFO*] Apache Royale: Examples: Royale: DataGridExample ... *SKIPPED*
> 
> [*INFO*] Apache Royale: Examples: Royale: DateControlsExample *SKIPPED*
> 
> [*INFO*] Apache Royale: Examples: Royale: DebuggingExample .. *SKIPPED*
> 
> [*INFO*] Apache Royale: Examples: Royale: DesktopMap ........ *SKIPPED*
> 
> [*INFO*] Apache Royale: Examples: Royale: DividedContainerExample *SKIPPED*
> 
> 2018-06-01 14:07 GMT+02:00 <[email protected]>:
> 
>> This is an automated email from the ASF dual-hosted git repository.
>> 
>> harbs 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 e74e4d0  Removed duplicate Container
>> e74e4d0 is described below
>> 
>> commit e74e4d095050477db43ac57f8928803b18961c38
>> Author: Harbs <[email protected]>
>> AuthorDate: Fri Jun 1 15:06:56 2018 +0300
>> 
>>    Removed duplicate Container
>> 
>>    There was a Container class in both core and html with references to
>> both.
>> ---
>> .../Basic/src/main/resources/basic-manifest.xml    |   2 +-
>> .../royale/org/apache/royale/core/Container.as     | 164
>> ---------------------
>> .../org/apache/royale/html/beads/AlertView.as      |   2 +-
>> .../royale/html/beads/ControlBarMeasurementBead.as |   2 +-
>> .../org/apache/royale/html/beads/DataGridView.as   |   2 +-
>> .../apache/royale/html/beads/DateChooserView.as    |   2 +-
>> .../org/apache/royale/html/beads/IDataGridView.as  |   2 +-
>> .../org/apache/royale/html/beads/PanelView.as      |   2 +-
>> .../royale/html/beads/PanelWithControlBarView.as   |   2 +-
>> .../org/apache/royale/html/beads/TreeGridView.as   |   2 +-
>> mustella/tests/basicTests/shim/VBox.as             |   2 +-
>> 11 files changed, 10 insertions(+), 174 deletions(-)
>> 
>> diff --git a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
>> b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
>> index 717040f..211fdca 100644
>> --- a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
>> +++ b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
>> @@ -24,7 +24,7 @@
>>     <component id="Application" class="org.apache.royale.core.
>> Application"/>
>>     <component id="AirApplication" class="org.apache.royale.core.
>> AirApplication"/>
>>     <component id="View" class="org.apache.royale.core.View"/>
>> -    <component id="Container" class="org.apache.royale.core.Container"/>
>> +    <component id="Container" class="org.apache.royale.html.Container"/>
>>     <component id="Button" class="org.apache.royale.html.Button"/>
>>     <component id="CloseButton" class="org.apache.royale.html.
>> CloseButton"/>
>>     <component id="ButtonBar" class="org.apache.royale.html.ButtonBar"/>
>> diff --git 
>> a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/Container.as
>> b/frameworks/projects/Basic/src/main/royale/org/apache/royal
>> e/core/Container.as
>> deleted file mode 100644
>> index e196115..0000000
>> --- a/frameworks/projects/Basic/src/main/royale/org/apache/royal
>> e/core/Container.as
>> +++ /dev/null
>> @@ -1,164 +0,0 @@
>> -///////////////////////////////////////////////////////////
>> /////////////////////
>> -//
>> -//  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 org.apache.royale.core
>> -{
>> -       import org.apache.royale.core.IMXMLDocument;
>> -       import org.apache.royale.core.ValuesManager;
>> -       import org.apache.royale.events.Event;
>> -       import org.apache.royale.utils.MXMLDataInterpreter;
>> -
>> -       /**
>> -        * The default property uses when additional MXML content appears
>> within an element's
>> -        * definition in an MXML file.
>> -        */
>> -       [DefaultProperty("mxmlContent")]
>> -
>> -
>> -    /**
>> -     *  The Container class implements a basic container for
>> -     *  other controls and containers.  The position and size
>> -     *  of the children are determined by a layout while the size of
>> -     *  a Container can either be determined by its children or by
>> -     *  specifying an exact size in pixels or as a percentage of the
>> -     *  parent element.
>> -     *
>> -     *  This Container does not have a built-in scroll bar or clipping of
>> -     *  its content should the content exceed the Container's boundaries.
>> To
>> -     *  have scroll bars and clipping, add the ScrollingView bead.
>> -     *
>> -     *  While the container is relatively lightweight, it should
>> -     *  generally not be used as the base class for other controls,
>> -     *  even if those controls are composed of children.  That's
>> -     *  because the fundamental API of Container is to support
>> -     *  an arbitrary set of children, and most controls only
>> -     *  support a specific set of children.
>> -     *
>> -     *  And that's one of the advantages of beads: that functionality
>> -     *  used in a Container can also be used in a Control as long
>> -     *  as that bead doesn't assume that its strand is a Container.
>> -     *
>> -     *  For example, even though you can use a Panel to create the
>> -     *  equivalent of an Alert control, the Alert is a
>> -     *  control and not a Container because the Alert does not
>> -     *  support an arbitrary set of children.
>> -     *
>> -     *  @toplevel
>> -     *  @see org.apache.royale.html.beads.layout
>> -     *  @see org.apache.royale.html.supportClasses.ScrollingViewport
>> -     *  @langversion 3.0
>> -     *  @playerversion Flash 10.2
>> -     *  @playerversion AIR 2.6
>> -     *  @productversion Royale 0.0
>> -     */
>> -       public class Container extends ContainerBase implements
>> IMXMLDocument
>> -       {
>> -        /**
>> -         *  Constructor.
>> -         *
>> -         *  @langversion 3.0
>> -         *  @playerversion Flash 10.2
>> -         *  @playerversion AIR 2.6
>> -         *  @productversion Royale 0.0
>> -         */
>> -               public function Container()
>> -               {
>> -                       COMPILE::JS
>> -                       {
>> -                               typeNames = 'Container';
>> -                       }
>> -                       super();
>> -               }
>> -
>> -               private var _mxmlDescriptor:Array;
>> -               private var _mxmlDocument:Object = this;
>> -               private var _initialized:Boolean;
>> -
>> -               /**
>> -                * @private
>> -                */
>> -               override public function addedToParent():void
>> -               {
>> -                       if (!_initialized)
>> -                       {
>> -                               // each MXML file can also have styles in
>> fx:Style block
>> -                               ValuesManager.valuesImpl.init(this);
>> -                       }
>> -
>> -                       super.addedToParent();
>> -
>> -                       if (!_initialized)
>> -                       {
>> -                               
>> MXMLDataInterpreter.generateMXMLInstances(_mxmlDocument,
>> this, MXMLDescriptor);
>> -
>> -                               dispatchEvent(new Event("initBindings"));
>> -                               dispatchEvent(new Event("initComplete"));
>> -                               _initialized = true;
>> -
>> -                               //?? why is this here? childrenAdded();
>> //?? Is this needed since MXMLDataInterpreter will have already called it
>> -                       }
>> -               }
>> -
>> -               /**
>> -                *  @copy org.apache.royale.core.Applica
>> tion#MXMLDescriptor
>> -                *
>> -                *  @langversion 3.0
>> -                *  @playerversion Flash 10.2
>> -                *  @playerversion AIR 2.6
>> -                *  @productversion Royale 0.8
>> -                */
>> -               public function get MXMLDescriptor():Array
>> -               {
>> -                       return _mxmlDescriptor;
>> -               }
>> -
>> -               /**
>> -                *  @private
>> -                */
>> -               public function setMXMLDescriptor(document:Object,
>> value:Array):void
>> -               {
>> -                       _mxmlDocument = document;
>> -                       _mxmlDescriptor = value;
>> -               }
>> -
>> -               /**
>> -                *  @copy org.apache.royale.core.Applica
>> tion#generateMXMLAttributes()
>> -                *
>> -                *  @langversion 3.0
>> -                *  @playerversion Flash 10.2
>> -                *  @playerversion AIR 2.6
>> -                *  @productversion Royale 0.8
>> -                */
>> -               public function generateMXMLAttributes(data:Array):void
>> -               {
>> -                       MXMLDataInterpreter.generateMXMLProperties(this,
>> data);
>> -               }
>> -
>> -               /**
>> -                *  @copy org.apache.royale.core.ItemRen
>> dererClassFactory#mxmlContent
>> -                *
>> -                *  @langversion 3.0
>> -                *  @playerversion Flash 10.2
>> -                *  @playerversion AIR 2.6
>> -                *  @productversion Royale 0.8
>> -         *
>> -         *  @royalesuppresspublicvarwarning
>> -                */
>> -               public var mxmlContent:Array;
>> -       }
>> -}
>> diff --git 
>> a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/AlertView.as
>> b/frameworks/projects/Basic/src/main/royale/org/apache/royal
>> e/html/beads/AlertView.as
>> index 4a6ed84..74dc371 100644
>> --- a/frameworks/projects/Basic/src/main/royale/org/apache/royal
>> e/html/beads/AlertView.as
>> +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royal
>> e/html/beads/AlertView.as
>> @@ -34,7 +34,7 @@ package org.apache.royale.html.beads
>>     import org.apache.royale.events.CloseEvent;
>>        import org.apache.royale.events.IEventDispatcher;
>>        import org.apache.royale.html.Alert;
>> -    import org.apache.royale.core.Container;
>> +    import org.apache.royale.html.Container;
>>     import org.apache.royale.html.ControlBar;
>>     import org.apache.royale.html.Group;
>>     import org.apache.royale.html.Label;
>> diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royal
>> e/html/beads/ControlBarMeasurementBead.as b/frameworks/projects/Basic/sr
>> c/main/royale/org/apache/royale/html/beads/ControlBarMeasurementBead.as
>> index 2ad8f75..3c5a8e2 100644
>> --- a/frameworks/projects/Basic/src/main/royale/org/apache/royal
>> e/html/beads/ControlBarMeasurementBead.as
>> +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royal
>> e/html/beads/ControlBarMeasurementBead.as
>> @@ -23,7 +23,7 @@ package org.apache.royale.html.beads
>>        import org.apache.royale.core.IMeasurementBead;
>>        import org.apache.royale.core.IStrand;
>>        import org.apache.royale.core.IUIBase;
>> -       import org.apache.royale.core.Container;
>> +       import org.apache.royale.html.Container;
>> 
>>        /**
>>         *  The ControlBarMeasurementBead class measures the size of a
>> org.apache.royale.html.ControlBar
>> diff --git 
>> a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataGridView.as
>> b/frameworks/projects/Basic/src/main/royale/org/apache/royal
>> e/html/beads/DataGridView.as
>> index 6540d86..1ff294b 100644
>> --- a/frameworks/projects/Basic/src/main/royale/org/apache/royal
>> e/html/beads/DataGridView.as
>> +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royal
>> e/html/beads/DataGridView.as
>> @@ -29,7 +29,7 @@ package org.apache.royale.html.beads
>>        import org.apache.royale.core.ValuesManager;
>>        import org.apache.royale.events.Event;
>>        import org.apache.royale.events.IEventDispatcher;
>> -       import org.apache.royale.core.Container;
>> +       import org.apache.royale.html.Container;
>>        import org.apache.royale.html.DataGrid;
>>        import org.apache.royale.html.DataGridButtonBar;
>>        import org.apache.royale.html.beads.layouts.ButtonBarLayout;
>> diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royal
>> e/html/beads/DateChooserView.as b/frameworks/projects/Basic/sr
>> c/main/royale/org/apache/royale/html/beads/DateChooserView.as
>> index cce7944..f254681 100644
>> --- a/frameworks/projects/Basic/src/main/royale/org/apache/royal
>> e/html/beads/DateChooserView.as
>> +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royal
>> e/html/beads/DateChooserView.as
>> @@ -28,7 +28,7 @@ package org.apache.royale.html.beads
>>        import org.apache.royale.core.ValuesManager;
>>        import org.apache.royale.events.Event;
>>        import org.apache.royale.events.IEventDispatcher;
>> -       import org.apache.royale.core.Container;
>> +       import org.apache.royale.html.Container;
>>        import org.apache.royale.html.Group;
>>        import org.apache.royale.html.List;
>>        import org.apache.royale.html.TextButton;
>> diff --git 
>> a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/IDataGridView.as
>> b/frameworks/projects/Basic/src/main/royale/org/apache/royal
>> e/html/beads/IDataGridView.as
>> index ddd5036..7eeba64 100644
>> --- a/frameworks/projects/Basic/src/main/royale/org/apache/royal
>> e/html/beads/IDataGridView.as
>> +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royal
>> e/html/beads/IDataGridView.as
>> @@ -20,7 +20,7 @@ package org.apache.royale.html.beads
>> {
>>        import org.apache.royale.core.IBeadView;
>>        import org.apache.royale.core.IUIBase;
>> -       import org.apache.royale.core.Container;
>> +       import org.apache.royale.html.Container;
>> 
>>        /**
>>         *  The IDataGridView interface marks as a component as being the
>> bead that
>> diff --git 
>> a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/PanelView.as
>> b/frameworks/projects/Basic/src/main/royale/org/apache/royal
>> e/html/beads/PanelView.as
>> index 44b1007..1adb9d5 100644
>> --- a/frameworks/projects/Basic/src/main/royale/org/apache/royal
>> e/html/beads/PanelView.as
>> +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royal
>> e/html/beads/PanelView.as
>> @@ -37,7 +37,7 @@ package org.apache.royale.html.beads
>>        import org.apache.royale.geom.Rectangle;
>>        import org.apache.royale.geom.Size;
>>        import org.apache.royale.html.Group;
>> -       import org.apache.royale.core.Container;
>> +       import org.apache.royale.html.Container;
>>        import org.apache.royale.html.Panel;
>>        import org.apache.royale.html.TitleBar;
>>        import org.apache.royale.utils.CSSUtils;
>> diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royal
>> e/html/beads/PanelWithControlBarView.as b/frameworks/projects/Basic/sr
>> c/main/royale/org/apache/royale/html/beads/PanelWithControlBarView.as
>> index 8b07778..ff0c4ae 100644
>> --- a/frameworks/projects/Basic/src/main/royale/org/apache/royal
>> e/html/beads/PanelWithControlBarView.as
>> +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royal
>> e/html/beads/PanelWithControlBarView.as
>> @@ -32,7 +32,7 @@ package org.apache.royale.html.beads
>>        import org.apache.royale.events.IEventDispatcher;
>>        import org.apache.royale.geom.Rectangle;
>>        import org.apache.royale.geom.Size;
>> -       import org.apache.royale.core.Container;
>> +       import org.apache.royale.html.Container;
>>        import org.apache.royale.html.Panel;
>>        import org.apache.royale.html.ControlBar;
>>        import org.apache.royale.html.TitleBar;
>> diff --git 
>> a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TreeGridView.as
>> b/frameworks/projects/Basic/src/main/royale/org/apache/royal
>> e/html/beads/TreeGridView.as
>> index fc7dd7e..89ea5ad 100644
>> --- a/frameworks/projects/Basic/src/main/royale/org/apache/royal
>> e/html/beads/TreeGridView.as
>> +++ b/frameworks/projects/Basic/src/main/royale/org/apache/royal
>> e/html/beads/TreeGridView.as
>> @@ -31,7 +31,7 @@ package org.apache.royale.html.beads
>>        import org.apache.royale.core.ValuesManager;
>>        import org.apache.royale.events.Event;
>>        import org.apache.royale.events.IEventDispatcher;
>> -       import org.apache.royale.core.Container;
>> +       import org.apache.royale.html.Container;
>>        import org.apache.royale.html.DataGridButtonBar;
>>        import org.apache.royale.html.List;
>>        import org.apache.royale.html.Tree;
>> diff --git a/mustella/tests/basicTests/shim/VBox.as
>> b/mustella/tests/basicTests/shim/VBox.as
>> index d5f318b..eaac084 100644
>> --- a/mustella/tests/basicTests/shim/VBox.as
>> +++ b/mustella/tests/basicTests/shim/VBox.as
>> @@ -18,7 +18,7 @@
>> ///////////////////////////////////////////////////////////
>> /////////////////////
>> package shim
>> {
>> -       import org.apache.royale.core.Container;
>> +       import org.apache.royale.html.Container;
>>        import org.apache.royale.html.beads.layouts.VerticalLayout;
>> 
>>        [DefaultProperty("mxmlContent")]
>> 
>> --
>> To stop receiving notification emails like this one, please contact
>> [email protected].
>> 
> 
> 
> 
> -- 
> Carlos Rovira
> http://about.me/carlosrovira

Reply via email to