Repository: flex-asjs Updated Branches: refs/heads/develop 7f179c9dd -> 23b457c6b
replace get_xxx() calls with xxx Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/4aed23bf Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4aed23bf Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4aed23bf Branch: refs/heads/develop Commit: 4aed23bf1c12cc9fdb40d09ad51e0b19a4cbd361 Parents: 4ba5cb8 Author: Alex Harui <aha...@apache.org> Authored: Thu Jan 29 14:16:06 2015 -0800 Committer: Alex Harui <aha...@apache.org> Committed: Thu Jan 29 14:16:06 2015 -0800 ---------------------------------------------------------------------- .../charts/supportClasses/ChartAxisGroup.js | 12 +++++------ .../charts/supportClasses/ChartDataGroup.js | 4 ++-- .../src/org/apache/flex/core/Application.js | 2 +- .../src/org/apache/flex/core/ContainerBase.js | 2 +- .../src/org/apache/flex/core/FilledRectangle.js | 2 +- .../src/org/apache/flex/core/FormatBase.js | 2 +- .../org/apache/flex/core/HTMLElementWrapper.js | 4 ++-- .../flex/core/ItemRendererClassFactory.js | 2 +- .../FlexJS/src/org/apache/flex/core/ListBase.js | 12 +++++------ .../org/apache/flex/core/SimpleCSSValuesImpl.js | 2 +- .../org/apache/flex/core/SimpleStatesImpl.js | 4 ++-- .../FlexJS/src/org/apache/flex/core/UIBase.js | 10 ++++----- .../FlexJS/src/org/apache/flex/core/ViewBase.js | 2 +- .../src/org/apache/flex/core/graphics/Circle.js | 10 ++++----- .../org/apache/flex/core/graphics/Ellipse.js | 10 ++++----- .../apache/flex/core/graphics/GradientEntry.js | 4 ++-- .../apache/flex/core/graphics/GraphicShape.js | 18 ++++++++-------- .../src/org/apache/flex/core/graphics/Line.js | 2 +- .../apache/flex/core/graphics/LinearGradient.js | 16 +++++++------- .../src/org/apache/flex/core/graphics/Path.js | 6 +++--- .../src/org/apache/flex/core/graphics/Rect.js | 10 ++++----- .../org/apache/flex/core/graphics/SolidColor.js | 4 ++-- .../flex/core/graphics/SolidColorStroke.js | 4 ++-- .../src/org/apache/flex/createjs/Application.js | 2 +- .../src/org/apache/flex/createjs/CheckBox.js | 2 +- .../org/apache/flex/createjs/core/ViewBase.js | 4 ++-- .../src/org/apache/flex/events/MouseEvent.js | 4 ++-- .../js/FlexJS/src/org/apache/flex/html/Alert.js | 4 ++-- .../FlexJS/src/org/apache/flex/html/ComboBox.js | 4 ++-- .../src/org/apache/flex/html/DropDownList.js | 2 +- .../js/FlexJS/src/org/apache/flex/html/Image.js | 2 +- .../js/FlexJS/src/org/apache/flex/html/List.js | 10 ++++----- .../src/org/apache/flex/html/NumericStepper.js | 16 +++++++------- .../js/FlexJS/src/org/apache/flex/html/Panel.js | 8 +++---- .../src/org/apache/flex/html/SimpleList.js | 6 +++--- .../FlexJS/src/org/apache/flex/html/Slider.js | 22 ++++++++++---------- .../FlexJS/src/org/apache/flex/html/TitleBar.js | 4 ++-- .../DataItemRendererFactoryForArrayData.js | 8 +++---- .../src/org/apache/flex/html/beads/ImageView.js | 2 +- .../src/org/apache/flex/html/beads/ListView.js | 12 +++++------ .../src/org/apache/flex/html/beads/PanelView.js | 12 +++++------ .../TextItemRendererFactoryForArrayData.js | 4 ++-- .../controllers/ItemRendererMouseController.js | 6 +++--- .../ListSingleSelectionMouseController.js | 4 ++-- .../beads/controllers/SliderMouseController.js | 16 +++++++------- .../beads/controllers/SpinnerMouseController.js | 12 +++++------ .../flex/html/beads/layouts/ButtonBarLayout.js | 10 ++++----- .../html/beads/layouts/NonVirtualBasicLayout.js | 12 +++++------ .../layouts/NonVirtualBasicScrollingLayout.js | 8 +++---- .../beads/layouts/NonVirtualHorizontalLayout.js | 4 ++-- .../beads/layouts/NonVirtualVerticalLayout.js | 4 ++-- .../flex/html/beads/layouts/TileLayout.js | 12 +++++------ .../html/supportClasses/StringItemRenderer.js | 8 +++---- .../html/supportClasses/UIItemRendererBase.js | 8 +++---- .../src/org/apache/flex/html5/ComboBox.js | 4 ++-- .../src/org/apache/flex/net/BinaryUploader.js | 6 +++--- .../flex/net/dataConverters/LazyCollection.js | 2 +- .../src/org/apache/flex/utils/PointUtils.js | 4 ++-- .../FlexJS/src/org/apache/flex/utils/UIUtils.js | 12 +++++------ 59 files changed, 202 insertions(+), 202 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/charts/supportClasses/ChartAxisGroup.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/charts/supportClasses/ChartAxisGroup.js b/frameworks/js/FlexJS/src/org/apache/flex/charts/supportClasses/ChartAxisGroup.js index f4135ca..bf760e0 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/charts/supportClasses/ChartAxisGroup.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/charts/supportClasses/ChartAxisGroup.js @@ -75,7 +75,7 @@ function(text, xpos, ypos, boxWidth, boxHeight, tickFill) { var label = new org_apache_flex_html_Label(); this.addElement(label); label.set_text(text); - label.set_x(xpos - label.get_width() / 2); + label.set_x(xpos - label.width / 2); label.set_y(ypos); }; @@ -95,7 +95,7 @@ function(text, xpos, ypos, boxWidth, boxHeight, tickFill) { this.addElement(label); label.set_text(text); label.set_x(xpos); - label.set_y(ypos - label.get_height() / 2); + label.set_y(ypos - label.height / 2); }; @@ -113,8 +113,8 @@ function(originX, originY, width, height, marks, tickStroke) { var tickPath = new org_apache_flex_core_graphics_Path(); tickPath.set_x(0); tickPath.set_y(0); - tickPath.set_width(this.get_width()); - tickPath.set_height(this.get_height()); + tickPath.set_width(this.width); + tickPath.set_height(this.height); this.addElement(tickPath); tickPath.set_stroke(tickStroke); tickPath.drawPath(0, 0, marks); @@ -134,8 +134,8 @@ function(originX, originY, width, height, lineStroke) { var axisPath = new org_apache_flex_core_graphics_Path(); axisPath.set_x(0); axisPath.set_y(0); - axisPath.set_width(this.get_width()); - axisPath.set_height(this.get_height()); + axisPath.set_width(this.width); + axisPath.set_height(this.height); this.addElement(axisPath); axisPath.set_stroke(lineStroke); var pathLine = 'M ' + String(originX) + ' ' + String(originY) + ' l ' + String(width) + ' ' + String(height); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/charts/supportClasses/ChartDataGroup.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/charts/supportClasses/ChartDataGroup.js b/frameworks/js/FlexJS/src/org/apache/flex/charts/supportClasses/ChartDataGroup.js index 0a132d1..960f1ea 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/charts/supportClasses/ChartDataGroup.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/charts/supportClasses/ChartDataGroup.js @@ -67,11 +67,11 @@ org_apache_flex_charts_supportClasses_ChartDataGroup. */ org_apache_flex_charts_supportClasses_ChartDataGroup.prototype.getItemRendererForSeriesAtIndex = function(series, index) { - var n = this.get_numElements(); + var n = this.numElements; for (var i = 0; i < n; i++) { var child = this.getElementAt(i); - if (child && child.get_series() == series) { + if (child && child.series == series) { if (index === 0) return child; --index; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/core/Application.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/Application.js b/frameworks/js/FlexJS/src/org/apache/flex/core/Application.js index ee6da47..89dc4cd 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/Application.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/Application.js @@ -86,7 +86,7 @@ org_apache_flex_core_Application.prototype.start = function() { this.element.flexjs_wrapper = this; this.element.className = 'Application'; - org_apache_flex_utils_MXMLDataInterpreter.generateMXMLInstances(this, null, this.get_MXMLDescriptor()); + org_apache_flex_utils_MXMLDataInterpreter.generateMXMLInstances(this, null, this.MXMLDescriptor); this.dispatchEvent('initialize'); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/core/ContainerBase.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/ContainerBase.js b/frameworks/js/FlexJS/src/org/apache/flex/core/ContainerBase.js index 18bf504..ae3c9f4 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/ContainerBase.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/ContainerBase.js @@ -99,7 +99,7 @@ org_apache_flex_core_ContainerBase.prototype.addedToParent = function() { if (!this.initialized_) { org_apache_flex_utils_MXMLDataInterpreter.generateMXMLInstances(this.document, - this, this.get_MXMLDescriptor()); + this, this.MXMLDescriptor); this.dispatchEvent('initBindings'); this.dispatchEvent('initComplete'); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/core/FilledRectangle.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/FilledRectangle.js b/frameworks/js/FlexJS/src/org/apache/flex/core/FilledRectangle.js index 9b246ad..85b67f9 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/FilledRectangle.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/FilledRectangle.js @@ -50,7 +50,7 @@ org_apache_flex_core_FilledRectangle.prototype.FLEXJS_CLASS_INFO = */ org_apache_flex_core_FilledRectangle.prototype.addedToParent = function() { org_apache_flex_core_FilledRectangle.base(this, 'addedToParent'); - this.drawRect(this.get_x(), this.get_y(), this.get_width(), this.get_height()); + this.drawRect(this.x, this.y, this.width, this.height); }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/core/FormatBase.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/FormatBase.js b/frameworks/js/FlexJS/src/org/apache/flex/core/FormatBase.js index 9799929..19494fd 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/FormatBase.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/FormatBase.js @@ -86,7 +86,7 @@ org_apache_flex_core_FormatBase.prototype._formattedResult = ''; * @return {Object} */ org_apache_flex_core_FormatBase.prototype.get_propertyValue = function() { - var value = this.strand_['get_' + this.get_propertyName()](); + var value = this.strand_['get_' + this.propertyName](); return value; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/core/HTMLElementWrapper.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/HTMLElementWrapper.js b/frameworks/js/FlexJS/src/org/apache/flex/core/HTMLElementWrapper.js index cc38ec7..08658b0 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/HTMLElementWrapper.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/HTMLElementWrapper.js @@ -164,7 +164,7 @@ goog.events.BrowserEvent.prototype.get_target = function() { // if it is a faked event so just return the target if (!this.event_) return this.target; // for true browser events, get the embedded event's target - return this.event_.get_target(); + return this.event_.target; }; @@ -178,7 +178,7 @@ goog.events.BrowserEvent.prototype.get_currentTarget = function() { // if it is a faked event so just return the currentTarget if (!this.event_) return this.currentTarget; // for true browser events, get the embedded event's currentTarget - return this.event_.get_currentTarget(); + return this.event_.currentTarget; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/core/ItemRendererClassFactory.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/ItemRendererClassFactory.js b/frameworks/js/FlexJS/src/org/apache/flex/core/ItemRendererClassFactory.js index e9f41be..12930a7 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/ItemRendererClassFactory.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/ItemRendererClassFactory.js @@ -55,7 +55,7 @@ org_apache_flex_core_ItemRendererClassFactory. // see if the _strand has an itemRenderer property that isn't empty. if that's // true, use that value instead of pulling it from the the style if (this.strand_.get_itemRenderer) { - this.itemRendererClassFactory = this.strand_.get_itemRenderer(); + this.itemRendererClassFactory = this.strand_.itemRenderer; if (this.itemRendererClassFactory) { this.createFunction = this.createFromClass; return; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/core/ListBase.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/ListBase.js b/frameworks/js/FlexJS/src/org/apache/flex/core/ListBase.js index 54c43e5..375edba 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/ListBase.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/ListBase.js @@ -77,7 +77,7 @@ org_apache_flex_core_ListBase.prototype.createElement = function() { */ org_apache_flex_core_ListBase.prototype.get_dataProvider = function() { - return this.get_model().get_dataProvider(); + return this.model.dataProvider; }; @@ -87,7 +87,7 @@ org_apache_flex_core_ListBase.prototype.get_dataProvider = */ org_apache_flex_core_ListBase.prototype.set_dataProvider = function(value) { - this.get_model().set_dataProvider(value); + this.model.set_dataProvider(value); }; @@ -97,7 +97,7 @@ org_apache_flex_core_ListBase.prototype.set_dataProvider = */ org_apache_flex_core_ListBase.prototype.get_selectedIndex = function() { - return this.get_model().get_selectedIndex(); + return this.model.selectedIndex; }; @@ -107,7 +107,7 @@ org_apache_flex_core_ListBase.prototype.get_selectedIndex = */ org_apache_flex_core_ListBase.prototype.set_selectedIndex = function(value) { - this.get_model().set_selectedIndex(value); + this.model.set_selectedIndex(value); }; @@ -117,7 +117,7 @@ org_apache_flex_core_ListBase.prototype.set_selectedIndex = */ org_apache_flex_core_ListBase.prototype.get_selectedItem = function() { - return this.get_model().get_selectedItem(); + return this.model.selectedItem; }; @@ -127,7 +127,7 @@ org_apache_flex_core_ListBase.prototype.get_selectedItem = */ org_apache_flex_core_ListBase.prototype.set_selectedItem = function(value) { - this.get_model().set_selectedItem(value); + this.model.set_selectedItem(value); }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/core/SimpleCSSValuesImpl.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/SimpleCSSValuesImpl.js b/frameworks/js/FlexJS/src/org/apache/flex/core/SimpleCSSValuesImpl.js index e39ab75..f930f0a 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/SimpleCSSValuesImpl.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/SimpleCSSValuesImpl.js @@ -76,7 +76,7 @@ org_apache_flex_core_SimpleCSSValuesImpl.prototype.getValue = if (typeof(thisObject.get_style) === 'function') { - var style = thisObject.get_style(); + var style = thisObject.style; if (style != null) { try { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/core/SimpleStatesImpl.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/SimpleStatesImpl.js b/frameworks/js/FlexJS/src/org/apache/flex/core/SimpleStatesImpl.js index c5780f5..6b12d08 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/SimpleStatesImpl.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/SimpleStatesImpl.js @@ -87,7 +87,7 @@ org_apache_flex_core_SimpleStatesImpl.prototype.initialStateHandler_ = var host = this.strand_; this.dispatchEvent(new org_apache_flex_events_ValueChangeEvent('currentStateChange', false, false, null, - host.get_currentState())); + host.currentState)); }; @@ -100,7 +100,7 @@ org_apache_flex_core_SimpleStatesImpl.prototype.stateChangeHandler_ = var arr, doc, p, s; doc = event.target; - arr = doc.get_states(); + arr = doc.states; for (p in arr) { s = arr[p]; if (s.name === event.oldValue) { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js b/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js index cd71d13..cb7a536 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/UIBase.js @@ -234,7 +234,7 @@ org_apache_flex_core_UIBase.prototype.get_parent = function() { */ org_apache_flex_core_UIBase.prototype.addedToParent = function() { - var styles = this.get_style(); + var styles = this.style; if (styles) org_apache_flex_core_ValuesManager.valuesImpl.applyStyles(this, styles); @@ -586,7 +586,7 @@ org_apache_flex_core_UIBase.prototype.setHeight = if (opt_noEvent === undefined) opt_noEvent = false; - var _height = this.get_height(); + var _height = this.height; if (_height != value) { this.positioner.style.height = value.toString() + 'px'; if (!opt_noEvent) @@ -606,7 +606,7 @@ org_apache_flex_core_UIBase.prototype.setWidth = if (opt_noEvent === undefined) opt_noEvent = false; - var _width = this.get_width(); + var _width = this.width; if (_width != value) { this.positioner.style.width = value.toString() + 'px'; if (!opt_noEvent) @@ -627,13 +627,13 @@ org_apache_flex_core_UIBase.prototype.setWidthAndHeight = if (opt_noEvent === undefined) opt_noEvent = false; - var _width = this.get_width(); + var _width = this.width; if (_width != newWidth) { this.positioner.style.width = newWidth.toString() + 'px'; if (!opt_noEvent) this.dispatchEvent('widthChanged'); } - var _height = this.get_height(); + var _height = this.height; if (_height != newHeight) { this.positioner.style.height = newHeight.toString() + 'px'; if (!opt_noEvent) http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/core/ViewBase.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/ViewBase.js b/frameworks/js/FlexJS/src/org/apache/flex/core/ViewBase.js index c5175e9..cebe40a 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/ViewBase.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/ViewBase.js @@ -138,7 +138,7 @@ org_apache_flex_core_ViewBase.prototype.addedToParent = function() { if (!this.initialized_) { org_apache_flex_utils_MXMLDataInterpreter.generateMXMLInstances(this.document, - this, this.get_MXMLDescriptor()); + this, this.MXMLDescriptor); this.dispatchEvent(new org_apache_flex_events_Event('initBindings')); this.dispatchEvent(new org_apache_flex_events_Event('initComplete')); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Circle.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Circle.js b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Circle.js index 7a7b47f..b64bd2e 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Circle.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Circle.js @@ -74,11 +74,11 @@ org_apache_flex_core_graphics_Circle.prototype.drawCircle = function(x, y, radiu var circle = document.createElementNS('http://www.w3.org/2000/svg', 'ellipse'); circle.flexjs_wrapper = this; circle.setAttribute('style', style); - if (this.get_stroke()) + if (this.stroke) { - circle.setAttribute('cx', String(radius + this.get_stroke().get_weight())); - circle.setAttribute('cy', String(radius + this.get_stroke().get_weight())); - this.setPosition(x - radius, y - radius, this.get_stroke().get_weight(), this.get_stroke().get_weight()); + circle.setAttribute('cx', String(radius + this.stroke.weight)); + circle.setAttribute('cy', String(radius + this.stroke.weight)); + this.setPosition(x - radius, y - radius, this.stroke.weight, this.stroke.weight); } else { @@ -99,5 +99,5 @@ org_apache_flex_core_graphics_Circle.prototype.drawCircle = function(x, y, radiu * @override */ org_apache_flex_core_graphics_Circle.prototype.draw = function() { - this.drawCircle(this.get_x(), this.get_y(), this.get_radius()); + this.drawCircle(this.x, this.y, this.radius); }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Ellipse.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Ellipse.js b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Ellipse.js index 1cd5d18..65469bb 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Ellipse.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Ellipse.js @@ -52,11 +52,11 @@ org_apache_flex_core_graphics_Ellipse.prototype.drawEllipse = function(x, y, wid var ellipse = document.createElementNS('http://www.w3.org/2000/svg', 'ellipse'); ellipse.flexjs_wrapper = this; ellipse.setAttribute('style', style); - if (this.get_stroke()) + if (this.stroke) { - ellipse.setAttribute('cx', String(width / 2 + this.get_stroke().get_weight())); - ellipse.setAttribute('cy', String(height / 2 + this.get_stroke().get_weight())); - this.setPosition(x, y, this.get_stroke().get_weight() * 2, this.get_stroke().get_weight() * 2); + ellipse.setAttribute('cx', String(width / 2 + this.stroke.weight)); + ellipse.setAttribute('cy', String(height / 2 + this.stroke.weight)); + this.setPosition(x, y, this.stroke.weight * 2, this.stroke.weight * 2); } else { @@ -76,5 +76,5 @@ org_apache_flex_core_graphics_Ellipse.prototype.drawEllipse = function(x, y, wid * @override */ org_apache_flex_core_graphics_Ellipse.prototype.draw = function() { - this.drawEllipse(this.get_x(), this.get_y(), this.get_width(), this.get_height()); + this.drawEllipse(this.x, this.y, this.width, this.height); }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/GradientEntry.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/GradientEntry.js b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/GradientEntry.js index df85483..aeb0d52 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/GradientEntry.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/GradientEntry.js @@ -120,7 +120,7 @@ org_apache_flex_core_graphics_GradientEntry.prototype.set_ratio = function(value * @param {org_apache_flex_core_graphics_GraphicShape} s */ org_apache_flex_core_graphics_GradientEntry.prototype.begin = function(s) { - s.get_graphics().beginFill(this.get_color(), this.get_alpha()); + s.graphics.beginFill(this.color, this.alpha); }; @@ -129,7 +129,7 @@ org_apache_flex_core_graphics_GradientEntry.prototype.begin = function(s) { * @param {org_apache_flex_core_graphics_GraphicShape} s */ org_apache_flex_core_graphics_GradientEntry.prototype.end = function(s) { - s.get_graphics().endFill(); + s.graphics.endFill(); }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/GraphicShape.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/GraphicShape.js b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/GraphicShape.js index fd4526f..870c645 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/GraphicShape.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/GraphicShape.js @@ -132,9 +132,9 @@ org_apache_flex_core_graphics_GraphicShape.prototype.addedToParent = function() /* * not sure this is valuable any longer var bbox = this.element.getBBox(); - if (bbox.width === 0 && !isNaN(this.get_width())) bbox.width = this.get_width(); - if (bbox.height === 0 && !isNaN(this.get_height())) bbox.height = this.get_height(); - this.resize(this.get_x(), this.get_y(), bbox);*/ + if (bbox.width === 0 && !isNaN(this.width)) bbox.width = this.width; + if (bbox.height === 0 && !isNaN(this.height)) bbox.height = this.height; + this.resize(this.x, this.y, bbox);*/ }; @@ -152,9 +152,9 @@ org_apache_flex_core_graphics_GraphicShape.prototype.draw = function() { */ org_apache_flex_core_graphics_GraphicShape.prototype.getStyleStr = function() { var fillStr; - if (this.get_fill()) + if (this.fill) { - fillStr = this.get_fill().addFillAttrib(this); + fillStr = this.fill.addFillAttrib(this); } else { @@ -162,9 +162,9 @@ org_apache_flex_core_graphics_GraphicShape.prototype.getStyleStr = function() { } var strokeStr; - if (this.get_stroke()) + if (this.stroke) { - strokeStr = this.get_stroke().addStrokeAttrib(this); + strokeStr = this.stroke.addStrokeAttrib(this); } else { @@ -183,8 +183,8 @@ org_apache_flex_core_graphics_GraphicShape.prototype.getStyleStr = function() { * @param {Object} bbox The bounding box of the svg element. */ org_apache_flex_core_graphics_GraphicShape.prototype.resize = function(x, y, bbox) { - var width = Math.max(this.get_width(), bbox.width); - var height = Math.max(this.get_height(), bbox.height); + var width = Math.max(this.width, bbox.width); + var height = Math.max(this.height, bbox.height); this.element.style.position = 'absolute'; if (!isNaN(x)) this.element.style.top = String(x) + 'px'; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Line.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Line.js b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Line.js index 9cb54a3..b45f8d7 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Line.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Line.js @@ -56,7 +56,7 @@ org_apache_flex_core_graphics_Line.prototype.drawLine = function(x1, y1, x2, y2) line.setAttribute('y1', y1); line.setAttribute('x2', x2 - x1); line.setAttribute('y2', y2); - this.setPosition(x1, y2, this.get_stroke().get_weight(), this.get_stroke().get_weight()); + this.setPosition(x1, y2, this.stroke.weight, this.stroke.weight); this.element.appendChild(line); this.resize(x, y, line.getBBox()); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/LinearGradient.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/LinearGradient.js b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/LinearGradient.js index c5eaec5..0d41a7a 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/LinearGradient.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/LinearGradient.js @@ -71,7 +71,7 @@ org_apache_flex_core_graphics_LinearGradient.prototype.addFillAttrib = function( //Create and add a linear gradient def var svgNS = value.element.namespaceURI; var grad = document.createElementNS(svgNS, 'linearGradient'); - var gradientId = this.get_newId(); + var gradientId = this.newId; grad.setAttribute('id', gradientId); //Set x1, y1, x2, y2 of gradient @@ -80,28 +80,28 @@ org_apache_flex_core_graphics_LinearGradient.prototype.addFillAttrib = function( grad.setAttribute('x2', '100%'); grad.setAttribute('y2', '0%'); - //Apply rotation to the gradient if get_rotatation() is a number - if (this.get_rotation()) + //Apply rotation to the gradient if rotation is a number + if (this.rotation) { - grad.setAttribute('gradientTransform', 'rotate(' + this.get_rotation() + ' 0.5 0.5)'); + grad.setAttribute('gradientTransform', 'rotate(' + this.rotation + ' 0.5 0.5)'); } //Process gradient entries and create a stop for each entry - var entries = this.get_entries(); + var entries = this.entries; for (var i = 0; i < entries.length; i++) { var gradientEntry = entries[i]; var stop = document.createElementNS(svgNS, 'stop'); //Set Offset - stop.setAttribute('offset', String(gradientEntry.get_ratio() * 100) + '%'); + stop.setAttribute('offset', String(gradientEntry.ratio * 100) + '%'); //Set Color - var color = Number(gradientEntry.get_color()).toString(16); + var color = Number(gradientEntry.color).toString(16); if (color.length == 1) color = '00' + color; if (color.length == 2) color = '00' + color; if (color.length == 4) color = '00' + color; stop.setAttribute('stop-color', '#' + String(color)); //Set Alpha - stop.setAttribute('stop-opacity', String(gradientEntry.get_alpha())); + stop.setAttribute('stop-opacity', String(gradientEntry.alpha)); grad.appendChild(stop); } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Path.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Path.js b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Path.js index 1490de9..293a481 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Path.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Path.js @@ -83,9 +83,9 @@ org_apache_flex_core_graphics_Path.prototype.drawPath = function(x, y, data) { path.setAttribute('style', style); path.setAttribute('d', data); this.element.appendChild(path); - if (this.get_stroke()) + if (this.stroke) { - this.setPosition(x, y, this.get_stroke().get_weight(), this.get_stroke().get_weight()); + this.setPosition(x, y, this.stroke.weight, this.stroke.weight); } else { @@ -100,5 +100,5 @@ org_apache_flex_core_graphics_Path.prototype.drawPath = function(x, y, data) { * @override */ org_apache_flex_core_graphics_Path.prototype.draw = function() { - this.drawPath(this.get_x(), this.get_y(), this.get_data()); + this.drawPath(this.x, this.y, this.data); }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Rect.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Rect.js b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Rect.js index f145b63..2a3c849 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Rect.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/Rect.js @@ -52,11 +52,11 @@ org_apache_flex_core_graphics_Rect.prototype.drawRect = function(x, y, width, he var rect = document.createElementNS('http://www.w3.org/2000/svg', 'rect'); rect.flexjs_wrapper = this; rect.setAttribute('style', style); - if (this.get_stroke()) + if (this.stroke) { - rect.setAttribute('x', String(this.get_stroke().get_weight() / 2) + 'px'); - rect.setAttribute('y', String(this.get_stroke().get_weight() / 2) + 'px'); - this.setPosition(x, y, this.get_stroke().get_weight(), this.get_stroke().get_weight()); + rect.setAttribute('x', String(this.stroke.weight / 2) + 'px'); + rect.setAttribute('y', String(this.stroke.weight / 2) + 'px'); + this.setPosition(x, y, this.stroke.weight, this.stroke.weight); } else { @@ -76,5 +76,5 @@ org_apache_flex_core_graphics_Rect.prototype.drawRect = function(x, y, width, he * @override */ org_apache_flex_core_graphics_Rect.prototype.draw = function() { - this.drawRect(this.get_x(), this.get_y(), this.get_width(), this.get_height()); + this.drawRect(this.x, this.y, this.width, this.height); }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/SolidColor.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/SolidColor.js b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/SolidColor.js index 43079b7..309905a 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/SolidColor.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/SolidColor.js @@ -91,10 +91,10 @@ org_apache_flex_core_graphics_SolidColor.prototype.set_alpha = function(value) { * @return {string} */ org_apache_flex_core_graphics_SolidColor.prototype.addFillAttrib = function(value) { - var color = Number(this.get_color()).toString(16); + var color = Number(this.color).toString(16); if (color.length == 1) color = '00' + color; if (color.length == 2) color = '00' + color; if (color.length == 4) color = '00' + color; - return 'fill:#' + String(color) + ';fill-opacity:' + String(this.get_alpha()); + return 'fill:#' + String(color) + ';fill-opacity:' + String(this.alpha); }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/SolidColorStroke.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/SolidColorStroke.js b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/SolidColorStroke.js index f6465eb..0e1f026 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/SolidColorStroke.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/core/graphics/SolidColorStroke.js @@ -114,10 +114,10 @@ org_apache_flex_core_graphics_SolidColorStroke.prototype.set_weight = function(v * @return {string} */ org_apache_flex_core_graphics_SolidColorStroke.prototype.addStrokeAttrib = function(value) { - var strokeColor = Number(this.get_color()).toString(16); + var strokeColor = Number(this.color).toString(16); if (strokeColor.length == 1) strokeColor = '00' + strokeColor; if (strokeColor.length == 2) strokeColor = '00' + strokeColor; if (strokeColor.length == 4) strokeColor = '00' + strokeColor; return 'stroke:#' + String(strokeColor) + ';stroke-width:' + - String(this.get_weight()) + ';stroke-opacity:' + String(this.get_alpha()); + String(this.weight) + ';stroke-opacity:' + String(this.alpha); }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/createjs/Application.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/createjs/Application.js b/frameworks/js/FlexJS/src/org/apache/flex/createjs/Application.js index 6dba7eb..82ffdcc 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/createjs/Application.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/createjs/Application.js @@ -99,7 +99,7 @@ org_apache_flex_createjs_Application.prototype.start = function() { this.stage = new createjs.Stage('flexjsCanvas'); org_apache_flex_utils_MXMLDataInterpreter.generateMXMLProperties(this, - this.get_MXMLProperties()); + this.MXMLProperties); this.dispatchEvent('initialize'); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/createjs/CheckBox.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/createjs/CheckBox.js b/frameworks/js/FlexJS/src/org/apache/flex/createjs/CheckBox.js index bd7f0dc..2f95955 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/createjs/CheckBox.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/createjs/CheckBox.js @@ -140,5 +140,5 @@ org_apache_flex_createjs_CheckBox.prototype.set_selected = */ org_apache_flex_createjs_CheckBox.prototype.clickHandler = function(event) { - this.set_selected(!this.get_selected()); + this.set_selected(!this.selected); }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/createjs/core/ViewBase.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/createjs/core/ViewBase.js b/frameworks/js/FlexJS/src/org/apache/flex/createjs/core/ViewBase.js index 81c140b..2c1ff4a 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/createjs/core/ViewBase.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/createjs/core/ViewBase.js @@ -76,7 +76,7 @@ org_apache_flex_createjs_core_ViewBase.prototype.MXMLDescriptor = null; org_apache_flex_createjs_core_ViewBase.prototype.initUI = function(model) { this.applicationModel = model; org_apache_flex_utils_MXMLDataInterpreter.generateMXMLProperties(this, - this.get_MXMLProperties()); + this.MXMLProperties); org_apache_flex_utils_MXMLDataInterpreter.generateMXMLInstances(this, - this, this.get_MXMLDescriptor()); + this, this.MXMLDescriptor); }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/events/MouseEvent.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/events/MouseEvent.js b/frameworks/js/FlexJS/src/org/apache/flex/events/MouseEvent.js index 0bad510..d182d4e 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/events/MouseEvent.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/events/MouseEvent.js @@ -126,14 +126,14 @@ org_apache_flex_events_MouseEvent.mouseOverHandler = function(e) { if (target.get_parent === undefined) parent = null; else - parent = target.get_parent(); + parent = target.parent; while (parent) { index = targets.indexOf(parent); if (index == -1) { newTargets.unshift(parent); if (parent.get_parent === undefined) break; - parent = parent.get_parent(); + parent = parent.parent; } else { outs = targets.slice(index + 1); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/html/Alert.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/Alert.js b/frameworks/js/FlexJS/src/org/apache/flex/html/Alert.js index 80d7ec0..3edca01 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/Alert.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/Alert.js @@ -121,7 +121,7 @@ org_apache_flex_html_Alert.show = */ org_apache_flex_html_Alert.prototype.get_title = function() { - return this.titleBar.get_title(); + return this.titleBar.title; }; @@ -140,7 +140,7 @@ org_apache_flex_html_Alert.prototype.set_title = */ org_apache_flex_html_Alert.prototype.get_text = function() { - return this.message.get_text(); + return this.message.text; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/html/ComboBox.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/ComboBox.js b/frameworks/js/FlexJS/src/org/apache/flex/html/ComboBox.js index 72dbd53..ed4f452 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/ComboBox.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/ComboBox.js @@ -156,7 +156,7 @@ org_apache_flex_html_ComboBox.prototype.buttonClicked = goog.events.listen(select, 'change', goog.bind(this.selectChanged, this)); opts = select.options; - dp = /** @type {Array.<string>} */ (this.get_dataProvider()); + dp = /** @type {Array.<string>} */ (this.dataProvider); n = dp.length; for (i = 0; i < n; i++) { opt = document.createElement('option'); @@ -166,7 +166,7 @@ org_apache_flex_html_ComboBox.prototype.buttonClicked = select.size = n; - si = this.get_selectedIndex(); + si = this.selectedIndex; if (si < 0) { select.value = null; } else { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/html/DropDownList.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/DropDownList.js b/frameworks/js/FlexJS/src/org/apache/flex/html/DropDownList.js index cdf487a..e76e5be 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/DropDownList.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/DropDownList.js @@ -111,5 +111,5 @@ org_apache_flex_html_DropDownList.prototype. org_apache_flex_html_DropDownList.prototype. set_selectedItem = function(value) { this.model.set_selectedItem(value); - this.element.selectedIndex = this.get_selectedIndex(); + this.element.selectedIndex = this.selectedIndex; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/html/Image.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/Image.js b/frameworks/js/FlexJS/src/org/apache/flex/html/Image.js index 7d7b76c..8498c8a 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/Image.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/Image.js @@ -72,7 +72,7 @@ org_apache_flex_html_Image.prototype.createElement = */ org_apache_flex_html_Image.prototype. get_source = function() { - return this.model.get_source(); + return this.model.source; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/html/List.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/List.js b/frameworks/js/FlexJS/src/org/apache/flex/html/List.js index de2e274..d4786f8 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/List.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/List.js @@ -77,7 +77,7 @@ function(value) { */ org_apache_flex_html_List.prototype.get_labelField = function() { - return this.get_model().get_labelField(); + return this.model.labelField; }; @@ -87,7 +87,7 @@ function() { */ org_apache_flex_html_List.prototype.set_labelField = function(value) { - this.get_model().set_labelField(value); + this.model.set_labelField(value); }; @@ -97,7 +97,7 @@ function(value) { */ org_apache_flex_html_List.prototype.get_rowHeight = function() { - return this.get_presentationModel().get_rowHeight(); + return this.presentationModel.rowHeight; }; @@ -107,7 +107,7 @@ function() { */ org_apache_flex_html_List.prototype.set_rowHeight = function(value) { - this.get_presentationModel().set_rowHeight(value); + this.presentationModel.set_rowHeight(value); }; @@ -170,7 +170,7 @@ org_apache_flex_html_List.prototype.internalChildren = function() { var listView = this.getBeadByType(org_apache_flex_html_beads_ListView); - var dg = listView.get_dataGroup(); + var dg = listView.dataGroup; var items = null; if (dg.renderers) { items = dg.renderers; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/html/NumericStepper.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/NumericStepper.js b/frameworks/js/FlexJS/src/org/apache/flex/html/NumericStepper.js index f66ab83..131e49d 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/NumericStepper.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/NumericStepper.js @@ -81,7 +81,7 @@ org_apache_flex_html_NumericStepper.prototype.createElement = this.element.flexjs_wrapper = this; this.set_className('NumericStepper'); - this.input.set_text(String(this.spinner.get_value())); + this.input.set_text(String(this.spinner.value)); return this.element; }; @@ -93,9 +93,9 @@ org_apache_flex_html_NumericStepper.prototype.createElement = org_apache_flex_html_NumericStepper.prototype.spinnerChange = function(event) { - var newValue = this.spinner.get_value(); + var newValue = this.spinner.value; this.set_value(newValue); - this.input.set_text(String(this.spinner.get_value())); + this.input.set_text(String(this.spinner.value)); this.dispatchEvent(new org_apache_flex_events_Event('valueChange')); }; @@ -106,7 +106,7 @@ org_apache_flex_html_NumericStepper.prototype.spinnerChange = */ org_apache_flex_html_NumericStepper.prototype.get_minimum = function() { - return this.model.get_minimum(); + return this.model.minimum; }; @@ -126,7 +126,7 @@ org_apache_flex_html_NumericStepper.prototype.set_minimum = */ org_apache_flex_html_NumericStepper.prototype.get_maximum = function() { - return this.model.get_maximum(); + return this.model.maximum; }; @@ -146,7 +146,7 @@ org_apache_flex_html_NumericStepper.prototype.set_maximum = */ org_apache_flex_html_NumericStepper.prototype.get_value = function() { - return this.model.get_value(); + return this.model.value; }; @@ -167,7 +167,7 @@ org_apache_flex_html_NumericStepper.prototype.set_value = */ org_apache_flex_html_NumericStepper.prototype.get_snapInterval = function() { - return this.model.get_snapInterval(); + return this.model.snapInterval; }; @@ -187,7 +187,7 @@ org_apache_flex_html_NumericStepper.prototype.set_snapInterval = */ org_apache_flex_html_NumericStepper.prototype.get_stepSize = function() { - return this.model.get_stepSize(); + return this.model.stepSize; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/html/Panel.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/Panel.js b/frameworks/js/FlexJS/src/org/apache/flex/html/Panel.js index b44f317..a94a477 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/Panel.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/Panel.js @@ -143,7 +143,7 @@ org_apache_flex_html_Panel.prototype.addedToParent = * @return {boolean} The showCloseButton getter. */ org_apache_flex_html_Panel.prototype.get_showCloseButton = function() { - return this.get_model().get_showCloseButton(); + return this.model.showCloseButton; }; @@ -153,7 +153,7 @@ org_apache_flex_html_Panel.prototype.get_showCloseButton = function() { */ org_apache_flex_html_Panel.prototype.set_showCloseButton = function(value) { - this.get_model().set_showCloseButton(value); + this.model.set_showCloseButton(value); }; @@ -162,7 +162,7 @@ org_apache_flex_html_Panel.prototype.set_showCloseButton = * @return {string} The title getter. */ org_apache_flex_html_Panel.prototype.get_title = function() { - return this.get_model().get_title(); + return this.model.title; }; @@ -172,7 +172,7 @@ org_apache_flex_html_Panel.prototype.get_title = function() { */ org_apache_flex_html_Panel.prototype.set_title = function(value) { - this.get_model().set_title(value); + this.model.set_title(value); }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/html/SimpleList.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/SimpleList.js b/frameworks/js/FlexJS/src/org/apache/flex/html/SimpleList.js index 1498c65..4445476 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/SimpleList.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/SimpleList.js @@ -62,7 +62,7 @@ org_apache_flex_html_SimpleList.prototype. */ org_apache_flex_html_SimpleList.prototype. get_dataProvider = function() { - return this.model.get_dataProvider(); + return this.model.dataProvider; }; @@ -96,7 +96,7 @@ org_apache_flex_html_SimpleList.prototype. */ org_apache_flex_html_SimpleList.prototype. get_selectedIndex = function() { - return this.model.get_selectedIndex(); + return this.model.selectedIndex; }; @@ -114,7 +114,7 @@ org_apache_flex_html_SimpleList.prototype. */ org_apache_flex_html_SimpleList.prototype. get_selectedItem = function() { - return this.model.get_selectedItem(); + return this.model.selectedItem; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/html/Slider.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/Slider.js b/frameworks/js/FlexJS/src/org/apache/flex/html/Slider.js index ccc2456..c4752c2 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/Slider.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/Slider.js @@ -79,7 +79,7 @@ org_apache_flex_html_Slider.prototype.createElement = */ org_apache_flex_html_Slider.prototype.get_value = function() { - return this.model.get_value(); + return this.model.value; }; @@ -91,7 +91,7 @@ org_apache_flex_html_Slider.prototype.get_value = org_apache_flex_html_Slider.prototype.set_value = function(newValue) { this.model.set_value(newValue); - this.setThumbFromValue(this.model.get_value()); + this.setThumbFromValue(this.model.value); }; @@ -101,7 +101,7 @@ org_apache_flex_html_Slider.prototype.set_value = */ org_apache_flex_html_Slider.prototype.get_minimum = function() { - return this.model.get_minimum(); + return this.model.minimum; }; @@ -122,7 +122,7 @@ org_apache_flex_html_Slider.prototype.set_minimum = */ org_apache_flex_html_Slider.prototype.get_maximum = function() { - return this.model.get_maximum(); + return this.model.maximum; }; @@ -143,7 +143,7 @@ org_apache_flex_html_Slider.prototype.set_maximum = */ org_apache_flex_html_Slider.prototype.get_snapInterval = function() { - return this.model.get_snapInterval(); + return this.model.snapInterval; }; @@ -164,7 +164,7 @@ org_apache_flex_html_Slider.prototype.set_snapInterval = */ org_apache_flex_html_Slider.prototype.get_stepSize = function() { - return this.model.get_stepSize(); + return this.model.stepSize; }; @@ -185,9 +185,9 @@ org_apache_flex_html_Slider.prototype.set_stepSize = */ org_apache_flex_html_Slider.prototype.snap = function(value) { - var si = this.get_snapInterval(); - var n = Math.round((value - this.get_minimum()) / si) * - si + this.get_minimum(); + var si = this.snapInterval; + var n = Math.round((value - this.minimum) / si) * + si + this.minimum; if (value > 0) { if (value - n < n + si - value) @@ -207,8 +207,8 @@ org_apache_flex_html_Slider.prototype.snap = function(value) org_apache_flex_html_Slider.prototype.setThumbFromValue = function(value) { - var min = this.model.get_minimum(); - var max = this.model.get_maximum(); + var min = this.model.minimum; + var max = this.model.maximum; var p = (value - min) / (max - min); var xloc = p * (parseInt(this.track.element.style.width, 10) - parseInt(this.thumb.element.style.width, 10)); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/html/TitleBar.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/TitleBar.js b/frameworks/js/FlexJS/src/org/apache/flex/html/TitleBar.js index 595314a..19e46a1 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/TitleBar.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/TitleBar.js @@ -66,7 +66,7 @@ org_apache_flex_html_TitleBar.prototype.createElement = */ org_apache_flex_html_TitleBar.prototype.get_title = function() { - return this.model.get_title(); + return this.model.title; }; @@ -86,7 +86,7 @@ org_apache_flex_html_TitleBar.prototype.set_title = */ org_apache_flex_html_TitleBar.prototype.get_showCloseButton = function() { - return this.model.get_showCloseButton(); + return this.model.showCloseButton; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.js index 0994346..7c35505 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.js @@ -71,7 +71,7 @@ org_apache_flex_html_beads_DataItemRendererFactoryForArrayData. this.listView = value.getBeadByType( org_apache_flex_html_beads_ListView); - this.dataGroup = this.listView.get_dataGroup(); + this.dataGroup = this.listView.dataGroup; this.model.addEventListener('dataProviderChanged', goog.bind(this.dataProviderChangedHandler, this)); @@ -128,14 +128,14 @@ org_apache_flex_html_beads_DataItemRendererFactoryForArrayData. var presModel = this.strand_.getBeadByType(org_apache_flex_core_IListPresentationModel); - dp = this.model.get_dataProvider(); + dp = this.model.dataProvider; n = dp.length; for (i = 0; i < n; i++) { var ir = this.itemRendererFactory_.createItemRenderer(this.dataGroup); ir.set_index(i); - ir.set_labelField(this.model.get_labelField()); + ir.set_labelField(this.model.labelField); ir.set_data(dp[i]); - if (presModel) ir.set_height(presModel.get_rowHeight()); + if (presModel) ir.set_height(presModel.rowHeight); } var newEvent = new org_apache_flex_events_Event('itemsCreated'); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ImageView.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ImageView.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ImageView.js index 94b6846..888f6ff 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ImageView.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ImageView.js @@ -59,5 +59,5 @@ org_apache_flex_html_beads_ImageView.prototype.set_strand = */ org_apache_flex_html_beads_ImageView.prototype. sourceChangeHandler = function(event) { - this.strand_.element.src = this.model.get_source(); + this.strand_.element.src = this.model.source; }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ListView.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ListView.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ListView.js index 4394572..f7f9e6e 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ListView.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/ListView.js @@ -66,7 +66,7 @@ org_apache_flex_html_beads_ListView.prototype.set_strand = this.strand_.addEventListener('heightChanged', goog.bind(this.handleSizeChange, this)); - this.model = this.strand_.get_model(); + this.model = this.strand_.model; this.model.addEventListener('selectedIndexChanged', goog.bind(this.selectionChangeHandler, this)); this.model.addEventListener('dataProviderChanged', @@ -122,12 +122,12 @@ org_apache_flex_html_beads_ListView.prototype. ir = this.dataGroup_.getItemRendererForIndex(this.lastSelectedIndex); if (ir) ir.set_selected(false); } - if (this.model.get_selectedIndex() != -1) { + if (this.model.selectedIndex != -1) { ir = this.dataGroup_.getItemRendererForIndex( - this.model.get_selectedIndex()); + this.model.selectedIndex); if (ir) ir.set_selected(true); } - this.lastSelectedIndex = this.model.get_selectedIndex(); + this.lastSelectedIndex = this.model.selectedIndex; }; @@ -190,6 +190,6 @@ org_apache_flex_html_beads_ListView.prototype.get_resizeableView = function() { * @param {Object} event The event that triggered the resize. */ org_apache_flex_html_beads_ListView.prototype.handleSizeChange = function(event) { - this.dataGroup_.set_width(this.strand_.get_width()); - this.dataGroup_.set_height(this.strand_.get_height()); + this.dataGroup_.set_width(this.strand_.width); + this.dataGroup_.set_height(this.strand_.height); }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/html/beads/PanelView.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/PanelView.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/PanelView.js index a5a6716..d7ffb4c 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/PanelView.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/PanelView.js @@ -62,7 +62,7 @@ org_apache_flex_html_beads_PanelView.prototype.set_strand = this.strand_.titleBar = this.titleBar_; this.titleBar_.set_id('titleBar'); - this.titleBar_.set_model(this.strand_.get_model()); + this.titleBar_.set_model(this.strand_.model); this.strand_.controlBar = new org_apache_flex_html_ControlBar(); @@ -93,12 +93,12 @@ org_apache_flex_html_beads_PanelView.prototype.changeHandler = } if (event.type == 'titleChange') { - this.titleBar_.set_title(strand.model.get_title()); + this.titleBar_.set_title(strand.model.title); } var p = this.strand_.positioner; if (!strand.isWidthSizedToContent()) { - var w = strand.get_width(); + var w = strand.width; w -= p.offsetWidth - p.clientWidth; this.titleBar_.setWidth(w); strand.contentArea.style.width = w.toString() + 'px'; @@ -106,12 +106,12 @@ org_apache_flex_html_beads_PanelView.prototype.changeHandler = strand.controlBar.setWidth(w); } if (!strand.isHeightSizedToContent()) { - var t = this.titleBar_.get_height(); + var t = this.titleBar_.height; var b = 0; if (strand.controlBar) - b = strand.controlBar.get_height(); + b = strand.controlBar.height; strand.contentArea.style.top = t.toString() + 'px'; - var h = strand.get_height() - t - b; + var h = strand.height - t - b; h -= p.offsetHeight - p.clientHeight; strand.contentArea.style.height = h.toString() + 'px'; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.js index 1db4afa..33a8340 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.js @@ -60,7 +60,7 @@ org_apache_flex_html_beads_TextItemRendererFactoryForArrayData. this.listView = value.getBeadByType( org_apache_flex_html_beads_ListView); - this.dataGroup = this.listView.get_dataGroup(); + this.dataGroup = this.listView.dataGroup; this.model.addEventListener('dataProviderChanged', goog.bind(this.dataProviderChangedHandler, this)); @@ -77,7 +77,7 @@ org_apache_flex_html_beads_TextItemRendererFactoryForArrayData. prototype.dataProviderChangedHandler = function(event) { var dp, i, n, opt; - dp = this.model.get_dataProvider(); + dp = this.model.dataProvider; n = dp.length; for (i = 0; i < n; i++) { opt = new http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ItemRendererMouseController.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ItemRendererMouseController.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ItemRendererMouseController.js index 879d3d2..97282c9 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ItemRendererMouseController.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ItemRendererMouseController.js @@ -68,7 +68,7 @@ org_apache_flex_html_beads_controllers_ItemRendererMouseController.prototype.han var newEvent = new goog.events.Event('rollover'); newEvent.target = this.strand_; - this.strand_.get_itemRendererParent().dispatchEvent(newEvent); + this.strand_.itemRendererParent.dispatchEvent(newEvent); }; @@ -82,7 +82,7 @@ org_apache_flex_html_beads_controllers_ItemRendererMouseController.prototype.han var newEvent = new goog.events.Event('rollout'); newEvent.target = this.strand_; - this.strand_.get_itemRendererParent().dispatchEvent(newEvent); + this.strand_.itemRendererParent.dispatchEvent(newEvent); }; @@ -113,5 +113,5 @@ org_apache_flex_html_beads_controllers_ItemRendererMouseController.prototype.han // 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); + this.strand_.itemRendererParent.dispatchEvent(newEvent); }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ListSingleSelectionMouseController.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ListSingleSelectionMouseController.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ListSingleSelectionMouseController.js index 3875d07..9d5e3c0 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ListSingleSelectionMouseController.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/ListSingleSelectionMouseController.js @@ -52,7 +52,7 @@ org_apache_flex_html_beads_controllers_ListSingleSelectionMouseController.protot this.listView = value.getBeadByType( org_apache_flex_html_beads_ListView); - this.dataGroup = this.listView.get_dataGroup(); + this.dataGroup = this.listView.dataGroup; this.dataGroup.addEventListener('selected', goog.bind(this.selectedHandler, this)); }; @@ -66,7 +66,7 @@ org_apache_flex_html_beads_controllers_ListSingleSelectionMouseController.protot org_apache_flex_html_beads_controllers_ListSingleSelectionMouseController.prototype.selectedHandler = function(event) { - var index = event.target.get_index(); + var index = event.target.index; this.model.set_selectedIndex(index); var newEvent = new org_apache_flex_events_Event('change'); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SliderMouseController.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SliderMouseController.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SliderMouseController.js index 7bc9b89..29b3f1f 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SliderMouseController.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SliderMouseController.js @@ -70,8 +70,8 @@ org_apache_flex_html_beads_controllers_SliderMouseController. { 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(); + var n = p * (this.strand_.maximum - this.strand_.minimum) + + this.strand_.minimum; this.strand_.set_value(n); @@ -154,14 +154,14 @@ org_apache_flex_html_beads_controllers_SliderMouseController. 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(); + var n = p * (this.strand_.maximum - this.strand_.minimum) + + this.strand_.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(); + if (n < this.strand_.minimum) n = this.strand_.minimum; + else if (n > this.strand_.maximum) n = this.strand_.maximum; - p = (n - this.strand_.get_minimum()) / (this.strand_.get_maximum() - - this.strand_.get_minimum()); + p = (n - this.strand_.minimum) / (this.strand_.maximum - + this.strand_.minimum); newX = p * parseInt(this.track.element.style.width, 10); this.thumb.element.style.left = String(newX - http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SpinnerMouseController.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SpinnerMouseController.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SpinnerMouseController.js index af6f574..89d9375 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SpinnerMouseController.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/controllers/SpinnerMouseController.js @@ -63,9 +63,9 @@ org_apache_flex_html_beads_controllers_SpinnerMouseController. org_apache_flex_html_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())); + var newValue = this.strand_.snap(Math.min(this.strand_.maximum, + this.strand_.value + + this.strand_.stepSize)); this.strand_.set_value(newValue); }; @@ -78,8 +78,8 @@ org_apache_flex_html_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())); + var newValue = this.strand_.snap(Math.max(this.strand_.minimum, + this.strand_.value - + this.strand_.stepSize)); this.strand_.set_value(newValue); }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.js index f87f2ff..a4874ea 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/ButtonBarLayout.js @@ -94,13 +94,13 @@ org_apache_flex_html_beads_layouts_ButtonBarLayout. prototype.changeHandler = function(event) { var layoutParent = this.strand_.getBeadByType(org_apache_flex_core_ILayoutParent); - var contentView = layoutParent.get_contentView(); + var contentView = layoutParent.contentView; var itemRendererParent = contentView; - var n = itemRendererParent.get_numElements(); + var n = itemRendererParent.numElements; var xpos = 0; - var useWidth = this.strand_.get_width() / n; - var useHeight = this.strand_.get_height(); + var useWidth = this.strand_.width / n; + var useHeight = this.strand_.height; for (var i = 0; i < n; i++) { @@ -121,6 +121,6 @@ org_apache_flex_html_beads_layouts_ButtonBarLayout. else ir.element.style.display = 'inline-block'; - xpos += ir.get_width(); + xpos += ir.width; } }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualBasicLayout.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualBasicLayout.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualBasicLayout.js index 26ee24e..f705adc 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualBasicLayout.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualBasicLayout.js @@ -66,8 +66,8 @@ org_apache_flex_html_beads_layouts_NonVirtualBasicLayout. // events because we let the browser layout based on // %'s and don't convert to pixels, so listen to the // other events anyway. - /* if (!isNaN(this.strand_.get_explicitWidth()) && - !isNaN(this.strand_.get_explicitHeight()))*/ + /* if (!isNaN(this.strand_.explicitWidth) && + !isNaN(this.strand_.explicitHeight))*/ this.addOtherListeners(); } } @@ -106,10 +106,10 @@ org_apache_flex_html_beads_layouts_NonVirtualBasicLayout. var i, n, h, w; var viewBead = this.strand_.getBeadByType(org_apache_flex_core_ILayoutParent); - var contentView = viewBead.get_contentView(); - w = contentView.get_width(); - h = contentView.get_height(); - n = contentView.get_numElements(); + var contentView = viewBead.contentView; + w = contentView.width; + h = contentView.height; + n = contentView.numElements; for (i = 0; i < n; i++) { var child = contentView.getElementAt(i); var left = org_apache_flex_core_ValuesManager.valuesImpl.getValue(child, 'left'); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualBasicScrollingLayout.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualBasicScrollingLayout.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualBasicScrollingLayout.js index c7b95a5..af85336 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualBasicScrollingLayout.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualBasicScrollingLayout.js @@ -64,11 +64,11 @@ org_apache_flex_html_beads_layouts_NonVirtualBasicScrollingLayout. var i, n, h, w; var viewBead = this.strand_.getBeadByType(org_apache_flex_core_ILayoutParent); - var contentView = viewBead.get_contentView(); + var contentView = viewBead.contentView; contentView.element.style.overflow = 'auto'; - w = contentView.get_width(); - h = contentView.get_height(); - n = contentView.get_numElements(); + w = contentView.width; + h = contentView.height; + n = contentView.numElements; for (i = 0; i < n; i++) { var child = contentView.getElementAt(i); var left = org_apache_flex_core_ValuesManager.valuesImpl.getValue(child, 'left'); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.js index fcf067a..984a62c 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualHorizontalLayout.js @@ -61,8 +61,8 @@ org_apache_flex_html_beads_layouts_NonVirtualHorizontalLayout. goog.bind(this.changeHandler, this)); this.strand_.addEventListener('sizeChanged', goog.bind(this.sizeChangeHandler, this)); - if (!isNaN(this.strand_.get_explicitWidth()) && - !isNaN(this.strand_.get_explicitHeight())) + if (!isNaN(this.strand_.explicitWidth) && + !isNaN(this.strand_.explicitHeight)) this.addOtherListeners(); } this.strand_.element.style.display = 'block'; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalLayout.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalLayout.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalLayout.js index 2e017c5..747a1f9 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalLayout.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/NonVirtualVerticalLayout.js @@ -58,8 +58,8 @@ org_apache_flex_html_beads_layouts_NonVirtualVerticalLayout. goog.bind(this.changeHandler, this)); this.strand_.addEventListener('sizeChanged', goog.bind(this.sizeChangeHandler, this)); - if (!isNaN(this.strand_.get_explicitWidth()) && - !isNaN(this.strand_.get_explicitHeight())) + if (!isNaN(this.strand_.explicitWidth) && + !isNaN(this.strand_.explicitHeight)) this.addOtherListeners(); } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/TileLayout.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/TileLayout.js b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/TileLayout.js index 5b95491..c9a2b9e 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/TileLayout.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/beads/layouts/TileLayout.js @@ -130,14 +130,14 @@ org_apache_flex_html_beads_layouts_TileLayout. xpos = 0; ypos = 0; - useWidth = this.get_columnWidth(); - useHeight = this.get_rowHeight(); + useWidth = this.columnWidth; + useHeight = this.rowHeight; - if (isNaN(useWidth)) useWidth = Math.floor(this.strand_.get_width() / this.get_numColumns()); // + gap + if (isNaN(useWidth)) useWidth = Math.floor(this.strand_.width / this.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); + var numRows = Math.floor(n / this.numColumns); + useHeight = Math.floor(this.strand_.height / numRows); } for (i = 0; i < n; i++) @@ -150,7 +150,7 @@ org_apache_flex_html_beads_layouts_TileLayout. xpos += useWidth; - if (((i + 1) % this.get_numColumns()) === 0) { + if (((i + 1) % this.numColumns) === 0) { xpos = 0; ypos += useHeight; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/StringItemRenderer.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/StringItemRenderer.js b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/StringItemRenderer.js index 73052cb..cca3712 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/StringItemRenderer.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/StringItemRenderer.js @@ -152,11 +152,11 @@ org_apache_flex_html_supportClasses_StringItemRenderer. org_apache_flex_html_supportClasses_StringItemRenderer.base(this, 'set_data', value); - if (this.get_labelField()) { - this.element.innerHTML = String(value[this.get_labelField()]); + if (this.labelField) { + this.element.innerHTML = String(value[this.labelField]); } - else if (this.get_dataField()) { - this.element.innerHTML = String(value[this.get_dataField()]); + else if (this.dataField) { + this.element.innerHTML = String(value[this.dataField]); } else if (value.toString) { this.element.innerHTML = value.toString(); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/UIItemRendererBase.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/UIItemRendererBase.js b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/UIItemRendererBase.js index 300dbcb..d3c8bac 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/UIItemRendererBase.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html/supportClasses/UIItemRendererBase.js @@ -61,7 +61,7 @@ function() { // each MXML file can also have styles in fx:Style block //? appropriate for JavaScript? ValuesManager.valuesImpl.init(this); - org_apache_flex_utils_MXMLDataInterpreter.generateMXMLInstances(this, this, this.get_MXMLDescriptor()); + org_apache_flex_utils_MXMLDataInterpreter.generateMXMLInstances(this, this, this.MXMLDescriptor); this.dispatchEvent(new org_apache_flex_events_Event('initComplete')); }; @@ -201,11 +201,11 @@ function(value) { */ org_apache_flex_html_supportClasses_UIItemRendererBase.prototype.updateRenderer = function() { - if (this.get_down()) { + if (this.down) { } - else if (this.get_hovered()) { + else if (this.hovered) { } - else if (this.get_selected()) { + else if (this.selected) { } }; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/html5/ComboBox.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/html5/ComboBox.js b/frameworks/js/FlexJS/src/org/apache/flex/html5/ComboBox.js index 07119a2..1e1f7e5 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/html5/ComboBox.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/html5/ComboBox.js @@ -142,7 +142,7 @@ org_apache_flex_html5_ComboBox.prototype.buttonClicked = select.onchange = /** @type {function(Event)} */ (goog.bind(this.selectChanged, this)); opts = select.options; - dp = /** @type {Array.<string>} */ (this.get_dataProvider()); + dp = /** @type {Array.<string>} */ (this.dataProvider); n = dp.length; for (i = 0; i < n; i++) { opt = document.createElement('option'); @@ -152,7 +152,7 @@ org_apache_flex_html5_ComboBox.prototype.buttonClicked = select.size = n; - si = this.get_selectedIndex(); + si = this.selectedIndex; if (si < 0) { select.value = null; } else { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/net/BinaryUploader.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/net/BinaryUploader.js b/frameworks/js/FlexJS/src/org/apache/flex/net/BinaryUploader.js index 14cfe9f..2df3b82 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/net/BinaryUploader.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/net/BinaryUploader.js @@ -306,12 +306,12 @@ org_apache_flex_net_BinaryUploader.prototype.send = function() { if (this.binaryData_ !== undefined) { if (this.method_ === org_apache_flex_net_BinaryUploader.HTTP_METHOD_GET) { if (url.indexOf('?') !== -1) { - url += this.binaryData_.get_data(); + url += this.binaryData_.data; } else { - url += '?' + this.binaryData_.get_data(); + url += '?' + this.binaryData_.data; } } else { - binaryData = this.binaryData_.get_data(); + binaryData = this.binaryData_.data; } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/net/dataConverters/LazyCollection.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/net/dataConverters/LazyCollection.js b/frameworks/js/FlexJS/src/org/apache/flex/net/dataConverters/LazyCollection.js index bd3db2a..06799a1 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/net/dataConverters/LazyCollection.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/net/dataConverters/LazyCollection.js @@ -159,7 +159,7 @@ org_apache_flex_net_dataConverters_LazyCollection.prototype.set_strand = */ org_apache_flex_net_dataConverters_LazyCollection.prototype.completeHandler = function() { - var results = this.strand_.get_data(); + var results = this.strand_.data; this.rawData_ = this.inputParser_.parseItems(results); this.data_ = []; this.dispatchEvent('complete'); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/utils/PointUtils.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/utils/PointUtils.js b/frameworks/js/FlexJS/src/org/apache/flex/utils/PointUtils.js index 0d6ea8d..0cb0216 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/utils/PointUtils.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/utils/PointUtils.js @@ -50,7 +50,7 @@ org_apache_flex_utils_PointUtils.globalToLocal = x -= element.offsetLeft; y -= element.offsetTop; if (local.get_parent) { - local = local.get_parent(); + local = local.parent; element = local.element; } else { element = null; @@ -76,7 +76,7 @@ org_apache_flex_utils_PointUtils.localToGlobal = x += element.offsetLeft; y += element.offsetTop; if (local.get_parent) { - local = local.get_parent(); + local = local.parent; element = local.element; } else { element = null; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4aed23bf/frameworks/js/FlexJS/src/org/apache/flex/utils/UIUtils.js ---------------------------------------------------------------------- diff --git a/frameworks/js/FlexJS/src/org/apache/flex/utils/UIUtils.js b/frameworks/js/FlexJS/src/org/apache/flex/utils/UIUtils.js index 3c503ef..dd51073 100644 --- a/frameworks/js/FlexJS/src/org/apache/flex/utils/UIUtils.js +++ b/frameworks/js/FlexJS/src/org/apache/flex/utils/UIUtils.js @@ -44,13 +44,13 @@ org_apache_flex_utils_UIUtils.prototype.FLEXJS_CLASS_INFO = org_apache_flex_utils_UIUtils.center = function(item, relativeTo) { - var rw = relativeTo.get_width(); + var rw = relativeTo.width; if (isNaN(rw)) rw = window.innerWidth; - var rh = relativeTo.get_height(); + var rh = relativeTo.height; if (isNaN(rh)) rh = window.innerHeight; - var xpos = (rw - item.get_width()) / 2; - var ypos = (rh - item.get_height()) / 2; + var xpos = (rw - item.width) / 2; + var ypos = (rh - item.height) / 2; item.set_x(xpos); item.set_y(ypos); }; @@ -65,7 +65,7 @@ org_apache_flex_utils_UIUtils.findPopUpHost = function(start) { while (start != null && !org_apache_flex_utils_Language.is(start, org_apache_flex_core_IPopUpHost)) { - start = start.get_parent(); + start = start.parent; } return start; @@ -79,6 +79,6 @@ org_apache_flex_utils_UIUtils.findPopUpHost = org_apache_flex_utils_UIUtils.removePopUp = function(popUp) { - var p = popUp.get_parent(); + var p = popUp.parent; p.removeElement(popUp); };
