http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSUI/src/FlexJSUIClasses.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSUI/src/FlexJSUIClasses.as b/frameworks/as/projects/FlexJSUI/src/FlexJSUIClasses.as index 46102d7..cfd05db 100644 --- a/frameworks/as/projects/FlexJSUI/src/FlexJSUIClasses.as +++ b/frameworks/as/projects/FlexJSUI/src/FlexJSUIClasses.as @@ -28,65 +28,65 @@ package internal class FlexJSUIClasses { - import org.apache.flex.html.staticControls.accessories.NumericOnlyTextInputBead; NumericOnlyTextInputBead; - import org.apache.flex.html.staticControls.accessories.PasswordInputBead; PasswordInputBead; - import org.apache.flex.html.staticControls.accessories.TextPromptBead; TextPromptBead; - import org.apache.flex.html.staticControls.beads.AlertView; AlertView; - import org.apache.flex.html.staticControls.beads.ButtonBarView; ButtonBarView; - import org.apache.flex.html.staticControls.beads.CheckBoxView; CheckBoxView; - import org.apache.flex.html.staticControls.beads.ComboBoxView; ComboBoxView; - import org.apache.flex.html.staticControls.beads.ContainerView; ContainerView; - import org.apache.flex.html.staticControls.beads.ControlBarMeasurementBead; ControlBarMeasurementBead; - import org.apache.flex.html.staticControls.beads.CSSButtonView; CSSButtonView; - import org.apache.flex.html.staticControls.beads.CSSTextButtonView; CSSTextButtonView; - import org.apache.flex.html.staticControls.beads.DropDownListView; DropDownListView; - import org.apache.flex.html.staticControls.beads.ImageView; ImageView; - import org.apache.flex.html.staticControls.beads.ListView; ListView; - import org.apache.flex.html.staticControls.beads.NumericStepperView; NumericStepperView; - import org.apache.flex.html.staticControls.beads.PanelView; PanelView; - import org.apache.flex.html.staticControls.beads.RadioButtonView; RadioButtonView; - import org.apache.flex.html.staticControls.beads.ScrollBarView; ScrollBarView; - import org.apache.flex.html.staticControls.beads.SimpleAlertView; SimpleAlertView; - import org.apache.flex.html.staticControls.beads.SingleLineBorderBead; SingleLineBorderBead; - import org.apache.flex.html.staticControls.beads.SliderView; SliderView; - import org.apache.flex.html.staticControls.beads.SliderThumbView; SliderThumbView; - import org.apache.flex.html.staticControls.beads.SliderTrackView; SliderTrackView; - import org.apache.flex.html.staticControls.beads.SolidBackgroundBead; SolidBackgroundBead; - import org.apache.flex.html.staticControls.beads.SpinnerView; SpinnerView; - import org.apache.flex.html.staticControls.beads.TextButtonMeasurementBead; TextButtonMeasurementBead; - import org.apache.flex.html.staticControls.beads.TextFieldLabelMeasurementBead; TextFieldLabelMeasurementBead; - import org.apache.flex.html.staticControls.beads.TextAreaView; TextAreaView; - import org.apache.flex.html.staticControls.beads.TextButtonView; TextButtonView; - import org.apache.flex.html.staticControls.beads.TextFieldView; TextFieldView; - import org.apache.flex.html.staticControls.beads.TextInputView; TextInputView; - import org.apache.flex.html.staticControls.beads.TextInputWithBorderView; TextInputWithBorderView; - import org.apache.flex.html.staticControls.beads.TitleBarMeasurementBead; TitleBarMeasurementBead; - import org.apache.flex.html.staticControls.beads.models.AlertModel; AlertModel; - import org.apache.flex.html.staticControls.beads.models.ArraySelectionModel; ArraySelectionModel; - import org.apache.flex.html.staticControls.beads.models.ComboBoxModel; ComboBoxModel; - import org.apache.flex.html.staticControls.beads.models.ImageModel; ImageModel; - import org.apache.flex.html.staticControls.beads.models.PanelModel; PanelModel; - import org.apache.flex.html.staticControls.beads.models.SingleLineBorderModel; SingleLineBorderModel; - import org.apache.flex.html.staticControls.beads.models.TextModel; TextModel; - import org.apache.flex.html.staticControls.beads.models.TitleBarModel; TitleBarModel; - import org.apache.flex.html.staticControls.beads.models.ToggleButtonModel; ToggleButtonModel; - import org.apache.flex.html.staticControls.beads.models.ValueToggleButtonModel; ValueToggleButtonModel; - import org.apache.flex.html.staticControls.beads.controllers.AlertController; AlertController; - import org.apache.flex.html.staticControls.beads.controllers.ComboBoxController; ComboBoxController; - import org.apache.flex.html.staticControls.beads.controllers.DropDownListController; DropDownListController; - import org.apache.flex.html.staticControls.beads.controllers.EditableTextKeyboardController; EditableTextKeyboardController; - import org.apache.flex.html.staticControls.beads.controllers.ItemRendererMouseController; ItemRendererMouseController; - import org.apache.flex.html.staticControls.beads.controllers.ListSingleSelectionMouseController; ListSingleSelectionMouseController; - import org.apache.flex.html.staticControls.beads.controllers.SliderMouseController; SliderMouseController; - import org.apache.flex.html.staticControls.beads.controllers.SpinnerMouseController; SpinnerMouseController; - import org.apache.flex.html.staticControls.beads.controllers.VScrollBarMouseController; VScrollBarMouseController; - import org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout; ButtonBarLayout; - import org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalScrollingLayout; NonVirtualVerticalScrollingLayout; - import org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalScrollingLayout; NonVirtualHorizontalScrollingLayout; - import org.apache.flex.html.staticControls.beads.layouts.VScrollBarLayout; VScrollBarLayout; - import org.apache.flex.html.staticControls.beads.layouts.TileLayout; TileLayout; - import org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData; TextItemRendererFactoryForArrayData; - import org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData; DataItemRendererFactoryForArrayData; + import org.apache.flex.html.accessories.NumericOnlyTextInputBead; NumericOnlyTextInputBead; + import org.apache.flex.html.accessories.PasswordInputBead; PasswordInputBead; + import org.apache.flex.html.accessories.TextPromptBead; TextPromptBead; + import org.apache.flex.html.beads.AlertView; AlertView; + import org.apache.flex.html.beads.ButtonBarView; ButtonBarView; + import org.apache.flex.html.beads.CheckBoxView; CheckBoxView; + import org.apache.flex.html.beads.ComboBoxView; ComboBoxView; + import org.apache.flex.html.beads.ContainerView; ContainerView; + import org.apache.flex.html.beads.ControlBarMeasurementBead; ControlBarMeasurementBead; + import org.apache.flex.html.beads.CSSButtonView; CSSButtonView; + import org.apache.flex.html.beads.CSSTextButtonView; CSSTextButtonView; + import org.apache.flex.html.beads.DropDownListView; DropDownListView; + import org.apache.flex.html.beads.ImageView; ImageView; + import org.apache.flex.html.beads.ListView; ListView; + import org.apache.flex.html.beads.NumericStepperView; NumericStepperView; + import org.apache.flex.html.beads.PanelView; PanelView; + import org.apache.flex.html.beads.RadioButtonView; RadioButtonView; + import org.apache.flex.html.beads.ScrollBarView; ScrollBarView; + import org.apache.flex.html.beads.SimpleAlertView; SimpleAlertView; + import org.apache.flex.html.beads.SingleLineBorderBead; SingleLineBorderBead; + import org.apache.flex.html.beads.SliderView; SliderView; + import org.apache.flex.html.beads.SliderThumbView; SliderThumbView; + import org.apache.flex.html.beads.SliderTrackView; SliderTrackView; + import org.apache.flex.html.beads.SolidBackgroundBead; SolidBackgroundBead; + import org.apache.flex.html.beads.SpinnerView; SpinnerView; + import org.apache.flex.html.beads.TextButtonMeasurementBead; TextButtonMeasurementBead; + import org.apache.flex.html.beads.TextFieldLabelMeasurementBead; TextFieldLabelMeasurementBead; + import org.apache.flex.html.beads.TextAreaView; TextAreaView; + import org.apache.flex.html.beads.TextButtonView; TextButtonView; + import org.apache.flex.html.beads.TextFieldView; TextFieldView; + import org.apache.flex.html.beads.TextInputView; TextInputView; + import org.apache.flex.html.beads.TextInputWithBorderView; TextInputWithBorderView; + import org.apache.flex.html.beads.TitleBarMeasurementBead; TitleBarMeasurementBead; + import org.apache.flex.html.beads.models.AlertModel; AlertModel; + import org.apache.flex.html.beads.models.ArraySelectionModel; ArraySelectionModel; + import org.apache.flex.html.beads.models.ComboBoxModel; ComboBoxModel; + import org.apache.flex.html.beads.models.ImageModel; ImageModel; + import org.apache.flex.html.beads.models.PanelModel; PanelModel; + import org.apache.flex.html.beads.models.SingleLineBorderModel; SingleLineBorderModel; + import org.apache.flex.html.beads.models.TextModel; TextModel; + import org.apache.flex.html.beads.models.TitleBarModel; TitleBarModel; + import org.apache.flex.html.beads.models.ToggleButtonModel; ToggleButtonModel; + import org.apache.flex.html.beads.models.ValueToggleButtonModel; ValueToggleButtonModel; + import org.apache.flex.html.beads.controllers.AlertController; AlertController; + import org.apache.flex.html.beads.controllers.ComboBoxController; ComboBoxController; + import org.apache.flex.html.beads.controllers.DropDownListController; DropDownListController; + import org.apache.flex.html.beads.controllers.EditableTextKeyboardController; EditableTextKeyboardController; + import org.apache.flex.html.beads.controllers.ItemRendererMouseController; ItemRendererMouseController; + import org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController; ListSingleSelectionMouseController; + import org.apache.flex.html.beads.controllers.SliderMouseController; SliderMouseController; + import org.apache.flex.html.beads.controllers.SpinnerMouseController; SpinnerMouseController; + import org.apache.flex.html.beads.controllers.VScrollBarMouseController; VScrollBarMouseController; + import org.apache.flex.html.beads.layouts.ButtonBarLayout; ButtonBarLayout; + import org.apache.flex.html.beads.layouts.NonVirtualVerticalScrollingLayout; NonVirtualVerticalScrollingLayout; + import org.apache.flex.html.beads.layouts.NonVirtualHorizontalScrollingLayout; NonVirtualHorizontalScrollingLayout; + import org.apache.flex.html.beads.layouts.VScrollBarLayout; VScrollBarLayout; + import org.apache.flex.html.beads.layouts.TileLayout; TileLayout; + import org.apache.flex.html.beads.TextItemRendererFactoryForArrayData; TextItemRendererFactoryForArrayData; + import org.apache.flex.html.beads.DataItemRendererFactoryForArrayData; DataItemRendererFactoryForArrayData; import org.apache.flex.core.ItemRendererClassFactory; ItemRendererClassFactory; import org.apache.flex.core.FilledRectangle; FilledRectangle; import org.apache.flex.events.CustomEvent; CustomEvent; @@ -102,3 +102,4 @@ internal class FlexJSUIClasses } } +
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/ILayoutParent.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/ILayoutParent.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/ILayoutParent.as index 9c6fa18..7ec767f 100644 --- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/ILayoutParent.as +++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/core/ILayoutParent.as @@ -21,8 +21,8 @@ package org.apache.flex.core import flash.display.DisplayObject; import flash.display.DisplayObjectContainer; - import org.apache.flex.html.staticControls.supportClasses.Border; - import org.apache.flex.html.staticControls.supportClasses.ScrollBar; + import org.apache.flex.html.supportClasses.Border; + import org.apache.flex.html.supportClasses.ScrollBar; /** * The ILayoutParent interface is the basic interface for the @@ -89,4 +89,4 @@ package org.apache.flex.core */ function get resizableView():DisplayObject; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/CheckBox.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/CheckBox.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/CheckBox.as index 2a36d05..571afa9 100644 --- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/CheckBox.as +++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/CheckBox.as @@ -18,9 +18,9 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.createjs { - import org.apache.flex.html.staticControls.CheckBox; + import org.apache.flex.html.CheckBox; - public class CheckBox extends org.apache.flex.html.staticControls.CheckBox + public class CheckBox extends org.apache.flex.html.CheckBox { } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/Label.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/Label.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/Label.as index 099c5b0..3da881a 100644 --- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/Label.as +++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/Label.as @@ -18,9 +18,9 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.createjs { - import org.apache.flex.html.staticControls.Label; + import org.apache.flex.html.Label; - public class Label extends org.apache.flex.html.staticControls.Label + public class Label extends org.apache.flex.html.Label { } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/TextButton.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/TextButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/TextButton.as index 6f4dc74..44c9e88 100644 --- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/TextButton.as +++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/createjs/TextButton.as @@ -19,7 +19,7 @@ package org.apache.flex.createjs { import org.apache.flex.core.ITextModel; - import org.apache.flex.html.staticControls.Button; + import org.apache.flex.html.Button; public class TextButton extends Button { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/AlertView.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/AlertView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/AlertView.as index d5b2931..f8f9e52 100644 --- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/AlertView.as +++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/AlertView.as @@ -27,7 +27,7 @@ package org.apache.flex.html.beads import org.apache.flex.core.UIBase; import org.apache.flex.core.UIMetrics; import org.apache.flex.core.ValuesManager; - import org.apache.flex.createjs.staticControls.Label; + import org.apache.flex.createjs.Label; import org.apache.flex.events.Event; import org.apache.flex.events.IEventDispatcher; import org.apache.flex.html.Alert; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/NumericStepperView.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/NumericStepperView.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/NumericStepperView.as index 232feb4..bafb3f5 100644 --- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/NumericStepperView.as +++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/html/beads/NumericStepperView.as @@ -27,7 +27,7 @@ package org.apache.flex.html.beads import org.apache.flex.core.IRangeModel; import org.apache.flex.core.IStrand; import org.apache.flex.core.UIBase; - import org.apache.flex.createjs.staticControls.Label; + import org.apache.flex.createjs.Label; import org.apache.flex.events.Event; import org.apache.flex.events.IEventDispatcher; import org.apache.flex.html.Spinner; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/CheckBox.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/CheckBox.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/CheckBox.as index 83ca32a..9b9cb71 100644 --- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/CheckBox.as +++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/CheckBox.as @@ -18,9 +18,9 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.jquery { - import org.apache.flex.html.staticControls.CheckBox; + import org.apache.flex.html.CheckBox; - public class CheckBox extends org.apache.flex.html.staticControls.CheckBox + public class CheckBox extends org.apache.flex.html.CheckBox { } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/RadioButton.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/RadioButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/RadioButton.as index 6fc0c8f..e7b64a9 100644 --- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/RadioButton.as +++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/RadioButton.as @@ -18,9 +18,9 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.jquery { - import org.apache.flex.html.staticControls.RadioButton; + import org.apache.flex.html.RadioButton; - public class RadioButton extends org.apache.flex.html.staticControls.RadioButton + public class RadioButton extends org.apache.flex.html.RadioButton { } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/TextButton.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/TextButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/TextButton.as index 9528f66..43d7dc8 100644 --- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/TextButton.as +++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/jquery/TextButton.as @@ -18,9 +18,9 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.jquery { - import org.apache.flex.html.staticControls.TextButton; + import org.apache.flex.html.TextButton; - public class TextButton extends org.apache.flex.html.staticControls.TextButton + public class TextButton extends org.apache.flex.html.TextButton { public function TextButton() { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSUI/src/org/apache/flex/svg/TextButton.as ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/svg/TextButton.as b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/svg/TextButton.as index ae8af52..83a2821 100644 --- a/frameworks/as/projects/FlexJSUI/src/org/apache/flex/svg/TextButton.as +++ b/frameworks/as/projects/FlexJSUI/src/org/apache/flex/svg/TextButton.as @@ -18,9 +18,9 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.svg { - import org.apache.flex.html.staticControls.TextButton; + import org.apache.flex.html.TextButton; - public class TextButton extends org.apache.flex.html.staticControls.TextButton + public class TextButton extends org.apache.flex.html.TextButton { public function TextButton() { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSUI/svg-manifest.xml ---------------------------------------------------------------------- diff --git a/frameworks/as/projects/FlexJSUI/svg-manifest.xml b/frameworks/as/projects/FlexJSUI/svg-manifest.xml index 89d7728..4bdaba1 100644 --- a/frameworks/as/projects/FlexJSUI/svg-manifest.xml +++ b/frameworks/as/projects/FlexJSUI/svg-manifest.xml @@ -21,6 +21,6 @@ <componentPackage> - <component id="TextButton" class="org.apache.flex.svg.staticControls.TextButton"/> + <component id="TextButton" class="org.apache.flex.svg.TextButton"/> </componentPackage> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/js/FlexJS/src/org/apache/flex/core/IDataProviderItemRendererMapper.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/IDataProviderItemRendererMapper.js b/frameworks/js/FlexJS/src/org/apache/flex/core/IDataProviderItemRendererMapper.js index 82f3730..d44593c 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/IDataProviderItemRendererMapper.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/IDataProviderItemRendererMapper.js @@ -13,7 +13,7 @@ */ /** - * org.apache.flex.html.staticControls.beads.IDataProviderItemRendererMapper + * org.apache.flex.html.beads.IDataProviderItemRendererMapper * * @fileoverview * http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/js/FlexJS/src/org/apache/flex/core/ListBase.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/ListBase.js b/frameworks/js/FlexJS/src/org/apache/flex/core/ListBase.js index fe315ca..a507870 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/ListBase.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/ListBase.js @@ -15,7 +15,7 @@ goog.provide('org.apache.flex.core.ListBase'); goog.require('org.apache.flex.core.UIBase'); -goog.require('org.apache.flex.html.staticControls.supportClasses.StringItemRenderer'); +goog.require('org.apache.flex.html.supportClasses.StringItemRenderer'); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/js/FlexJS/src/org/apache/flex/html/ButtonBar.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/ButtonBar.js b/frameworks/js/FlexJS/src/org/apache/flex/html/ButtonBar.js index 18da0c8..a221c7d 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/ButtonBar.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/ButtonBar.js @@ -44,7 +44,7 @@ org.apache.flex.html.ButtonBar = function() { // org.apache.flex.html.beads. // DataItemRendererFactoryForArrayData(); // this.itemRendererFactory.set_itemRendererClass('org.apache.flex.html.' + - // 'staticControls.supportClasses.ButtonBarButtonItemRenderer'); + // 'supportClasses.ButtonBarButtonItemRenderer'); // this.addBead(this.itemRendererFactory); // this.addBead(new http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/js/FlexJS/src/org/apache/flex/svg/TextButton.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/svg/TextButton.js b/frameworks/js/FlexJS/src/org/apache/flex/svg/TextButton.js index d43edd9..376c5bf 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/svg/TextButton.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/svg/TextButton.js @@ -45,7 +45,7 @@ org.apache.flex.svg.TextButton.prototype.FLEXJS_CLASS_INFO = org.apache.flex.svg.TextButton.prototype.createElement = function() { this.element = document.createElement('embed'); - this.element.setAttribute('src', 'org/apache/flex/svg/staticControls/assets/TextButton_Skin.svg'); + this.element.setAttribute('src', 'org/apache/flex/svg/assets/TextButton_Skin.svg'); this.positioner = this.element; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/js/FlexJS/tests/MyInitialView.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/tests/MyInitialView.js b/frameworks/js/FlexJS/tests/MyInitialView.js index 88ac542..35f35d2 100644 --- a/frameworks/js/FlexJS/tests/MyInitialView.js +++ b/frameworks/js/FlexJS/tests/MyInitialView.js @@ -17,8 +17,8 @@ goog.provide('MyInitialView'); goog.require('org.apache.flex.FlexGlobal'); goog.require('org.apache.flex.core.ViewBase'); -goog.require('org.apache.flex.html.staticControls.Label'); -goog.require('org.apache.flex.html.staticControls.TextButton'); +goog.require('org.apache.flex.html.Label'); +goog.require('org.apache.flex.html.TextButton'); /** * @constructor @@ -36,14 +36,14 @@ goog.inherits(MyInitialView, org.apache.flex.core.ViewBase); */ MyInitialView.prototype.get_uiDescriptors = function() { return [ - org.apache.flex.html.staticControls.Label, + org.apache.flex.html.Label, null, 'lbl', 2, 'x', 100, 'y', 25, 0, 0, 1, 'text', 0, 'model', 'labelText', 'labelTextChanged', - org.apache.flex.html.staticControls.TextButton, + org.apache.flex.html.TextButton, null, null, 3, 'text', 'OK', 'x', 100, 'y', 75, http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/js/FlexJS/tests/MySimpleValuesImpl.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/tests/MySimpleValuesImpl.js b/frameworks/js/FlexJS/tests/MySimpleValuesImpl.js index 9373405..8f09bd7 100644 --- a/frameworks/js/FlexJS/tests/MySimpleValuesImpl.js +++ b/frameworks/js/FlexJS/tests/MySimpleValuesImpl.js @@ -30,11 +30,11 @@ MySimpleValuesImpl = function() { this.values_ = { /* ITextButtonBead : - org.apache.flex.html.staticControls.beads.TextButtonBead, + org.apache.flex.html.beads.TextButtonBead, ITextBead : - org.apache.flex.html.staticControls.beads.TextFieldBead, + org.apache.flex.html.beads.TextFieldBead, ITextModel : - org.apache.flex.html.staticControls.beads.models.TextModel + org.apache.flex.html.beads.models.TextModel */ }; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/js/FlexJS/tests/test.html ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/tests/test.html b/frameworks/js/FlexJS/tests/test.html index 5b7bc41..60c6032 100644 --- a/frameworks/js/FlexJS/tests/test.html +++ b/frameworks/js/FlexJS/tests/test.html @@ -25,8 +25,8 @@ <script type="text/javascript" src="../src/org/apache/flex/core/SimpleValuesImpl.js"></script> <script type="text/javascript" src="../src/org/apache/flex/core/Application.js"></script> - <script type="text/javascript" src="../src/org/apache/flex/html/staticControls/Label.js"></script> - <script type="text/javascript" src="../src/org/apache/flex/html/staticControls/TextButton.js"></script> + <script type="text/javascript" src="../src/org/apache/flex/html/Label.js"></script> + <script type="text/javascript" src="../src/org/apache/flex/html/TextButton.js"></script> <script type="text/javascript" src="./MySimpleValuesImpl.js"></script> <script type="text/javascript" src="./MyController.js"></script> @@ -40,4 +40,4 @@ </head> <body onload="new FlexJSTest().start();"> </body> -</html> \ No newline at end of file +</html> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/marmotinni/build.xml ---------------------------------------------------------------------- diff --git a/marmotinni/build.xml b/marmotinni/build.xml index 77f10db..71b31c8 100644 --- a/marmotinni/build.xml +++ b/marmotinni/build.xml @@ -19,8 +19,8 @@ --> <project name="marmotinni" default="main" basedir="."> - <property name="test.file" value="FlexJS/framework/org/apache/flex/html/staticControls/TextButton/TextButton.mxml" /> - <property name="test.class" value="org.apache.flex.html.staticControls.textButton.TextButton" /> + <property name="test.file" value="FlexJS/framework/org/apache/flex/html/TextButton/TextButton.mxml" /> + <property name="test.class" value="org.apache.flex.html.textButton.TextButton" /> <property file="build.properties" /> @@ -152,7 +152,7 @@ </target> <target name="test_compile" depends="test_prepare"> - <javac srcdir="${basedir}/java/src/org/apache/flex/html/staticControls/textButton" destdir="${basedir}/java/bin" debug="off" optimize="on"> + <javac srcdir="${basedir}/java/src/org/apache/flex/html/textButton" destdir="${basedir}/java/bin" debug="off" optimize="on"> <classpath> <pathelement location="${basedir}/java/lib/selenium/selenium-java-2.32.0.jar"/> <pathelement location="${basedir}/java/lib/selenium/libs/apache-mime4j-0.6.jar"/> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/marmotinni/java/src/org/apache/flex/html/staticControls/textButton/TextButton.java ---------------------------------------------------------------------- diff --git a/marmotinni/java/src/org/apache/flex/html/staticControls/textButton/TextButton.java b/marmotinni/java/src/org/apache/flex/html/staticControls/textButton/TextButton.java index 7860de4..6e8e6fa 100644 --- a/marmotinni/java/src/org/apache/flex/html/staticControls/textButton/TextButton.java +++ b/marmotinni/java/src/org/apache/flex/html/staticControls/textButton/TextButton.java @@ -17,7 +17,7 @@ * */ -package org.apache.flex.html.staticControls.textButton; +package org.apache.flex.html.textButton; import java.util.HashMap; import java.util.Map; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/mustella/tests/basicTests/BasicTests.css ---------------------------------------------------------------------- diff --git a/mustella/tests/basicTests/BasicTests.css b/mustella/tests/basicTests/BasicTests.css index 1c62545..ce61bba 100644 --- a/mustella/tests/basicTests/BasicTests.css +++ b/mustella/tests/basicTests/BasicTests.css @@ -155,7 +155,7 @@ TextInput { */ my|VBox { - IBeadLayout: ClassReference("org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalLayout"); + IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.NonVirtualVerticalLayout"); } /* @@ -167,4 +167,4 @@ my|VBox { fontSize:9px; } } -*/ \ No newline at end of file +*/ http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/mustella/tests/basicTests/shim/VBox.as ---------------------------------------------------------------------- diff --git a/mustella/tests/basicTests/shim/VBox.as b/mustella/tests/basicTests/shim/VBox.as index 7192199..891ccf6 100644 --- a/mustella/tests/basicTests/shim/VBox.as +++ b/mustella/tests/basicTests/shim/VBox.as @@ -21,7 +21,7 @@ package shim import flash.display.DisplayObject; import flash.display.DisplayObjectContainer; - import org.apache.flex.html.staticControls.Container; + import org.apache.flex.html.Container; [DefaultProperty("mxmlContent")] @@ -44,4 +44,4 @@ package shim } } -} \ No newline at end of file +}
