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 2014/03/25 22:04:06 UTC
[34/35] git commit: [flex-asjs] [refs/heads/develop] - finish sed
sweep of staticControls
finish sed sweep of staticControls
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f43a7b61
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f43a7b61
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f43a7b61
Branch: refs/heads/develop
Commit: f43a7b61a5bc07e9c4e37414e9482ff6231669ac
Parents: 9fecc95
Author: Alex Harui <ah...@apache.org>
Authored: Tue Mar 25 13:12:32 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Mar 25 13:12:32 2014 -0700
----------------------------------------------------------------------
.../src/mybeads/RowHeightBead.as | 8 +-
.../src/products/ProductItemRenderer.as | 6 +-
.../DataGridXcompile/src/DataGridXcompile.mxml | 2 +-
.../DataGridXcompile/src/MyInitialView.mxml | 8 +-
.../customControls/beads/DataGridColumnView.as | 4 +-
.../html/customControls/beads/DataGridView.as | 14 +-
.../DataItemRendererFactoryForColumnData.as | 6 +-
.../html/staticControls/beads/BoxGridView.as | 6 +-
.../FlexJSTest_Panel/src/MyInitialView.mxml | 14 +-
.../FlexJSTest_jquery/src/MyInitialView.mxml | 4 +-
examples/FormatExample/src/MyFormView.mxml | 2 +-
.../FormatExample/src/dialogs/DialogView.as | 4 +-
.../accessories/NumberFormatter.as | 4 +-
.../accessories/PhoneNumberFormatter.as | 4 +-
examples/ListsTest/src/FirstView.mxml | 4 +-
.../src/products/ProductItemRenderer.as | 8 +-
examples/StockQuote/src/MyInitialView.mxml | 4 +-
.../sample/todo/renderers/TodoItemRenderer.as | 10 +-
.../src/sample/todo/views/TodoListView.mxml | 4 +-
.../as/projects/FlexJSJX/basic-manifest.xml | 16 +-
frameworks/as/projects/FlexJSJX/defaults.css | 26 +-
.../as/projects/FlexJSJX/src/FlexJSJXClasses.as | 29 +--
.../src/org/apache/flex/charts/BarChart.as | 4 +-
.../apache/flex/charts/beads/BarChartView.as | 4 +-
.../charts/beads/ChartItemRendererFactory.as | 4 +-
.../org/apache/flex/charts/beads/XAxisBead.as | 6 +-
.../charts/supportClasses/BoxItemRenderer.as | 6 +-
.../flex/core/IDataGridPresentationModel.as | 4 +-
.../flexUnitTests/DataGridColumnTesterTest.as | 4 +-
.../as/projects/FlexJSUI/basic-manifest.xml | 72 +++---
.../as/projects/FlexJSUI/createjs-manifest.xml | 6 +-
frameworks/as/projects/FlexJSUI/defaults.css | 240 +++++++++----------
.../as/projects/FlexJSUI/html5-manifest.xml | 18 +-
.../as/projects/FlexJSUI/jquery-manifest.xml | 6 +-
.../as/projects/FlexJSUI/src/FlexJSUIClasses.as | 119 ++++-----
.../src/org/apache/flex/core/ILayoutParent.as | 6 +-
.../src/org/apache/flex/createjs/CheckBox.as | 4 +-
.../src/org/apache/flex/createjs/Label.as | 4 +-
.../src/org/apache/flex/createjs/TextButton.as | 2 +-
.../src/org/apache/flex/html/beads/AlertView.as | 2 +-
.../flex/html/beads/NumericStepperView.as | 2 +-
.../src/org/apache/flex/jquery/CheckBox.as | 4 +-
.../src/org/apache/flex/jquery/RadioButton.as | 4 +-
.../src/org/apache/flex/jquery/TextButton.as | 4 +-
.../src/org/apache/flex/svg/TextButton.as | 4 +-
.../as/projects/FlexJSUI/svg-manifest.xml | 2 +-
.../core/IDataProviderItemRendererMapper.js | 2 +-
.../FlexJS/src/org/apache/flex/core/ListBase.js | 2 +-
.../src/org/apache/flex/html/ButtonBar.js | 2 +-
.../src/org/apache/flex/svg/TextButton.js | 2 +-
frameworks/js/FlexJS/tests/MyInitialView.js | 8 +-
.../js/FlexJS/tests/MySimpleValuesImpl.js | 6 +-
frameworks/js/FlexJS/tests/test.html | 6 +-
marmotinni/build.xml | 6 +-
.../staticControls/textButton/TextButton.java | 2 +-
mustella/tests/basicTests/BasicTests.css | 4 +-
mustella/tests/basicTests/shim/VBox.as | 4 +-
57 files changed, 382 insertions(+), 380 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/DataGridExample/src/mybeads/RowHeightBead.as
----------------------------------------------------------------------
diff --git a/examples/DataGridExample/src/mybeads/RowHeightBead.as b/examples/DataGridExample/src/mybeads/RowHeightBead.as
index 2b0661e..7c41e64 100644
--- a/examples/DataGridExample/src/mybeads/RowHeightBead.as
+++ b/examples/DataGridExample/src/mybeads/RowHeightBead.as
@@ -28,9 +28,9 @@ package mybeads
import org.apache.flex.core.UIBase;
import org.apache.flex.events.Event;
import org.apache.flex.events.IEventDispatcher;
- import org.apache.flex.html.staticControls.List;
- import org.apache.flex.html.staticControls.beads.DataGridView;
- import org.apache.flex.html.staticControls.beads.IListView;
+ import org.apache.flex.html.List;
+ import org.apache.flex.html.beads.DataGridView;
+ import org.apache.flex.html.beads.IListView;
public class RowHeightBead implements IBead
{
@@ -152,4 +152,4 @@ package mybeads
}
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/DataGridExample/src/products/ProductItemRenderer.as
----------------------------------------------------------------------
diff --git a/examples/DataGridExample/src/products/ProductItemRenderer.as b/examples/DataGridExample/src/products/ProductItemRenderer.as
index f24da32..b08f759 100644
--- a/examples/DataGridExample/src/products/ProductItemRenderer.as
+++ b/examples/DataGridExample/src/products/ProductItemRenderer.as
@@ -18,8 +18,8 @@
////////////////////////////////////////////////////////////////////////////////
package products
{
- import org.apache.flex.html.staticControls.Image;
- import org.apache.flex.html.staticControls.supportClasses.DataItemRenderer;
+ import org.apache.flex.html.Image;
+ import org.apache.flex.html.supportClasses.DataItemRenderer;
public class ProductItemRenderer extends DataItemRenderer
{
@@ -58,4 +58,4 @@ package products
updateRenderer();
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/DataGridXcompile/src/DataGridXcompile.mxml
----------------------------------------------------------------------
diff --git a/examples/DataGridXcompile/src/DataGridXcompile.mxml b/examples/DataGridXcompile/src/DataGridXcompile.mxml
index 9182b33..6d89f91 100644
--- a/examples/DataGridXcompile/src/DataGridXcompile.mxml
+++ b/examples/DataGridXcompile/src/DataGridXcompile.mxml
@@ -22,7 +22,7 @@
xmlns:local="*"
xmlns:models="models.*"
xmlns:basic="library://ns.apache.org/flexjs/basic"
- xmlns:staticControls="org.apache.flex.html.staticControls.*"
+ xmlns:staticControls="org.apache.flex.html.*"
>
<basic:valuesImpl>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/DataGridXcompile/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/DataGridXcompile/src/MyInitialView.mxml b/examples/DataGridXcompile/src/MyInitialView.mxml
index 11bf6c0..71dee99 100644
--- a/examples/DataGridXcompile/src/MyInitialView.mxml
+++ b/examples/DataGridXcompile/src/MyInitialView.mxml
@@ -31,16 +31,16 @@ limitations under the License.
.boxGrid {
background-color: #FF0000;
- IBeadView: ClassReference('org.apache.flex.html.staticControls.beads.BoxGridView');
+ IBeadView: ClassReference('org.apache.flex.html.beads.BoxGridView');
}
custom|DataGrid
{
- IDataGridPresentationModel: ClassReference("org.apache.flex.html.staticControls.beads.models.DataGridPresentationModel");
+ IDataGridPresentationModel: ClassReference("org.apache.flex.html.beads.models.DataGridPresentationModel");
IBeadView: ClassReference("org.apache.flex.html.customControls.beads.DataGridView");
- IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.DataGridModel");
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.DataGridModel");
IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
- IItemRenderer: ClassReference("org.apache.flex.html.staticControls.supportClasses.StringItemRenderer");
+ IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
background-color: #FFFFFF;
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataGridColumnView.as
----------------------------------------------------------------------
diff --git a/examples/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataGridColumnView.as b/examples/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataGridColumnView.as
index 92ae4d2..88bd2ff 100644
--- a/examples/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataGridColumnView.as
+++ b/examples/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataGridColumnView.as
@@ -19,7 +19,7 @@
package org.apache.flex.html.customControls.beads
{
import org.apache.flex.core.IStrand;
- import org.apache.flex.html.staticControls.beads.ListView;
+ import org.apache.flex.html.beads.ListView;
public class DataGridColumnView extends ListView
{
@@ -54,4 +54,4 @@ package org.apache.flex.html.customControls.beads
_labelField = value;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataGridView.as
----------------------------------------------------------------------
diff --git a/examples/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataGridView.as b/examples/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataGridView.as
index 0f41aab..97f59e8 100644
--- a/examples/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataGridView.as
+++ b/examples/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataGridView.as
@@ -30,12 +30,12 @@ package org.apache.flex.html.customControls.beads
import org.apache.flex.core.ValuesManager;
import org.apache.flex.events.Event;
import org.apache.flex.events.IEventDispatcher;
- import org.apache.flex.html.staticControls.ButtonBar;
- import org.apache.flex.html.staticControls.Container;
- import org.apache.flex.html.staticControls.List;
- import org.apache.flex.html.staticControls.SimpleList;
- import org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout;
- import org.apache.flex.html.staticControls.beads.models.ArraySelectionModel;
+ import org.apache.flex.html.ButtonBar;
+ import org.apache.flex.html.Container;
+ import org.apache.flex.html.List;
+ import org.apache.flex.html.SimpleList;
+ import org.apache.flex.html.beads.layouts.NonVirtualHorizontalLayout;
+ import org.apache.flex.html.beads.models.ArraySelectionModel;
public class DataGridView implements IDataGridView
{
@@ -146,4 +146,4 @@ package org.apache.flex.html.customControls.beads
IEventDispatcher(_strand).dispatchEvent(new Event('change'));
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataItemRendererFactoryForColumnData.as
----------------------------------------------------------------------
diff --git a/examples/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataItemRendererFactoryForColumnData.as b/examples/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataItemRendererFactoryForColumnData.as
index a3e5a38..493984f 100644
--- a/examples/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataItemRendererFactoryForColumnData.as
+++ b/examples/DataGridXcompile/src/org/apache/flex/html/customControls/beads/DataItemRendererFactoryForColumnData.as
@@ -28,8 +28,8 @@ package org.apache.flex.html.customControls.beads
import org.apache.flex.core.ValuesManager;
import org.apache.flex.events.Event;
import org.apache.flex.events.IEventDispatcher;
- import org.apache.flex.html.staticControls.supportClasses.DataItemRenderer;
- import org.apache.flex.html.staticControls.beads.IListView;
+ import org.apache.flex.html.supportClasses.DataItemRenderer;
+ import org.apache.flex.html.beads.IListView;
public class DataItemRendererFactoryForColumnData implements IBead, IDataProviderItemRendererMapper
{
@@ -98,4 +98,4 @@ package org.apache.flex.html.customControls.beads
IEventDispatcher(_strand).dispatchEvent(new Event("itemsCreated"));
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/DataGridXcompile/src/org/apache/flex/html/staticControls/beads/BoxGridView.as
----------------------------------------------------------------------
diff --git a/examples/DataGridXcompile/src/org/apache/flex/html/staticControls/beads/BoxGridView.as b/examples/DataGridXcompile/src/org/apache/flex/html/staticControls/beads/BoxGridView.as
index e716abb..a9d7b8f 100644
--- a/examples/DataGridXcompile/src/org/apache/flex/html/staticControls/beads/BoxGridView.as
+++ b/examples/DataGridXcompile/src/org/apache/flex/html/staticControls/beads/BoxGridView.as
@@ -16,12 +16,12 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.beads
+package org.apache.flex.html.beads
{
import org.apache.flex.core.IBeadView;
import org.apache.flex.core.IStrand;
import org.apache.flex.core.UIBase;
- import org.apache.flex.html.staticControls.Label;
+ import org.apache.flex.html.Label;
public class BoxGridView implements IBeadView
{
@@ -45,4 +45,4 @@ package org.apache.flex.html.staticControls.beads
UIBase(_strand).addElement(label);
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/FlexJSTest_Panel/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/FlexJSTest_Panel/src/MyInitialView.mxml b/examples/FlexJSTest_Panel/src/MyInitialView.mxml
index e5df7da..a9c0647 100644
--- a/examples/FlexJSTest_Panel/src/MyInitialView.mxml
+++ b/examples/FlexJSTest_Panel/src/MyInitialView.mxml
@@ -22,8 +22,8 @@ limitations under the License.
initComplete="initControls()">
<fx:Script>
<![CDATA[
- import org.apache.flex.html.staticControls.Alert;
- import org.apache.flex.html.staticControls.SimpleAlert;
+ import org.apache.flex.html.Alert;
+ import org.apache.flex.html.SimpleAlert;
private function initControls():void
{
@@ -103,17 +103,17 @@ limitations under the License.
@media -flex-flash
{
.TitleBar {
- iBackgroundBead: ClassReference('org.apache.flex.html.staticControls.beads.SolidBackgroundBead');
+ iBackgroundBead: ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
}
.panel1 {
- iBorderBead: ClassReference('org.apache.flex.html.staticControls.beads.SingleLineBorderBead');
- iBackgroundBead: ClassReference('org.apache.flex.html.staticControls.beads.SolidBackgroundBead');
+ iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
+ iBackgroundBead: ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
}
.numStepper {
- iBorderBead: ClassReference('org.apache.flex.html.staticControls.beads.SingleLineBorderBead');
- iBackgroundBead: ClassReference('org.apache.flex.html.staticControls.beads.SolidBackgroundBead');
+ iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
+ iBackgroundBead: ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/FlexJSTest_jquery/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/FlexJSTest_jquery/src/MyInitialView.mxml b/examples/FlexJSTest_jquery/src/MyInitialView.mxml
index 7868d10..40b533c 100644
--- a/examples/FlexJSTest_jquery/src/MyInitialView.mxml
+++ b/examples/FlexJSTest_jquery/src/MyInitialView.mxml
@@ -25,8 +25,8 @@ limitations under the License.
<![CDATA[
import org.apache.flex.events.CustomEvent;
import org.apache.flex.events.Event;
- import org.apache.flex.html.staticControls.Label;
- import org.apache.flex.html.staticControls.TextButton;
+ import org.apache.flex.html.Label;
+ import org.apache.flex.html.TextButton;
import org.apache.flex.utils.Timer;
private var timer:org.apache.flex.utils.Timer;
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/FormatExample/src/MyFormView.mxml
----------------------------------------------------------------------
diff --git a/examples/FormatExample/src/MyFormView.mxml b/examples/FormatExample/src/MyFormView.mxml
index 60df6dd..56d89d7 100644
--- a/examples/FormatExample/src/MyFormView.mxml
+++ b/examples/FormatExample/src/MyFormView.mxml
@@ -21,7 +21,7 @@ limitations under the License.
xmlns:basic="library://ns.apache.org/flexjs/basic"
xmlns:local="*"
xmlns:models="models.*"
- xmlns:acc="org.apache.flex.html.staticControls.accessories.*">
+ xmlns:acc="org.apache.flex.html.accessories.*">
<fx:Style>
.title {
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/FormatExample/src/dialogs/DialogView.as
----------------------------------------------------------------------
diff --git a/examples/FormatExample/src/dialogs/DialogView.as b/examples/FormatExample/src/dialogs/DialogView.as
index dc4377d..0122c06 100644
--- a/examples/FormatExample/src/dialogs/DialogView.as
+++ b/examples/FormatExample/src/dialogs/DialogView.as
@@ -19,7 +19,7 @@
package dialogs
{
import org.apache.flex.core.IStrand;
- import org.apache.flex.html.staticControls.beads.PanelView;
+ import org.apache.flex.html.beads.PanelView;
public class DialogView extends PanelView
{
@@ -35,4 +35,4 @@ package dialogs
super.strand = value;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/FormatExample/src/org/apache/flex/html/staticControls/accessories/NumberFormatter.as
----------------------------------------------------------------------
diff --git a/examples/FormatExample/src/org/apache/flex/html/staticControls/accessories/NumberFormatter.as b/examples/FormatExample/src/org/apache/flex/html/staticControls/accessories/NumberFormatter.as
index ab9e6b7..0d1b613 100644
--- a/examples/FormatExample/src/org/apache/flex/html/staticControls/accessories/NumberFormatter.as
+++ b/examples/FormatExample/src/org/apache/flex/html/staticControls/accessories/NumberFormatter.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.accessories
+package org.apache.flex.html.accessories
{
import org.apache.flex.core.IBeadModel;
import org.apache.flex.core.IFormatBead;
@@ -207,4 +207,4 @@ package org.apache.flex.html.staticControls.accessories
return result;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/FormatExample/src/org/apache/flex/html/staticControls/accessories/PhoneNumberFormatter.as
----------------------------------------------------------------------
diff --git a/examples/FormatExample/src/org/apache/flex/html/staticControls/accessories/PhoneNumberFormatter.as b/examples/FormatExample/src/org/apache/flex/html/staticControls/accessories/PhoneNumberFormatter.as
index 5655732..7523c96 100644
--- a/examples/FormatExample/src/org/apache/flex/html/staticControls/accessories/PhoneNumberFormatter.as
+++ b/examples/FormatExample/src/org/apache/flex/html/staticControls/accessories/PhoneNumberFormatter.as
@@ -16,7 +16,7 @@
// limitations under the License.
//
////////////////////////////////////////////////////////////////////////////////
-package org.apache.flex.html.staticControls.accessories
+package org.apache.flex.html.accessories
{
import org.apache.flex.core.IBead;
import org.apache.flex.core.IBeadModel;
@@ -192,4 +192,4 @@ package org.apache.flex.html.staticControls.accessories
return result;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/ListsTest/src/FirstView.mxml
----------------------------------------------------------------------
diff --git a/examples/ListsTest/src/FirstView.mxml b/examples/ListsTest/src/FirstView.mxml
index 7c480a6..32e9d82 100644
--- a/examples/ListsTest/src/FirstView.mxml
+++ b/examples/ListsTest/src/FirstView.mxml
@@ -38,13 +38,13 @@ limitations under the License.
* the itemRenderer in a style definition along with other settings.
*/
.productList {
- IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData");
+ IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.DataItemRendererFactoryForArrayData");
IItemRenderer: ClassReference("products.ProductItemRenderer");
}
sample|ProductItemRenderer {
height: 40;
- IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.ItemRendererMouseController");
+ IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ItemRendererMouseController");
}
</fx:Style>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/ListsTest/src/products/ProductItemRenderer.as
----------------------------------------------------------------------
diff --git a/examples/ListsTest/src/products/ProductItemRenderer.as b/examples/ListsTest/src/products/ProductItemRenderer.as
index 2e39669..587cae6 100644
--- a/examples/ListsTest/src/products/ProductItemRenderer.as
+++ b/examples/ListsTest/src/products/ProductItemRenderer.as
@@ -18,9 +18,9 @@
////////////////////////////////////////////////////////////////////////////////
package products
{
- import org.apache.flex.html.staticControls.Label;
- import org.apache.flex.html.staticControls.Image;
- import org.apache.flex.html.staticControls.supportClasses.DataItemRenderer;
+ import org.apache.flex.html.Label;
+ import org.apache.flex.html.Image;
+ import org.apache.flex.html.supportClasses.DataItemRenderer;
public class ProductItemRenderer extends DataItemRenderer
{
@@ -75,4 +75,4 @@ package products
updateRenderer();
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/StockQuote/src/MyInitialView.mxml
----------------------------------------------------------------------
diff --git a/examples/StockQuote/src/MyInitialView.mxml b/examples/StockQuote/src/MyInitialView.mxml
index 2b52faa..ef54a26 100644
--- a/examples/StockQuote/src/MyInitialView.mxml
+++ b/examples/StockQuote/src/MyInitialView.mxml
@@ -92,11 +92,11 @@ limitations under the License.
{
.leftSide {
- iBorderBead: ClassReference('org.apache.flex.html.staticControls.beads.SingleLineBorderBead');
+ iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
}
.rightSide {
- iBorderBead: ClassReference('org.apache.flex.html.staticControls.beads.SingleLineBorderBead');
+ iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
}
}
</fx:Style>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/TodoListSampleApp/src/sample/todo/renderers/TodoItemRenderer.as
----------------------------------------------------------------------
diff --git a/examples/TodoListSampleApp/src/sample/todo/renderers/TodoItemRenderer.as b/examples/TodoListSampleApp/src/sample/todo/renderers/TodoItemRenderer.as
index 0158513..a4fa9f1 100644
--- a/examples/TodoListSampleApp/src/sample/todo/renderers/TodoItemRenderer.as
+++ b/examples/TodoListSampleApp/src/sample/todo/renderers/TodoItemRenderer.as
@@ -17,10 +17,10 @@
//
////////////////////////////////////////////////////////////////////////////////
package sample.todo.renderers {
- import org.apache.flex.html.staticControls.Button;
- import org.apache.flex.html.staticControls.CheckBox;
- import org.apache.flex.html.staticControls.Label;
- import org.apache.flex.html.staticControls.supportClasses.DataItemRenderer;
+ import org.apache.flex.html.Button;
+ import org.apache.flex.html.CheckBox;
+ import org.apache.flex.html.Label;
+ import org.apache.flex.html.supportClasses.DataItemRenderer;
public class TodoItemRenderer extends DataItemRenderer {
public function TodoItemRenderer() {
@@ -66,4 +66,4 @@ package sample.todo.renderers {
updateRenderer();
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/examples/TodoListSampleApp/src/sample/todo/views/TodoListView.mxml
----------------------------------------------------------------------
diff --git a/examples/TodoListSampleApp/src/sample/todo/views/TodoListView.mxml b/examples/TodoListSampleApp/src/sample/todo/views/TodoListView.mxml
index 844158e..7bbe027 100644
--- a/examples/TodoListSampleApp/src/sample/todo/views/TodoListView.mxml
+++ b/examples/TodoListSampleApp/src/sample/todo/views/TodoListView.mxml
@@ -96,13 +96,13 @@ limitations under the License.
* the itemRenderer in a style definition along with other settings.
*/
.todoList {
- IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData");
+ IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.DataItemRendererFactoryForArrayData");
IItemRenderer: ClassReference("sample.todo.renderers.TodoItemRenderer");
}
renderers|TodoItemRenderer {
height: 40;
- IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.ItemRendererMouseController");
+ IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ItemRendererMouseController");
}
</fx:Style>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSJX/basic-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/basic-manifest.xml b/frameworks/as/projects/FlexJSJX/basic-manifest.xml
index 85135bf..9630ad6 100644
--- a/frameworks/as/projects/FlexJSJX/basic-manifest.xml
+++ b/frameworks/as/projects/FlexJSJX/basic-manifest.xml
@@ -21,14 +21,14 @@
<componentPackage>
- <component id="DataGrid" class="org.apache.flex.html.staticControls.DataGrid"/>
- <component id="DataGridColumn" class="org.apache.flex.html.staticControls.supportClasses.DataGridColumn"/>
- <component id="FormatableLabelView" class="org.apache.flex.html.staticControls.beads.FormatableLabelView"/>
- <component id="FormatableTextInputView" class="org.apache.flex.html.staticControls.beads.FormatableTextInputView"/>
- <component id="DataGridPresentationModel" class="org.apache.flex.html.staticControls.beads.models.DataGridPresentationModel" />
-
- <component id="DateChooser" class="org.apache.flex.html.staticControls.DateChooser"/>
- <component id="DateField" class="org.apache.flex.html.staticControls.DateField"/>
+ <component id="DataGrid" class="org.apache.flex.html.DataGrid"/>
+ <component id="DataGridColumn" class="org.apache.flex.html.supportClasses.DataGridColumn"/>
+ <component id="FormatableLabelView" class="org.apache.flex.html.beads.FormatableLabelView"/>
+ <component id="FormatableTextInputView" class="org.apache.flex.html.beads.FormatableTextInputView"/>
+ <component id="DataGridPresentationModel" class="org.apache.flex.html.beads.models.DataGridPresentationModel" />
+
+ <component id="DateChooser" class="org.apache.flex.html.DateChooser"/>
+ <component id="DateField" class="org.apache.flex.html.DateField"/>
<component id="BarChart" class="org.apache.flex.charts.BarChart" />
<component id="BarChartSeries" class="org.apache.flex.charts.supportClasses.BarChartSeries" />
<component id="BoxItemRenderer" class="org.apache.flex.charts.supportClasses.BoxItemRenderer" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSJX/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/defaults.css b/frameworks/as/projects/FlexJSJX/defaults.css
index 3666776..6b0970b 100644
--- a/frameworks/as/projects/FlexJSJX/defaults.css
+++ b/frameworks/as/projects/FlexJSJX/defaults.css
@@ -21,9 +21,9 @@
BarChart
{
- IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ArraySelectionModel");
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
IBeadView: ClassReference("org.apache.flex.charts.beads.BarChartView");
- IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.ListSingleSelectionMouseController");
+ IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController");
IBeadLayout: ClassReference("org.apache.flex.charts.beads.layouts.BarChartLayout");
IDataProviderItemRendererMapper: ClassReference("org.apache.flex.charts.beads.ChartItemRendererFactory");
IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
@@ -32,26 +32,26 @@ BarChart
DataGrid
{
- IDataGridPresentationModel: ClassReference("org.apache.flex.html.staticControls.beads.models.DataGridPresentationModel");
- IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.DataGridView");
- IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.DataGridModel");
+ IDataGridPresentationModel: ClassReference("org.apache.flex.html.beads.models.DataGridPresentationModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.DataGridView");
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.DataGridModel");
IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
- IItemRenderer: ClassReference("org.apache.flex.html.staticControls.supportClasses.StringItemRenderer");
+ IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
background-color: #FFFFFF;
}
DateChooser {
- IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.DateChooserView");
- IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.DateChooserModel");
- IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.DateChooserMouseController");
+ IBeadView: ClassReference("org.apache.flex.html.beads.DateChooserView");
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.DateChooserModel");
+ IBeadController: ClassReference("org.apache.flex.html.beads.controllers.DateChooserMouseController");
width: 280px;
height: 240px;
}
DateField {
- IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.DateFieldView");
- IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.DateChooserModel");
- IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.DateFieldMouseController");
- IFormatBead: ClassReference("org.apache.flex.html.staticControls.accessories.DateFormatMMDDYYYYBead");
+ IBeadView: ClassReference("org.apache.flex.html.beads.DateFieldView");
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.DateChooserModel");
+ IBeadController: ClassReference("org.apache.flex.html.beads.controllers.DateFieldMouseController");
+ IFormatBead: ClassReference("org.apache.flex.html.accessories.DateFormatMMDDYYYYBead");
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSJX/src/FlexJSJXClasses.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/FlexJSJXClasses.as b/frameworks/as/projects/FlexJSJX/src/FlexJSJXClasses.as
index 7ca0481..5e8608a 100644
--- a/frameworks/as/projects/FlexJSJX/src/FlexJSJXClasses.as
+++ b/frameworks/as/projects/FlexJSJX/src/FlexJSJXClasses.as
@@ -34,20 +34,21 @@ internal class FlexJSJXClasses
import org.apache.flex.charts.supportClasses.BarChartSeries; BarChartSeries;
import org.apache.flex.charts.supportClasses.BoxItemRenderer; BoxItemRenderer;
- import org.apache.flex.html.staticControls.accessories.DateFormatMMDDYYYYBead; DateFormatMMDDYYYYBead;
- import org.apache.flex.html.staticControls.beads.DataGridColumnView; DataGridColumnView;
- import org.apache.flex.html.staticControls.beads.DataGridView; DataGridView;
- import org.apache.flex.html.staticControls.beads.DateChooserView; DateChooserView;
- import org.apache.flex.html.staticControls.beads.DateFieldView; DateFieldView;
- import org.apache.flex.html.staticControls.beads.FormatableLabelView; FormatableLabelView;
- import org.apache.flex.html.staticControls.beads.FormatableTextInputView; FormatableTextInputView;
- import org.apache.flex.html.staticControls.beads.models.DataGridModel; DataGridModel;
- import org.apache.flex.html.staticControls.beads.models.DateChooserModel; DateChooserModel;
- import org.apache.flex.html.staticControls.beads.models.DataGridPresentationModel; DataGridPresentationModel;
- import org.apache.flex.html.staticControls.beads.controllers.DateChooserMouseController; DateChooserMouseController;
- import org.apache.flex.html.staticControls.beads.controllers.DateFieldMouseController; DateFieldMouseController;
- import org.apache.flex.html.staticControls.supportClasses.DataGridColumn; DataGridColumn;
- import org.apache.flex.html.staticControls.supportClasses.DateChooserButton; DateChooserButton;
+ import org.apache.flex.html.accessories.DateFormatMMDDYYYYBead; DateFormatMMDDYYYYBead;
+ import org.apache.flex.html.beads.DataGridColumnView; DataGridColumnView;
+ import org.apache.flex.html.beads.DataGridView; DataGridView;
+ import org.apache.flex.html.beads.DateChooserView; DateChooserView;
+ import org.apache.flex.html.beads.DateFieldView; DateFieldView;
+ import org.apache.flex.html.beads.FormatableLabelView; FormatableLabelView;
+ import org.apache.flex.html.beads.FormatableTextInputView; FormatableTextInputView;
+ import org.apache.flex.html.beads.models.DataGridModel; DataGridModel;
+ import org.apache.flex.html.beads.models.DateChooserModel; DateChooserModel;
+ import org.apache.flex.html.beads.models.DataGridPresentationModel; DataGridPresentationModel;
+ import org.apache.flex.html.beads.controllers.DateChooserMouseController; DateChooserMouseController;
+ import org.apache.flex.html.beads.controllers.DateFieldMouseController; DateFieldMouseController;
+ import org.apache.flex.html.supportClasses.DataGridColumn; DataGridColumn;
+ import org.apache.flex.html.supportClasses.DateChooserButton; DateChooserButton;
}
}
+
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/BarChart.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/BarChart.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/BarChart.as
index 4151634..0048ad2 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/BarChart.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/BarChart.as
@@ -20,7 +20,7 @@ package org.apache.flex.charts
{
import org.apache.flex.charts.core.IChart;
import org.apache.flex.events.Event;
- import org.apache.flex.html.staticControls.List;
+ import org.apache.flex.html.List;
/**
* The BarChart class draws a multi-series graph of data using vertical
@@ -68,4 +68,4 @@ package org.apache.flex.charts
dispatchEvent(new Event("seriesChanged"));
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/BarChartView.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/BarChartView.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/BarChartView.as
index 86aa397..bd79026 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/BarChartView.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/BarChartView.as
@@ -20,7 +20,7 @@ package org.apache.flex.charts.beads
{
import org.apache.flex.core.ISelectionModel;
import org.apache.flex.core.IStrand;
- import org.apache.flex.html.staticControls.beads.ListView;
+ import org.apache.flex.html.beads.ListView;
/**
* The BarChartView class is the visual bead for a BarChart. This class makes
@@ -64,4 +64,4 @@ package org.apache.flex.charts.beads
super.strand = value;
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartItemRendererFactory.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartItemRendererFactory.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartItemRendererFactory.as
index 4204811..8820f7e 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartItemRendererFactory.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/ChartItemRendererFactory.as
@@ -29,7 +29,7 @@ package org.apache.flex.charts.beads
import org.apache.flex.core.IStrand;
import org.apache.flex.events.Event;
import org.apache.flex.events.IEventDispatcher;
- import org.apache.flex.html.staticControls.beads.IListView;
+ import org.apache.flex.html.beads.IListView;
/**
* The ChartItemRendererFactory class implements IDataProviderItemRendererMapper
@@ -143,4 +143,4 @@ package org.apache.flex.charts.beads
{
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/XAxisBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/XAxisBead.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/XAxisBead.as
index 1763fce..c3af014 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/XAxisBead.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/beads/XAxisBead.as
@@ -30,8 +30,8 @@ package org.apache.flex.charts.beads
import org.apache.flex.core.UIBase;
import org.apache.flex.events.Event;
import org.apache.flex.events.IEventDispatcher;
- import org.apache.flex.html.staticControls.Label;
- import org.apache.flex.html.staticControls.beads.models.ArraySelectionModel;
+ import org.apache.flex.html.Label;
+ import org.apache.flex.html.beads.models.ArraySelectionModel;
/**
* The BoxItemRenderer displays a colored rectangular area suitable for use as
@@ -150,4 +150,4 @@ package org.apache.flex.charts.beads
}
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/BoxItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/BoxItemRenderer.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/BoxItemRenderer.as
index 67f5978..1062371 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/BoxItemRenderer.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/charts/supportClasses/BoxItemRenderer.as
@@ -21,7 +21,7 @@ package org.apache.flex.charts.supportClasses
import org.apache.flex.charts.core.IChartItemRenderer;
import org.apache.flex.core.FilledRectangle;
import org.apache.flex.core.UIBase;
- import org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase;
+ import org.apache.flex.html.supportClasses.UIItemRendererBase;
/**
* The BoxItemRenderer displays a colored rectangular area suitable for use as
@@ -129,7 +129,7 @@ package org.apache.flex.charts.supportClasses
}
/**
- * @copy org.apache.flex.staticControls.supportClasses.UIItemRendererBase#data
+ * @copy org.apache.flex.supportClasses.UIItemRendererBase#data
*
* @langversion 3.0
* @playerversion Flash 10.2
@@ -185,4 +185,4 @@ package org.apache.flex.charts.supportClasses
}
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSJX/src/org/apache/flex/core/IDataGridPresentationModel.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/core/IDataGridPresentationModel.as b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/core/IDataGridPresentationModel.as
index 4603eaa..2e4fa90 100644
--- a/frameworks/as/projects/FlexJSJX/src/org/apache/flex/core/IDataGridPresentationModel.as
+++ b/frameworks/as/projects/FlexJSJX/src/org/apache/flex/core/IDataGridPresentationModel.as
@@ -43,7 +43,7 @@ package org.apache.flex.core
function set columnLabels(value:Array):void;
/**
- * The height of all of the rows in the org.apache.flex.html.staticControls.DataGrid.
+ * The height of all of the rows in the org.apache.flex.html.DataGrid.
*
* @langversion 3.0
* @playerversion Flash 10.2
@@ -53,4 +53,4 @@ package org.apache.flex.core
function get rowHeight():Number;
function set rowHeight(value:Number):void;
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSJX/tests/flexUnitTests/DataGridColumnTesterTest.as
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSJX/tests/flexUnitTests/DataGridColumnTesterTest.as b/frameworks/as/projects/FlexJSJX/tests/flexUnitTests/DataGridColumnTesterTest.as
index 9720119..275b2a3 100644
--- a/frameworks/as/projects/FlexJSJX/tests/flexUnitTests/DataGridColumnTesterTest.as
+++ b/frameworks/as/projects/FlexJSJX/tests/flexUnitTests/DataGridColumnTesterTest.as
@@ -2,7 +2,7 @@ package flexUnitTests
{
import flexunit.framework.Assert;
- import org.apache.flex.html.staticControls.supportClasses.DataGridColumn;
+ import org.apache.flex.html.supportClasses.DataGridColumn;
public class DataGridColumnTesterTest
{
@@ -34,4 +34,4 @@ package flexUnitTests
Assert.assertEquals("Error testing DataGridColumn.label", column.label, "foo");
}
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSUI/basic-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/basic-manifest.xml b/frameworks/as/projects/FlexJSUI/basic-manifest.xml
index 01b7a46..7ac02b3 100644
--- a/frameworks/as/projects/FlexJSUI/basic-manifest.xml
+++ b/frameworks/as/projects/FlexJSUI/basic-manifest.xml
@@ -27,49 +27,49 @@
<component id="ViewBase" class="org.apache.flex.core.ViewBase"/>
<component id="ConstantBinding" class="org.apache.flex.binding.ConstantBinding"/>
<component id="SimpleBinding" class="org.apache.flex.binding.SimpleBinding"/>
- <component id="Button" class="org.apache.flex.html.staticControls.Button"/>
- <component id="ButtonBar" class="org.apache.flex.html.staticControls.ButtonBar"/>
- <component id="DropDownList" class="org.apache.flex.html.staticControls.DropDownList"/>
- <component id="DropDownListList" class="org.apache.flex.html.staticControls.supportClasses.DropDownListList"/>
- <component id="Image" class="org.apache.flex.html.staticControls.Image"/>
- <component id="Label" class="org.apache.flex.html.staticControls.Label"/>
- <component id="TextButton" class="org.apache.flex.html.staticControls.TextButton"/>
- <component id="TextInput" class="org.apache.flex.html.staticControls.TextInput"/>
- <component id="TextArea" class="org.apache.flex.html.staticControls.TextArea"/>
- <component id="List" class="org.apache.flex.html.staticControls.List"/>
- <component id="SimpleList" class="org.apache.flex.html.staticControls.SimpleList"/>
- <component id="CheckBox" class="org.apache.flex.html.staticControls.CheckBox"/>
- <component id="RadioButton" class="org.apache.flex.html.staticControls.RadioButton"/>
- <component id="ComboBox" class="org.apache.flex.html.staticControls.ComboBox"/>
+ <component id="Button" class="org.apache.flex.html.Button"/>
+ <component id="ButtonBar" class="org.apache.flex.html.ButtonBar"/>
+ <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="Label" class="org.apache.flex.html.Label"/>
+ <component id="TextButton" class="org.apache.flex.html.TextButton"/>
+ <component id="TextInput" class="org.apache.flex.html.TextInput"/>
+ <component id="TextArea" class="org.apache.flex.html.TextArea"/>
+ <component id="List" class="org.apache.flex.html.List"/>
+ <component id="SimpleList" class="org.apache.flex.html.SimpleList"/>
+ <component id="CheckBox" class="org.apache.flex.html.CheckBox"/>
+ <component id="RadioButton" class="org.apache.flex.html.RadioButton"/>
+ <component id="ComboBox" class="org.apache.flex.html.ComboBox"/>
<component id="HTTPService" class="org.apache.flex.net.HTTPService"/>
<component id="LazyCollection" class="org.apache.flex.net.dataConverters.LazyCollection"/>
<component id="JSONInputParser" class="org.apache.flex.net.JSONInputParser"/>
<component id="JSONItemConverter" class="org.apache.flex.net.JSONItemConverter"/>
<component id="ViewSourceContextMenuOption" class="org.apache.flex.utils.ViewSourceContextMenuOption"/>
<component id="BinaryUploader" class="org.apache.flex.net.BinaryUploader"/>
- <component id="Container" class="org.apache.flex.html.staticControls.Container"/>
- <component id="Panel" class="org.apache.flex.html.staticControls.Panel"/>
- <component id="ControlBar" class="org.apache.flex.html.staticControls.ControlBar"/>
- <component id="TitleBar" class="org.apache.flex.html.staticControls.TitleBar"/>
- <component id="TitleBarModel" class="org.apache.flex.html.staticControls.beads.models.TitleBarModel"/>
- <component id="NonVirtualVerticalLayout" class="org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalLayout"/>
- <component id="NonVirtualHorizontalLayout" class="org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout"/>
- <component id="TileLayout" class="org.apache.flex.html.staticControls.beads.layouts.TileLayout"/>
- <component id="SimpleAlert" class="org.apache.flex.html.staticControls.SimpleAlert"/>
- <component id="Alert" class="org.apache.flex.html.staticControls.Alert"/>
- <component id="Spinner" class="org.apache.flex.html.staticControls.Spinner"/>
- <component id="Slider" class="org.apache.flex.html.staticControls.Slider"/>
- <component id="SolidBackgroundBead" class="org.apache.flex.html.staticControls.beads.SolidBackgroundBead"/>
+ <component id="Container" class="org.apache.flex.html.Container"/>
+ <component id="Panel" class="org.apache.flex.html.Panel"/>
+ <component id="ControlBar" class="org.apache.flex.html.ControlBar"/>
+ <component id="TitleBar" class="org.apache.flex.html.TitleBar"/>
+ <component id="TitleBarModel" class="org.apache.flex.html.beads.models.TitleBarModel"/>
+ <component id="NonVirtualVerticalLayout" class="org.apache.flex.html.beads.layouts.NonVirtualVerticalLayout"/>
+ <component id="NonVirtualHorizontalLayout" class="org.apache.flex.html.beads.layouts.NonVirtualHorizontalLayout"/>
+ <component id="TileLayout" class="org.apache.flex.html.beads.layouts.TileLayout"/>
+ <component id="SimpleAlert" class="org.apache.flex.html.SimpleAlert"/>
+ <component id="Alert" class="org.apache.flex.html.Alert"/>
+ <component id="Spinner" class="org.apache.flex.html.Spinner"/>
+ <component id="Slider" class="org.apache.flex.html.Slider"/>
+ <component id="SolidBackgroundBead" class="org.apache.flex.html.beads.SolidBackgroundBead"/>
<component id="ViewBaseDataBinding" class="org.apache.flex.core.ViewBaseDataBinding"/>
- <component id="NumericStepper" class="org.apache.flex.html.staticControls.NumericStepper" />
- <component id="TextFieldItemRenderer" class="org.apache.flex.html.staticControls.supportClasses.TextFieldItemRenderer"/>
- <component id="StringItemRenderer" class="org.apache.flex.html.staticControls.supportClasses.StringItemRenderer"/>
- <component id="DataItemRenderer" class="org.apache.flex.html.staticControls.supportClasses.DataItemRenderer"/>
- <component id="ButtonBarButtonItemRenderer" class="org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer"/>
- <component id="ScrollBar" class="org.apache.flex.html.staticControls.supportClasses.ScrollBar"/>
- <component id="NumericOnlyTextInputBead" class="org.apache.flex.html.staticControls.accessories.NumericOnlyTextInputBead" />
- <component id="PasswordInputBead" class="org.apache.flex.html.staticControls.accessories.PasswordInputBead" />
- <component id="TextPromptBead" class="org.apache.flex.html.staticControls.accessories.TextPromptBead" />
+ <component id="NumericStepper" class="org.apache.flex.html.NumericStepper" />
+ <component id="TextFieldItemRenderer" class="org.apache.flex.html.supportClasses.TextFieldItemRenderer"/>
+ <component id="StringItemRenderer" class="org.apache.flex.html.supportClasses.StringItemRenderer"/>
+ <component id="DataItemRenderer" class="org.apache.flex.html.supportClasses.DataItemRenderer"/>
+ <component id="ButtonBarButtonItemRenderer" class="org.apache.flex.html.supportClasses.ButtonBarButtonItemRenderer"/>
+ <component id="ScrollBar" class="org.apache.flex.html.supportClasses.ScrollBar"/>
+ <component id="NumericOnlyTextInputBead" class="org.apache.flex.html.accessories.NumericOnlyTextInputBead" />
+ <component id="PasswordInputBead" class="org.apache.flex.html.accessories.PasswordInputBead" />
+ <component id="TextPromptBead" class="org.apache.flex.html.accessories.TextPromptBead" />
<component id="MixinManager" class="org.apache.flex.utils.MixinManager" />
</componentPackage>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSUI/createjs-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/createjs-manifest.xml b/frameworks/as/projects/FlexJSUI/createjs-manifest.xml
index c72090c..1c5a5ed 100644
--- a/frameworks/as/projects/FlexJSUI/createjs-manifest.xml
+++ b/frameworks/as/projects/FlexJSUI/createjs-manifest.xml
@@ -24,8 +24,8 @@
<component id="Application" class="org.apache.flex.createjs.Application"/>
<component id="UIBase" class="org.apache.flex.createjs.core.UIBase"/>
<component id="ViewBase" class="org.apache.flex.createjs.core.ViewBase"/>
- <component id="Label" class="org.apache.flex.createjs.staticControls.Label"/>
- <component id="TextButton" class="org.apache.flex.createjs.staticControls.TextButton"/>
- <component id="CheckBox" class="org.apache.flex.createjs.staticControls.CheckBox"/>
+ <component id="Label" class="org.apache.flex.createjs.Label"/>
+ <component id="TextButton" class="org.apache.flex.createjs.TextButton"/>
+ <component id="CheckBox" class="org.apache.flex.createjs.CheckBox"/>
</componentPackage>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSUI/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/defaults.css b/frameworks/as/projects/FlexJSUI/defaults.css
index 7a4d2f8..e41f815 100644
--- a/frameworks/as/projects/FlexJSUI/defaults.css
+++ b/frameworks/as/projects/FlexJSUI/defaults.css
@@ -53,13 +53,13 @@ Button:active
ButtonBar
{
- IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ArraySelectionModel");
- IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.ButtonBarView");
- IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.ListSingleSelectionMouseController");
- IBeadLayout: ClassReference("org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout");
- IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData");
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.ButtonBarView");
+ IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController");
+ IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.ButtonBarLayout");
+ IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.TextItemRendererFactoryForArrayData");
IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
- IItemRenderer: ClassReference("org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer");
+ IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.ButtonBarButtonItemRenderer");
border-style: none;
}
@@ -72,29 +72,29 @@ ButtonBarButtonItemRenderer
List
{
- IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ArraySelectionModel");
- IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.ListView");
- IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.ListSingleSelectionMouseController");
- IBeadLayout: ClassReference("org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalScrollingLayout");
- IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.staticControls.beads.DataItemRendererFactoryForArrayData");
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.ListView");
+ IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController");
+ IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.NonVirtualVerticalScrollingLayout");
+ IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.DataItemRendererFactoryForArrayData");
IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
- IItemRenderer: ClassReference("org.apache.flex.html.staticControls.supportClasses.StringItemRenderer");
+ IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
}
SimpleList
{
- IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ArraySelectionModel");
- IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.ListView");
- IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.ListSingleSelectionMouseController");
- IBeadLayout: ClassReference("org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalScrollingLayout");
- IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData");
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.ListView");
+ IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ListSingleSelectionMouseController");
+ IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.NonVirtualVerticalScrollingLayout");
+ IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.TextItemRendererFactoryForArrayData");
IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
- IItemRenderer: ClassReference("org.apache.flex.html.staticControls.supportClasses.StringItemRenderer");
+ IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
}
StringItemRenderer
{
- IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.ItemRendererMouseController");
+ IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ItemRendererMouseController");
height: 16;
}
@@ -109,11 +109,11 @@ global
Alert
{
- IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.AlertModel");
- IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.AlertView");
- IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.AlertController");
- iBackgroundBead: ClassReference("org.apache.flex.html.staticControls.beads.SolidBackgroundBead");
- iBorderBead: ClassReference("org.apache.flex.html.staticControls.beads.SingleLineBorderBead");
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.AlertModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.AlertView");
+ IBeadController: ClassReference("org.apache.flex.html.beads.controllers.AlertController");
+ iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
+ iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
background-color: #FFFFFF;
border-style: solid;
@@ -123,37 +123,37 @@ Alert
Button
{
- IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.CSSButtonView");
+ IBeadView: ClassReference("org.apache.flex.html.beads.CSSButtonView");
}
CheckBox
{
- IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ToggleButtonModel");
- IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.CheckBoxView");
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.ToggleButtonModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.CheckBoxView");
}
ComboBox
{
- IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ComboBoxModel");
- IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.ComboBoxView");
- IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.ComboBoxController");
- IPopUp: ClassReference("org.apache.flex.html.staticControls.supportClasses.DropDownListList");
- IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData");
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.ComboBoxModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.ComboBoxView");
+ IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ComboBoxController");
+ IPopUp: ClassReference("org.apache.flex.html.supportClasses.DropDownListList");
+ IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.TextItemRendererFactoryForArrayData");
IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
- IItemRenderer: ClassReference("org.apache.flex.html.staticControls.supportClasses.StringItemRenderer");
+ IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
}
Container
{
- IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.ContainerView")
+ IBeadView: ClassReference("org.apache.flex.html.beads.ContainerView")
}
ControlBar
{
- IBeadLayout: ClassReference("org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout");
- iMeasurementBead: ClassReference("org.apache.flex.html.staticControls.beads.ControlBarMeasurementBead");
- iBackgroundBead: ClassReference("org.apache.flex.html.staticControls.beads.SolidBackgroundBead");
- iBorderBead: ClassReference("org.apache.flex.html.staticControls.beads.SingleLineBorderBead");
+ IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.NonVirtualHorizontalLayout");
+ iMeasurementBead: ClassReference("org.apache.flex.html.beads.ControlBarMeasurementBead");
+ iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
+ iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
background-color: #CECECE;
border-style: solid;
@@ -163,63 +163,63 @@ ControlBar
DropDownList
{
- IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ArraySelectionModel");
- IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.DropDownListView");
- IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.DropDownListController");
- IPopUp: ClassReference("org.apache.flex.html.staticControls.supportClasses.DropDownListList");
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.DropDownListView");
+ IBeadController: ClassReference("org.apache.flex.html.beads.controllers.DropDownListController");
+ IPopUp: ClassReference("org.apache.flex.html.supportClasses.DropDownListList");
}
DropDownListList
{
- IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ArraySelectionModel");
- IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData");
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
+ IDataProviderItemRendererMapper: ClassReference("org.apache.flex.html.beads.TextItemRendererFactoryForArrayData");
IItemRendererClassFactory: ClassReference("org.apache.flex.core.ItemRendererClassFactory");
- IItemRenderer: ClassReference("org.apache.flex.html.staticControls.supportClasses.StringItemRenderer");
+ IItemRenderer: ClassReference("org.apache.flex.html.supportClasses.StringItemRenderer");
}
Image
{
width: 64;
height: 64;
- IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ImageModel");
- IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.ImageView");
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.ImageModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.ImageView");
}
Label
{
width: 95;
height: 18;
- IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.TextModel");
- IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.TextFieldView");
- iMeasurementBead: ClassReference("org.apache.flex.html.staticControls.beads.TextFieldLabelMeasurementBead");
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.TextFieldView");
+ iMeasurementBead: ClassReference("org.apache.flex.html.beads.TextFieldLabelMeasurementBead");
}
List
{
- iBorderBead: ClassReference('org.apache.flex.html.staticControls.beads.SingleLineBorderBead');
- iBorderModel: ClassReference('org.apache.flex.html.staticControls.beads.models.SingleLineBorderModel');
+ iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
+ iBorderModel: ClassReference('org.apache.flex.html.beads.models.SingleLineBorderModel');
}
NumericStepper
{
- IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.RangeModel");
- IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.NumericStepperView");
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.RangeModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.NumericStepperView");
padding: 0px;
border-style: solid;
border-color: #000000;
border-thickness: 1;
background-color: #FFFFFF;
- iBorderBead: ClassReference('org.apache.flex.html.staticControls.beads.SingleLineBorderBead');
- iBackgroundBead: ClassReference('org.apache.flex.html.staticControls.beads.SolidBackgroundBead');
+ iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
+ iBackgroundBead: ClassReference('org.apache.flex.html.beads.SolidBackgroundBead');
}
Panel
{
- IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.PanelModel");
- IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.PanelView");
- iBorderBead: ClassReference("org.apache.flex.html.staticControls.beads.SingleLineBorderBead");
- iBackgroundBead: ClassReference("org.apache.flex.html.staticControls.beads.SolidBackgroundBead");
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.PanelModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.PanelView");
+ iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
+ iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
background-color: #FFFFFF;
border-style: solid;
@@ -229,25 +229,25 @@ Panel
RadioButton
{
- IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ValueToggleButtonModel");
- IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.RadioButtonView");
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.ValueToggleButtonModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.RadioButtonView");
}
ScrollBar
{
- IBeadLayout: ClassReference("org.apache.flex.html.staticControls.beads.layouts.VScrollBarLayout");
- IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ScrollBarModel");
- IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.ScrollBarView");
- IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.VScrollBarMouseController");
+ IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.VScrollBarLayout");
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.ScrollBarModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.ScrollBarView");
+ IBeadController: ClassReference("org.apache.flex.html.beads.controllers.VScrollBarMouseController");
}
SimpleAlert
{
- IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.AlertModel");
- IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.SimpleAlertView");
- IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.AlertController");
- iBorderBead: ClassReference("org.apache.flex.html.staticControls.beads.SingleLineBorderBead");
- iBackgroundBead: ClassReference("org.apache.flex.html.staticControls.beads.SolidBackgroundBead");
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.AlertModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.SimpleAlertView");
+ IBeadController: ClassReference("org.apache.flex.html.beads.controllers.AlertController");
+ iBorderBead: ClassReference("org.apache.flex.html.beads.SingleLineBorderBead");
+ iBackgroundBead: ClassReference("org.apache.flex.html.beads.SolidBackgroundBead");
background-color: #FFFFFF;
border-style: solid;
@@ -257,145 +257,145 @@ SimpleAlert
Slider
{
- IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.RangeModel");
- iBeadView: ClassReference("org.apache.flex.html.staticControls.beads.SliderView");
- iBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.SliderMouseController");
- iThumbView: ClassReference("org.apache.flex.html.staticControls.beads.SliderThumbView");
- iTrackView: ClassReference("org.apache.flex.html.staticControls.beads.SliderTrackView");
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.RangeModel");
+ iBeadView: ClassReference("org.apache.flex.html.beads.SliderView");
+ iBeadController: ClassReference("org.apache.flex.html.beads.controllers.SliderMouseController");
+ iThumbView: ClassReference("org.apache.flex.html.beads.SliderThumbView");
+ iTrackView: ClassReference("org.apache.flex.html.beads.SliderTrackView");
}
Spinner
{
- IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.RangeModel");
- IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.SpinnerView");
- IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.SpinnerMouseController");
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.RangeModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.SpinnerView");
+ IBeadController: ClassReference("org.apache.flex.html.beads.controllers.SpinnerMouseController");
}
TextArea
{
- IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.TextModel");
- IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.TextAreaView");
- IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.EditableTextKeyboardController");
- iBorderBead: ClassReference('org.apache.flex.html.staticControls.beads.SingleLineBorderBead');
- iBorderModel: ClassReference('org.apache.flex.html.staticControls.beads.models.SingleLineBorderModel');
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.TextAreaView");
+ IBeadController: ClassReference("org.apache.flex.html.beads.controllers.EditableTextKeyboardController");
+ iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
+ iBorderModel: ClassReference('org.apache.flex.html.beads.models.SingleLineBorderModel');
width: 135;
height: 20;
}
TextButton
{
- IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.TextModel");
- IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.CSSTextButtonView");
- iMeasurementBead: ClassReference("org.apache.flex.html.staticControls.beads.TextButtonMeasurementBead");
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.CSSTextButtonView");
+ iMeasurementBead: ClassReference("org.apache.flex.html.beads.TextButtonMeasurementBead");
}
TextFieldItemRenderer
{
- IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.ItemRendererMouseController");
+ IBeadController: ClassReference("org.apache.flex.html.beads.controllers.ItemRendererMouseController");
height: 16;
}
TextInput
{
- IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.TextModel");
- IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.TextInputWithBorderView");
- IBeadController: ClassReference("org.apache.flex.html.staticControls.beads.controllers.EditableTextKeyboardController");
- iBorderBead: ClassReference('org.apache.flex.html.staticControls.beads.SingleLineBorderBead');
- iBorderModel: ClassReference('org.apache.flex.html.staticControls.beads.models.SingleLineBorderModel');
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.TextInputWithBorderView");
+ IBeadController: ClassReference("org.apache.flex.html.beads.controllers.EditableTextKeyboardController");
+ iBorderBead: ClassReference('org.apache.flex.html.beads.SingleLineBorderBead');
+ iBorderModel: ClassReference('org.apache.flex.html.beads.models.SingleLineBorderModel');
width: 135;
height: 20;
}
TitleBar
{
- IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.TitleBarModel");
- IBeadLayout: ClassReference("org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout");
- iMeasurementBead: ClassReference("org.apache.flex.html.staticControls.beads.TitleBarMeasurementBead");
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.TitleBarModel");
+ IBeadLayout: ClassReference("org.apache.flex.html.beads.layouts.NonVirtualHorizontalLayout");
+ iMeasurementBead: ClassReference("org.apache.flex.html.beads.TitleBarMeasurementBead");
}
/* HTML5 */
h5|TextButton
{
- IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.CSSTextButtonView");
+ IBeadView: ClassReference("org.apache.flex.html.beads.CSSTextButtonView");
}
h5|TextInput
{
- IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.TextInputWithBorderView");
+ IBeadView: ClassReference("org.apache.flex.html.beads.TextInputWithBorderView");
}
h5|CheckBox
{
- IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ToggleButtonModel");
- IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.CheckBoxView");
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.ToggleButtonModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.CheckBoxView");
}
h5|RadioButton
{
- IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ValueToggleButtonModel");
- IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.RadioButtonView");
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.ValueToggleButtonModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.RadioButtonView");
}
h5|List
{
- IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ArraySelectionModel");
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
}
h5|DropDownList
{
- IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ArraySelectionModel");
- IPopUp: ClassReference("org.apache.flex.html.staticControls.supportClasses.DropDownListList");
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.ArraySelectionModel");
+ IPopUp: ClassReference("org.apache.flex.html.supportClasses.DropDownListList");
}
h5|ComboBox
{
- IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.ComboBoxView");
- IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ComboBoxModel");
- IPopUp: ClassReference("org.apache.flex.html.staticControls.supportClasses.DropDownListList");
+ IBeadView: ClassReference("org.apache.flex.html.beads.ComboBoxView");
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.ComboBoxModel");
+ IPopUp: ClassReference("org.apache.flex.html.supportClasses.DropDownListList");
}
/* jQuery */
jq|TextButton
{
- IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.TextModel");
- IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.TextButtonView");
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.TextButtonView");
}
jq|CheckBox
{
- IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ToggleButtonModel");
- IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.CheckBoxView");
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.ToggleButtonModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.CheckBoxView");
}
jq|RadioButton
{
- IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.ValueToggleButtonModel");
- IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.RadioButtonView");
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.ValueToggleButtonModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.RadioButtonView");
}
/* createjs */
createjs|TextButton
{
- IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.TextModel");
- IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.TextButtonView");
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.TextButtonView");
}
createjs|CheckBox
{
- IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.CheckBoxView");
+ IBeadView: ClassReference("org.apache.flex.html.beads.CheckBoxView");
}
/* SVG */
svg|TextButton
{
- IBeadModel: ClassReference("org.apache.flex.html.staticControls.beads.models.TextModel");
- IBeadView: ClassReference("org.apache.flex.html.staticControls.beads.CSSTextButtonView");
- iMeasurementBead: ClassReference("org.apache.flex.html.staticControls.beads.TextButtonMeasurementBead");
+ IBeadModel: ClassReference("org.apache.flex.html.beads.models.TextModel");
+ IBeadView: ClassReference("org.apache.flex.html.beads.CSSTextButtonView");
+ iMeasurementBead: ClassReference("org.apache.flex.html.beads.TextButtonMeasurementBead");
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSUI/html5-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/html5-manifest.xml b/frameworks/as/projects/FlexJSUI/html5-manifest.xml
index efba2fa..bb0a281 100644
--- a/frameworks/as/projects/FlexJSUI/html5-manifest.xml
+++ b/frameworks/as/projects/FlexJSUI/html5-manifest.xml
@@ -22,14 +22,14 @@
<componentPackage>
- <component id="Label" class="org.apache.flex.html5.staticControls.Label"/>
- <component id="TextButton" class="org.apache.flex.html5.staticControls.TextButton"/>
- <component id="TextInput" class="org.apache.flex.html5.staticControls.TextInput"/>
- <component id="TextArea" class="org.apache.flex.html5.staticControls.TextArea"/>
- <component id="CheckBox" class="org.apache.flex.html5.staticControls.CheckBox"/>
- <component id="RadioButton" class="org.apache.flex.html5.staticControls.RadioButton"/>
- <component id="List" class="org.apache.flex.html5.staticControls.List"/>
- <component id="DropDownList" class="org.apache.flex.html5.staticControls.DropDownList"/>
- <component id="ComboBox" class="org.apache.flex.html5.staticControls.ComboBox"/>
+ <component id="Label" class="org.apache.flex.html5.Label"/>
+ <component id="TextButton" class="org.apache.flex.html5.TextButton"/>
+ <component id="TextInput" class="org.apache.flex.html5.TextInput"/>
+ <component id="TextArea" class="org.apache.flex.html5.TextArea"/>
+ <component id="CheckBox" class="org.apache.flex.html5.CheckBox"/>
+ <component id="RadioButton" class="org.apache.flex.html5.RadioButton"/>
+ <component id="List" class="org.apache.flex.html5.List"/>
+ <component id="DropDownList" class="org.apache.flex.html5.DropDownList"/>
+ <component id="ComboBox" class="org.apache.flex.html5.ComboBox"/>
</componentPackage>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f43a7b61/frameworks/as/projects/FlexJSUI/jquery-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/as/projects/FlexJSUI/jquery-manifest.xml b/frameworks/as/projects/FlexJSUI/jquery-manifest.xml
index cdb9dd5..e94c165 100644
--- a/frameworks/as/projects/FlexJSUI/jquery-manifest.xml
+++ b/frameworks/as/projects/FlexJSUI/jquery-manifest.xml
@@ -22,8 +22,8 @@
<componentPackage>
<component id="Application" class="org.apache.flex.jquery.Application"/>
- <component id="TextButton" class="org.apache.flex.jquery.staticControls.TextButton"/>
- <component id="CheckBox" class="org.apache.flex.jquery.staticControls.CheckBox"/>
- <component id="RadioButton" class="org.apache.flex.jquery.staticControls.RadioButton"/>
+ <component id="TextButton" class="org.apache.flex.jquery.TextButton"/>
+ <component id="CheckBox" class="org.apache.flex.jquery.CheckBox"/>
+ <component id="RadioButton" class="org.apache.flex.jquery.RadioButton"/>
</componentPackage>