Updated Branches: refs/heads/develop ff20b3321 -> 2052b633f
remove IInitModel. Models are now initialized on demand Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/4b0994a7 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4b0994a7 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4b0994a7 Branch: refs/heads/develop Commit: 4b0994a72b11bb7204f6a0f0426d3cde108ea950 Parents: ff20b33 Author: Alex Harui <aha...@apache.org> Authored: Fri Jul 12 11:54:16 2013 -0700 Committer: Alex Harui <aha...@apache.org> Committed: Fri Jul 12 11:54:16 2013 -0700 ---------------------------------------------------------------------- frameworks/as/defaults.css | 40 ++++++++++---------- .../as/src/org/apache/flex/core/IInitModel.as | 25 ------------ .../as/src/org/apache/flex/core/UIBase.as | 12 +++--- .../src/org/apache/flex/createjs/core/UIBase.as | 8 +--- .../flex/createjs/staticControls/TextButton.as | 11 +----- .../apache/flex/html/staticControls/Alert.as | 7 ---- .../apache/flex/html/staticControls/Button.as | 8 +--- .../apache/flex/html/staticControls/CheckBox.as | 9 +---- .../apache/flex/html/staticControls/ComboBox.as | 8 +--- .../flex/html/staticControls/DropDownList.as | 8 +--- .../apache/flex/html/staticControls/Label.as | 8 +--- .../org/apache/flex/html/staticControls/List.as | 6 --- .../flex/html/staticControls/NumericStepper.as | 7 ---- .../apache/flex/html/staticControls/Panel.as | 34 ----------------- .../flex/html/staticControls/RadioButton.as | 9 +---- .../flex/html/staticControls/SimpleAlert.as | 7 ---- .../apache/flex/html/staticControls/Spinner.as | 10 +---- .../apache/flex/html/staticControls/TextArea.as | 6 --- .../flex/html/staticControls/TextButton.as | 9 +---- .../flex/html/staticControls/TextInput.as | 6 --- .../apache/flex/html/staticControls/TitleBar.as | 18 +++------ .../flex/html/staticControls/beads/AlertBead.as | 7 ---- .../html/staticControls/beads/ComboBoxBead.as | 5 --- .../staticControls/beads/DropDownListBead.as | 3 -- .../flex/html/staticControls/beads/ListBead.as | 1 - .../staticControls/beads/NumericStepperBead.as | 2 - .../flex/html/staticControls/beads/PanelBead.as | 4 +- .../staticControls/beads/SimpleAlertBead.as | 3 -- .../html/staticControls/beads/TextAreaBead.as | 1 - .../flex/jquery/staticControls/RadioButton.as | 4 -- .../apache/flex/utils/MXMLDataInterpreter.as | 5 +-- 31 files changed, 45 insertions(+), 246 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4b0994a7/frameworks/as/defaults.css ---------------------------------------------------------------------- diff --git a/frameworks/as/defaults.css b/frameworks/as/defaults.css index b5b9f12..cf55157 100644 --- a/frameworks/as/defaults.css +++ b/frameworks/as/defaults.css @@ -57,13 +57,13 @@ Button:active global { ITextBead: ClassReference("org.apache.flex.html.staticControls.beads.TextFieldBead"); - ITextModel: ClassReference("org.apache.flex.html.staticControls.beads.models.TextModel"); + IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.TextModel"); IStatesImpl: ClassReference("org.apache.flex.core.SimpleStatesImpl"); } CheckBox { - IToggleButtonModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ToggleButtonModel"); + IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ToggleButtonModel"); ICheckBoxBead: ClassReference("org.apache.flex.html.staticControls.beads.CheckBoxBead"); } @@ -75,19 +75,19 @@ Container ComboBox { IComboBoxBead: ClassReference("org.apache.flex.html.staticControls.beads.ComboBoxBead"); - IComboBoxModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ComboBoxModel"); + IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ComboBoxModel"); IPopUp: ClassReference("org.apache.flex.html.staticControls.supportClasses.DropDownListList"); } DropDownList { - ISelectionModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ArraySelectionModel"); + IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ArraySelectionModel"); IPopUp: ClassReference("org.apache.flex.html.staticControls.supportClasses.DropDownListList"); } DropDownListList { - ISelectionModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ArraySelectionModel"); + IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ArraySelectionModel"); } Label @@ -99,12 +99,12 @@ Label List { - ISelectionModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ArraySelectionModel"); + IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ArraySelectionModel"); } RadioButton { - IToggleButtonModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ValueToggleButtonModel"); + IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ValueToggleButtonModel"); IRadioButtonBead: ClassReference("org.apache.flex.html.staticControls.beads.RadioButtonBead"); } @@ -123,7 +123,7 @@ TextInput TitleBar { - ITitleBarModel: ClassReference("org.apache.flex.html.staticControls.beads.models.TitleBarModel"); + IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.TitleBarModel"); ILayoutBead: ClassReference("org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout"); iMeasurementBead: ClassReference("org.apache.flex.html.staticControls.beads.TitleBarMeasurementBead"); } @@ -136,7 +136,7 @@ ControlBar Panel { - IPanelModel: ClassReference("org.apache.flex.html.staticControls.beads.models.PanelModel"); + IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.PanelModel"); IPanelBead: ClassReference("org.apache.flex.html.staticControls.beads.PanelBead"); iBorderBead: ClassReference("org.apache.flex.html.staticControls.beads.SingleLineBorderBead"); iBackgroundBead: ClassReference("org.apache.flex.html.staticControls.beads.SolidBackgroundBead"); @@ -149,7 +149,7 @@ Panel SimpleAlert { - iAlertModel: ClassReference("org.apache.flex.html.staticControls.beads.models.AlertModel"); + iBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.AlertModel"); iAlertBead: ClassReference("org.apache.flex.html.staticControls.beads.SimpleAlertBead"); iBorderBead: ClassReference("org.apache.flex.html.staticControls.beads.SingleLineBorderBead"); iBackgroundBead: ClassReference("org.apache.flex.html.staticControls.beads.SolidBackgroundBead"); @@ -162,7 +162,7 @@ SimpleAlert Alert { - iAlertModel: ClassReference("org.apache.flex.html.staticControls.beads.models.AlertModel"); + iBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.AlertModel"); iAlertBead: ClassReference("org.apache.flex.html.staticControls.beads.AlertBead"); iBackgroundBead: ClassReference("org.apache.flex.html.staticControls.beads.SolidBackgroundBead"); iBorderBead: ClassReference("org.apache.flex.html.staticControls.beads.SingleLineBorderBead"); @@ -175,13 +175,13 @@ Alert Spinner { - iSpinnerModel: ClassReference("org.apache.flex.html.staticControls.beads.models.SpinnerModel"); + iBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.SpinnerModel"); iSpinnerBead: ClassReference("org.apache.flex.html.staticControls.beads.SpinnerBead"); } NumericStepper { - iNumericStepperModel: ClassReference("org.apache.flex.html.staticControls.beads.models.SpinnerModel"); + iBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.SpinnerModel"); iNumericStepperBead: ClassReference("org.apache.flex.html.staticControls.beads.NumericStepperBead"); padding: 0px; @@ -207,31 +207,31 @@ h5|TextInput h5|CheckBox { - IToggleButtonModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ToggleButtonModel"); + IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ToggleButtonModel"); ICheckBoxBead: ClassReference("org.apache.flex.html.staticControls.beads.CheckBoxBead"); } h5|RadioButton { - IToggleButtonModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ValueToggleButtonModel"); + IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ValueToggleButtonModel"); IRadioButtonBead: ClassReference("org.apache.flex.html.staticControls.beads.RadioButtonBead"); } h5|List { - ISelectionModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ArraySelectionModel"); + IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ArraySelectionModel"); } h5|DropDownList { - ISelectionModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ArraySelectionModel"); + IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ArraySelectionModel"); IPopUp: ClassReference("org.apache.flex.html.staticControls.supportClasses.DropDownListList"); } h5|ComboBox { IComboBoxBead: ClassReference("org.apache.flex.html.staticControls.beads.ComboBoxBead"); - IComboBoxModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ComboBoxModel"); + IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ComboBoxModel"); IPopUp: ClassReference("org.apache.flex.html.staticControls.supportClasses.DropDownListList"); } @@ -245,13 +245,13 @@ jq|TextButton jq|CheckBox { - IToggleButtonModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ToggleButtonModel"); + IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ToggleButtonModel"); ICheckBoxBead: ClassReference("org.apache.flex.html.staticControls.beads.CheckBoxBead"); } jq|RadioButton { - IToggleButtonModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ValueToggleButtonModel"); + IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ValueToggleButtonModel"); IRadioButtonBead: ClassReference("org.apache.flex.html.staticControls.beads.RadioButtonBead"); } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4b0994a7/frameworks/as/src/org/apache/flex/core/IInitModel.as ---------------------------------------------------------------------- diff --git a/frameworks/as/src/org/apache/flex/core/IInitModel.as b/frameworks/as/src/org/apache/flex/core/IInitModel.as deleted file mode 100644 index 7ed9716..0000000 --- a/frameworks/as/src/org/apache/flex/core/IInitModel.as +++ /dev/null @@ -1,25 +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 -{ - public interface IInitModel - { - function initModel():void; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4b0994a7/frameworks/as/src/org/apache/flex/core/UIBase.as ---------------------------------------------------------------------- diff --git a/frameworks/as/src/org/apache/flex/core/UIBase.as b/frameworks/as/src/org/apache/flex/core/UIBase.as index fc073fa..70bb1b8 100644 --- a/frameworks/as/src/org/apache/flex/core/UIBase.as +++ b/frameworks/as/src/org/apache/flex/core/UIBase.as @@ -24,7 +24,7 @@ package org.apache.flex.core import org.apache.flex.events.Event; import org.apache.flex.events.IEventDispatcher; - public class UIBase extends Sprite implements IInitModel, IStrand, IEventDispatcher, IUIBase + public class UIBase extends Sprite implements IStrand, IEventDispatcher, IUIBase { public function UIBase() { @@ -84,6 +84,11 @@ package org.apache.flex.core private var _model:IBeadModel; public function get model():IBeadModel { + if (_model == null) + { + // addbead will set _model + addBead(new (ValuesManager.valuesImpl.getValue(this, "iBeadModel")) as IBead); + } return _model; } public function set model(value:IBeadModel):void @@ -163,11 +168,6 @@ package org.apache.flex.core return null; } - public function initModel():void - { - - } - public function addToParent(p:Object):void { if (p is UIBase) http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4b0994a7/frameworks/as/src/org/apache/flex/createjs/core/UIBase.as ---------------------------------------------------------------------- diff --git a/frameworks/as/src/org/apache/flex/createjs/core/UIBase.as b/frameworks/as/src/org/apache/flex/createjs/core/UIBase.as index c76d864..20bf5e0 100644 --- a/frameworks/as/src/org/apache/flex/createjs/core/UIBase.as +++ b/frameworks/as/src/org/apache/flex/createjs/core/UIBase.as @@ -20,14 +20,13 @@ package org.apache.flex.createjs.core { import flash.display.DisplayObjectContainer; import flash.display.Sprite; - import org.apache.flex.core.IInitModel; import org.apache.flex.core.IStrand; import org.apache.flex.core.IBeadModel; import org.apache.flex.core.IBead; import org.apache.flex.events.Event; import org.apache.flex.events.IEventDispatcher; - public class UIBase extends Sprite implements IInitModel, IStrand, IEventDispatcher + public class UIBase extends Sprite implements IStrand, IEventDispatcher { public function UIBase() { @@ -138,11 +137,6 @@ package org.apache.flex.createjs.core return null; } - public function initModel():void - { - - } - public function addToParent(p:DisplayObjectContainer):void { p.addChild(this); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4b0994a7/frameworks/as/src/org/apache/flex/createjs/staticControls/TextButton.as ---------------------------------------------------------------------- diff --git a/frameworks/as/src/org/apache/flex/createjs/staticControls/TextButton.as b/frameworks/as/src/org/apache/flex/createjs/staticControls/TextButton.as index c84ea26..74aa8cd 100644 --- a/frameworks/as/src/org/apache/flex/createjs/staticControls/TextButton.as +++ b/frameworks/as/src/org/apache/flex/createjs/staticControls/TextButton.as @@ -22,13 +22,12 @@ package org.apache.flex.createjs.staticControls import org.apache.flex.core.IBead; import org.apache.flex.core.ITextModel; - import org.apache.flex.core.IInitModel; import org.apache.flex.core.IInitSkin; import org.apache.flex.core.ValuesManager; import org.apache.flex.html.staticControls.Button; import org.apache.flex.html.staticControls.beads.ITextButtonBead; - public class TextButton extends Button implements IInitModel, IInitSkin + public class TextButton extends Button implements IInitSkin { public function TextButton(upState:DisplayObject=null, overState:DisplayObject=null, downState:DisplayObject=null, hitTestState:DisplayObject=null) { @@ -52,13 +51,7 @@ package org.apache.flex.createjs.staticControls { ITextModel(model).html = value; } - - override public function initModel():void - { - if (getBeadByType(ITextModel) == null) - addBead(new (ValuesManager.valuesImpl.getValue(this, "iTextModel")) as IBead); - } - + override public function initSkin():void { if (getBeadByType(ITextButtonBead) == null) http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4b0994a7/frameworks/as/src/org/apache/flex/html/staticControls/Alert.as ---------------------------------------------------------------------- diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/Alert.as b/frameworks/as/src/org/apache/flex/html/staticControls/Alert.as index 372dcbe..c7dff7d 100644 --- a/frameworks/as/src/org/apache/flex/html/staticControls/Alert.as +++ b/frameworks/as/src/org/apache/flex/html/staticControls/Alert.as @@ -49,7 +49,6 @@ package org.apache.flex.html.staticControls static public function show( text:String, parent:Object, title:String="", flags:uint=Alert.OK ) : void { var alert:Alert = new Alert(); - alert.initModel(); alert.message = text; alert.title = title; alert.flags = flags; @@ -63,12 +62,6 @@ package org.apache.flex.html.staticControls addToParent(parent); } - override public function initModel():void - { - if (getBeadByType(IAlertModel) == null) - addBead(new (ValuesManager.valuesImpl.getValue(this, "iAlertModel")) as IBead); - } - public function get title():String { return IAlertModel(model).title; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4b0994a7/frameworks/as/src/org/apache/flex/html/staticControls/Button.as ---------------------------------------------------------------------- diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/Button.as b/frameworks/as/src/org/apache/flex/html/staticControls/Button.as index ec51f7e..fb03e01 100644 --- a/frameworks/as/src/org/apache/flex/html/staticControls/Button.as +++ b/frameworks/as/src/org/apache/flex/html/staticControls/Button.as @@ -25,7 +25,6 @@ package org.apache.flex.html.staticControls import org.apache.flex.core.IBead; import org.apache.flex.core.IBeadModel; - import org.apache.flex.core.IInitModel; import org.apache.flex.core.IInitSkin; import org.apache.flex.core.IMeasurementBead; import org.apache.flex.core.IStrand; @@ -37,7 +36,7 @@ package org.apache.flex.html.staticControls [Event(name="click", type="org.apache.flex.events.Event")] - public class Button extends SimpleButton implements IStrand, IInitSkin, IInitModel, IEventDispatcher, IUIBase + public class Button extends SimpleButton implements IStrand, IInitSkin, IEventDispatcher, IUIBase { public function Button(upState:DisplayObject=null, overState:DisplayObject=null, downState:DisplayObject=null, hitTestState:DisplayObject=null) { @@ -181,11 +180,6 @@ package org.apache.flex.html.staticControls return null; } - public function initModel():void - { - - } - public function initSkin():void { _width = $width; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4b0994a7/frameworks/as/src/org/apache/flex/html/staticControls/CheckBox.as ---------------------------------------------------------------------- diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/CheckBox.as b/frameworks/as/src/org/apache/flex/html/staticControls/CheckBox.as index d61015a..8cf36f5 100644 --- a/frameworks/as/src/org/apache/flex/html/staticControls/CheckBox.as +++ b/frameworks/as/src/org/apache/flex/html/staticControls/CheckBox.as @@ -26,7 +26,6 @@ package org.apache.flex.html.staticControls import org.apache.flex.core.IBeadModel; import org.apache.flex.core.ICheckBoxBead; import org.apache.flex.core.IToggleButtonModel; - import org.apache.flex.core.IInitModel; import org.apache.flex.core.IInitSkin; import org.apache.flex.core.IStrand; import org.apache.flex.core.ValuesManager; @@ -34,7 +33,7 @@ package org.apache.flex.html.staticControls [Event(name="change", type="org.apache.flex.events.Event")] - public class CheckBox extends SimpleButton implements IStrand, IInitSkin, IInitModel + public class CheckBox extends SimpleButton implements IStrand, IInitSkin { public function CheckBox(upState:DisplayObject=null, overState:DisplayObject=null, downState:DisplayObject=null, hitTestState:DisplayObject=null) { @@ -62,12 +61,6 @@ package org.apache.flex.html.staticControls IToggleButtonModel(model).selected = value; } - public function initModel():void - { - if (getBeadByType(IToggleButtonModel) == null) - addBead(new (ValuesManager.valuesImpl.getValue(this, "iToggleButtonModel")) as IBead); - } - public function initSkin():void { if (getBeadByType(ICheckBoxBead) == null) http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4b0994a7/frameworks/as/src/org/apache/flex/html/staticControls/ComboBox.as ---------------------------------------------------------------------- diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/ComboBox.as b/frameworks/as/src/org/apache/flex/html/staticControls/ComboBox.as index 303e51d..6753694 100644 --- a/frameworks/as/src/org/apache/flex/html/staticControls/ComboBox.as +++ b/frameworks/as/src/org/apache/flex/html/staticControls/ComboBox.as @@ -61,13 +61,7 @@ package org.apache.flex.html.staticControls { IComboBoxModel(model).selectedItem = value; } - - override public function initModel():void - { - if (getBeadByType(IComboBoxModel) == null) - addBead(new (ValuesManager.valuesImpl.getValue(this, "iComboBoxModel")) as IBead); - } - + public function initSkin():void { if (getBeadByType(IComboBoxBead) == null) { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4b0994a7/frameworks/as/src/org/apache/flex/html/staticControls/DropDownList.as ---------------------------------------------------------------------- diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/DropDownList.as b/frameworks/as/src/org/apache/flex/html/staticControls/DropDownList.as index f824644..52aacce 100644 --- a/frameworks/as/src/org/apache/flex/html/staticControls/DropDownList.as +++ b/frameworks/as/src/org/apache/flex/html/staticControls/DropDownList.as @@ -59,13 +59,7 @@ package org.apache.flex.html.staticControls { ISelectionModel(model).selectedItem = value; } - - override public function initModel():void - { - if (getBeadByType(ISelectionModel) == null) - addBead(new (ValuesManager.valuesImpl.getValue(this, "iSelectionModel")) as IBead); - } - + override public function initSkin():void { // TODO: (aharui) remove later http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4b0994a7/frameworks/as/src/org/apache/flex/html/staticControls/Label.as ---------------------------------------------------------------------- diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/Label.as b/frameworks/as/src/org/apache/flex/html/staticControls/Label.as index bb80171..baf2203 100644 --- a/frameworks/as/src/org/apache/flex/html/staticControls/Label.as +++ b/frameworks/as/src/org/apache/flex/html/staticControls/Label.as @@ -58,13 +58,7 @@ package org.apache.flex.html.staticControls { ITextModel(model).html = value; } - - override public function initModel():void - { - if (getBeadByType(ITextModel) == null) - addBead(new (ValuesManager.valuesImpl.getValue(this, "iTextModel")) as IBead); - } - + public function initSkin():void { if (getBeadByType(ITextBead) == null) http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4b0994a7/frameworks/as/src/org/apache/flex/html/staticControls/List.as ---------------------------------------------------------------------- diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/List.as b/frameworks/as/src/org/apache/flex/html/staticControls/List.as index 05b19e5..17d6b6c 100644 --- a/frameworks/as/src/org/apache/flex/html/staticControls/List.as +++ b/frameworks/as/src/org/apache/flex/html/staticControls/List.as @@ -77,12 +77,6 @@ package org.apache.flex.html.staticControls ISelectionModel(model).selectedItem = value; } - override public function initModel():void - { - if (getBeadByType(ISelectionModel) == null) - addBead(new (ValuesManager.valuesImpl.getValue(this, "iSelectionModel")) as IBead); - } - public function initSkin():void { // TODO: (aharui) remove later http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4b0994a7/frameworks/as/src/org/apache/flex/html/staticControls/NumericStepper.as ---------------------------------------------------------------------- diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/NumericStepper.as b/frameworks/as/src/org/apache/flex/html/staticControls/NumericStepper.as index bcdf804..76339e9 100644 --- a/frameworks/as/src/org/apache/flex/html/staticControls/NumericStepper.as +++ b/frameworks/as/src/org/apache/flex/html/staticControls/NumericStepper.as @@ -76,13 +76,6 @@ package org.apache.flex.html.staticControls ISpinnerModel(model).snapInterval = value; } - override public function initModel():void - { - if (getBeadByType(ISpinnerModel) == null ) { - addBead(new (ValuesManager.valuesImpl.getValue(this, "iNumericStepperModel")) as IBead); - } - } - override public function initSkin():void { super.initSkin(); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4b0994a7/frameworks/as/src/org/apache/flex/html/staticControls/Panel.as ---------------------------------------------------------------------- diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/Panel.as b/frameworks/as/src/org/apache/flex/html/staticControls/Panel.as index 94c8391..abf6016 100644 --- a/frameworks/as/src/org/apache/flex/html/staticControls/Panel.as +++ b/frameworks/as/src/org/apache/flex/html/staticControls/Panel.as @@ -61,13 +61,6 @@ package org.apache.flex.html.staticControls IPanelModel(model).showCloseButton = value; } - public function get titleBar():TitleBar - { - var bead:PanelBead = getBeadByType(PanelBead) as PanelBead; - if( bead != null ) return bead.titleBar; - return null; - } - private var _controlBar:Array; public function get controlBar():Array { @@ -78,31 +71,6 @@ package org.apache.flex.html.staticControls _controlBar = value; } - override public function initModel():void - { - super.initModel(); - - if (getBeadByType(IPanelModel) == null) - addBead(new (ValuesManager.valuesImpl.getValue(this, "iPanelModel")) as IBead); - - model.addEventListener('titleChange',handlePropertyChange); - model.addEventListener('htmlTitleChange',handlePropertyChange); - model.addEventListener('showCloseButtonChange',handlePropertyChange); - } - - private function handlePropertyChange(event:Event):void - { - if( event.type == "titleChange" && titleBar ) { - titleBar.title = title; - } - else if( event.type == "htmlTitleChange" && titleBar ) { - titleBar.htmlTitle = title; - } - else if( event.type == "showCloseButtonChange" && titleBar ) { - titleBar.showCloseButton = showCloseButton; - } - } - override public function initSkin():void { super.initSkin(); @@ -111,8 +79,6 @@ package org.apache.flex.html.staticControls addBead(new (ValuesManager.valuesImpl.getValue(this,"iPanelBead")) as IBead); } - titleBar.title = this.title; - titleBar.showCloseButton = this.showCloseButton; } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4b0994a7/frameworks/as/src/org/apache/flex/html/staticControls/RadioButton.as ---------------------------------------------------------------------- diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/RadioButton.as b/frameworks/as/src/org/apache/flex/html/staticControls/RadioButton.as index a6caf5b..41bb87a 100644 --- a/frameworks/as/src/org/apache/flex/html/staticControls/RadioButton.as +++ b/frameworks/as/src/org/apache/flex/html/staticControls/RadioButton.as @@ -26,7 +26,6 @@ package org.apache.flex.html.staticControls import org.apache.flex.core.IBead; import org.apache.flex.core.IBeadModel; - import org.apache.flex.core.IInitModel; import org.apache.flex.core.IInitSkin; import org.apache.flex.core.IRadioButtonBead; import org.apache.flex.core.IStrand; @@ -36,7 +35,7 @@ package org.apache.flex.html.staticControls [Event(name="change", type="org.apache.flex.events.Event")] - public class RadioButton extends SimpleButton implements IStrand, IInitSkin, IInitModel + public class RadioButton extends SimpleButton implements IStrand, IInitSkin { public function RadioButton(upState:DisplayObject=null, overState:DisplayObject=null, downState:DisplayObject=null, hitTestState:DisplayObject=null) { @@ -117,12 +116,6 @@ package org.apache.flex.html.staticControls p.addChild(this); } - public function initModel():void - { - if (getBeadByType(IValueToggleButtonModel) == null) - addBead(new (ValuesManager.valuesImpl.getValue(this, "iToggleButtonModel")) as IBead); - } - public function initSkin():void { if (getBeadByType(IRadioButtonBead) == null) http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4b0994a7/frameworks/as/src/org/apache/flex/html/staticControls/SimpleAlert.as ---------------------------------------------------------------------- diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/SimpleAlert.as b/frameworks/as/src/org/apache/flex/html/staticControls/SimpleAlert.as index 656b2d0..9b62e3f 100644 --- a/frameworks/as/src/org/apache/flex/html/staticControls/SimpleAlert.as +++ b/frameworks/as/src/org/apache/flex/html/staticControls/SimpleAlert.as @@ -40,12 +40,6 @@ package org.apache.flex.html.staticControls className = "SimpleAlert"; } - override public function initModel():void - { - if (getBeadByType(IAlertModel) == null) - addBead(new (ValuesManager.valuesImpl.getValue(this, "iAlertModel")) as IBead); - } - private function get message():String { return IAlertModel(model).message; @@ -81,7 +75,6 @@ package org.apache.flex.html.staticControls static public function show(message:String, parent:Object):SimpleAlert { var alert:SimpleAlert = new SimpleAlert(); - alert.initModel(); alert.message = message; alert.initSkin(); alert.show(parent); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4b0994a7/frameworks/as/src/org/apache/flex/html/staticControls/Spinner.as ---------------------------------------------------------------------- diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/Spinner.as b/frameworks/as/src/org/apache/flex/html/staticControls/Spinner.as index 517051e..dd8b36c 100644 --- a/frameworks/as/src/org/apache/flex/html/staticControls/Spinner.as +++ b/frameworks/as/src/org/apache/flex/html/staticControls/Spinner.as @@ -19,7 +19,6 @@ package org.apache.flex.html.staticControls { import org.apache.flex.core.IBead; - import org.apache.flex.core.IInitModel; import org.apache.flex.core.IInitSkin; import org.apache.flex.core.ISpinnerModel; import org.apache.flex.core.UIBase; @@ -28,7 +27,7 @@ package org.apache.flex.html.staticControls [Event(name="valueChanged", type="org.apache.flex.events.Event")] - public class Spinner extends UIBase implements IInitModel, IInitSkin + public class Spinner extends UIBase implements IInitSkin { public function Spinner() { @@ -82,13 +81,6 @@ package org.apache.flex.html.staticControls ISpinnerModel(model).stepSize = value; } - override public function initModel():void - { - if( getBeadByType(ISpinnerModel) == null ) { - addBead(new (ValuesManager.valuesImpl.getValue(this, "iSpinnerModel")) as IBead); - } - } - public function initSkin():void { if( getBeadByType(ISpinnerBead) == null ) { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4b0994a7/frameworks/as/src/org/apache/flex/html/staticControls/TextArea.as ---------------------------------------------------------------------- diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/TextArea.as b/frameworks/as/src/org/apache/flex/html/staticControls/TextArea.as index 02206c5..9eaa7f4 100644 --- a/frameworks/as/src/org/apache/flex/html/staticControls/TextArea.as +++ b/frameworks/as/src/org/apache/flex/html/staticControls/TextArea.as @@ -51,12 +51,6 @@ package org.apache.flex.html.staticControls ITextModel(model).html = value; } - override public function initModel():void - { - if (getBeadByType(ITextModel) == null) - addBead(new (ValuesManager.valuesImpl.getValue(this, "iTextModel")) as IBead); - } - public function initSkin():void { if (getBeadByType(ITextAreaBead) == null) { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4b0994a7/frameworks/as/src/org/apache/flex/html/staticControls/TextButton.as ---------------------------------------------------------------------- diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/TextButton.as b/frameworks/as/src/org/apache/flex/html/staticControls/TextButton.as index 07eff1d..b08e5c7 100644 --- a/frameworks/as/src/org/apache/flex/html/staticControls/TextButton.as +++ b/frameworks/as/src/org/apache/flex/html/staticControls/TextButton.as @@ -21,13 +21,12 @@ package org.apache.flex.html.staticControls import flash.display.DisplayObject; import org.apache.flex.core.IBead; - import org.apache.flex.core.IInitModel; import org.apache.flex.core.IInitSkin; import org.apache.flex.core.ITextModel; import org.apache.flex.core.ValuesManager; import org.apache.flex.html.staticControls.beads.ITextButtonBead; - public class TextButton extends Button implements IInitModel, IInitSkin + public class TextButton extends Button implements IInitSkin { public function TextButton(upState:DisplayObject=null, overState:DisplayObject=null, downState:DisplayObject=null, hitTestState:DisplayObject=null) { @@ -52,12 +51,6 @@ package org.apache.flex.html.staticControls ITextModel(model).html = value; } - override public function initModel():void - { - if (getBeadByType(ITextModel) == null) - addBead(new (ValuesManager.valuesImpl.getValue(this, "iTextModel")) as IBead); - } - override public function initSkin():void { if (getBeadByType(ITextButtonBead) == null) http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4b0994a7/frameworks/as/src/org/apache/flex/html/staticControls/TextInput.as ---------------------------------------------------------------------- diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/TextInput.as b/frameworks/as/src/org/apache/flex/html/staticControls/TextInput.as index 079f2af..7be663c 100644 --- a/frameworks/as/src/org/apache/flex/html/staticControls/TextInput.as +++ b/frameworks/as/src/org/apache/flex/html/staticControls/TextInput.as @@ -49,12 +49,6 @@ package org.apache.flex.html.staticControls ITextModel(model).html = value; } - override public function initModel():void - { - if (getBeadByType(ITextModel) == null) - addBead(new (ValuesManager.valuesImpl.getValue(this, "iTextModel")) as IBead); - } - public function initSkin():void { if (getBeadByType(ITextInputBead) == null) http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4b0994a7/frameworks/as/src/org/apache/flex/html/staticControls/TitleBar.as ---------------------------------------------------------------------- diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/TitleBar.as b/frameworks/as/src/org/apache/flex/html/staticControls/TitleBar.as index 3888207..4fc6b0d 100644 --- a/frameworks/as/src/org/apache/flex/html/staticControls/TitleBar.as +++ b/frameworks/as/src/org/apache/flex/html/staticControls/TitleBar.as @@ -64,16 +64,6 @@ package org.apache.flex.html.staticControls ITitleBarModel(model).showCloseButton = value; } - override public function initModel():void - { - if (getBeadByType(ITitleBarModel) == null) - addBead(new (ValuesManager.valuesImpl.getValue(this, "iTitleBarModel")) as IBead); - - model.addEventListener('titleChange',handlePropertyChange); - model.addEventListener('htmlTitleChange',handlePropertyChange); - model.addEventListener('showCloseButtonChange',handlePropertyChange); - } - private var _titleLabel:Label; public function get titleLabel():Label { @@ -105,7 +95,11 @@ package org.apache.flex.html.staticControls _closeButton.addToParent(this); childrenAdded(); - + + model.addEventListener('titleChange',handlePropertyChange); + model.addEventListener('htmlTitleChange',handlePropertyChange); + model.addEventListener('showCloseButtonChange',handlePropertyChange); + // dispatch this event to force any beads to update dispatchEvent(new Event("widthChanged")); } @@ -132,7 +126,6 @@ package org.apache.flex.html.staticControls protected function createTitle() : Label { var label:Label = new Label(); - label.initModel(); label.initSkin(); label.text = title; return label; @@ -165,7 +158,6 @@ package org.apache.flex.html.staticControls hitArea.graphics.endFill(); var button:Button = new Button(upState, overState, downState, hitArea); - button.initModel(); button.initSkin(); button.visible = showCloseButton; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4b0994a7/frameworks/as/src/org/apache/flex/html/staticControls/beads/AlertBead.as ---------------------------------------------------------------------- diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/AlertBead.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/AlertBead.as index 88a5289..f14fd79 100644 --- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/AlertBead.as +++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/AlertBead.as @@ -80,45 +80,38 @@ package org.apache.flex.html.staticControls.beads var flags:uint = IAlertModel(UIBase(_strand).model).flags; if( flags & Alert.OK ) { _okButton = new TextButton(); - _okButton.initModel(); _okButton.text = IAlertModel(UIBase(_strand).model).okLabel; _okButton.initSkin(); _okButton.addEventListener("click",handleOK); } if( flags & Alert.CANCEL ) { _cancelButton = new TextButton(); - _cancelButton.initModel(); _cancelButton.text = IAlertModel(UIBase(_strand).model).cancelLabel; _cancelButton.initSkin(); _cancelButton.addEventListener("click",handleCancel); } if( flags & Alert.YES ) { _yesButton = new TextButton(); - _yesButton.initModel(); _yesButton.text = IAlertModel(UIBase(_strand).model).yesLabel; _yesButton.initSkin(); _yesButton.addEventListener("click",handleYes); } if( flags & Alert.NO ) { _noButton = new TextButton(); - _noButton.initModel(); _noButton.text = IAlertModel(UIBase(_strand).model).noLabel; _noButton.initSkin(); _noButton.addEventListener("click",handleNo); } _titleBar = new TitleBar(); - _titleBar.initModel(); _titleBar.title = IAlertModel(UIBase(_strand).model).title; _titleBar.initSkin(); _label = new Label(); - _label.initModel(); _label.text = IAlertModel(UIBase(_strand).model).message; _label.initSkin(); _controlBar = new ControlBar(); - _controlBar.initModel(); _controlBar.initSkin(); if( _okButton ) _okButton.addToParent(_controlBar); if( _cancelButton ) _cancelButton.addToParent(_controlBar); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4b0994a7/frameworks/as/src/org/apache/flex/html/staticControls/beads/ComboBoxBead.as ---------------------------------------------------------------------- diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/ComboBoxBead.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/ComboBoxBead.as index 35eddec..072489a 100644 --- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/ComboBoxBead.as +++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/ComboBoxBead.as @@ -25,7 +25,6 @@ package org.apache.flex.html.staticControls.beads import org.apache.flex.core.IBead; import org.apache.flex.core.IComboBoxBead; import org.apache.flex.core.IComboBoxModel; - import org.apache.flex.core.IInitModel; import org.apache.flex.core.IInitSkin; import org.apache.flex.core.IStrand; import org.apache.flex.core.ValuesManager; @@ -77,7 +76,6 @@ package org.apache.flex.html.staticControls.beads textInput = new TextInput(); textInput.addToParent(DisplayObjectContainer(strand)); - textInput.initModel(); textInput.width = 100; textInput.height = 18; textInput.initSkin(); @@ -91,7 +89,6 @@ package org.apache.flex.html.staticControls.beads button = new Button( upSprite, overSprite, downSprite ); DisplayObjectContainer(strand).addChild(button); - button.initModel(); button.width = 18; button.height = 18; button.x = textInput.width; @@ -156,8 +153,6 @@ package org.apache.flex.html.staticControls.beads while (host.parent != root) host = host.parent; host.addChild(_popUp as DisplayObject); - if (_popUp is IInitModel) - IInitModel(_popUp).initModel(); if (_popUp is IInitSkin) IInitSkin(_popUp).initSkin(); } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4b0994a7/frameworks/as/src/org/apache/flex/html/staticControls/beads/DropDownListBead.as ---------------------------------------------------------------------- diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/DropDownListBead.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/DropDownListBead.as index 4020053..0eaf91a 100644 --- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/DropDownListBead.as +++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/DropDownListBead.as @@ -27,7 +27,6 @@ package org.apache.flex.html.staticControls.beads import flash.text.TextFieldType; import org.apache.flex.core.CSSTextField; - import org.apache.flex.core.IInitModel; import org.apache.flex.core.IInitSkin; import org.apache.flex.core.ISelectionModel; import org.apache.flex.core.IStrand; @@ -209,8 +208,6 @@ package org.apache.flex.html.staticControls.beads while (host.parent != root) host = host.parent; host.addChild(_popUp as DisplayObject); - if (_popUp is IInitModel) - IInitModel(_popUp).initModel(); if (_popUp is IInitSkin) IInitSkin(_popUp).initSkin(); } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4b0994a7/frameworks/as/src/org/apache/flex/html/staticControls/beads/ListBead.as ---------------------------------------------------------------------- diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/ListBead.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/ListBead.as index fa22f55..2ec9c5f 100644 --- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/ListBead.as +++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/ListBead.as @@ -119,7 +119,6 @@ package org.apache.flex.html.staticControls.beads vsbm.stepSize = 1; vsbm.value = 0; vsb.model = vsbm; - vsb.initModel(); vsb.width = 16; var vsbb:ScrollBarBead = new ScrollBarBead(); vsbb.initSkin(); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4b0994a7/frameworks/as/src/org/apache/flex/html/staticControls/beads/NumericStepperBead.as ---------------------------------------------------------------------- diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/NumericStepperBead.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/NumericStepperBead.as index 5cd690a..7f295c4 100644 --- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/NumericStepperBead.as +++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/NumericStepperBead.as @@ -50,14 +50,12 @@ package org.apache.flex.html.staticControls.beads // add an input field input = new TextInput(); - input.initModel(); input.addToParent(value); input.initSkin(); // add a spinner spinner = new Spinner(); spinner.addBead( value.getBeadByType(ISpinnerModel) ); - spinner.initModel(); spinner.addToParent(value); spinner.initSkin(); spinner.width = 17; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4b0994a7/frameworks/as/src/org/apache/flex/html/staticControls/beads/PanelBead.as ---------------------------------------------------------------------- diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/PanelBead.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/PanelBead.as index 8af730b..f3ba9b7 100644 --- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/PanelBead.as +++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/PanelBead.as @@ -40,7 +40,6 @@ package org.apache.flex.html.staticControls.beads public function PanelBead() { _titleBar = new TitleBar(); - _titleBar.initModel(); _titleBar.initSkin(); } @@ -68,7 +67,6 @@ package org.apache.flex.html.staticControls.beads var controlBarItems:Array = Panel(_strand).controlBar; if( controlBarItems && controlBarItems.length > 0 ) { _controlBar = new ControlBar(); - _controlBar.initModel(); _controlBar.initSkin(); for each(var comp:IUIBase in controlBarItems) { @@ -79,6 +77,7 @@ package org.apache.flex.html.staticControls.beads } IEventDispatcher(_strand).addEventListener("childrenAdded", changeHandler); + } private var controlBarArea:ControlBar; @@ -104,5 +103,6 @@ package org.apache.flex.html.staticControls.beads UIBase(_strand).height = metrics.top + metrics.bottom + titleBar.height + actualParent.height + (controlBar ? controlBar.height : 0); } + } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4b0994a7/frameworks/as/src/org/apache/flex/html/staticControls/beads/SimpleAlertBead.as ---------------------------------------------------------------------- diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/SimpleAlertBead.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/SimpleAlertBead.as index ab482f5..56afc59 100644 --- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/SimpleAlertBead.as +++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/SimpleAlertBead.as @@ -23,7 +23,6 @@ package org.apache.flex.html.staticControls.beads import org.apache.flex.core.IAlertModel; import org.apache.flex.core.IBead; - import org.apache.flex.core.IInitModel; import org.apache.flex.core.IInitSkin; import org.apache.flex.core.IMeasurementBead; import org.apache.flex.core.IStrand; @@ -81,14 +80,12 @@ package org.apache.flex.html.staticControls.beads model.addEventListener("htmlMessageChange",handleMessageChange); messageLabel = new Label(); - messageLabel.initModel(); messageLabel.initSkin(); messageLabel.text = model.message; messageLabel.html = model.htmlMessage; messageLabel.addToParent(_strand); okButton = new TextButton(); - okButton.initModel(); okButton.text = model.okLabel; okButton.initSkin(); okButton.addToParent(_strand); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4b0994a7/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextAreaBead.as ---------------------------------------------------------------------- diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextAreaBead.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextAreaBead.as index 30fb9d7..05ef36b 100644 --- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextAreaBead.as +++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextAreaBead.as @@ -110,7 +110,6 @@ package org.apache.flex.html.staticControls.beads vsbm.stepSize = 1; vsbm.value = 0; vsb.model = vsbm; - vsb.initModel(); vsb.width = 16; var vsbb:ScrollBarBead = new ScrollBarBead(); vsbb.initSkin(); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4b0994a7/frameworks/as/src/org/apache/flex/jquery/staticControls/RadioButton.as ---------------------------------------------------------------------- diff --git a/frameworks/as/src/org/apache/flex/jquery/staticControls/RadioButton.as b/frameworks/as/src/org/apache/flex/jquery/staticControls/RadioButton.as index aac1ad5..a94739a 100644 --- a/frameworks/as/src/org/apache/flex/jquery/staticControls/RadioButton.as +++ b/frameworks/as/src/org/apache/flex/jquery/staticControls/RadioButton.as @@ -22,9 +22,5 @@ package org.apache.flex.jquery.staticControls public class RadioButton extends org.apache.flex.html.staticControls.RadioButton { - override public function initModel():void - { - super.initModel(); - } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4b0994a7/frameworks/as/src/org/apache/flex/utils/MXMLDataInterpreter.as ---------------------------------------------------------------------- diff --git a/frameworks/as/src/org/apache/flex/utils/MXMLDataInterpreter.as b/frameworks/as/src/org/apache/flex/utils/MXMLDataInterpreter.as index 75dccb2..131ed80 100644 --- a/frameworks/as/src/org/apache/flex/utils/MXMLDataInterpreter.as +++ b/frameworks/as/src/org/apache/flex/utils/MXMLDataInterpreter.as @@ -24,7 +24,6 @@ import flash.display.DisplayObjectContainer; import org.apache.flex.core.IStrand; import org.apache.flex.core.IBead; import org.apache.flex.core.IDocument; -import org.apache.flex.core.IInitModel; import org.apache.flex.core.IInitSkin; import org.apache.flex.core.UIBase; import org.apache.flex.core.IContainer; @@ -121,11 +120,9 @@ public class MXMLDataInterpreter if (value is IBead && comp is IStrand) IStrand(comp).addBead(value as IBead); } - if (comp is IInitModel) - IInitModel(comp).initModel(); var beadOffset:int = i + (m - 1) * 3; if (beadOffset >= -1) - trace(beadOffset, data[beadOffset]); + trace(beadOffset, data[beadOffset]); if (m > 0 && data[beadOffset] == "beads") { m--;
