You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2017/02/09 05:45:42 UTC
[50/50] [abbrv] git commit: [flex-asjs] [refs/heads/dual] - remove
wrapped components from HTML to make sure we are relying on Basic
remove wrapped components from HTML to make sure we are relying on Basic
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d89659f5
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d89659f5
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d89659f5
Branch: refs/heads/dual
Commit: d89659f595d3221ad5f9d5c28e6d51719df81f30
Parents: 83ed677
Author: Alex Harui <ah...@apache.org>
Authored: Wed Feb 8 21:43:00 2017 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Feb 8 21:43:00 2017 -0800
----------------------------------------------------------------------
frameworks/build.xml | 2 +-
.../src/main/config/compile-js-config.xml | 6 +-
.../flex/org/apache/flex/html/BinaryImage.as | 89 ++
.../apache/flex/html/beads/BinaryImageLoader.as | 121 ++
.../flex/html/beads/models/BinaryImageModel.as | 86 ++
.../Basic/src/main/resources/basic-manifest.xml | 1 +
.../HTML/src/main/config/compile-as-config.xml | 7 +-
.../flex/org/apache/flex/core/Application.as | 592 --------
.../org/apache/flex/core/ApplicationBase.as | 109 --
.../flex/org/apache/flex/core/ContainerBase.as | 453 ------
.../flex/core/ContainerBaseStrandChildren.as | 99 --
.../org/apache/flex/core/FilledRectangle.as | 125 --
.../apache/flex/core/IScrollingLayoutParent.as | 68 -
.../main/flex/org/apache/flex/core/ImageBase.as | 84 --
.../main/flex/org/apache/flex/core/ListBase.as | 134 --
.../apache/flex/core/ListBaseStrandChildren.as | 100 --
.../org/apache/flex/core/SimpleApplication.as | 104 --
.../main/flex/org/apache/flex/core/UIBase.as | 1408 ------------------
.../flex/org/apache/flex/core/UIButtonBase.as | 792 ----------
.../src/main/flex/org/apache/flex/core/View.as | 34 -
.../main/flex/org/apache/flex/core/ViewBase.as | 105 --
.../org/apache/flex/events/ItemAddedEvent.as | 89 --
.../org/apache/flex/events/ItemClickedEvent.as | 116 --
.../org/apache/flex/events/ItemRemovedEvent.as | 89 --
.../org/apache/flex/events/ItemRendererEvent.as | 91 --
.../src/main/flex/org/apache/flex/html/Alert.as | 320 ----
.../flex/org/apache/flex/html/BinaryImage.as | 89 --
.../main/flex/org/apache/flex/html/Button.as | 86 --
.../main/flex/org/apache/flex/html/ButtonBar.as | 77 -
.../flex/org/apache/flex/html/ButtonBase.as | 101 --
.../main/flex/org/apache/flex/html/CheckBox.as | 189 ---
.../flex/org/apache/flex/html/CloseButton.as | 67 -
.../main/flex/org/apache/flex/html/ComboBox.as | 119 --
.../main/flex/org/apache/flex/html/Container.as | 116 --
.../flex/org/apache/flex/html/ControlBar.as | 100 --
.../main/flex/org/apache/flex/html/DataGrid.as | 183 ---
.../org/apache/flex/html/DataGridButtonBar.as | 51 -
.../flex/html/DataGridButtonBarTextButton.as | 55 -
.../flex/org/apache/flex/html/DateChooser.as | 77 -
.../main/flex/org/apache/flex/html/DateField.as | 96 --
.../flex/org/apache/flex/html/DropDownList.as | 236 ---
.../src/main/flex/org/apache/flex/html/Form.as | 100 --
.../flex/org/apache/flex/html/HContainer.as | 62 -
.../src/main/flex/org/apache/flex/html/HRule.as | 64 -
.../src/main/flex/org/apache/flex/html/Image.as | 82 -
.../org/apache/flex/html/ImageAndTextButton.as | 129 --
.../flex/org/apache/flex/html/ImageButton.as | 91 --
.../src/main/flex/org/apache/flex/html/Label.as | 195 ---
.../src/main/flex/org/apache/flex/html/List.as | 319 ----
.../flex/org/apache/flex/html/MXMLBeadView.as | 317 ----
.../main/flex/org/apache/flex/html/Module.as | 4 +-
.../flex/org/apache/flex/html/MultilineLabel.as | 77 -
.../flex/org/apache/flex/html/NumericStepper.as | 203 ---
.../src/main/flex/org/apache/flex/html/Panel.as | 122 --
.../org/apache/flex/html/PanelWithControlBar.as | 122 --
.../flex/org/apache/flex/html/RadioButton.as | 351 -----
.../flex/org/apache/flex/html/RangeStepper.as | 70 -
.../flex/org/apache/flex/html/SimpleAlert.as | 141 --
.../flex/org/apache/flex/html/SimpleList.as | 80 -
.../main/flex/org/apache/flex/html/Slider.as | 199 ---
.../main/flex/org/apache/flex/html/Spacer.as | 65 -
.../main/flex/org/apache/flex/html/Spinner.as | 167 ---
.../main/flex/org/apache/flex/html/TextArea.as | 127 --
.../flex/org/apache/flex/html/TextButton.as | 140 --
.../main/flex/org/apache/flex/html/TextInput.as | 188 ---
.../main/flex/org/apache/flex/html/TitleBar.as | 147 --
.../org/apache/flex/html/ToggleTextButton.as | 209 ---
.../main/flex/org/apache/flex/html/ToolTip.as | 61 -
.../src/main/flex/org/apache/flex/html/Tree.as | 74 -
.../flex/org/apache/flex/html/VContainer.as | 63 -
.../src/main/flex/org/apache/flex/html/VRule.as | 69 -
.../flex/org/apache/flex/html/WebBrowser.as | 146 --
.../accessories/NumericOnlyTextInputBead.as | 202 ---
.../flex/html/accessories/PasswordInputBead.as | 102 --
.../flex/html/accessories/TextPromptBead.as | 153 --
.../apache/flex/html/accessories/ToolTipBead.as | 141 --
.../flex/html/beads/AlertMeasurementBead.as | 88 --
.../org/apache/flex/html/beads/AlertView.as | 228 ---
.../flex/html/beads/BackgroundImageBead.as | 112 --
.../apache/flex/html/beads/BinaryImageLoader.as | 121 --
.../org/apache/flex/html/beads/ButtonBarView.as | 70 -
.../org/apache/flex/html/beads/CSSButtonView.as | 171 ---
.../html/beads/CSSImageAndTextButtonView.as | 373 -----
.../apache/flex/html/beads/CSSTextButtonView.as | 351 -----
.../flex/html/beads/CSSTextToggleButtonView.as | 106 --
.../org/apache/flex/html/beads/CheckBoxView.as | 300 ----
.../apache/flex/html/beads/CloseButtonView.as | 104 --
.../org/apache/flex/html/beads/ComboBoxView.as | 207 ---
.../org/apache/flex/html/beads/ContainerView.as | 555 -------
.../html/beads/ControlBarMeasurementBead.as | 116 --
.../flex/html/beads/DataGridColumnView.as | 102 --
.../apache/flex/html/beads/DataGridLinesBead.as | 199 ---
.../org/apache/flex/html/beads/DataGridView.as | 281 ----
.../DataItemRendererFactoryForArrayData.as | 177 ---
.../DataItemRendererFactoryForArrayList.as | 194 ---
.../DataItemRendererFactoryForColumnData.as | 142 --
...ataItemRendererFactoryForHierarchicalData.as | 113 --
.../html/beads/DataProviderChangeNotifier.as | 194 ---
.../apache/flex/html/beads/DateChooserView.as | 213 ---
.../org/apache/flex/html/beads/DateFieldView.as | 193 ---
.../flex/html/beads/DecrementButtonView.as | 94 --
.../flex/html/beads/DownArrowButtonView.as | 116 --
.../apache/flex/html/beads/DropDownListView.as | 300 ----
.../org/apache/flex/html/beads/HRuleView.as | 88 --
.../flex/html/beads/HScrollBarThumbView.as | 125 --
.../flex/html/beads/HScrollBarTrackView.as | 124 --
.../apache/flex/html/beads/HScrollBarView.as | 105 --
.../apache/flex/html/beads/IBackgroundBead.as | 35 -
.../org/apache/flex/html/beads/IBorderBead.as | 35 -
.../org/apache/flex/html/beads/IComboBoxView.as | 76 -
.../org/apache/flex/html/beads/IDataGridView.as | 36 -
.../apache/flex/html/beads/IDropDownListView.as | 57 -
.../apache/flex/html/beads/IGraphicsDrawing.as | 36 -
.../org/apache/flex/html/beads/IListView.as | 48 -
.../apache/flex/html/beads/IScrollBarView.as | 80 -
.../org/apache/flex/html/beads/ISliderView.as | 55 -
.../org/apache/flex/html/beads/ISpinnerView.as | 69 -
.../apache/flex/html/beads/ITextFieldView.as | 44 -
.../apache/flex/html/beads/ITextItemRenderer.as | 45 -
.../flex/html/beads/ImageAndTextButtonView.as | 279 ----
.../apache/flex/html/beads/ImageButtonView.as | 162 --
.../org/apache/flex/html/beads/ImageView.as | 47 -
.../flex/html/beads/IncrementButtonView.as | 94 --
.../flex/html/beads/LeftArrowButtonView.as | 117 --
.../flex/org/apache/flex/html/beads/ListView.as | 212 ---
.../flex/html/beads/MultilineTextFieldView.as | 57 -
.../flex/html/beads/NumericStepperView.as | 187 ---
.../org/apache/flex/html/beads/PanelView.as | 169 ---
.../flex/html/beads/PanelWithControlBarView.as | 208 ---
.../apache/flex/html/beads/RadioButtonView.as | 285 ----
.../apache/flex/html/beads/RangeStepperView.as | 158 --
.../flex/html/beads/RightArrowButtonView.as | 117 --
.../org/apache/flex/html/beads/ScrollBarView.as | 217 ---
.../apache/flex/html/beads/SimpleAlertView.as | 151 --
.../flex/html/beads/SingleLineBorderBead.as | 91 --
.../apache/flex/html/beads/SliderThumbView.as | 121 --
.../apache/flex/html/beads/SliderTrackView.as | 121 --
.../org/apache/flex/html/beads/SliderView.as | 190 ---
.../flex/html/beads/SolidBackgroundBead.as | 195 ---
.../org/apache/flex/html/beads/SpinnerView.as | 183 ---
.../org/apache/flex/html/beads/TextAreaView.as | 265 ----
.../html/beads/TextButtonMeasurementBead.as | 86 --
.../apache/flex/html/beads/TextButtonView.as | 222 ---
.../html/beads/TextFieldLabelMeasurementBead.as | 92 --
.../org/apache/flex/html/beads/TextFieldView.as | 55 -
.../apache/flex/html/beads/TextFieldViewBase.as | 412 -----
.../org/apache/flex/html/beads/TextInputView.as | 136 --
.../flex/html/beads/TextInputWithBorderView.as | 101 --
.../TextItemRendererFactoryForArrayData.as | 163 --
...extItemRendererFactoryForStringVectorData.as | 143 --
.../flex/html/beads/TitleBarMeasurementBead.as | 108 --
.../apache/flex/html/beads/TitleBarView.mxml | 58 -
.../apache/flex/html/beads/UpArrowButtonView.as | 117 --
.../org/apache/flex/html/beads/VRuleView.as | 88 --
.../flex/html/beads/VScrollBarThumbView.as | 120 --
.../flex/html/beads/VScrollBarTrackView.as | 123 --
.../apache/flex/html/beads/VScrollBarView.as | 123 --
.../apache/flex/html/beads/WebBrowserView.as | 199 ---
.../html/beads/controllers/AlertController.as | 90 --
.../controllers/ButtonAutoRepeatController.as | 147 --
.../beads/controllers/ComboBoxController.as | 80 -
.../controllers/DateChooserMouseController.as | 125 --
.../controllers/DateFieldMouseController.as | 166 ---
.../beads/controllers/DropDownListController.as | 116 --
.../EditableTextKeyboardController.as | 86 --
.../controllers/HScrollBarMouseController.as | 101 --
.../controllers/ItemRendererMouseController.as | 209 ---
.../ListSingleSelectionMouseController.as | 153 --
.../controllers/RangeStepperMouseController.as | 94 --
.../controllers/ScrollBarMouseControllerBase.as | 184 ---
.../beads/controllers/SliderMouseController.as | 285 ----
.../beads/controllers/SpinnerMouseController.as | 124 --
.../TreeSingleSelectionMouseController.as | 86 --
.../controllers/VScrollBarMouseController.as | 101 --
.../flex/html/beads/layouts/BasicLayout.as | 448 ------
.../flex/html/beads/layouts/ButtonBarLayout.as | 143 --
.../flex/html/beads/layouts/DataGridLayout.as | 216 ---
.../beads/layouts/DataGridPercentageLayout.as | 224 ---
.../FlexibleFirstChildHorizontalLayout.as | 247 ---
.../flex/html/beads/layouts/HScrollBarLayout.as | 123 --
.../html/beads/layouts/HorizontalFlowLayout.as | 288 ----
.../flex/html/beads/layouts/HorizontalLayout.as | 332 -----
.../flex/html/beads/layouts/IDataGridLayout.as | 52 -
.../html/beads/layouts/LayoutChangeNotifier.as | 103 --
.../layouts/OneFlexibleChildHorizontalLayout.as | 346 -----
.../layouts/OneFlexibleChildVerticalLayout.as | 494 ------
.../flex/html/beads/layouts/TileLayout.as | 254 ----
.../flex/html/beads/layouts/VScrollBarLayout.as | 124 --
.../html/beads/layouts/VerticalColumnLayout.as | 202 ---
.../flex/html/beads/layouts/VerticalLayout.as | 363 -----
.../apache/flex/html/beads/models/AlertModel.as | 288 ----
.../beads/models/ArrayListSelectionModel.as | 244 ---
.../html/beads/models/ArraySelectionModel.as | 243 ---
.../flex/html/beads/models/BinaryImageModel.as | 86 --
.../flex/html/beads/models/ComboBoxModel.as | 100 --
.../flex/html/beads/models/DataGridModel.as | 71 -
.../beads/models/DataGridPresentationModel.as | 88 --
.../flex/html/beads/models/DateChooserModel.as | 289 ----
.../flex/html/beads/models/ImageAndTextModel.as | 77 -
.../apache/flex/html/beads/models/ImageModel.as | 90 --
.../html/beads/models/ListPresentationModel.as | 107 --
.../apache/flex/html/beads/models/PanelModel.as | 158 --
.../apache/flex/html/beads/models/RangeModel.as | 222 ---
.../html/beads/models/RangeModelExtended.as | 101 --
.../flex/html/beads/models/ScrollBarModel.as | 98 --
.../html/beads/models/SingleLineBorderModel.as | 85 --
.../html/beads/models/StringSelectionModel.as | 221 ---
.../apache/flex/html/beads/models/TextModel.as | 125 --
.../flex/html/beads/models/TitleBarModel.as | 136 --
.../flex/html/beads/models/ToggleButtonModel.as | 145 --
.../html/beads/models/ValueToggleButtonModel.as | 123 --
.../flex/html/beads/models/ViewportModel.as | 72 -
.../flex/html/beads/models/WebBrowserModel.as | 100 --
.../apache/flex/html/supportClasses/Border.as | 49 -
.../ButtonBarButtonItemRenderer.as | 145 --
.../flex/html/supportClasses/CheckBoxIcon.as | 92 --
.../html/supportClasses/ClippingViewport.as | 137 --
.../flex/html/supportClasses/ComboBoxList.as | 62 -
.../html/supportClasses/ContainerContentArea.as | 90 --
.../DataGridButtonBarButtonItemRenderer.as | 81 -
.../flex/html/supportClasses/DataGridColumn.as | 127 --
.../html/supportClasses/DataGridColumnList.as | 61 -
.../flex/html/supportClasses/DataGroup.as | 122 --
.../html/supportClasses/DataItemRenderer.as | 179 ---
.../html/supportClasses/DateChooserButton.as | 67 -
.../html/supportClasses/DateHeaderButton.as | 48 -
.../html/supportClasses/DropDownListList.as | 63 -
.../html/supportClasses/GraphicsItemRenderer.as | 316 ----
.../flex/html/supportClasses/HScrollBar.as | 49 -
.../html/supportClasses/MXMLItemRenderer.as | 83 --
.../flex/html/supportClasses/RadioButtonIcon.as | 111 --
.../flex/html/supportClasses/ScrollBar.as | 50 -
.../html/supportClasses/ScrollingViewport.as | 354 -----
.../flex/html/supportClasses/SpinnerButton.as | 31 -
.../html/supportClasses/StringItemRenderer.as | 180 ---
.../supportClasses/TextFieldItemRenderer.as | 555 -------
.../html/supportClasses/TreeItemRenderer.as | 64 -
.../flex/html/supportClasses/TreeListData.as | 76 -
.../html/supportClasses/UIItemRendererBase.as | 302 ----
.../flex/html/supportClasses/VScrollBar.as | 49 -
.../apache/flex/html/supportClasses/Viewport.as | 151 --
.../flex/org/apache/flex/svg/BinaryImage.as | 87 --
.../src/main/flex/org/apache/flex/svg/Circle.as | 119 --
.../flex/org/apache/flex/svg/CompoundGraphic.as | 584 --------
.../main/flex/org/apache/flex/svg/DOMWrapper.as | 56 -
.../main/flex/org/apache/flex/svg/Ellipse.as | 171 ---
.../org/apache/flex/svg/GraphicContainer.as | 209 ---
.../flex/org/apache/flex/svg/GraphicShape.as | 233 ---
.../src/main/flex/org/apache/flex/svg/Image.as | 133 --
.../src/main/flex/org/apache/flex/svg/Path.as | 133 --
.../src/main/flex/org/apache/flex/svg/Rect.as | 162 --
.../src/main/flex/org/apache/flex/svg/Text.as | 150 --
.../main/flex/org/apache/flex/svg/TextButton.as | 30 -
.../flex/org/apache/flex/svg/beads/ImageView.as | 87 --
254 files changed, 303 insertions(+), 38818 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d89659f5/frameworks/build.xml
----------------------------------------------------------------------
diff --git a/frameworks/build.xml b/frameworks/build.xml
index d9450bf..5eb0e65 100644
--- a/frameworks/build.xml
+++ b/frameworks/build.xml
@@ -81,8 +81,8 @@
<antcall target="Graphics"/>
<antcall target="Binding"/>
<antcall target="Collections"/>
- <antcall target="HTML"/>
<antcall target="Basic"/>
+ <antcall target="HTML"/>
<antcall target="Effects"/>
<antcall target="Flat"/>
<antcall target="Charts"/>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d89659f5/frameworks/js/FlexJS/projects/HTMLJS/src/main/config/compile-js-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/projects/HTMLJS/src/main/config/compile-js-config.xml b/frameworks/js/FlexJS/projects/HTMLJS/src/main/config/compile-js-config.xml
index 4a555f0..bf01ba5 100644
--- a/frameworks/js/FlexJS/projects/HTMLJS/src/main/config/compile-js-config.xml
+++ b/frameworks/js/FlexJS/projects/HTMLJS/src/main/config/compile-js-config.xml
@@ -57,6 +57,7 @@
<path-element>../../../../../libs/CoreJS.swc</path-element>
<path-element>../../../../../libs/GraphicsJS.swc</path-element>
<path-element>../../../../../libs/CollectionsJS.swc</path-element>
+ <path-element>../../../../../libs/BasicJS.swc</path-element>
</library-path>
<namespaces>
@@ -64,10 +65,6 @@
<uri>library://ns.apache.org/flexjs/basic</uri>
<manifest>../../../../../../../projects/HTML/src/main/resources/basic-manifest.xml</manifest>
</namespace>
- <namespace>
- <uri>library://ns.apache.org/flexjs/svg</uri>
- <manifest>../../../../../../../projects/HTML/src/main/resources/svg-manifest.xml</manifest>
- </namespace>
</namespaces>
<source-path>
@@ -89,7 +86,6 @@
<include-namespaces>
<uri>library://ns.apache.org/flexjs/basic</uri>
- <uri>library://ns.apache.org/flexjs/svg</uri>
</include-namespaces>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d89659f5/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/BinaryImage.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/BinaryImage.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/BinaryImage.as
new file mode 100644
index 0000000..ce95b09
--- /dev/null
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/BinaryImage.as
@@ -0,0 +1,89 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.flex.html
+{
+ import org.apache.flex.core.IBinaryImage;
+ import org.apache.flex.core.IBinaryImageModel;
+ import org.apache.flex.core.ValuesManager;
+ import org.apache.flex.core.IBinaryImageLoader;
+ import org.apache.flex.utils.BinaryData;
+
+
+ /**
+ * The Image class is a component that displays a bitmap. The Image uses
+ * the following beads:
+ *
+ * org.apache.flex.core.IBeadModel: the data model for the Image, including the url/binary property.
+ * org.apache.flex.core.IBeadView: constructs the visual elements of the component.
+ *
+ * @toplevel
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class BinaryImage extends Image implements IBinaryImage
+ {
+ /**
+ * constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function BinaryImage()
+ {
+ super();
+ }
+
+ override public function addedToParent():void
+ {
+ var c:Class = ValuesManager.valuesImpl.getValue(this, "iBinaryImageLoader") as Class;
+ if (c)
+ {
+ if (c)
+ {
+ var loader:IBinaryImageLoader = (new c()) as IBinaryImageLoader;
+ addBead(loader);
+ }
+ }
+ super.addedToParent();
+ }
+
+ /**
+ * The binary bitmap data.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ * @flexjsignorecoercion org.apache.flex.core.IImageModel
+ */
+ public function get binary():BinaryData
+ {
+ return (model as IBinaryImageModel).binary;
+ }
+ public function set binary(value:BinaryData):void
+ {
+ (model as IBinaryImageModel).binary = value;
+ }
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d89659f5/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/BinaryImageLoader.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/BinaryImageLoader.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/BinaryImageLoader.as
new file mode 100644
index 0000000..0e429d3
--- /dev/null
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/BinaryImageLoader.as
@@ -0,0 +1,121 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.flex.html.beads
+{
+ import org.apache.flex.core.CallLaterBead;
+ import org.apache.flex.core.IBeadModel;
+ import org.apache.flex.core.IBinaryImageLoader;
+ import org.apache.flex.core.IBinaryImageModel;
+ import org.apache.flex.core.IImageView;
+ import org.apache.flex.core.IStrand;
+ import org.apache.flex.core.ValuesManager;
+ import org.apache.flex.events.Event;
+
+ COMPILE::JS
+ {
+ import goog.events;
+ import org.apache.flex.utils.URLUtils;
+ import org.apache.flex.core.IBinaryImage;
+ }
+
+
+ /**
+ * The ImageView class creates the visual elements of the org.apache.flex.html.Image component.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class BinaryImageLoader implements IBinaryImageLoader
+ {
+ /**
+ * constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function BinaryImageLoader()
+ {
+ }
+
+ private var _objectURL:String;
+ private var _strand:IStrand;
+
+ private function get model():IBinaryImageModel
+ {
+ var result:IBinaryImageModel = _strand.getBeadByType(IBinaryImageModel) as IBinaryImageModel;
+ if (!result && _strand)
+ {
+ var c:Class = ValuesManager.valuesImpl.getValue(_strand, "iBeadModel") as Class;
+ var model:IBinaryImageModel = new c as IBinaryImageModel;
+ _strand.addBead(model);
+ result = model;
+ }
+ return result;
+ }
+
+ /**
+ * @copy org.apache.flex.core.IBead#strand
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function set strand(value:IStrand):void
+ {
+ _strand = value;
+ model.addEventListener("binaryChanged", handleBinaryChange);
+ }
+
+ /**
+ * @private
+ * @flexjsignorecoercion Object
+ * @flexjsignorecoercion UIBase
+ */
+ private function handleBinaryChange(event:Event):void
+ {
+ var m:IBinaryImageModel = model;
+ var imageView:IImageView = _strand.getBeadByType(IImageView) as IImageView;
+ COMPILE::SWF
+ {
+ if (m.binary) {
+ imageView.setupLoader();
+ imageView.loader.loadBytes(m.binary.array);
+ }
+ }
+ COMPILE::JS
+ {
+ if (m.binary) {
+ imageView.setupLoader();
+ if(_objectURL)
+ URLUtils.revokeObjectURL(_objectURL);
+ var blob:Blob = new Blob([m.binary.array]);
+// I don't think we need to specify the type.
+// var blob = new Blob([response], {type: "image/png"});
+ _objectURL = URLUtils.createObjectURL(blob);
+ (_strand as IBinaryImage).applyImageData(_objectURL);
+ }
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d89659f5/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/BinaryImageModel.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/BinaryImageModel.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/BinaryImageModel.as
new file mode 100644
index 0000000..1ec5372
--- /dev/null
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/html/beads/models/BinaryImageModel.as
@@ -0,0 +1,86 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// 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.flex.html.beads.models
+{
+ import org.apache.flex.core.IBinaryImageModel;
+ import org.apache.flex.core.IStrand;
+ import org.apache.flex.events.Event;
+ import org.apache.flex.events.EventDispatcher;
+ import org.apache.flex.utils.BinaryData;
+
+ /**
+ * The ImageModel class bead defines the data associated with an org.apache.flex.html.Image
+ * component, namely the source of the image.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public class BinaryImageModel extends ImageModel implements IBinaryImageModel
+ {
+ /**
+ * constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.7
+ */
+ public function BinaryImageModel()
+ {
+ super();
+ }
+
+ private var _binary:BinaryData;
+
+ override public function set url(value:String):void
+ {
+ if (value && value != _url)
+ _binary = null;
+
+ super.url = value;
+ }
+
+ /**
+ * The BinaryData of the image.
+ * This is used to set the image using binary content retrieved using HTTP requests or File APIs.
+ *
+ * @copy org.apache.flex.core.IImageModel#binary
+ *
+ * @langversion 3.0
+ * @playerversion Flash 10.2
+ * @playerversion AIR 2.6
+ * @productversion FlexJS 0.0
+ */
+ public function get binary():BinaryData
+ {
+ return _binary;
+ }
+ public function set binary(value:BinaryData):void
+ {
+ if (value != _binary) {
+ _binary = value;
+ if(value)
+ _url = "";
+ dispatchEvent( new Event("binaryChanged") );
+ }
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d89659f5/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
index efeec04..02a707d 100644
--- a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
+++ b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
@@ -30,6 +30,7 @@
<component id="DropDownList" class="org.apache.flex.html.DropDownList"/>
<component id="DropDownListList" class="org.apache.flex.html.supportClasses.DropDownListList"/>
<component id="Image" class="org.apache.flex.html.Image"/>
+ <component id="BinaryImage" class="org.apache.flex.html.BinaryImage"/>
<component id="Label" class="org.apache.flex.html.Label"/>
<component id="MultilineLabel" class="org.apache.flex.html.MultilineLabel"/>
<component id="ImageAndTextButton" class="org.apache.flex.html.ImageAndTextButton"/>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d89659f5/frameworks/projects/HTML/src/main/config/compile-as-config.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/config/compile-as-config.xml b/frameworks/projects/HTML/src/main/config/compile-as-config.xml
index 0f0bbae..a3d2ff6 100644
--- a/frameworks/projects/HTML/src/main/config/compile-as-config.xml
+++ b/frameworks/projects/HTML/src/main/config/compile-as-config.xml
@@ -27,8 +27,10 @@
<path-element>../../../../../libs/Core.swc</path-element>
<path-element>../../../../../libs/Graphics.swc</path-element>
<path-element>../../../../../libs/Collections.swc</path-element>
+ <path-element>../../../../../libs/Basic.swc</path-element>
</external-library-path>
+ <allow-subclass-overrides>true</allow-subclass-overrides>
<mxml>
<children-as-data>true</children-as-data>
</mxml>
@@ -53,10 +55,6 @@
<uri>library://ns.apache.org/flexjs/basic</uri>
<manifest>../resources/basic-manifest.xml</manifest>
</namespace>
- <namespace>
- <uri>library://ns.apache.org/flexjs/svg</uri>
- <manifest>../resources/svg-manifest.xml</manifest>
- </namespace>
</namespaces>
<source-path>
@@ -72,7 +70,6 @@
<include-namespaces>
<uri>library://ns.apache.org/flexjs/basic</uri>
- <uri>library://ns.apache.org/flexjs/svg</uri>
</include-namespaces>
<target-player>${playerglobal.version}</target-player>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d89659f5/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
deleted file mode 100644
index da34bc0..0000000
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/Application.as
+++ /dev/null
@@ -1,592 +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.flex.core
-{
-
-
- import org.apache.flex.events.Event;
- import org.apache.flex.events.IEventDispatcher;
- import org.apache.flex.utils.MXMLDataInterpreter;
- import org.apache.flex.utils.Timer;
-
- COMPILE::SWF {
- import flash.display.Stage;
- import flash.display.DisplayObject;
- import flash.display.Graphics;
- import flash.display.Sprite;
- import flash.events.Event;
- import org.apache.flex.events.utils.MouseEventConverter;
- }
-
- //--------------------------------------
- // Events
- //--------------------------------------
-
- /**
- * Dispatched at startup. Attributes and sub-instances of
- * the MXML document have been created and assigned.
- * The component lifecycle is different
- * than the Flex SDK. There is no creationComplete event.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- [Event(name="initialize", type="org.apache.flex.events.Event")]
-
- /**
- * Dispatched at startup before the instances get created.
- * Beads can call preventDefault and defer initialization.
- * This event will be dispatched on every frame until no
- * listeners call preventDefault(), then the initialize()
- * method will be called.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- [Event(name="preinitialize", type="org.apache.flex.events.Event")]
-
- /**
- * Dispatched at startup after the initial view has been
- * put on the display list. This event is sent before
- * applicationComplete is dispatched.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- [Event(name="viewChanged", type="org.apache.flex.events.Event")]
-
- /**
- * Dispatched at startup after the initial view has been
- * put on the display list.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- [Event(name="applicationComplete", type="org.apache.flex.events.Event")]
-
- /**
- * A SWF application must be bootstrapped by a Flash Sprite.
- * The factory class is the default bootstrap.
- *
- * @langversion 3.0
- * @playerversion Flash 9
- * @playerversion AIR 1.1
- * @productversion Flex 3
- */
- [Frame(factoryClass="org.apache.flex.core.ApplicationFactory")]
-
- /**
- * The Application class is the main class and entry point for a FlexJS
- * application. This Application class is different than the
- * Flex SDK's mx:Application or spark:Application in that it does not contain
- * user interface elements. Those UI elements go in the views (ViewBase). This
- * Application class expects there to be a main model, a controller, and
- * an initial view.
- *
- * @toplevel
- * @see ViewBase
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public class Application extends ApplicationBase implements IInitialViewApplication, IStrand, IParent, IEventDispatcher, ISWFApplication, IPopUpHost, IRenderedObject
- {
- /**
- * Constructor.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function Application()
- {
- super();
- }
-
- /**
- * Application wraps the root object.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- COMPILE::SWF
- public function setRoot(r:WrappedMovieClip):void
- {
- element = r;
- element.flexjs_wrapper = this;
- MouseEventConverter.setupAllConverters(r.stage);
- MouseEventConverter.setupAllConverters(r.stage, false);
- initHandler();
- }
-
- COMPILE::SWF
- private function initHandler():void
- {
- if (model is IBead) addBead(model as IBead);
- if (controller is IBead) addBead(controller as IBead);
-
- for each (var bead:IBead in beads)
- addBead(bead);
-
- dispatchEvent(new org.apache.flex.events.Event("beadsAdded"));
-
- if (dispatchEvent(new org.apache.flex.events.Event("preinitialize", false, true)))
- initialize();
- else
- addEventListener(flash.events.Event.ENTER_FRAME, enterFrameHandler);
-
- }
-
- COMPILE::SWF
- private function enterFrameHandler(event:flash.events.Event):void
- {
- if (dispatchEvent(new org.apache.flex.events.Event("preinitialize", false, true)))
- {
- removeEventListener(flash.events.Event.ENTER_FRAME, enterFrameHandler);
- initialize();
- }
- }
-
- /**
- * This method gets called when all preinitialize handlers
- * no longer call preventDefault();
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- * @flexjsignorecoercion org.apache.flex.core.IBead
- */
- protected function initialize():void
- {
- MXMLDataInterpreter.generateMXMLInstances(this, null, MXMLDescriptor);
-
- dispatchEvent(new org.apache.flex.events.Event("initialize"));
-
- if (initialView)
- {
- initialView.applicationModel = model;
- this.addElement(initialView);
-
- COMPILE::SWF
- {
- // if someone has installed a resize listener, fake an event to run it now
- if ($displayObject.stage.hasEventListener("resize"))
- $displayObject.stage.dispatchEvent(new flash.events.Event("resize"));
- else if (initialView is ILayoutChild)
- {
- var ilc:ILayoutChild = initialView as ILayoutChild;
- // otherwise, size once like this
- if (!isNaN(ilc.percentWidth) && !isNaN(ilc.percentHeight))
- ilc.setWidthAndHeight($displayObject.stage.stageWidth, $displayObject.stage.stageHeight, true);
- else if (!isNaN(ilc.percentWidth))
- ilc.setWidth($displayObject.stage.stageWidth);
- else if (!isNaN(ilc.percentHeight))
- ilc.setHeight($displayObject.stage.stageHeight);
- }
- }
- COMPILE::JS
- {
- var baseView:UIBase = initialView as UIBase;
- if (!isNaN(baseView.percentWidth) || !isNaN(baseView.percentHeight)) {
- this.element.style.height = window.innerHeight + 'px';
- this.element.style.width = window.innerWidth + 'px';
- this.initialView.dispatchEvent('sizeChanged'); // kick off layout if % sizes
- }
- }
- COMPILE::SWF
- {
- var bgColor:Object = ValuesManager.valuesImpl.getValue(this, "background-color");
- if (bgColor != null)
- {
- var backgroundColor:uint = ValuesManager.valuesImpl.convertColor(bgColor);
- var graphics:Graphics = Sprite($displayObject).graphics;
- graphics.beginFill(backgroundColor);
- graphics.drawRect(0, 0, initialView.width, initialView.height);
- graphics.endFill();
- }
- }
- dispatchEvent(new org.apache.flex.events.Event("viewChanged"));
- }
- dispatchEvent(new org.apache.flex.events.Event("applicationComplete"));
- }
-
- /**
- * The org.apache.flex.core.IValuesImpl that will
- * determine the default values and other values
- * for the application. The most common choice
- * is org.apache.flex.core.SimpleCSSValuesImpl.
- *
- * @see org.apache.flex.core.SimpleCSSValuesImpl
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function set valuesImpl(value:IValuesImpl):void
- {
- ValuesManager.valuesImpl = value;
- ValuesManager.valuesImpl.init(this);
- }
-
- private var _initialView:IApplicationView;
-
- /**
- * The controller. The controller typically watches
- * the UI for events and updates the model accordingly.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public var controller:Object;
-
- /**
- * An array of data that describes the MXML attributes
- * and tags in an MXML document. This data is usually
- * decoded by an MXMLDataInterpreter
- *
- * @see org.apache.flex.utils.MXMLDataInterpreter
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function get MXMLDescriptor():Array
- {
- return null;
- }
-
- /**
- * An method called by the compiler's generated
- * code to kick off the setting of MXML attribute
- * values and instantiation of child tags.
- *
- * The call has to be made in the generated code
- * in order to ensure that the constructors have
- * completed first.
- *
- * @param data The encoded data representing the
- * MXML attributes.
- *
- * @see org.apache.flex.utils.MXMLDataInterpreter
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function generateMXMLAttributes(data:Array):void
- {
- MXMLDataInterpreter.generateMXMLProperties(this, data);
- }
-
- /**
- * The array property that is used to add additional
- * beads to an MXML tag. From ActionScript, just
- * call addBead directly.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public var beads:Array;
-
- private var _elements:Array;
-
- /**
- * @copy org.apache.flex.core.IParent#addElement()
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- * @flexjsignorecoercion org.apache.flex.core.IUIBase
- * @flexjsignorecoercion HTMLElement
- */
- public function addElement(c:IChild, dispatchEvent:Boolean = true):void
- {
- COMPILE::SWF
- {
- if(_elements == null)
- _elements = [];
- _elements[_elements.length] = c;
- $displayObjectContainer.addChild(c.$displayObject);
- if (c is IUIBase)
- {
- IUIBase(c).addedToParent();
- }
- }
- COMPILE::JS {
- this.element.appendChild(c.element as HTMLElement);
- (c as IUIBase).addedToParent();
- }
- }
-
- /**
- * @copy org.apache.flex.core.IParent#addElementAt()
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- * @flexjsignorecoercion org.apache.flex.core.IUIBase
- */
- public function addElementAt(c:IChild, index:int, dispatchEvent:Boolean = true):void
- {
- COMPILE::SWF
- {
- if(_elements == null)
- _elements = [];
- _elements.splice(index,0,c);
-
- $displayObjectContainer.addChildAt(c.$displayObject,index);
-
- if (c is IUIBase)
- {
- IUIBase(c).addedToParent();
- }
- }
- COMPILE::JS {
- var children:NodeList = internalChildren();
- if (index >= children.length)
- addElement(c);
- else
- {
- element.insertBefore(c.positioner,
- children[index]);
- (c as IUIBase).addedToParent();
- }
-
- }
- }
-
- /**
- * @copy org.apache.flex.core.IParent#getElementAt()
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function getElementAt(index:int):IChild
- {
- COMPILE::SWF
- {
- if(_elements == null)
- return null;
- return _elements[index];
- }
- COMPILE::JS
- {
- var children:NodeList = internalChildren();
- return children[index].flexjs_wrapper;
- }
- }
-
- /**
- * @copy org.apache.flex.core.IParent#getElementIndex()
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function getElementIndex(c:IChild):int
- {
- COMPILE::SWF
- {
- if(_elements == null)
- return -1;
- return _elements.indexOf(c);
- }
- COMPILE::JS {
- var children:NodeList = internalChildren();
- var n:int = children.length;
- for (var i:int = 0; i < n; i++)
- {
- if (children[i] == c.element)
- return i;
- }
- return -1;
- }
- }
-
- /**
- * @copy org.apache.flex.core.IParent#removeElement()
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- * @flexjsignorecoercion HTMLElement
- */
- public function removeElement(c:IChild, dispatchEvent:Boolean = true):void
- {
- COMPILE::SWF
- {
- if(_elements)
- {
- var idx:int = _elements.indexOf(c);
- if(idx>=0)
- _elements.splice(idx,1);
- }
- $displayObjectContainer.removeChild(c.$displayObject as DisplayObject);
- }
- COMPILE::JS
- {
- element.removeChild(c.element as HTMLElement);
- }
- }
-
- /**
- * @copy org.apache.flex.core.IParent#numElements
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function get numElements():int
- {
- COMPILE::SWF
- {
- return _elements ? _elements.length : 0;
- }
- COMPILE::JS
- {
- var children:NodeList = internalChildren();
- return children.length;
- }
- }
-
- /**
- * @return {Object} The array of children.
- */
- COMPILE::JS
- protected function internalChildren():NodeList
- {
- return element.childNodes;
- };
-
- COMPILE::JS
- protected var startupTimer:Timer;
-
- /**
- * @flexjsignorecoercion org.apache.flex.core.IBead
- */
- COMPILE::JS
- public function start():void
- {
- element = document.getElementsByTagName('body')[0];
- element.flexjs_wrapper = this;
- element.className = 'Application';
- positioner = element;
-
- if (model is IBead) addBead(model as IBead);
- if (controller is IBead) addBead(controller as IBead);
-
- for (var index:int in beads) {
- addBead(beads[index]);
- }
-
- dispatchEvent(new org.apache.flex.events.Event("beadsAdded"));
-
- if (dispatchEvent(new org.apache.flex.events.Event("preinitialize", false, true)))
- initialize();
- else {
- startupTimer = new Timer(34, 0);
- startupTimer.addEventListener("timer", handleStartupTimer);
- startupTimer.start();
- }
- }
-
- /**
- * @private
- */
- COMPILE::JS
- protected function handleStartupTimer(event:Event):void
- {
- if (dispatchEvent(new org.apache.flex.events.Event("preinitialize", false, true)))
- {
- startupTimer.stop();
- initialize();
- }
- }
-
- /**
- * The initial view.
- *
- * @see org.apache.flex.core.ViewBase
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function get initialView():IApplicationView
- {
- return _initialView;
- }
-
- public function set initialView(value:IApplicationView):void
- {
- _initialView = value;
- }
-
- COMPILE::SWF
- public function get stage():Stage
- {
- return $displayObject.stage;
- }
-
- COMPILE::SWF
- override public function set width(value:Number):void
- {
- // just eat this.
- // The stageWidth will be set by SWF metadata.
- // Setting this directly doesn't do anything
- }
-
- COMPILE::SWF
- override public function set height(value:Number):void
- {
- // just eat this.
- // The stageWidth will be set by SWF metadata.
- // Setting this directly doesn't do anything
- }
-
- }
-}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d89659f5/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ApplicationBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ApplicationBase.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ApplicationBase.as
deleted file mode 100644
index 0fe63ba..0000000
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ApplicationBase.as
+++ /dev/null
@@ -1,109 +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.flex.core
-{
- COMPILE::SWF {
- import flash.system.ApplicationDomain;
- import flash.utils.getQualifiedClassName;
- }
-
- /**
- * This is a platform-dependent base class
- * for Application
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- COMPILE::SWF
- public class ApplicationBase extends UIHTMLElementWrapper implements IFlexInfo
- {
- /**
- * Constructor.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function ApplicationBase()
- {
- super();
- }
-
- private var _info:Object;
-
- /**
- * An Object containing information generated
- * by the compiler that is useful at startup time.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function info():Object
- {
- if (!_info)
- {
- var mainClassName:String = getQualifiedClassName(this);
- var initClassName:String = "_" + mainClassName + "_FlexInit";
- var c:Class = ApplicationDomain.currentDomain.getDefinition(initClassName) as Class;
- _info = c.info();
- }
- return _info;
- }
- }
-
- COMPILE::JS
- public class ApplicationBase extends UIHTMLElementWrapper implements IFlexInfo
- {
- /**
- * Constructor.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function ApplicationBase()
- {
- super();
- }
-
- private var _info:Object;
-
- /**
- * An Object containing information generated
- * by the compiler that is useful at startup time.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function info():Object
- {
- return _info;
- }
-
-
- }
-}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d89659f5/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ContainerBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ContainerBase.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ContainerBase.as
deleted file mode 100644
index 047b635..0000000
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ContainerBase.as
+++ /dev/null
@@ -1,453 +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.flex.core
-{
- import org.apache.flex.core.IMXMLDocument;
- import org.apache.flex.core.ValuesManager;
- import org.apache.flex.events.Event;
- import org.apache.flex.events.ValueChangeEvent;
- import org.apache.flex.states.State;
- import org.apache.flex.utils.MXMLDataInterpreter;
-
- /**
- * Indicates that the state change has completed. All properties
- * that need to change have been changed, and all transitinos
- * that need to run have completed. However, any deferred work
- * may not be completed, and the screen may not be updated until
- * code stops executing.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- [Event(name="stateChangeComplete", type="org.apache.flex.events.Event")]
-
- /**
- * Indicates that the initialization of the container is complete.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- [Event(name="initComplete", type="org.apache.flex.events.Event")]
-
- /**
- * Indicates that the children of the container is have been added.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- [Event(name="childrenAdded", type="org.apache.flex.events.Event")]
-
- [DefaultProperty("mxmlContent")]
-
- /**
- * The ContainerBase class is the base class for most containers
- * in FlexJS. It is usable as the root tag of MXML
- * documents and UI controls and containers are added to it.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public class ContainerBase extends UIBase implements IMXMLDocument, IStatesObject, IContainer, IContentViewHost
- {
- /**
- * Constructor.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function ContainerBase()
- {
- super();
-
- _strandChildren = new ContainerBaseStrandChildren(this);
- }
-
- private var _strandChildren:ContainerBaseStrandChildren;
-
- /**
- * @private
- */
- public function get strandChildren():IParent
- {
- return _strandChildren;
- }
-
- /**
- * @copy org.apache.flex.core.IParent#getElementAt()
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- override public function getElementAt(index:int):IChild
- {
- var contentView:IParent = view as IParent;
- if (contentView != null) {
- return contentView.getElementAt(index);
- } else {
- return super.getElementAt(index);
- }
- }
-
- /**
- * @private
- */
- override public function getElementIndex(c:IChild):int
- {
- var contentView:IParent = view as IParent;
- if (contentView != null) {
- return contentView.getElementIndex(c);
- } else {
- return super.getElementIndex(c);
- }
- }
-
- /**
- * @private
- */
- override public function addElement(c:IChild, dispatchEvent:Boolean = true):void
- {
- var contentView:IParent = view as IParent;
- if (contentView != null) {
- contentView.addElement(c, dispatchEvent);
- if (dispatchEvent)
- this.dispatchEvent(new Event("childrenAdded"));
- }
- else {
- super.addElement(c);
- }
- }
-
- /**
- * @private
- */
- override public function addElementAt(c:IChild, index:int, dispatchEvent:Boolean = true):void
- {
- var contentView:IParent = view as IParent;
- if (contentView != null) {
- contentView.addElementAt(c, index, dispatchEvent);
- if (dispatchEvent)
- this.dispatchEvent(new Event("childrenAdded"));
- }
- else {
- super.addElementAt(c, index);
- }
- }
-
- /**
- * @private
- */
- override public function removeElement(c:IChild, dispatchEvent:Boolean = true):void
- {
- var contentView:IParent = view as IParent;
- if (contentView != null) {
- contentView.removeElement(c, dispatchEvent);
- if (dispatchEvent)
- this.dispatchEvent(new Event("childrenRemoved"));
- }
- else {
- super.removeElement(c);
- }
- }
-
- /**
- * @private
- */
- public function childrenAdded():void
- {
- dispatchEvent(new Event("childrenAdded"));
- }
-
- /**
- * A ContainerBase doesn't create its children until it is added to
- * a parent.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- 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;
- }
- }
-
- /**
- * @private
- */
- override public function get numElements():int
- {
- var contentView:IParent = view as IParent;
- return contentView != null ? contentView.numElements : super.numElements;
- }
-
-
- /**
- * @private
- * @suppress {undefinedNames}
- * Support strandChildren.
- */
- public function $numElements():int
- {
- return super.numElements();
- }
-
- /**
- * @private
- * @suppress {undefinedNames}
- * Support strandChildren.
- */
- public function $addElement(c:IChild, dispatchEvent:Boolean = true):void
- {
- super.addElement(c, dispatchEvent);
- }
-
- /**
- * @private
- * @suppress {undefinedNames}
- * Support strandChildren.
- */
- public function $addElementAt(c:IChild, index:int, dispatchEvent:Boolean = true):void
- {
- super.addElementAt(c, index, dispatchEvent);
- }
-
- /**
- * @private
- * @suppress {undefinedNames}
- * Support strandChildren.
- */
- public function $removeElement(c:IChild, dispatchEvent:Boolean = true):void
- {
- super.removeElement(c, dispatchEvent);
- }
-
- /**
- * @private
- * @suppress {undefinedNames}
- * Support strandChildren.
- */
- public function $getElementIndex(c:IChild):int
- {
- return super.getElementIndex(c);
- }
-
- /**
- * @private
- * @suppress {undefinedNames}
- * Support strandChildren.
- */
- public function $getElementAt(index:int):IChild
- {
- return super.getElementAt(index);
- }
-
- private var _mxmlDescriptor:Array;
- private var _mxmlDocument:Object = this;
- private var _initialized:Boolean;
-
- /**
- * @copy org.apache.flex.core.Application#MXMLDescriptor
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function get MXMLDescriptor():Array
- {
- return _mxmlDescriptor;
- }
-
- /**
- * @private
- */
- public function setMXMLDescriptor(document:Object, value:Array):void
- {
- _mxmlDocument = document;
- _mxmlDescriptor = value;
- }
-
- /**
- * @copy org.apache.flex.core.Application#generateMXMLAttributes()
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function generateMXMLAttributes(data:Array):void
- {
- MXMLDataInterpreter.generateMXMLProperties(this, data);
- }
-
- /**
- * @copy org.apache.flex.core.ItemRendererClassFactory#mxmlContent
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public var mxmlContent:Array;
-
- private var _states:Array;
-
- /**
- * The array of view states. These should
- * be instances of org.apache.flex.states.State.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function get states():Array
- {
- return _states;
- }
-
- /**
- * @private
- * @flexjsignorecoercion Class
- * @flexjsignorecoercion org.apache.flex.core.IBead
- */
- public function set states(value:Array):void
- {
- _states = value;
- _currentState = _states[0].name;
-
- try{
- if (getBeadByType(IStatesImpl) == null)
- {
- var c:Class = ValuesManager.valuesImpl.getValue(this, "iStatesImpl") as Class;
- var b:Object = new c();
- addBead(b as IBead);
- }
- }
- //TODO: Need to handle this case more gracefully
- catch(e:Error)
- {
- COMPILE::SWF
- {
- trace(e.message);
- }
- }
-
- }
-
- /**
- * <code>true</code> if the array of states
- * contains a state with this name.
- *
- * @param state The state namem.
- * @return True if state in state array
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function hasState(state:String):Boolean
- {
- for each (var s:State in _states)
- {
- if (s.name == state)
- return true;
- }
- return false;
- }
-
- private var _currentState:String;
-
- [Bindable("currentStateChange")]
- /**
- * The name of the current state.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function get currentState():String
- {
- return _currentState;
- }
-
- /**
- * @private
- */
- public function set currentState(value:String):void
- {
- var event:ValueChangeEvent = new ValueChangeEvent("currentStateChange", false, false, _currentState, value)
- _currentState = value;
- dispatchEvent(event);
- }
-
- private var _transitions:Array;
-
- /**
- * The array of transitions.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function get transitions():Array
- {
- return _transitions;
- }
-
- /**
- * @private
- */
- public function set transitions(value:Array):void
- {
- _transitions = value;
- }
-
- }
-}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d89659f5/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ContainerBaseStrandChildren.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ContainerBaseStrandChildren.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ContainerBaseStrandChildren.as
deleted file mode 100644
index e961c1f..0000000
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ContainerBaseStrandChildren.as
+++ /dev/null
@@ -1,99 +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.flex.core
-{
- /**
- * The ContainerBaseStrandChildren class the provides a way for advanced
- * components to place children directly into the strand unlike the
- * addElement() APIs on the Container which place children into the contentView.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public class ContainerBaseStrandChildren implements IParent
- {
- /**
- * Constructor.
- *
- * @flexjsignorecoercion org.apache.flex.core.ContainerBase
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function ContainerBaseStrandChildren(owner:IParent)
- {
- super();
-
- this.owner = owner as ContainerBase;
- }
-
- public var owner:ContainerBase;
-
- /**
- * @private
- */
- public function get numElements():int
- {
- return owner.$numElements();
- }
-
- /**
- * @private
- */
- public function addElement(c:IChild, dispatchEvent:Boolean = true):void
- {
- owner.$addElement(c, dispatchEvent);
- }
-
- /**
- * @private
- */
- public function addElementAt(c:IChild, index:int, dispatchEvent:Boolean = true):void
- {
- owner.$addElementAt(c, index, dispatchEvent);
- }
-
- /**
- * @private
- */
- public function removeElement(c:IChild, dispatchEvent:Boolean = true):void
- {
- owner.$removeElement(c, dispatchEvent);
- }
-
- /**
- * @private
- */
- public function getElementIndex(c:IChild):int
- {
- return owner.$getElementIndex(c);
- }
-
- /**
- * @private
- */
- public function getElementAt(index:int):IChild
- {
- return owner.$getElementAt(index);
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d89659f5/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/FilledRectangle.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/FilledRectangle.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/FilledRectangle.as
deleted file mode 100644
index 5888a94..0000000
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/FilledRectangle.as
+++ /dev/null
@@ -1,125 +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.flex.core
-{
- COMPILE::SWF
- {
- import flash.display.Shape;
- }
-
- import org.apache.flex.core.UIBase;
-
- /**
- * The FilledRectangle class draws a simple filled
- * rectangle without a border and with square corners.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public class FilledRectangle extends UIBase
- {
- /**
- * Constructor.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function FilledRectangle()
- {
- super();
-
- COMPILE::SWF
- {
- _shape = new flash.display.Shape();
- $displayObjectContainer.addChild(_shape);
- }
- }
-
- COMPILE::SWF
- private var _shape:flash.display.Shape;
-
- private var _fillColor:uint = 0x000000;
-
- /**
- * The color of the rectangle.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function get fillColor():uint
- {
- return _fillColor;
- }
-
- /**
- * @private
- */
- public function set fillColor(value:uint):void
- {
- _fillColor = value;
- }
-
- /**
- * @private
- */
- override public function addedToParent():void
- {
- super.addedToParent();
- drawRect(0, 0, this.width, this.height);
- }
-
- /**
- * Draw the rectangle.
- * @param x The x position of the top-left corner of the rectangle.
- * @param y The y position of the top-left corner.
- * @param width The width of the rectangle.
- * @param height The height of the rectangle.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function drawRect(x:Number, y:Number, width:Number, height:Number):void
- {
- COMPILE::SWF
- {
- _shape.graphics.clear();
- _shape.graphics.beginFill(_fillColor);
- _shape.graphics.drawRect(x, y, width, height);
- _shape.graphics.endFill();
- }
- COMPILE::JS
- {
- element.style.position = 'absolute';
- element.style.backgroundColor = '#' + _fillColor.toString(16);
- if (!isNaN(x)) this.x = x;
- if (!isNaN(y)) this.y = y;
- if (!isNaN(width)) this.width = width;
- if (!isNaN(height)) this.height = height;
- }
- }
- }
-}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d89659f5/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/IScrollingLayoutParent.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/IScrollingLayoutParent.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/IScrollingLayoutParent.as
deleted file mode 100644
index 5e9768e..0000000
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/IScrollingLayoutParent.as
+++ /dev/null
@@ -1,68 +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.flex.core
-{
- import org.apache.flex.html.supportClasses.Border;
- import org.apache.flex.html.supportClasses.ScrollBar;
-
- /**
- * The IScrollingLayoutParent interface is an ILayoutParent
- * that has traditional scrollbars. The layout implementation
- * often needs to know certain things about other objects in
- * the component.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public interface IScrollingLayoutParent
- {
- /**
- * The border.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- function get border():Border;
-
- /**
- * The vertical ScrollBar.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- function get vScrollBar():ScrollBar;
-
- /**
- * The horizontal ScrollBar.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- function get hScrollBar():ScrollBar;
-
- }
-}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d89659f5/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ImageBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ImageBase.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ImageBase.as
deleted file mode 100644
index 71454a7..0000000
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ImageBase.as
+++ /dev/null
@@ -1,84 +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.flex.core
-{
- import org.apache.flex.core.IImage;
- import org.apache.flex.core.IImageModel;
- import org.apache.flex.core.UIBase;
-
- /**
- * The ImageBase class serves as a base class for components that displays a bitmap. The Image uses
- * the following beads:
- *
- * org.apache.flex.core.IBeadModel: the data model for the Image, including the url/binary property.
- * org.apache.flex.core.IBeadView: constructs the visual elements of the component.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public class ImageBase extends UIBase implements IImage
- {
- /**
- * constructor.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function ImageBase()
- {
- super();
- }
-
- /**
- * The location of the bitmap, usually a URL.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- * @flexjsignorecoercion org.apache.flex.core.IImageModel
- */
- public function get url():String
- {
- return (model as IImageModel).url;
- }
- public function set url(value:String):void
- {
- (model as IImageModel).url = value;
- }
-
- COMPILE::JS
- public function get imageElement():Element
- {
- return null;
- // override this
- }
-
- COMPILE::JS
- public function applyImageData(binaryDataAsString:String):void
- {
- // override this
- }
-
- }
-}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d89659f5/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ListBase.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ListBase.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ListBase.as
deleted file mode 100644
index 3487822..0000000
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ListBase.as
+++ /dev/null
@@ -1,134 +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.flex.core
-{
- import org.apache.flex.core.IMXMLDocument;
- import org.apache.flex.core.ValuesManager;
- import org.apache.flex.events.Event;
- import org.apache.flex.events.ValueChangeEvent;
- import org.apache.flex.states.State;
- import org.apache.flex.utils.MXMLDataInterpreter;
-
- /**
- * The ListBase class is the base class for most lists
- * in FlexJS.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public class ListBase extends UIBase implements IContentViewHost, ILayoutParent
- {
- /**
- * Constructor.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion FlexJS 0.0
- */
- public function ListBase()
- {
- super();
-
- _strandChildren = new ListBaseStrandChildren(this);
- }
-
- private var _strandChildren:ListBaseStrandChildren;
-
- /**
- * @private
- */
- public function get strandChildren():IParent
- {
- return _strandChildren;
- }
-
- /**
- * @private
- */
- public function getLayoutHost():ILayoutHost
- {
- return view as ILayoutHost;
- }
-
- /**
- * @private
- * @suppress {undefinedNames}
- * Support strandChildren.
- */
- public function $numElements():int
- {
- return super.numElements();
- }
-
-
- /**
- * @private
- * @suppress {undefinedNames}
- * Support strandChildren.
- */
- public function $addElement(c:IChild, dispatchEvent:Boolean = true):void
- {
- super.addElement(c, dispatchEvent);
- }
-
- /**
- * @private
- * @suppress {undefinedNames}
- * Support strandChildren.
- */
- public function $addElementAt(c:IChild, index:int, dispatchEvent:Boolean = true):void
- {
- super.addElementAt(c, index, dispatchEvent);
- }
-
- /**
- * @private
- * @suppress {undefinedNames}
- * Support strandChildren.
- */
- public function $removeElement(c:IChild, dispatchEvent:Boolean = true):void
- {
- super.removeElement(c, dispatchEvent);
- }
-
- /**
- * @private
- * @suppress {undefinedNames}
- * Support strandChildren.
- */
- public function $getElementIndex(c:IChild):int
- {
- return super.getElementIndex(c);
- }
-
- /**
- * @private
- * @suppress {undefinedNames}
- * Support strandChildren.
- */
- public function $getElementAt(index:int):IChild
- {
- return super.getElementAt(index);
- }
-
- }
-}