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:03:34 UTC

[02/35] remove staticControls folders and move components up a level. Next commit will rename packages inside the files

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/TextItemRendererFactoryForArrayData.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/TextItemRendererFactoryForArrayData.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/TextItemRendererFactoryForArrayData.js
deleted file mode 100644
index d340174..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/TextItemRendererFactoryForArrayData.js
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-goog.provide('org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData');
-
-goog.require('org.apache.flex.core.IDataProviderItemRendererMapper');
-goog.require('org.apache.flex.core.IItemRenderer');
-goog.require('org.apache.flex.events.EventDispatcher');
-goog.require('org.apache.flex.html.staticControls.beads.models.ArraySelectionModel');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.events.EventDispatcher}
- * @implements {org.apache.flex.core.IItemRenderer}
- */
-org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData =
-    function() {
-  goog.base(this);
-};
-goog.inherits(
-    org.apache.flex.html.staticControls.
-        beads.TextItemRendererFactoryForArrayData,
-    org.apache.flex.events.EventDispatcher);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData.
-    prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'TextItemRendererFactoryForArrayData',
-                qName: 'org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData' }],
-      interfaces: [org.apache.flex.core.IItemRenderer] };
-
-
-/**
- * @expose
- * @param {Object} value The component strand.
- */
-org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData.
-    prototype.set_strand = function(value) {
-  this.strand_ = value;
-
-  this.model = value.getBeadByType(
-      org.apache.flex.html.staticControls.beads.models.ArraySelectionModel);
-
-  this.listView = value.getBeadByType(
-      org.apache.flex.html.staticControls.beads.ListView);
-  this.dataGroup = this.listView.get_dataGroup();
-
-  this.model.addEventListener('dataProviderChanged',
-      goog.bind(this.dataProviderChangedHandler, this));
-
-  this.dataProviderChangedHandler(null);
-};
-
-
-/**
- * @expose
- * @param {Object} event The event that triggered the dataProvider change.
- */
-org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData.
-    prototype.dataProviderChangedHandler = function(event) {
-  var dp, i, n, opt;
-
-  dp = this.model.get_dataProvider();
-  n = dp.length;
-  for (i = 0; i < n; i++) {
-    opt = new
-        org.apache.flex.html.staticControls.supportClasses.StringItemRenderer();
-    this.dataGroup.addElement(opt);
-    opt.set_text(dp[i]);
-  }
-
-  var newEvent = new org.apache.flex.events.Event('itemsCreated');
-  this.strand_.dispatchEvent(newEvent);
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/controllers/ItemRendererMouseController.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/controllers/ItemRendererMouseController.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/controllers/ItemRendererMouseController.js
deleted file mode 100644
index 8893383..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/controllers/ItemRendererMouseController.js
+++ /dev/null
@@ -1,124 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-goog.provide('org.apache.flex.html.staticControls.beads.controllers.ItemRendererMouseController');
-
-goog.require('org.apache.flex.core.IBeadController');
-
-
-
-/**
- * @constructor
- * @implements {org.apache.flex.core.IBeadController}
- */
-org.apache.flex.html.staticControls.beads.controllers.
-    ItemRendererMouseController = function() {
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.controllers.
-    ItemRendererMouseController.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'ItemRendererMouseController',
-                qName: 'org.apache.flex.html.staticControls.beads.controllers.ItemRendererMouseController' }],
-      interfaces: [org.apache.flex.core.IBeadController] };
-
-
-/**
- * @expose
- * @param {Object} value The strand for this component.
- */
-org.apache.flex.html.staticControls.beads.controllers.
-    ItemRendererMouseController.prototype.set_strand = function(value) {
-  this.strand_ = value;
-
-  goog.events.listen(this.strand_.element, goog.events.EventType.MOUSEOVER,
-      goog.bind(this.handleMouseOver, this));
-
-  goog.events.listen(this.strand_.element, goog.events.EventType.MOUSEOUT,
-      goog.bind(this.handleMouseOut, this));
-
-  goog.events.listen(this.strand_.element, goog.events.EventType.MOUSEDOWN,
-      goog.bind(this.handleMouseDown, this));
-
-  goog.events.listen(this.strand_.element, goog.events.EventType.MOUSEUP,
-      goog.bind(this.handleMouseUp, this));
-};
-
-
-/**
- * @expose
- * @param {Object} event The mouse event that triggered the hover.
- */
-org.apache.flex.html.staticControls.beads.controllers.
-    ItemRendererMouseController.prototype.handleMouseOver = function(event) {
-
-  this.strand_.set_hovered(true);
-
-  var newEvent = new goog.events.Event('rollover');
-  newEvent.target = this.strand_;
-  this.strand_.get_itemRendererParent().dispatchEvent(newEvent);
-};
-
-
-/**
- * @expose
- * @param {Object} event The mouse-out event.
- */
-org.apache.flex.html.staticControls.beads.controllers.
-    ItemRendererMouseController.prototype.handleMouseOut = function(event) {
-
-  this.strand_.set_hovered(false);
-
-  var newEvent = new goog.events.Event('rollout');
-  newEvent.target = this.strand_;
-  this.strand_.get_itemRendererParent().dispatchEvent(newEvent);
-};
-
-
-/**
- * @expose
- * @param {Object} event The mouse-down event.
- */
-org.apache.flex.html.staticControls.beads.controllers.
-    ItemRendererMouseController.prototype.handleMouseDown = function(event) {
-
-  // ??
-};
-
-
-/**
- * @expose
- * @param {Object} event The mouse-up event that triggers the selection.
- */
-org.apache.flex.html.staticControls.beads.controllers.
-    ItemRendererMouseController.prototype.handleMouseUp = function(event) {
-
-  var newEvent = new goog.events.Event('selected');
-
-  // normally you do not - and should not - change the target of an event,
-  // but these events do not propagate nor bubble up the object tree, so
-  // we have to force the event's target to be this item renderer instance.
-
-  newEvent.target = this.strand_;
-
-  // since the event is not going to up the chain, we also have to dispatch
-  // it against its final destination.
-
-  this.strand_.get_itemRendererParent().dispatchEvent(newEvent);
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/controllers/ListSingleSelectionMouseController.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/controllers/ListSingleSelectionMouseController.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/controllers/ListSingleSelectionMouseController.js
deleted file mode 100644
index 42025b3..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/controllers/ListSingleSelectionMouseController.js
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-goog.provide('org.apache.flex.html.staticControls.beads.controllers.ListSingleSelectionMouseController');
-
-goog.require('org.apache.flex.core.IBeadController');
-goog.require('org.apache.flex.html.staticControls.beads.ListView');
-goog.require('org.apache.flex.html.staticControls.beads.models.ArraySelectionModel');
-
-
-
-/**
- * @constructor
- * @implements {org.apache.flex.core.IBeadController}
- */
-org.apache.flex.html.staticControls.beads.controllers.
-    ListSingleSelectionMouseController = function() {
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.controllers.ListSingleSelectionMouseController.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'ListSingleSelectionMouseController',
-                qName: 'org.apache.flex.html.staticControls.beads.controllers.ListSingleSelectionMouseController' }],
-      interfaces: [org.apache.flex.core.IBeadController] };
-
-
-/**
- * @expose
- *        ListSingleSelectionMouseController}
- * @param {Object} value The strand for this component.
- */
-org.apache.flex.html.staticControls.beads.controllers.
-    ListSingleSelectionMouseController.prototype.set_strand = function(value) {
-  this.strand_ = value;
-
-  this.model = value.getBeadByType(
-      org.apache.flex.html.staticControls.beads.models.ArraySelectionModel);
-  this.listView = value.getBeadByType(
-      org.apache.flex.html.staticControls.beads.ListView);
-
-  this.dataGroup = this.listView.get_dataGroup();
-  this.dataGroup.addEventListener('selected',
-      goog.bind(this.selectedHandler, this));
-};
-
-
-/**
- * @expose
- *        ListSingleSelectionMouseController}
- * @param {Object} event The event that triggered the selection.
- */
-org.apache.flex.html.staticControls.beads.controllers.
-    ListSingleSelectionMouseController.prototype.selectedHandler =
-        function(event) {
-
-  var index = event.target.get_index();
-  this.model.set_selectedIndex(index);
-
-  var newEvent = new org.apache.flex.events.Event('change');
-  this.strand_.dispatchEvent(newEvent);
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/controllers/SliderMouseController.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/controllers/SliderMouseController.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/controllers/SliderMouseController.js
deleted file mode 100644
index afa6c29..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/controllers/SliderMouseController.js
+++ /dev/null
@@ -1,173 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-goog.provide('org.apache.flex.html.staticControls.beads.controllers.SliderMouseController');
-
-goog.require('org.apache.flex.html.staticControls.beads.SliderThumbView');
-goog.require('org.apache.flex.html.staticControls.beads.SliderTrackView');
-
-
-
-/**
- * @constructor
- */
-org.apache.flex.html.staticControls.beads.controllers.SliderMouseController =
-    function() {
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.controllers.
-    SliderMouseController.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'SliderMouseController',
-                qName: 'org.apache.flex.html.staticControls.beads.controllers.SliderMouseController' }] };
-
-
-/**
- * @expose
- *        SliderMouseController}
- * @param {Object} value The strand.
- */
-org.apache.flex.html.staticControls.beads.controllers.SliderMouseController.
-    prototype.set_strand = function(value) {
-  this.strand_ = value;
-
-  this.track = this.strand_.getBeadByType(
-      org.apache.flex.html.staticControls.beads.SliderTrackView);
-  this.thumb = this.strand_.getBeadByType(
-      org.apache.flex.html.staticControls.beads.SliderThumbView);
-
-  goog.events.listen(this.track.element, goog.events.EventType.CLICK,
-                     this.handleTrackClick, false, this);
-
-  goog.events.listen(this.thumb.element, goog.events.EventType.MOUSEDOWN,
-                     this.handleThumbDown, false, this);
-};
-
-
-/**
- *        SliderMouseController}
- * @param {Event} event The event triggering the function.
- * @return {void} Handles click on track.
- */
-org.apache.flex.html.staticControls.beads.controllers.SliderMouseController.
-    prototype.handleTrackClick =
-    function(event)
-    {
-  var xloc = event.clientX;
-  var p = Math.min(1, xloc / parseInt(this.track.element.style.width, 10));
-  var n = p * (this.strand_.get_maximum() - this.strand_.get_minimum()) +
-          this.strand_.get_minimum();
-
-  this.strand_.set_value(n);
-
-  this.origin = parseInt(this.thumb.element.style.left, 10);
-  this.position = parseInt(this.thumb.element.style.left, 10);
-
-  this.calcValFromMousePosition(event, true);
-
-  this.strand_.dispatchEvent(new org.apache.flex.events.Event('valueChanged'));
-};
-
-
-/**
- *        SliderMouseController}
- * @param {Event} event The event triggering the function.
- * @return {void} Handles mouse-down on the thumb.
- */
-org.apache.flex.html.staticControls.beads.controllers.SliderMouseController.
-    prototype.handleThumbDown =
-    function(event)
-    {
-  goog.events.listen(this.strand_.element, goog.events.EventType.MOUSEUP,
-                     this.handleThumbUp, false, this);
-  goog.events.listen(this.strand_.element, goog.events.EventType.MOUSEMOVE,
-                     this.handleThumbMove, false, this);
-
-  this.origin = event.clientX;
-  this.position = parseInt(this.thumb.element.style.left, 10);
-};
-
-
-/**
- *        SliderMouseController}
- * @param {Event} event The event triggering the function.
- * @return {void} Handles mouse-up on the thumb.
- */
-org.apache.flex.html.staticControls.beads.controllers.SliderMouseController.
-    prototype.handleThumbUp =
-    function(event)
-    {
-  goog.events.unlisten(this.strand_.element, goog.events.EventType.MOUSEUP,
-                       this.handleThumbUp, false, this);
-  goog.events.unlisten(this.strand_.element, goog.events.EventType.MOUSEMOVE,
-                       this.handleThumbMove, false, this);
-
-  this.calcValFromMousePosition(event, false);
-
-  this.strand_.dispatchEvent(new org.apache.flex.events.Event('valueChanged'));
-};
-
-
-/**
- *        SliderMouseController}
- * @param {Event} event The event triggering the function.
- * @return {void} Handles mouse-move on the thumb.
- */
-org.apache.flex.html.staticControls.beads.controllers.SliderMouseController.
-    prototype.handleThumbMove =
-    function(event)
-    {
-  this.calcValFromMousePosition(event, false);
-
-  this.strand_.dispatchEvent(new org.apache.flex.events.Event('valueChanged'));
-};
-
-
-/**
- *        SliderMouseController}
- * @param {Event} event The event triggering the function.
- * @param {boolean} useOffset If true, event.offsetX is used in the calculation.
- * @return {void} Determines the new value based on the movement of the mouse
- * along the slider.
- */
-org.apache.flex.html.staticControls.beads.controllers.SliderMouseController.
-    prototype.calcValFromMousePosition =
-    function(event, useOffset)
-    {
-  var deltaX = (useOffset ? event.offsetX : event.clientX) - this.origin;
-  var thumbW = parseInt(this.thumb.element.style.width, 10) / 2;
-  var newX = this.position + deltaX;
-
-  var p = newX / parseInt(this.track.element.style.width, 10);
-  var n = p * (this.strand_.get_maximum() - this.strand_.get_minimum()) +
-          this.strand_.get_minimum();
-  n = this.strand_.snap(n);
-  if (n < this.strand_.get_minimum()) n = this.strand_.get_minimum();
-  else if (n > this.strand_.get_maximum()) n = this.strand_.get_maximum();
-
-  p = (n - this.strand_.get_minimum()) / (this.strand_.get_maximum() -
-      this.strand_.get_minimum());
-  newX = p * parseInt(this.track.element.style.width, 10);
-
-  this.thumb.element.style.left = String(newX -
-      parseInt(this.thumb.element.style.width, 10) / 2) + 'px';
-
-  this.strand_.set_value(n);
-};
-

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/controllers/SpinnerMouseController.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/controllers/SpinnerMouseController.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/controllers/SpinnerMouseController.js
deleted file mode 100644
index 4549d09..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/controllers/SpinnerMouseController.js
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-goog.provide('org.apache.flex.html.staticControls.beads.controllers.SpinnerMouseController');
-
-goog.require('org.apache.flex.html.staticControls.TextButton');
-
-
-
-/**
- * @constructor
- */
-org.apache.flex.html.staticControls.beads.controllers.SpinnerMouseController =
-    function() {
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.controllers.
-    SpinnerMouseController.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'SpinnerMouseController',
-                qName: 'org.apache.flex.html.staticControls.beads.controllers.SpinnerMouseController' }] };
-
-
-/**
- * @expose
- *        SpinnerMouseController}
- * @param {Object} value The strand.
- */
-org.apache.flex.html.staticControls.beads.controllers.SpinnerMouseController.
-    prototype.set_strand = function(value) {
-  this.strand_ = value;
-
-  this.incrementButton = this.strand_.incrementButton;
-  this.decrementButton = this.strand_.decrementButton;
-
-  goog.events.listen(this.incrementButton.element, goog.events.EventType.CLICK,
-      goog.bind(this.handleIncrementClick, this));
-
-  goog.events.listen(this.decrementButton.element, goog.events.EventType.CLICK,
-      goog.bind(this.handleDecrementClick, this));
-};
-
-
-/**
- *        SpinnerMouseController}
- * @param {Object} event The event object.
- */
-org.apache.flex.html.staticControls.beads.controllers.SpinnerMouseController.
-    prototype.handleIncrementClick = function(event)
-    {
-  var newValue = this.strand_.snap(Math.min(this.strand_.get_maximum(),
-      this.strand_.get_value() +
-      this.strand_.get_stepSize()));
-  this.strand_.set_value(newValue);
-};
-
-
-/**
- *        SpinnerMouseController}
- * @param {Event} event The event object.
- */
-org.apache.flex.html.staticControls.beads.controllers.SpinnerMouseController.
-    prototype.handleDecrementClick =
-    function(event)
-    {
-  var newValue = this.strand_.snap(Math.max(this.strand_.get_minimum(),
-      this.strand_.get_value() -
-      this.strand_.get_stepSize()));
-  this.strand_.set_value(newValue);
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/ButtonBarLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/ButtonBarLayout.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/ButtonBarLayout.js
deleted file mode 100644
index 6e1c0cf..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/ButtonBarLayout.js
+++ /dev/null
@@ -1,113 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-goog.provide('org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout');
-
-goog.require('org.apache.flex.core.IBeadLayout');
-goog.require('org.apache.flex.html.staticControls.beads.ListView');
-
-
-
-/**
- * @constructor
- * @implements {org.apache.flex.core.IBeadLayout}
- */
-org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout =
-    function() {
-  this.strand_ = null;
-
-  this.className = 'ButtonBarLayout';
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout
-    .prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'ButtonBarLayout',
-                qName: 'org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout' }],
-      interfaces: [org.apache.flex.core.IBeadLayout] };
-
-
-/**
- * @expose
- * @param {Array} value A set of widths to use for each button (optional).
- */
-org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout.prototype.set_buttonWidths =
-function(value) {
-  this.buttonWidths_ = value;
-};
-
-
-/**
- * @expose
- * @return {Array} A set of widths to use for each button.
- */
-org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout.prototype.get_buttonWidths =
-function() {
-  return this.buttonWidths_;
-};
-
-
-/**
- * @expose
- * @param {Object} value The new host.
- */
-org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout.
-    prototype.set_strand =
-    function(value) {
-  if (this.strand_ !== value) {
-    this.strand_ = value;
-    this.strand_.addEventListener('childrenAdded',
-        goog.bind(this.changeHandler, this));
-    this.strand_.addEventListener('itemsCreated',
-        goog.bind(this.changeHandler, this));
-    this.strand_.element.style.display = 'block';
-  }
-};
-
-
-/**
- * @param {org.apache.flex.events.Event} event The text getter.
- */
-org.apache.flex.html.staticControls.beads.layouts.ButtonBarLayout.
-    prototype.changeHandler = function(event) {
-  var children, i, n, xpos, useWidth, useHeight;
-
-  children = this.strand_.internalChildren();
-  n = children.length;
-
-  xpos = 0;
-  useWidth = this.strand_.get_width() / n;
-  useHeight = this.strand_.get_height();
-
-  for (i = 0; i < n; i++)
-  {
-    children[i].set_height(useHeight);
-    if (this.buttonWidths_) children[i].set_width(this.buttonWidths_[i]);
-    else children[i].set_width(useWidth);
-    children[i].element.style['vertical-align'] = 'middle';
-    children[i].element.style['text-align'] = 'center';
-    children[i].element.style['left-margin'] = 'auto';
-    children[i].element.style['right-margin'] = 'auto';
-
-    if (children[i].element.style.display == 'none')
-      children[i].lastDisplay_ = 'inline-block';
-    else
-      children[i].element.style.display = 'inline-block';
-  }
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualHorizontalLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualHorizontalLayout.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualHorizontalLayout.js
deleted file mode 100644
index d649698..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualHorizontalLayout.js
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-goog.provide('org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout');
-
-goog.require('org.apache.flex.core.IBeadLayout');
-goog.require('org.apache.flex.html.staticControls.beads.ListView');
-
-
-
-/**
- * @constructor
- * @implements {org.apache.flex.core.IBeadLayout}
- */
-org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout =
-    function() {
-  this.strand_ = null;
-  this.className = 'NonVirtualHorizontalLayout';
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout.
-    prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'NonVirtualHorizontalLayout',
-                qName: 'org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout' }],
-      interfaces: [org.apache.flex.core.IBeadLayout] };
-
-
-/**
- * @expose
-          NonVirtualHorizontalLayout}
- * @param {Object} value The new host.
- */
-org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout.
-    prototype.set_strand =
-    function(value) {
-  if (this.strand_ !== value) {
-    this.strand_ = value;
-    this.strand_.addEventListener('childrenAdded',
-        goog.bind(this.changeHandler, this));
-    this.strand_.addEventListener('itemsCreated',
-                                  goog.bind(this.changeHandler, this));
-    this.strand_.addEventListener('elementAdded',
-                                  goog.bind(this.changeHandler, this));
-    this.strand_.element.style.display = 'block';
-
-    this.changeHandler(null);
-  }
-};
-
-
-/**
-          NonVirtualHorizontalLayout}
- * @param {org.apache.flex.events.Event} event The text getter.
- */
-org.apache.flex.html.staticControls.beads.layouts.NonVirtualHorizontalLayout.
-    prototype.changeHandler = function(event) {
-  var children, i, n;
-
-  children = this.strand_.internalChildren();
-  n = children.length;
-  for (i = 0; i < n; i++)
-  {
-    if (children[i].style.display == 'none')
-      children[i].lastDisplay_ = 'inline-block';
-    else
-      children[i].style.display = 'inline-block';
-  }
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalLayout.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalLayout.js
deleted file mode 100644
index 23269b1..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalLayout.js
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-goog.provide('org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalLayout');
-
-goog.require('org.apache.flex.core.IBeadLayout');
-
-
-
-/**
- * @constructor
- * @implements {org.apache.flex.core.IBeadLayout}
- */
-org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalLayout =
-    function() {
-  this.strand_ = null;
-  this.className = 'NonVirtualVerticalLayout';
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalLayout.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'NonVirtualVerticalLayout',
-                qName: 'org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalLayout'}],
-      interfaces: [org.apache.flex.core.IBeadLayout] };
-
-
-/**
- * @expose
- * @param {Object} value The new host.
- */
-org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalLayout.
-    prototype.set_strand = function(value) {
-  if (this.strand_ !== value) {
-    this.strand_ = value;
-    this.strand_.addEventListener('childrenAdded',
-        goog.bind(this.changeHandler, this));
-    this.strand_.addEventListener('layoutNeeded',
-        goog.bind(this.changeHandler, this));
-  }
-};
-
-
-/**
- * @param {org.apache.flex.events.Event} event The text getter.
- */
-org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalLayout.
-    prototype.changeHandler = function(event) {
-  var children, i, n;
-
-  children = this.strand_.internalChildren();
-  n = children.length;
-  for (i = 0; i < n; i++)
-  {
-    if (children[i].style.display === 'none') {
-      children[i].lastDisplay_ = 'block';
-    } else {
-      children[i].style.display = 'block';
-    }
-  }
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalScrollingLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalScrollingLayout.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalScrollingLayout.js
deleted file mode 100644
index 87073c3..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/NonVirtualVerticalScrollingLayout.js
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-goog.provide('org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalScrollingLayout');
-
-goog.require('org.apache.flex.core.IBeadLayout');
-
-
-
-/**
- * @constructor
- * @implements {org.apache.flex.core.IBeadLayout}
- */
-org.apache.flex.html.staticControls.beads.layouts.
-    NonVirtualVerticalScrollingLayout = function() {
-  this.strand_ = null;
-  this.className = 'NonVirtualVerticalScrollingLayout';
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.layouts.
-    NonVirtualVerticalScrollingLayout.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'NonVirtualVerticalScrollingLayout',
-                qName: 'org.apache.flex.html.staticControls.beads.layouts.NonVirtualVerticalScrollingLayout' }],
-      interfaces: [org.apache.flex.core.IBeadLayout] };
-
-
-/**
- * @expose
- * @param {Object} value The new host.
- */
-org.apache.flex.html.staticControls.beads.layouts.
-    NonVirtualVerticalScrollingLayout.prototype.set_strand = function(value) {
-  if (this.strand_ !== value) {
-    this.strand_ = value;
-    this.strand_.addEventListener('childrenAdded',
-        goog.bind(this.changeHandler, this));
-    this.strand_.addEventListener('layoutNeeded',
-        goog.bind(this.changeHandler, this));
-  }
-};
-
-
-/**
- * @param {org.apache.flex.events.Event} event The text getter.
- */
-org.apache.flex.html.staticControls.beads.layouts.
-    NonVirtualVerticalScrollingLayout.prototype.changeHandler =
-        function(event) {
-  var children, i, n;
-
-  children = this.strand_.internalChildren();
-  n = children.length;
-
-  for (i = 0; i < n; i++)
-  {
-    if (children[i].element.style.display == 'none')
-      children[i].lastDisplay_ = 'block';
-    else {
-      children[i].element.style.display = 'inline-block';
-      children[i].set_width(this.strand_.get_width());
-    }
-  }
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/TileLayout.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/TileLayout.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/TileLayout.js
deleted file mode 100644
index c9b42f2..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/layouts/TileLayout.js
+++ /dev/null
@@ -1,158 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-goog.provide('org.apache.flex.html.staticControls.beads.layouts.TileLayout');
-
-goog.require('org.apache.flex.core.IBeadLayout');
-
-
-
-/**
- * @constructor
- * @implements {org.apache.flex.core.IBeadLayout}
- */
-org.apache.flex.html.staticControls.beads.layouts.TileLayout =
-    function() {
-  this.strand_ = null;
-  this.className = 'TileLayout';
-};
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'TileLayout',
-                qName: 'org.apache.flex.html.staticControls.beads.layouts.TileLayout'}],
-      interfaces: [org.apache.flex.core.IBeadLayout] };
-
-
-/**
- * @expose
- * @return {number} The number of columns wide for the layout.
- */
-org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.
-  get_numColumns = function() {
-  return this._numColumns;
-};
-
-
-/**
- * @expose
- * @param {number} value The number of columns wide for the layout.
- */
-org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.
-  set_numColumns = function(value) {
-  this._numColumns = value;
-};
-
-
-/**
- * @expose
- * @return {number} The width of each column in the layout.
- */
-org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.
-  get_columnWidth = function() {
-  return this._columnWidth;
-};
-
-
-/**
- * @expose
- * @param {number} value The width of each column in the layout.
- */
-org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.
-  set_columnWidth = function(value) {
-  this._columnWidth = value;
-};
-
-
-/**
- * @expose
- * @return {number} The height of each row of the layout.
- */
-org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.
-  get_rowHeight = function() {
-  return this._rowHeight;
-};
-
-
-/**
- * @expose
- * @param {number} value The height of each row of the Tile layout.
- */
-org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.
-  set_rowHeight = function(value) {
-  this._rowHeight = value;
-};
-
-
-/**
- * @expose
- * @param {Object} value The new host.
- */
-org.apache.flex.html.staticControls.beads.layouts.TileLayout.prototype.
-  set_strand = function(value) {
-  if (this.strand_ !== value) {
-    this.strand_ = value;
-    this.strand_.addEventListener('childrenAdded',
-        goog.bind(this.changeHandler, this));
-    this.strand_.addEventListener('layoutNeeded',
-        goog.bind(this.changeHandler, this));
-  }
-};
-
-
-/**
- * @param {org.apache.flex.events.Event} event The text getter.
- */
-org.apache.flex.html.staticControls.beads.layouts.TileLayout.
-    prototype.changeHandler = function(event) {
-  var children, i, n;
-  var xpos, ypos, useWidth, useHeight;
-
-  children = this.strand_.internalChildren();
-  n = children.length;
-  if (n === 0) return;
-
-  xpos = 0;
-  ypos = 0;
-  useWidth = this.get_columnWidth();
-  useHeight = this.get_rowHeight();
-
-  if (isNaN(useWidth)) useWidth = Math.floor(this.strand_.get_width() / this.get_numColumns()); // + gap
-  if (isNaN(useHeight)) {
-    // given the width and total number of items, how many rows?
-    var numRows = Math.floor(n / this.get_numColumns());
-    useHeight = Math.floor(this.strand_.get_height() / numRows);
-  }
-
-  for (i = 0; i < n; i++)
-  {
-    var child = children[i].flexjs_wrapper;
-    child.set_width(useWidth);
-    child.set_height(useHeight);
-    child.set_x(xpos);
-    child.set_y(ypos);
-
-    xpos += useWidth;
-
-    if (((i + 1) % this.get_numColumns()) === 0) {
-      xpos = 0;
-      ypos += useHeight;
-    }
-  }
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/ArraySelectionModel.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/ArraySelectionModel.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/ArraySelectionModel.js
deleted file mode 100644
index 8d3c0f6..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/ArraySelectionModel.js
+++ /dev/null
@@ -1,160 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-goog.provide('org.apache.flex.html.staticControls.beads.models.ArraySelectionModel');
-
-goog.require('org.apache.flex.core.ISelectionModel');
-goog.require('org.apache.flex.events.EventDispatcher');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.events.EventDispatcher}
- * @implements {org.apache.flex.core.ISelectionModel}
- */
-org.apache.flex.html.staticControls.beads.models.ArraySelectionModel =
-    function() {
-  goog.base(this);
-  this.className = 'ArraySelectionModel';
-};
-goog.inherits(
-    org.apache.flex.html.staticControls.beads.models.ArraySelectionModel,
-    org.apache.flex.events.EventDispatcher);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'ArraySelectionModel',
-                qName: 'org.apache.flex.html.staticControls.beads.models.ArraySelectionModel' }],
-      interfaces: [org.apache.flex.core.ISelectionModel] };
-
-
-/**
- * @expose
- * @param {Object} value The strand.
- */
-org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.
-    set_strand = function(value) {
-  this.strand_ = value;
-};
-
-
-/**
- * @expose
- * @return {Object} value The dataProvider.
- */
-org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.
-    get_dataProvider = function() {
-  return this.dataProvider_;
-};
-
-
-/**
- * @expose
- * @param {Object} value The dataProvider.
- */
-org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.
-    set_dataProvider = function(value) {
-  this.dataProvider_ = value;
-  this.dispatchEvent('dataProviderChanged');
-};
-
-
-/**
- * @expose
- * @return {number} value The selected index.
- */
-org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.
-    get_selectedIndex = function() {
-  return this.selectedIndex_;
-};
-
-
-/**
- * @expose
- * @param {number} value The selected index.
- */
-org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.
-    set_selectedIndex = function(value) {
-  this.selectedIndex_ = value;
-  this.dispatchEvent('selectedIndexChanged');
-};
-
-
-/**
- * @expose
- * @return {Object} value The selected item.
- */
-org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.
-    get_selectedItem = function() {
-  var si;
-
-  si = this.selectedIndex_;
-
-  if (!this.dataProvider_ || si < 0 ||
-      si >= this.dataProvider_.length) {
-    return null;
-  }
-
-  return this.dataProvider_[si];
-};
-
-
-/**
- * @expose
- * @param {Object} value The selected item.
- */
-org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.
-    set_selectedItem = function(value) {
-  // find item in dataProvider and set selectedIndex or -1 if not exists
-
-  this.selectedIndex_ = -1;
-  var n = this.dataProvider_.length;
-  for (var i = 0; i < n; i++) {
-    var item = this.dataProvider_[i];
-    if (item == value) {
-      this.selectedIndex_ = i;
-      break;
-    }
-  }
-
-  this.dispatchEvent('selectedItemChanged');
-  this.dispatchEvent('selectedIndexChanged');
-};
-
-
-/**
- * @expose
- * @return {String} The name of the field to use as a label.
- */
-org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.get_labelField =
-function() {
-  return this.labelField_;
-};
-
-
-/**
- * @expose
- * @param {String} value The name of the field to use as a label.
- */
-org.apache.flex.html.staticControls.beads.models.ArraySelectionModel.prototype.set_labelField =
-function(value) {
-  this.labelField_ = value;
-  this.dispatchEvent('labelFieldChanged');
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/DataGridModel.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/DataGridModel.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/DataGridModel.js
deleted file mode 100644
index 15c0f9a..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/DataGridModel.js
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-goog.provide('org.apache.flex.html.staticControls.beads.models.DataGridModel');
-
-goog.require('org.apache.flex.core.IDataGridModel');
-goog.require('org.apache.flex.html.staticControls.beads.models.ArraySelectionModel');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.html.staticControls.beads.models.ArraySelectionModel}
- * @implements {org.apache.flex.core.IDataGridModel}
- */
-org.apache.flex.html.staticControls.beads.models.DataGridModel =
-    function() {
-  goog.base(this);
-
-  this.labelFields_ = [];
-
-  this.className = 'DataGridModel';
-};
-goog.inherits(
-    org.apache.flex.html.staticControls.beads.models.DataGridModel,
-    org.apache.flex.html.staticControls.beads.models.ArraySelectionModel);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.models.DataGridModel.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'DataGridModel',
-                qName: 'org.apache.flex.html.staticControls.beads.models.DataGridModel' }],
-      interfaces: [org.apache.flex.core.IDataGridModel] };
-
-
-/**
- * @expose
- * @param {Object} value The strand.
- */
-org.apache.flex.html.staticControls.beads.models.DataGridModel.prototype.
-    set_strand = function(value) {
-  goog.base(this, 'set_strand', value);
-  this.strand_ = value;
-};
-
-
-/**
- * @expose
- * @param {Array} value Array of DataGridColumn instances.
- */
-org.apache.flex.html.staticControls.beads.models.DataGridModel.prototype.
-    set_columns = function(value) {
-  this.columns_ = value;
-};
-
-
-/**
- * @expose
- * @return {Array} Array of DataGridColumn instances.
- */
-org.apache.flex.html.staticControls.beads.models.DataGridModel.prototype.
-    get_columns = function() {
-  return this.columns_;
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/ImageModel.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/ImageModel.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/ImageModel.js
deleted file mode 100644
index 889a6b7..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/ImageModel.js
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-goog.provide('org.apache.flex.html.staticControls.beads.models.ImageModel');
-
-goog.require('org.apache.flex.events.EventDispatcher');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.events.EventDispatcher}
- */
-org.apache.flex.html.staticControls.beads.models.ImageModel =
-    function() {
-  goog.base(this);
-};
-goog.inherits(
-    org.apache.flex.html.staticControls.beads.models.ImageModel,
-    org.apache.flex.events.EventDispatcher);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.models.ImageModel.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'ImageModel',
-                qName: 'org.apache.flex.html.staticControls.beads.models.ImageModel'}] };
-
-
-/**
- * @expose
- * @param {Object} value The strand.
- */
-org.apache.flex.html.staticControls.beads.models.ImageModel.prototype.
-    set_strand = function(value) {
-  this.strand_ = value;
-};
-
-
-/**
- * @expose
- * @return {Object} value The image source.
- */
-org.apache.flex.html.staticControls.beads.models.ImageModel.prototype.
-    get_source = function() {
-  return this.source;
-};
-
-
-/**
- * @expose
- * @param {Object} value The image source.
- */
-org.apache.flex.html.staticControls.beads.models.ImageModel.prototype.
-    set_source = function(value) {
-  this.source = value;
-  this.dispatchEvent('sourceChanged');
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/PanelModel.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/PanelModel.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/PanelModel.js
deleted file mode 100644
index 04c735d..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/PanelModel.js
+++ /dev/null
@@ -1,136 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-goog.provide('org.apache.flex.html.staticControls.beads.models.PanelModel');
-
-goog.require('org.apache.flex.events.EventDispatcher');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.events.EventDispatcher}
- */
-org.apache.flex.html.staticControls.beads.models.PanelModel = function() {
-  goog.base(this);
-
-  /**
-   * @private
-   * @type {string}
-   */
-  this.title_ = '';
-  /**
-   * @private
-   * @type {string}
-   */
-  this.htmlTitle_ = '';
-  /**
-   * @private
-   * @type {boolean}
-   */
-  this.showCloseButton_ = false;
-};
-goog.inherits(org.apache.flex.html.staticControls.beads.models.PanelModel,
-    org.apache.flex.events.EventDispatcher);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'PanelModel',
-                qName: 'org.apache.flex.html.staticControls.beads.models.PanelModel'}] };
-
-
-/**
- * @expose
- * @param {Object} value The strand.
- */
-org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.
-    set_strand = function(value) {
-  this.strand_ = value;
-};
-
-
-/**
- * @expose
- * @return {string} The title.
- */
-org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.
-    get_title = function() {
-  return this.title_;
-};
-
-
-/**
- * @expose
- * @param {string} value The title to set.
- */
-org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.
-    set_title = function(value) {
-  if (this.title_ != value) {
-    this.title_ = value;
-    this.dispatchEvent('titleChange');
-  }
-};
-
-
-/**
- * @expose
- * @return {string} The HTML title.
- */
-org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.
-    get_htmlTitle = function() {
-  return this.htmlTitle_;
-};
-
-
-/**
- * @expose
- * @param {string} value The new HTML title.
- */
-org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.
-    set_htmlTitle = function(value) {
-  if (this.htmlTitle_ != value) {
-    this.htmlTitle_ = value;
-    this.dispatchEvent('htmlTitleChange');
-  }
-};
-
-
-/**
- * @expose
- * @return {boolean} Returns true if the close button should appear in
- * the TitleBar.
- */
-org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.
-    get_showCloseButton = function() {
-  return this.showCloseButton_;
-};
-
-
-/**
- * @expose
- * @param {boolean} value Determines if the close button shows (true) or
- * not (false).
- */
-org.apache.flex.html.staticControls.beads.models.PanelModel.prototype.
-    set_showCloseButton = function(value) {
-  if (this.showCloseButton_ != value) {
-    this.showCloseButton_ = value;
-    this.dispatchEvent('showCloseButtonChange');
-  }
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/RangeModel.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/RangeModel.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/RangeModel.js
deleted file mode 100644
index eeb391b..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/RangeModel.js
+++ /dev/null
@@ -1,200 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-goog.provide('org.apache.flex.html.staticControls.beads.models.RangeModel');
-
-goog.require('org.apache.flex.events.EventDispatcher');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.events.EventDispatcher}
- */
-org.apache.flex.html.staticControls.beads.models.RangeModel = function() {
-  goog.base(this);
-
-  this.minimum_ = 0;
-  this.maximum_ = 100;
-  this.value_ = 0;
-  this.snapInterval_ = 1;
-  this.stepSize_ = 1;
-};
-goog.inherits(org.apache.flex.html.staticControls.beads.models.RangeModel,
-    org.apache.flex.events.EventDispatcher);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'RangeModel',
-                qName: 'org.apache.flex.html.staticControls.beads.models.RangeModel'}] };
-
-
-/**
- * @expose
- * @param {Object} value The strand.
- */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
-    set_strand = function(value) {
-  this.strand_ = value;
-};
-
-
-/**
- * @expose
- * @return {number} The current minimum value.
- */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
-    get_minimum = function() {
-  return this.minimum_;
-};
-
-
-/**
- * @expose
- * @param {number} value The new minimum value.
- */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
-    set_minimum = function(value) {
-  if (this.minimum_ != value) {
-    this.minimum_ = value;
-    this.dispatchEvent('minimumChange');
-  }
-};
-
-
-/**
- * @expose
- * @return {number} The current maximu value.
- */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
-    get_maximum = function() {
-  return this.maximum_;
-};
-
-
-/**
- * @expose
- * @param {number} value The new maximum value.
- */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
-    set_maximum = function(value) {
-  if (this.maximum_ != value) {
-    this.maximum_ = value;
-    this.dispatchEvent('maximumChange');
-  }
-};
-
-
-/**
- * @expose
- * @return {number} The current value.
- */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
-    get_value = function() {
-  return this.value_;
-};
-
-
-/**
- * @expose
- * @param {number} newValue The new value.
- */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
-    set_value = function(newValue) {
-  if (this.value_ != newValue) {
-
-    // value must lie within the boundaries of minimum & maximum
-    // and be on a step interval, so the value is adjusted to
-    // what is coming in.
-    newValue = Math.max(this.minimum_, newValue - this.stepSize_);
-    newValue = Math.min(this.maximum_, newValue + this.stepSize_);
-    this.value_ = this.snap(newValue);
-
-    this.dispatchEvent('valueChange');
-  }
-};
-
-
-/**
- * @expose
- * @return {number} The current snapInterval value.
- */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
-    get_snapInterval = function() {
-  return this.snapInterval_;
-};
-
-
-/**
- * @expose
- * @param {number} value The new snapInterval value.
- */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
-    set_snapInterval = function(value) {
-  if (this.snapInterval_ != value) {
-    this.snapInterval_ = value;
-    this.dispatchEvent('snapIntervalChange');
-  }
-};
-
-
-/**
- * @expose
- * @return {number} The current stepSize value.
- */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
-    get_stepSize = function() {
-  return this.stepSize_;
-};
-
-
-/**
- * @expose
- * @param {number} value The new stepSize value.
- */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
-    set_stepSize = function(value) {
-  if (this.stepSize_ != value) {
-    this.stepSize_ = value;
-    this.dispatchEvent('stepSizeChange');
-  }
-};
-
-
-/**
- * @expose
- * @param {number} value The candidate number.
- * @return {number} Adjusted value.
- */
-org.apache.flex.html.staticControls.beads.models.RangeModel.prototype.
-    snap = function(value) {
-  var si = this.snapInterval_;
-  var n = Math.round((value - this.minimum_) / si) *
-                 si + this.minimum_;
-  if (value > 0)
-  {
-    if (value - n < n + si - value)
-      return n;
-    return n + si;
-  }
-  if (value - n > n + si - value)
-    return n + si;
-  return n;
-};
-

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/TitleBarModel.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/TitleBarModel.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/TitleBarModel.js
deleted file mode 100644
index 8d9b64d..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/beads/models/TitleBarModel.js
+++ /dev/null
@@ -1,136 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-goog.provide('org.apache.flex.html.staticControls.beads.models.TitleBarModel');
-
-goog.require('org.apache.flex.events.EventDispatcher');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.events.EventDispatcher}
- */
-org.apache.flex.html.staticControls.beads.models.TitleBarModel = function() {
-  goog.base(this);
-
-  /**
-   * @private
-   * @type {string}
-   */
-  this.title_ = '';
-  /**
-   * @private
-   * @type {string}
-   */
-  this.htmlTitle_ = '';
-  /**
-   * @private
-   * @type {boolean}
-   */
-  this.showCloseButton_ = false;
-};
-goog.inherits(org.apache.flex.html.staticControls.beads.models.TitleBarModel,
-    org.apache.flex.events.EventDispatcher);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'RangeModel',
-                qName: 'org.apache.flex.html.staticControls.beads.models.TitleBarModel'}] };
-
-
-/**
- * @expose
- * @param {Object} value The strand.
- */
-org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.
-    set_strand = function(value) {
-  this.strand_ = value;
-};
-
-
-/**
- * @expose
- * @return {string} The title.
- */
-org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.
-    get_title = function() {
-  return this.title_;
-};
-
-
-/**
- * @expose
- * @param {string} value The title to set.
- */
-org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.
-    set_title = function(value) {
-  if (this.title_ != value) {
-    this.title_ = value;
-    this.dispatchEvent('titleChange');
-  }
-};
-
-
-/**
- * @expose
- * @return {string} The HTML title.
- */
-org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.
-    get_htmlTitle = function() {
-  return this.htmlTitle_;
-};
-
-
-/**
- * @expose
- * @param {string} value The new HTML title.
- */
-org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.
-    set_htmlTitle = function(value) {
-  if (this.htmlTitle_ != value) {
-    this.htmlTitle_ = value;
-    this.dispatchEvent('htmlTitleChange');
-  }
-};
-
-
-/**
- * @expose
- * @return {boolean} Returns true if the close button should appear in
- * the TitleBar.
- */
-org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.
-    get_showCloseButton = function() {
-  return this.showCloseButton_;
-};
-
-
-/**
- * @expose
- * @param {boolean} value Determines if the close button shows (true) or
- * not (false).
- */
-org.apache.flex.html.staticControls.beads.models.TitleBarModel.prototype.
-    set_showCloseButton = function(value) {
-  if (this.showCloseButton_ != value) {
-    this.showCloseButton_ = value;
-    this.dispatchEvent('showCloseButtonChange');
-  }
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/ButtonBarButtonItemRenderer.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/ButtonBarButtonItemRenderer.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/ButtonBarButtonItemRenderer.js
deleted file mode 100644
index ff85b7a..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/ButtonBarButtonItemRenderer.js
+++ /dev/null
@@ -1,112 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-goog.provide('org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer');
-
-goog.require('org.apache.flex.html.staticControls.beads.controllers.ItemRendererMouseController');
-goog.require('org.apache.flex.html.staticControls.supportClasses.DataItemRenderer');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.html.staticControls.supportClasses.DataItemRenderer}
- */
-org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer =
-    function() {
-  goog.base(this);
-};
-goog.inherits(
-    org.apache.flex.html.staticControls.
-        supportClasses.ButtonBarButtonItemRenderer,
-    org.apache.flex.html.staticControls.supportClasses.DataItemRenderer);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'ButtonBarButtonItemRenderer',
-                qName: 'org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer' }] };
-
-
-/**
- * @override
- */
-org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer.
-    prototype.createElement = function() {
-
-  this.element = document.createElement('div');
-  this.positioner = this.element;
-
-  this.button = document.createElement('button');
-  this.element.appendChild(this.button);
-
-  this.element.flexjs_wrapper = this;
-  this.set_className('ButtonBarButtonItemRenderer');
-
-  // itemRenderers should provide something for the background to handle
-  // the selection and highlight
-  this.backgroundView = this.element;
-
-  this.controller = new org.apache.flex.html.staticControls.beads.controllers.
-      ItemRendererMouseController();
-  this.controller.set_strand(this);
-
-  return this.element;
-};
-
-
-/**
- * @expose
- * @param {Object} value The strand.
- */
-org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer.
-    prototype.set_strand = function(value) {
-
-  this.strand_ = value;
-};
-
-
-/**
- * @expose
- * @return {Object} The strand.
- */
-org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer.
-    prototype.get_strand = function() {
-  return this.strand_;
-};
-
-
-/**
- * @expose
- * @param {Object} value The text to display.
- */
-org.apache.flex.html.staticControls.supportClasses.ButtonBarButtonItemRenderer.
-    prototype.set_data = function(value) {
-
-  goog.base(this, 'set_data', value);
-
-  if (value.hasOwnProperty('label')) {
-    this.button.innerHTML = value.label;
-  }
-  else if (value.hasOwnProperty('title')) {
-    this.button.innerHTML = value.title;
-  }
-  else {
-    this.button.innerHHTML = String(value);
-  }
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/DataGridColumn.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/DataGridColumn.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/DataGridColumn.js
deleted file mode 100644
index 8b59a9b..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/DataGridColumn.js
+++ /dev/null
@@ -1,107 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-goog.provide('org.apache.flex.html.staticControls.supportClasses.DataGridColumn');
-
-goog.require('mx.core.IFactory');
-
-
-
-/**
- * @constructor
- */
-org.apache.flex.html.staticControls.supportClasses.DataGridColumn =
-    function() {
-};
-
-
-/**
- * @expose
- * @return {mx.core.IFactory} The object factory for the itemRenderer.
- */
-org.apache.flex.html.staticControls.supportClasses.DataGridColumn.prototype.get_itemRenderer =
-function() {
-  return this.itemRenderer_;
-};
-
-
-/**
- * @expose
- * @param {mx.core.IFactory} value The object factory for the itemRenderer.
- */
-org.apache.flex.html.staticControls.supportClasses.DataGridColumn.prototype.set_itemRenderer =
-function(value) {
-  this.itemRenderer_ = value;
-};
-
-
-/**
- * @expose
- * @return {Number} The width of the column.
- */
-org.apache.flex.html.staticControls.supportClasses.DataGridColumn.prototype.get_columnWidth =
-function() {
-  return this.columnWidth_;
-};
-
-
-/**
- * @expose
- * @param {Number} value The width of the column.
- */
-org.apache.flex.html.staticControls.supportClasses.DataGridColumn.prototype.set_columnWidth =
-function(value) {
-  this.columnWidth_ = value;
-};
-
-
-/**
- * @expose
- * @return {String} The label for the column.
- */
-org.apache.flex.html.staticControls.supportClasses.DataGridColumn.prototype.get_label =
-function() {
-  return this.label_;
-};
-
-
-/**
- * @expose
- * @param {String} value The label for the column.
- */
-org.apache.flex.html.staticControls.supportClasses.DataGridColumn.prototype.set_label =
-function(value) {
-  this.label_ = value;
-};
-
-
-/**
- * @expose
- * @return {String} The field for the data for the column.
- */
-org.apache.flex.html.staticControls.supportClasses.DataGridColumn.prototype.get_dataField =
-function() {
-  return this.dataField_;
-};
-
-
-/**
- * @expose
- * @param {String} value The field for the data for the column.
- */
-org.apache.flex.html.staticControls.supportClasses.DataGridColumn.prototype.set_dataField =
-function(value) {
-  this.dataField_ = value;
-};
-

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/DataItemRenderer.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/DataItemRenderer.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/DataItemRenderer.js
deleted file mode 100644
index 48d8c4f..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/DataItemRenderer.js
+++ /dev/null
@@ -1,158 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-goog.provide('org.apache.flex.html.staticControls.supportClasses.DataItemRenderer');
-
-goog.require('org.apache.flex.core.IItemRenderer');
-goog.require('org.apache.flex.html.staticControls.beads.controllers.ItemRendererMouseController');
-goog.require('org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase}
- * @implements {org.apache.flex.core.IItemRenderer}
- */
-org.apache.flex.html.staticControls.supportClasses.DataItemRenderer =
-    function() {
-  goog.base(this);
-};
-goog.inherits(
-    org.apache.flex.html.staticControls.supportClasses.DataItemRenderer,
-    org.apache.flex.html.staticControls.supportClasses.UIItemRendererBase);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
-    prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'DataItemRenderer',
-                qName: 'org.apache.flex.html.staticControls.supportClasses.DataItemRenderer' }],
-      interfaces: [org.apache.flex.core.IItemRenderer] };
-
-
-/**
- * @override
- */
-org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
-    prototype.createElement = function() {
-
-  this.element = document.createElement('div');
-  this.positioner = this.element;
-
-  this.element.flexjs_wrapper = this;
-  this.set_className('DataItemRenderer');
-
-  // itemRenderers should provide something for the background to handle
-  // the selection and highlight
-  this.backgroundView = this.element;
-
-  this.controller = new org.apache.flex.html.staticControls.beads.controllers.
-      ItemRendererMouseController();
-  this.controller.set_strand(this);
-
-  return this.element;
-};
-
-
-/**
- * @expose
- * @return {Object} The item renderer's parent.
- */
-org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
-    prototype.get_itemRendererParent = function() {
-  return this.rendererParent_;
-};
-
-
-/**
- * @expose
- * @param {Object} value The item renderer's parent.
- */
-org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
-    prototype.set_itemRendererParent = function(value) {
-  this.rendererParent_ = value;
-};
-
-
-/**
- * @expose
- * @param {Object} value The renderer's index.
- */
-org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
-    prototype.set_index = function(value) {
-  this.index_ = value;
-};
-
-
-/**
- * @expose
- * @param {string} value The name of field to use.
- */
-org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
-    prototype.set_dataField = function(value) {
-
-  this.dataField_ = value;
-};
-
-
-/**
- * @expose
- * @return {string} The name of the field to use.
- */
-org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
-    prototype.get_dataField = function() {
-
-  return this.dataField_;
-};
-
-
-/**
- * @override
- * @param {Boolean} value The selection state.
- */
-org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
-    prototype.set_selected = function(value) {
-  this.selected_ = value;
-
-  if (value) {
-    this.backgroundView.style.backgroundColor = '#9C9C9C';
-  } else {
-    this.backgroundView.style.backgroundColor = null;
-  }
-};
-
-
-/**
- * @override
- * @param {Boolean} value The hovered state.
- */
-org.apache.flex.html.staticControls.supportClasses.DataItemRenderer.
-    prototype.set_hovered = function(value) {
-  this.hovered_ = value;
-
-  if (value) {
-    this.backgroundView.style.backgroundColor = '#ECECEC';
-  } else {
-    if (this.selected_) {
-      this.backgroundView.style.backgroundColor = '#9C9C9C';
-    } else {
-      this.backgroundView.style.backgroundColor = null;
-    }
-  }
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/NonVirtualDataGroup.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/NonVirtualDataGroup.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/NonVirtualDataGroup.js
deleted file mode 100644
index 83fb799..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/NonVirtualDataGroup.js
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-goog.provide('org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup');
-
-goog.require('org.apache.flex.core.UIBase');
-goog.require('org.apache.flex.html.staticControls.supportClasses.DataItemRenderer');
-goog.require('org.apache.flex.utils.Language');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.core.UIBase}
- */
-org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup =
-    function() {
-  this.renderers = [];
-  goog.base(this);
-};
-goog.inherits(
-    org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup,
-    org.apache.flex.core.UIBase);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup.prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'NonVirtualDataGroup',
-                qName: 'org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup' }] };
-
-
-/**
- * @expose
- * @param {Object} value The strand.
- */
-org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup.
-    prototype.set_strand = function(value) {
-  this.strand_ = value;
-};
-
-
-/**
- * @override
- */
-org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup.
-    prototype.createElement = function() {
-  this.element = document.createElement('div');
-  this.element.style.overflow = 'auto';
-  this.element.style.display = 'inline-block';
-  this.element.style.position = 'inherit';
-  this.element.flexjs_wrapper = this;
-  this.set_className('NonVirtualDataGroup');
-
-  this.positioner = this.element;
-
-  return this.element;
-};
-
-
-/**
- * @override
- * @param {Object} value The child element being added.
- */
-org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup.
-    prototype.addElement = function(value) {
-  goog.base(this, 'addElement', value);
-
-  var itemRenderer = org.apache.flex.utils.Language.as(value,
-                           org.apache.flex.html.staticControls.supportClasses.DataItemRenderer);
-  itemRenderer.set_index(this.renderers.length);
-  itemRenderer.set_itemRendererParent(this);
-  this.renderers.push(value);
-};
-
-
-/**
- * @expose
- */
-org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup.
-    prototype.removeAllElements = function() {
-    // to do
-};
-
-
-/**
- * @expose
- * @param {Object} index The index for the itemRenderer.
- * @return {Object} The itemRenderer that matches the index.
- */
-org.apache.flex.html.staticControls.supportClasses.NonVirtualDataGroup.
-    prototype.getItemRendererForIndex = function(index) {
-  return this.renderers[index];
-};

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5759d50b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/StringItemRenderer.js
----------------------------------------------------------------------
diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/StringItemRenderer.js b/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/StringItemRenderer.js
deleted file mode 100644
index c19729e..0000000
--- a/frameworks/js/FlexJS/src/org/apache/flex/html/staticControls/supportClasses/StringItemRenderer.js
+++ /dev/null
@@ -1,178 +0,0 @@
-/**
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-goog.provide('org.apache.flex.html.staticControls.supportClasses.StringItemRenderer');
-
-goog.require('org.apache.flex.core.IItemRenderer');
-goog.require('org.apache.flex.core.UIBase');
-goog.require('org.apache.flex.html.staticControls.beads.controllers.ItemRendererMouseController');
-goog.require('org.apache.flex.html.staticControls.supportClasses.DataItemRenderer');
-
-
-
-/**
- * @constructor
- * @extends {org.apache.flex.html.staticControls.supportClasses.DataItemRenderer}
- * @implements {org.apache.flex.core.IItemRenderer}
- */
-org.apache.flex.html.staticControls.supportClasses.StringItemRenderer =
-    function() {
-  goog.base(this);
-};
-goog.inherits(
-    org.apache.flex.html.staticControls.supportClasses.StringItemRenderer,
-    org.apache.flex.html.staticControls.supportClasses.DataItemRenderer);
-
-
-/**
- * Metadata
- *
- * @type {Object.<string, Array.<Object>>}
- */
-org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
-    prototype.FLEXJS_CLASS_INFO =
-    { names: [{ name: 'StringItemRenderer',
-                qName: 'org.apache.flex.html.staticControls.supportClasses.StringItemRenderer' }],
-      interfaces: [org.apache.flex.core.IItemRenderer] };
-
-
-/**
- * @override
- */
-org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
-    prototype.createElement = function() {
-
-  this.element = document.createElement('div');
-  this.positioner = this.element;
-
-  this.element.flexjs_wrapper = this;
-  this.set_className('StringItemRenderer');
-
-  // itemRenderers should provide something for the background to handle
-  // the selection and highlight
-  this.backgroundView = this.element;
-
-  this.controller = new org.apache.flex.html.staticControls.beads.controllers.
-      ItemRendererMouseController();
-  this.controller.set_strand(this);
-
-  return this.element;
-};
-
-
-/**
- * @expose
- * @param {Object} value The strand.
- */
-org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
-    prototype.set_strand = function(value) {
-
-  this.strand_ = value;
-};
-
-
-/**
- * @expose
- * @return {Object} The strand.
- */
-org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
-    prototype.get_strand = function() {
-  return this.strand_;
-};
-
-
-/**
- * @expose
- * @return {Object} The item renderer's parent.
- */
-org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
-    prototype.get_itemRendererParent = function() {
-  return this.rendererParent_;
-};
-
-
-/**
- * @expose
- * @param {Object} value The item renderer's parent.
- */
-org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
-    prototype.set_itemRendererParent = function(value) {
-  this.rendererParent_ = value;
-};
-
-
-/**
- * @expose
- * @param {Object} value The renderer's index.
- */
-org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
-    prototype.set_index = function(value) {
-  this.index_ = value;
-};
-
-
-/**
- * @expose
- * @param {Object} value The text to display.
- */
-org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
-    prototype.set_text = function(value) {
-
-  this.element.innerHTML = value;
-};
-
-
-/**
- * @expose
- * @return {Object} The text being displayed.
- */
-org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
-    prototype.get_text = function() {
-
-  return this.element.innerHTML;
-};
-
-
-/**
- * @expose
- * @param {Object} value The text to display.
- */
-org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
-    prototype.set_data = function(value) {
-
-  goog.base(this, 'set_data', value);
-
-  if (this.get_labelField()) {
-    this.element.innerHTML = String(value[this.get_labelField()]);
-  }
-  else if (this.get_dataField()) {
-    this.element.innerHTML = String(value[this.get_dataField()]);
-  }
-  else if (value.toString) {
-    this.element.innerHTML = value.toString();
-  } else {
-    this.element.innerHTML = String(value);
-  }
-};
-
-
-/**
- * @expose
- * @return {Object} The text being displayed.
- */
-org.apache.flex.html.staticControls.supportClasses.StringItemRenderer.
-    prototype.get_data = function() {
-
-  return this.element.innerHTML;
-};