This is an automated email from the ASF dual-hosted git repository.
harbs pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 7a991d9 renamed methods to not conflict with needsLayout in
UIComponent
new ceb4daa Merge branch 'develop' of
https://github.com/apache/royale-asjs into develop
7a991d9 is described below
commit 7a991d934169fd131baa2dace4c8ec34aa564e00
Author: Harbs <ha...@in-tools.com>
AuthorDate: Mon Jan 3 14:50:47 2022 +0200
renamed methods to not conflict with needsLayout in UIComponent
---
.../src/main/royale/org/apache/royale/core/GroupBase.as | 4 ++--
.../src/main/royale/org/apache/royale/core/UIBase.as | 16 ++++++++--------
.../royale/org/apache/royale/html/NodeElementBase.as | 6 +++---
.../royale/org/apache/royale/svg/elements/SVGBase.as | 6 +++---
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/GroupBase.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/GroupBase.as
index a00f2b9..3593418 100644
---
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/GroupBase.as
+++
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/GroupBase.as
@@ -109,7 +109,7 @@ package org.apache.royale.core
super.addedToParent();
// Load the layout bead if it hasn't already been
loaded.
- if(needsLayout())
+ if(requiresLayout())
loadBeadFromValuesManager(IBeadLayout, "iBeadLayout", this);
}
@@ -117,7 +117,7 @@ package org.apache.royale.core
* Subclasses can override this method to declare whether they need a
layout.
* Components which do not need a layout can avoid searching for
layout beads
*/
- protected function needsLayout():Boolean
+ protected function requiresLayout():Boolean
{
return true;
}
diff --git
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as
index 6d75c86..97254be 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as
@@ -1391,30 +1391,30 @@ package org.apache.royale.core
*/
protected function loadBeads():void
{
- if(needsView())
+ if(requiresView())
{
_view = loadBeadFromValuesManager(IBeadView, "iBeadView",
this) as IBeadView;
sendEvent(this,"viewChanged");
}
- if(needsController())
+ if(requiresController())
loadBeadFromValuesManager(IBeadController, "iBeadController",
this);
}
/**
- * Subclasses can override this method to declare whether they need a
view.
- * Components which do not need a view can avoid searching for view
beads
+ * Subclasses can override this method to declare whether they require
a view.
+ * Components which do not require a view can avoid searching for view
beads
*/
- protected function needsView():Boolean
+ protected function requiresView():Boolean
{
return true;
}
/**
- * Subclasses can override this method to declare whether they need a
controller.
- * Components which do not need a controller can avoid searching for
controller beads
+ * Subclasses can override this method to declare whether they require
a controller.
+ * Components which do not require a controller can avoid searching
for controller beads
*/
- protected function needsController():Boolean
+ protected function requiresController():Boolean
{
return true;
}
diff --git
a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/NodeElementBase.as
b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/NodeElementBase.as
index 8d4298f..a1b5103 100644
---
a/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/NodeElementBase.as
+++
b/frameworks/projects/HTML/src/main/royale/org/apache/royale/html/NodeElementBase.as
@@ -28,17 +28,17 @@ package org.apache.royale.html
typeNames = "";
}
- override protected function needsView():Boolean
+ override protected function requiresView():Boolean
{
return false;
}
- override protected function needsController():Boolean
+ override protected function requiresController():Boolean
{
return false;
}
- override protected function needsLayout():Boolean
+ override protected function requiresLayout():Boolean
{
return false;
}
diff --git
a/frameworks/projects/HTML/src/main/royale/org/apache/royale/svg/elements/SVGBase.as
b/frameworks/projects/HTML/src/main/royale/org/apache/royale/svg/elements/SVGBase.as
index e7888e0..77d5685 100644
---
a/frameworks/projects/HTML/src/main/royale/org/apache/royale/svg/elements/SVGBase.as
+++
b/frameworks/projects/HTML/src/main/royale/org/apache/royale/svg/elements/SVGBase.as
@@ -26,15 +26,15 @@ package org.apache.royale.svg.elements
{
super();
}
- override protected function needsView():Boolean
+ override protected function requiresView():Boolean
{
return false;
}
- override protected function needsController():Boolean
+ override protected function requiresController():Boolean
{
return false;
}
- override protected function needsLayout():Boolean
+ override protected function requiresLayout():Boolean
{
return false;
}
