You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by yi...@apache.org on 2018/07/02 11:03:06 UTC
[royale-asjs] branch feature/revert-refactor updated: Renamed
filter files
This is an automated email from the ASF dual-hosted git repository.
yishayw pushed a commit to branch feature/revert-refactor
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/feature/revert-refactor by this push:
new 6338bef Renamed filter files
6338bef is described below
commit 6338befd686f4ba95d5e5353b7c4d2b64ea746d4
Author: DESKTOP-RH4S838\Yishay <yi...@hotmail.com>
AuthorDate: Mon Jul 2 14:02:38 2018 +0300
Renamed filter files
---
.../Graphics/src/main/resources/svg-manifest.xml | 8 ++++----
.../royale/svg/{BlendFilter.as => BlendFilterElement.as} | 8 ++++----
.../royale/svg/{BlurFilter.as => BlurFilterElement.as} | 8 ++++----
.../apache/royale/svg/{DropShadowBead.as => Filter.as} | 16 +++++-----------
.../royale/svg/{OffsetBead.as => OffsetFilterElement.as} | 8 ++++----
5 files changed, 21 insertions(+), 27 deletions(-)
diff --git a/frameworks/projects/Graphics/src/main/resources/svg-manifest.xml b/frameworks/projects/Graphics/src/main/resources/svg-manifest.xml
index ca8b045..4c95d2f 100644
--- a/frameworks/projects/Graphics/src/main/resources/svg-manifest.xml
+++ b/frameworks/projects/Graphics/src/main/resources/svg-manifest.xml
@@ -22,10 +22,10 @@
<componentPackage>
<component id="TransformBead" class="org.apache.royale.svg.TransformBead" />
<component id="ClipBead" class="org.apache.royale.svg.ClipBead" />
- <component id="DropShadowBead" class="org.apache.royale.svg.DropShadowBead" />
- <component id="OffsetBead" class="org.apache.royale.svg.OffsetBead" />
- <component id="BlurFilter" class="org.apache.royale.svg.BlurFilter" />
- <component id="BlendFilter" class="org.apache.royale.svg.BlendFilter" />
+ <component id="Filter" class="org.apache.royale.svg.Filter" />
+ <component id="OffsetFilterElement" class="org.apache.royale.svg.OffsetFilterElement" />
+ <component id="BlurFilterElement" class="org.apache.royale.svg.BlurFilterElement" />
+ <component id="BlendFilterElement" class="org.apache.royale.svg.BlendFilterElement" />
<component id="MaskBead" class="org.apache.royale.svg.MaskBead" />
<component id="DisableClipBead" class="org.apache.royale.svg.DisableClipBead" />
<component id="LinearGradient" class="org.apache.royale.svg.LinearGradient" />
diff --git a/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/BlendFilter.as b/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/BlendFilterElement.as
similarity index 90%
rename from frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/BlendFilter.as
rename to frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/BlendFilterElement.as
index 112dba2..ab6a41b 100644
--- a/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/BlendFilter.as
+++ b/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/BlendFilterElement.as
@@ -29,19 +29,19 @@ package org.apache.royale.svg
}
/**
- * The BlendFilter blends several filter elements
+ * The BlendFilterElement blends several filter elements
*
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9.3
*/
- public class BlendFilter implements IBead
+ public class BlendFilterElement implements IBead
{
private var _strand:IStrand;
private var _in2:String;
- public function BlendFilter()
+ public function BlendFilterElement()
{
}
@@ -66,7 +66,7 @@ package org.apache.royale.svg
{
COMPILE::JS
{
- var filter:Element = (_strand.getBeadByType(DropShadowBead) as DropShadowBead).filterElement;
+ var filter:Element = (_strand.getBeadByType(Filter) as Filter).filterElement;
var blend:Element = addSvgElementToElement(filter, "feBlend") as Element;
blend.setAttribute("in", "SourceGraphic");
blend.setAttribute("in2", in2);
diff --git a/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/BlurFilter.as b/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/BlurFilterElement.as
similarity index 91%
rename from frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/BlurFilter.as
rename to frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/BlurFilterElement.as
index 00de473..8269828 100644
--- a/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/BlurFilter.as
+++ b/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/BlurFilterElement.as
@@ -30,20 +30,20 @@ package org.apache.royale.svg
}
/**
- * The BlurFilter bead adds a blur to a filtered SVG element
+ * The BlurFilterElement bead adds a blur to a filtered SVG element
*
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9.3
*/
- public class BlurFilter implements IBead
+ public class BlurFilterElement implements IBead
{
private var _strand:IStrand;
private var _stdDeviation:Number = 3;
private var _blurResult:String = "blurResult";
- public function BlurFilter()
+ public function BlurFilterElement()
{
}
@@ -68,7 +68,7 @@ package org.apache.royale.svg
{
COMPILE::JS
{
- var filter:Element = (_strand.getBeadByType(DropShadowBead) as DropShadowBead).filterElement;
+ var filter:Element = (_strand.getBeadByType(Filter) as Filter).filterElement;
var offset:Element = addSvgElementToElement(filter, "feGaussianBlur") as Element;
offset.setAttribute("stdDeviation", stdDeviation);
offset.setAttribute("result", blurResult);
diff --git a/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/DropShadowBead.as b/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/Filter.as
similarity index 91%
rename from frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/DropShadowBead.as
rename to frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/Filter.as
index 18e2d27..bb52f84 100644
--- a/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/DropShadowBead.as
+++ b/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/Filter.as
@@ -23,12 +23,6 @@ package org.apache.royale.svg
import org.apache.royale.core.IRenderedObject;
import org.apache.royale.core.IStrand;
- COMPILE::SWF {
- import flash.display.Graphics;
- import flash.display.Sprite;
- import flash.display.DisplayObject;
- }
-
COMPILE::JS
{
import org.apache.royale.utils.UIDUtil;
@@ -36,14 +30,14 @@ package org.apache.royale.svg
import org.apache.royale.events.IEventDispatcher;
}
/**
- * The DropShadowBead bead allows you to filter
+ * The Filter bead allows you to filter an SVG element. Filter elements should be added to the strand to achieve the desired effect.
*
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
- * @productversion Royale 0.0
+ * @productversion Royale 0.9.3
*/
- public class DropShadowBead implements IBead
+ public class Filter implements IBead
{
private var _strand:IStrand;
private var _width:String = "200%";
@@ -54,7 +48,7 @@ package org.apache.royale.svg
private var _filterElement:Element;
}
- public function DropShadowBead()
+ public function Filter()
{
}
@@ -127,7 +121,7 @@ package org.apache.royale.svg
}
- public function get host():IRenderedObject
+ private function get host():IRenderedObject
{
return _strand as IRenderedObject;
}
diff --git a/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/OffsetBead.as b/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/OffsetFilterElement.as
similarity index 91%
rename from frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/OffsetBead.as
rename to frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/OffsetFilterElement.as
index d572109..d45dcf8 100644
--- a/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/OffsetBead.as
+++ b/frameworks/projects/Graphics/src/main/royale/org/apache/royale/svg/OffsetFilterElement.as
@@ -30,21 +30,21 @@ package org.apache.royale.svg
}
/**
- * The OffsetBead bead adds an offset to a filtered SVG element
+ * The OffsetFilterElement bead adds an offset to a filtered SVG element
*
* @langversion 3.0
* @playerversion Flash 10.2
* @playerversion AIR 2.6
* @productversion Royale 0.9.3
*/
- public class OffsetBead implements IBead
+ public class OffsetFilterElement implements IBead
{
private var _strand:IStrand;
private var _dx:Number = 0;
private var _dy:Number = 0;
private var _offsetResult:String = "offsetResult";
- public function OffsetBead()
+ public function OffsetFilterElement()
{
}
@@ -69,7 +69,7 @@ package org.apache.royale.svg
{
COMPILE::JS
{
- var filter:Element = (_strand.getBeadByType(DropShadowBead) as DropShadowBead).filterElement;
+ var filter:Element = (_strand.getBeadByType(Filter) as Filter).filterElement;
var offset:Element = addSvgElementToElement(filter, "feOffset") as Element;
offset.setAttribute("dx", dx);
offset.setAttribute("dy", dy);