You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ha...@apache.org on 2026/02/25 22:08:10 UTC

(royale-asjs) branch develop updated: Cleanup

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 939213f1f3 Cleanup
939213f1f3 is described below

commit 939213f1f3e8ef580bf4a3c62c1a06f6f7da25f7
Author: Harbs <ha...@in-tools.com>
AuthorDate: Thu Feb 26 00:07:59 2026 +0200

    Cleanup
---
 .../Style/src/main/resources/basic-manifest.xml    |  44 ++-
 .../BackdropFilter.as => CompositeStyle.as}        |  27 +-
 .../royale/style/stylebeads/border/BorderColor.as  |   2 +-
 .../royale/style/stylebeads/border/BorderRadius.as | 307 ++++++++++++++++++---
 .../stylebeads/border/BorderRadiusBottomLeft.as    |  28 --
 .../stylebeads/border/BorderRadiusBottomRight.as   |  28 --
 .../style/stylebeads/border/BorderRadiusEndEnd.as  |  28 --
 .../stylebeads/border/BorderRadiusEndStart.as      |  28 --
 .../stylebeads/border/BorderRadiusStartEnd.as      |  28 --
 .../stylebeads/border/BorderRadiusStartStart.as    |  28 --
 .../style/stylebeads/border/BorderRadiusTopLeft.as |  28 --
 .../stylebeads/border/BorderRadiusTopRight.as      |  28 --
 .../royale/style/stylebeads/border/BorderStyle.as  |   2 +-
 .../royale/style/stylebeads/border/BorderWidth.as  |   2 +-
 .../style/stylebeads/border/BorderWidthBlock.as    |   2 +-
 .../style/stylebeads/border/BorderWidthBlockEnd.as |   2 +-
 .../stylebeads/border/BorderWidthBlockStart.as     |   2 +-
 .../style/stylebeads/border/BorderWidthBottom.as   |   2 +-
 .../style/stylebeads/border/BorderWidthInline.as   |   2 +-
 .../stylebeads/border/BorderWidthInlineEnd.as      |   2 +-
 .../stylebeads/border/BorderWidthInlineStart.as    |   2 +-
 .../style/stylebeads/border/BorderWidthLeft.as     |   2 +-
 .../style/stylebeads/border/BorderWidthRight.as    |   2 +-
 .../style/stylebeads/border/BorderWidthTop.as      |   2 +-
 .../royale/style/stylebeads/border/OutlineColor.as |   2 +-
 .../style/stylebeads/border/OutlineOffset.as       |   2 +-
 .../royale/style/stylebeads/border/OutlineStyle.as |   2 +-
 .../royale/style/stylebeads/border/OutlineWidth.as |   2 +-
 .../style/stylebeads/filters/BackdropFilter.as     |   2 +-
 .../style/stylebeads/filters/FilterEffect.as       |   3 +-
 .../style/stylebeads/filters/FilterEffectBase.as   |   2 +-
 .../style/stylebeads/tables/BorderCollapse.as      |   2 +-
 .../style/stylebeads/tables/BorderSpacing.as       |   2 +-
 .../royale/style/stylebeads/tables/CaptionSide.as  |   2 +-
 .../royale/style/stylebeads/tables/TableLayout.as  |   2 +-
 35 files changed, 339 insertions(+), 312 deletions(-)

diff --git a/frameworks/projects/Style/src/main/resources/basic-manifest.xml b/frameworks/projects/Style/src/main/resources/basic-manifest.xml
index 2aad0b3e12..3903d6007b 100644
--- a/frameworks/projects/Style/src/main/resources/basic-manifest.xml
+++ b/frameworks/projects/Style/src/main/resources/basic-manifest.xml
@@ -39,7 +39,7 @@
   <component id="SizeStyle" class="org.apache.royale.style.stylebeads.SizeStyle"/>
   <component id="WidthStyle" class="org.apache.royale.style.stylebeads.WidthStyle"/>
 
-  <!-- 
+
   <component id="FontFamily" class="org.apache.royale.style.stylebeads.typography.FontFamily"/>
   <component id="FontFeatures" class="org.apache.royale.style.stylebeads.typography.FontFeatures"/>
   <component id="FontNumeric" class="org.apache.royale.style.stylebeads.typography.FontNumeric"/>
@@ -66,8 +66,24 @@
   <component id="VerticalAlign" class="org.apache.royale.style.stylebeads.typography.VerticalAlign"/>
   <component id="Whitespace" class="org.apache.royale.style.stylebeads.typography.Whitespace"/>
   <component id="WordBreak" class="org.apache.royale.style.stylebeads.typography.WordBreak"/>
-  -->
-  <!-- 
+
+  <component id="Animation" class="org.apache.royale.style.stylebeads.anim.Animation"/>
+  <component id="TransitionBehavior" class="org.apache.royale.style.stylebeads.anim.TransitionBehavior"/>
+  <component id="TransitionDelay" class="org.apache.royale.style.stylebeads.anim.TransitionDelay"/>
+  <component id="TransitionDuration" class="org.apache.royale.style.stylebeads.anim.TransitionDuration"/>
+  <component id="TransitionProperty" class="org.apache.royale.style.stylebeads.anim.TransitionProperty"/>
+  <component id="TransitionTimingFunction" class="org.apache.royale.style.stylebeads.anim.TransitionTimingFunction"/>
+
+  <component id="BackgroundAttachment" class="org.apache.royale.style.stylebeads.background.BackgroundAttachment"/>
+  <component id="BackgroundClip" class="org.apache.royale.style.stylebeads.background.BackgroundClip"/>
+  <component id="BackgroundColor" class="org.apache.royale.style.stylebeads.background.BackgroundColor"/>
+  <component id="BackgroundImage" class="org.apache.royale.style.stylebeads.background.BackgroundImage"/>
+  <component id="BackgroundOrigin" class="org.apache.royale.style.stylebeads.background.BackgroundOrigin"/>
+  <component id="BackgroundPosition" class="org.apache.royale.style.stylebeads.background.BackgroundPosition"/>
+  <component id="BackgroundRepeat" class="org.apache.royale.style.stylebeads.background.BackgroundRepeat"/>
+  <component id="BackgroundSize" class="org.apache.royale.style.stylebeads.background.BackgroundSize"/>
+  
+   
   <component id="BackgroundBlendMode" class="org.apache.royale.style.stylebeads.effects.BackgroundBlendMode"/>
   <component id="BoxShadow" class="org.apache.royale.style.stylebeads.effects.BoxShadow"/>
   <component id="MaskClip" class="org.apache.royale.style.stylebeads.effects.MaskClip"/>
@@ -81,12 +97,26 @@
   <component id="MaskType" class="org.apache.royale.style.stylebeads.effects.MaskType"/>
   <component id="OpacityStyle" class="org.apache.royale.style.stylebeads.effects.OpacityStyle"/>
   <component id="TextShadow" class="org.apache.royale.style.stylebeads.effects.TextShadow"/>
-  <component id="FilterEffect" class="org.apache.royale.style.stylebeads.effects.FilterEffect"/>
-  <component id="BackdropFilter" class="org.apache.royale.style.stylebeads.effects.BackdropFilter"/>
+  <component id="FilterEffect" class="org.apache.royale.style.stylebeads.filters.FilterEffect"/>
+  <component id="BackdropFilter" class="org.apache.royale.style.stylebeads.filters.BackdropFilter"/>
 
   <component id="TableLayout" class="org.apache.royale.style.stylebeads.TableLayout"/>
-  
-  -->
+  <component id="BorderColor" class="org.apache.royale.style.stylebeads.border.BorderColor"/>
+  <component id="BorderRadius" class="org.apache.royale.style.stylebeads.border.BorderRadius"/>
+  <component id="BorderStyle" class="org.apache.royale.style.stylebeads.border.BorderStyle"/>
+  <component id="BorderWidth" class="org.apache.royale.style.stylebeads.border.BorderWidth"/>
+  <component id="ColumnGap" class="org.apache.royale.style.stylebeads.flexgrid.ColumnGap"/>
+  <component id="RowGap" class="org.apache.royale.style.stylebeads.flexgrid.RowGap"/>
+  <component id="GridRow" class="org.apache.royale.style.stylebeads.flexgrid.GridRow"/>
+  <component id="RowSpan" class="org.apache.royale.style.stylebeads.flexgrid.GridRow"/>
+  <component id="GridAutoColumns" class="org.apache.royale.style.stylebeads.flexgrid.GridAutoColumns"/>
+  <component id="GridAutoFlow" class="org.apache.royale.style.stylebeads.flexgrid.GridAutoFlow"/>
+  <component id="GridAutoRows" class="org.apache.royale.style.stylebeads.flexgrid.GridAutoRows"/>
+  <component id="GridTemplateColumns" class="org.apache.royale.style.stylebeads.flexgrid.GridTemplateColumns"/>
+  <component id="GridTemplateRows" class="org.apache.royale.style.stylebeads.flexgrid.GridTemplateRows"/>
+  <component id="Stroke" class="org.apache.royale.style.stylebeads.svg.Stroke"/>
+  <component id="StrokeWidth" class="org.apache.royale.style.stylebeads.svg.StrokeWidth"/>
+  <component id="ForcedColorAdjust" class="org.apache.royale.style.stylebeads.access.ForcedColorAdjust"/>
 
 
 </componentPackage>
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/filters/BackdropFilter.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/CompositeStyle.as
similarity index 70%
copy from frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/filters/BackdropFilter.as
copy to frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/CompositeStyle.as
index 3686ca197f..8785a1108a 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/filters/BackdropFilter.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/CompositeStyle.as
@@ -16,26 +16,31 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.effects
+package org.apache.royale.style.stylebeads
 {
-
-	public class BackdropFilter extends FilterEffectBase
+	public class CompositeStyle extends StyleBeadBase
 	{
-		public function BackdropFilter()
+		public function CompositeStyle()
 		{
-			super();
+			
 		}
-		/**
-		 * TODO: Figure this out
-		 */
+		protected var _styles:Array = [];
 		override public function get selectors():Array
 		{
-			return [];
+			var retVal:Array = [];
+			for each (var style:StyleBeadBase in _styles)			{
+				retVal = retVal.concat(style.selectors);
+			}
+			return retVal;
 		}
 
 		override public function get rules():Array
 		{
-			return [];
-		}
+			var retVal:Array = [];
+			for each (var style:StyleBeadBase in _styles)			{
+				retVal = retVal.concat(style.rules);
+			}
+			return retVal;
+		}		
 	}
 }
\ No newline at end of file
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderColor.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderColor.as
index 68d393014c..4c73b9f9b0 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderColor.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderColor.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.background
+package org.apache.royale.style.stylebeads.border
 {
 	import org.apache.royale.style.stylebeads.SingleStyleBase;
 	import org.apache.royale.debugging.assert;
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderRadius.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderRadius.as
index 977a236db4..c2e7ae0a84 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderRadius.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderRadius.as
@@ -16,64 +16,279 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.background
+package org.apache.royale.style.stylebeads.border
 {
 	import org.apache.royale.style.stylebeads.SingleStyleBase;
 	import org.apache.royale.debugging.assert;
 	import org.apache.royale.style.util.ThemeManager;
 	import org.apache.royale.style.util.StyleTheme;
+	import org.apache.royale.style.stylebeads.CompositeStyle;
 
-	public class BorderRadius extends SingleStyleBase
+	public class BorderRadius extends CompositeStyle
 	{
-		public function BorderRadius(selectorPrefix:String = "rounded", rulePrefix:String = "border-radius")
+		public function BorderRadius()
 		{
-			super(selectorPrefix, rulePrefix);
+			super();
 		}
-		override public function set value(value:*):void
+
+		private var _radius:*;
+		public function get radius():*
+		{
+			return _radius;
+		}
+		private var rStyle:Radius;
+		public function set radius(value:*):void
+		{
+			if(!rStyle)
+			{
+				rStyle = new Radius();
+				_styles.push(rStyle);
+			}
+			_radius = value;
+			rStyle.value = value;
+		}
+		private var _topLeft:*;
+		public function get topLeft():*
+		{
+			return _topLeft;
+		}
+
+		private var tlStyle:TopLeft;
+		public function set topLeft(value:*):void
+		{
+			if(!tlStyle)
+			{
+				tlStyle = new TopLeft();
+				_styles.push(tlStyle);
+			}
+			_topLeft = value;
+			tlStyle.value = value;
+		}
+		private var _topRight:*;
+		public function get topRight():*
+		{
+			return _topRight;
+		}
+		private var trStyle:TopRight;
+		public function set topRight(value:*):void
+		{
+			if(!trStyle)
+			{
+				trStyle = new TopRight();
+				_styles.push(trStyle);
+			}
+			_topRight = value;
+			trStyle.value = value;
+		}
+		private var _bottomLeft:*;
+		public function get bottomLeft():*
+		{
+			return _bottomLeft;
+		}
+		private var blStyle:BottomLeft;
+		public function set bottomLeft(value:*):void
+		{
+			if(!blStyle)
+			{
+				blStyle = new BottomLeft();
+				_styles.push(blStyle);
+			}
+			_bottomLeft = value;
+			blStyle.value = value;
+		}
+		private var _bottomRight:*;
+		public function get bottomRight():*
+		{
+			return _bottomRight;
+		}
+		private var brStyle:BottomRight;
+		public function set bottomRight(value:*):void
+		{
+			if(!brStyle)
+			{
+				brStyle = new BottomRight();
+				_styles.push(brStyle);
+			}
+			_bottomRight = value;
+			brStyle.value = value;
+		}
+		private var _startStart:*;
+		public function get startStart():*
+		{
+			return _startStart;
+		}
+		private var ssStyle:StartStart;
+		public function set startStart(value:*):void
+		{
+			if(!ssStyle)
+			{
+				ssStyle = new StartStart();
+				_styles.push(ssStyle);
+			}
+			_startStart = value;
+			ssStyle.value = value;
+		}
+		private var _startEnd:*;
+		public function get startEnd():*
+		{
+			return _startEnd;
+		}
+		private var seStyle:StartEnd;
+		public function set startEnd(value:*):void
+		{
+			if(!seStyle)
+			{
+				seStyle = new StartEnd();
+				_styles.push(seStyle);
+			}
+			_startEnd = value;
+			seStyle.value = value;
+		}
+		private var _endStart:*;
+		public function get endStart():*
+		{
+			return _endStart;
+		}
+		private var esStyle:EndStart;
+		public function set endStart(value:*):void
 		{
-			var selectorValue:String = value;
-			var ruleValue:String = value;
-			var theme:StyleTheme = ThemeManager.instance.activeTheme;
-			switch(value)
+			if(!esStyle)
 			{
-				case "xs":
-					ruleValue = theme.radiusXS;
-					break;
-				case "sm":
-					ruleValue = theme.radiusSM;
-					break;
-				case "md":
-					ruleValue = theme.radiusMD;
-					break;
-				case "lg":
-					ruleValue = theme.radiusLG;
-					break;
-				case "xl":
-					ruleValue = theme.radiusXL;
-					break;
-				case "2xl":
-					ruleValue = theme.radius2XL;
-					break;
-				case "3xl":
-					ruleValue = theme.radius3XL;
-					break;
-				case "4xl":
-					ruleValue = theme.radius4XL;
-					break;
-				case "none":
-					ruleValue = "0";
-					break;
-				case "full":
-					ruleValue = "calc(infinity * 1px)";
-					break;
-				default:
-					ruleValue = value;
-					selectorValue = sanitizeSelector(value);
-					break;
+				esStyle = new EndStart();
+				_styles.push(esStyle);
 			}
-			_value = value;
-			calculatedRuleValue = ruleValue;
-			calculatedSelector = selectorValue;
+			_endStart = value;
+			esStyle.value = value;
+		}
+		private var _endEnd:*;
+		public function get endEnd():*
+		{
+			return _endEnd;
 		}
+		private var eeStyle:EndEnd;
+		public function set endEnd(value:*):void
+		{
+			if(!eeStyle)
+			{
+				eeStyle = new EndEnd();
+				_styles.push(eeStyle);
+			}
+			_endEnd = value;
+			eeStyle.value = value;
+		}
+	}
+}
+import org.apache.royale.style.stylebeads.border.BorderRadius;
+import org.apache.royale.style.util.StyleTheme;
+import org.apache.royale.style.util.ThemeManager;
+import org.apache.royale.style.stylebeads.SingleStyleBase;
+
+class Radius extends SingleStyleBase
+{
+	public function Radius(selectorPrefix:String = "rounded", rulePrefix:String = "border-radius")
+	{
+		super(selectorPrefix, rulePrefix);
+	}
+	override public function set value(value:*):void
+	{
+		var selectorValue:String = value;
+		var ruleValue:String = value;
+		var theme:StyleTheme = ThemeManager.instance.activeTheme;
+		switch(value)
+		{
+			case "xs":
+				ruleValue = theme.radiusXS;
+				break;
+			case "sm":
+				ruleValue = theme.radiusSM;
+				break;
+			case "md":
+				ruleValue = theme.radiusMD;
+				break;
+			case "lg":
+				ruleValue = theme.radiusLG;
+				break;
+			case "xl":
+				ruleValue = theme.radiusXL;
+				break;
+			case "2xl":
+				ruleValue = theme.radius2XL;
+				break;
+			case "3xl":
+				ruleValue = theme.radius3XL;
+				break;
+			case "4xl":
+				ruleValue = theme.radius4XL;
+				break;
+			case "none":
+				ruleValue = "0";
+				break;
+			case "full":
+				ruleValue = "calc(infinity * 1px)";
+				break;
+			default:
+				ruleValue = value;
+				selectorValue = sanitizeSelector(value);
+				break;
+		}
+		_value = value;
+		calculatedRuleValue = ruleValue;
+		calculatedSelector = selectorValue;
+	}
+}
+class TopRight extends Radius
+{
+	public function TopRight()
+	{
+		super("rounded-tr", "border-top-right-radius");
+	}
+}
+class TopLeft extends Radius
+{
+	public function TopLeft()
+	{
+		super("rounded-tl", "border-top-left-radius");
+	}
+}
+class StartStart extends Radius
+{
+	public function StartStart()
+	{
+		super("rounded-ss", "border-start-start-radius");
+	}
+}
+class StartEnd extends Radius
+{
+	public function StartEnd()
+	{
+		super("rounded-se", "border-start-end-radius");
+	}
+}
+class EndStart extends Radius
+{
+	public function EndStart()
+	{
+		super("rounded-es", "border-end-start-radius");
+	}
+}
+class EndEnd extends Radius
+{
+	public function EndEnd()
+	{
+		super("rounded-ee", "border-end-end-radius");
+	}
+}
+class BottomRight extends Radius
+{
+	public function BottomRight()
+	{
+		super("rounded-br", "border-bottom-right-radius");
+	}
+}
+class BottomLeft extends Radius
+{
+	public function BottomLeft()
+	{
+		super("rounded-bl", "border-bottom-left-radius");
 	}
 }
\ No newline at end of file
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderRadiusBottomLeft.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderRadiusBottomLeft.as
deleted file mode 100644
index e0e42fa7de..0000000000
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderRadiusBottomLeft.as
+++ /dev/null
@@ -1,28 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.background
-{
-	public class BorderRadiusBottomLeft extends BorderRadius
-	{
-		public function BorderRadiusBottomLeft()
-		{
-			super("rounded-bl", "border-bottom-left-radius");
-		}
-	}
-}
\ No newline at end of file
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderRadiusBottomRight.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderRadiusBottomRight.as
deleted file mode 100644
index e4653a1052..0000000000
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderRadiusBottomRight.as
+++ /dev/null
@@ -1,28 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.background
-{
-	public class BorderRadiusBottomRight extends BorderRadius
-	{
-		public function BorderRadiusBottomRight()
-		{
-			super("rounded-br", "border-bottom-right-radius");
-		}
-	}
-}
\ No newline at end of file
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderRadiusEndEnd.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderRadiusEndEnd.as
deleted file mode 100644
index 227b72e468..0000000000
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderRadiusEndEnd.as
+++ /dev/null
@@ -1,28 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.background
-{
-	public class BorderRadiusEndEnd extends BorderRadius
-	{
-		public function BorderRadiusEndEnd()
-		{
-			super("rounded-ee", "border-end-end-radius");
-		}
-	}
-}
\ No newline at end of file
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderRadiusEndStart.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderRadiusEndStart.as
deleted file mode 100644
index a91a932692..0000000000
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderRadiusEndStart.as
+++ /dev/null
@@ -1,28 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.background
-{
-	public class BorderRadiusEndStart extends BorderRadius
-	{
-		public function BorderRadiusEndStart()
-		{
-			super("rounded-es", "border-end-start-radius");
-		}
-	}
-}
\ No newline at end of file
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderRadiusStartEnd.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderRadiusStartEnd.as
deleted file mode 100644
index 3415d6d78a..0000000000
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderRadiusStartEnd.as
+++ /dev/null
@@ -1,28 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.background
-{
-	public class BorderRadiusStartEnd extends BorderRadius
-	{
-		public function BorderRadiusStartEnd()
-		{
-			super("rounded-se", "border-start-end-radius");
-		}
-	}
-}
\ No newline at end of file
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderRadiusStartStart.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderRadiusStartStart.as
deleted file mode 100644
index 584ef6c5fb..0000000000
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderRadiusStartStart.as
+++ /dev/null
@@ -1,28 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.background
-{
-	public class BorderRadiusStartStart extends BorderRadius
-	{
-		public function BorderRadiusStartStart()
-		{
-			super("rounded-ss", "border-start-start-radius");
-		}
-	}
-}
\ No newline at end of file
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderRadiusTopLeft.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderRadiusTopLeft.as
deleted file mode 100644
index 647da1fb58..0000000000
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderRadiusTopLeft.as
+++ /dev/null
@@ -1,28 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.background
-{
-	public class BorderRadiusTopLeft extends BorderRadius
-	{
-		public function BorderRadiusTopLeft()
-		{
-			super("rounded-tl", "border-top-left-radius");
-		}
-	}
-}
\ No newline at end of file
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderRadiusTopRight.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderRadiusTopRight.as
deleted file mode 100644
index b188ade132..0000000000
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderRadiusTopRight.as
+++ /dev/null
@@ -1,28 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.background
-{
-	public class BorderRadiusTopRight extends BorderRadius
-	{
-		public function BorderRadiusTopRight()
-		{
-			super("rounded-tr", "border-top-right-radius");
-		}
-	}
-}
\ No newline at end of file
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderStyle.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderStyle.as
index 46575bc752..b8ab689612 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderStyle.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderStyle.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.background
+package org.apache.royale.style.stylebeads.border
 {
 	import org.apache.royale.style.stylebeads.SingleStyleBase;
 	import org.apache.royale.debugging.assert;
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidth.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidth.as
index f273244f33..75a0c98074 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidth.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidth.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.background
+package org.apache.royale.style.stylebeads.border
 {
 	import org.apache.royale.style.stylebeads.SingleStyleBase;
 	import org.apache.royale.debugging.assert;
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthBlock.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthBlock.as
index d46a9a01f3..dae55eb2b3 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthBlock.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthBlock.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.background
+package org.apache.royale.style.stylebeads.border
 {
 	/**
 	 * Defaults to 1px.
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthBlockEnd.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthBlockEnd.as
index 7717d9b4bd..fe1c61485e 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthBlockEnd.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthBlockEnd.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.background
+package org.apache.royale.style.stylebeads.border
 {
 	/**
 	 * Defaults to 1px.
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthBlockStart.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthBlockStart.as
index 5a4b944822..156f870c41 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthBlockStart.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthBlockStart.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.background
+package org.apache.royale.style.stylebeads.border
 {
 	/**
 	 * Defaults to 1px.
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthBottom.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthBottom.as
index aa4ec06c8c..b8cff07605 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthBottom.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthBottom.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.background
+package org.apache.royale.style.stylebeads.border
 {
 	/**
 	 * Defaults to 1px.
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthInline.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthInline.as
index b63bcfebc9..cf386bcecf 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthInline.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthInline.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.background
+package org.apache.royale.style.stylebeads.border
 {
 	/**
 	 * Defaults to 1px.
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthInlineEnd.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthInlineEnd.as
index 27ce4ff93e..4cbebd52db 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthInlineEnd.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthInlineEnd.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.background
+package org.apache.royale.style.stylebeads.border
 {
 	/**
 	 * Defaults to 1px.
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthInlineStart.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthInlineStart.as
index ecf2914b2c..6abb0ee3c2 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthInlineStart.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthInlineStart.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.background
+package org.apache.royale.style.stylebeads.border
 {
 	/**
 	 * Defaults to 1px.
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthLeft.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthLeft.as
index c0c7a0b588..040703bdcb 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthLeft.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthLeft.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.background
+package org.apache.royale.style.stylebeads.border
 {
 	/**
 	 * Defaults to 1px.
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthRight.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthRight.as
index d12daf878a..a8b1cdf52b 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthRight.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthRight.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.background
+package org.apache.royale.style.stylebeads.border
 {
 	/**
 	 * Defaults to 1px.
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthTop.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthTop.as
index 4b3d04cfea..600dbba1ba 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthTop.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/BorderWidthTop.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.background
+package org.apache.royale.style.stylebeads.border
 {
 	/**
 	 * Defaults to 1px.
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/OutlineColor.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/OutlineColor.as
index d433810719..086f6cf795 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/OutlineColor.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/OutlineColor.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.background
+package org.apache.royale.style.stylebeads.border
 {
 	import org.apache.royale.style.stylebeads.SingleStyleBase;
 	import org.apache.royale.debugging.assert;
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/OutlineOffset.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/OutlineOffset.as
index 4beac54407..e86612c9b0 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/OutlineOffset.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/OutlineOffset.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.background
+package org.apache.royale.style.stylebeads.border
 {
 
 	import org.apache.royale.style.stylebeads.SingleStyleBase;
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/OutlineStyle.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/OutlineStyle.as
index b1e5b22d4a..139601b1a8 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/OutlineStyle.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/OutlineStyle.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.background
+package org.apache.royale.style.stylebeads.border
 {
 	import org.apache.royale.style.stylebeads.SingleStyleBase;
 	import org.apache.royale.debugging.assert;
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/OutlineWidth.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/OutlineWidth.as
index 8ccad908d4..c74a29f5b3 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/OutlineWidth.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/border/OutlineWidth.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.background
+package org.apache.royale.style.stylebeads.border
 {
 	import org.apache.royale.style.stylebeads.SingleStyleBase;
 	import org.apache.royale.debugging.assert;
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/filters/BackdropFilter.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/filters/BackdropFilter.as
index 3686ca197f..55194d44ee 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/filters/BackdropFilter.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/filters/BackdropFilter.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.effects
+package org.apache.royale.style.stylebeads.filters
 {
 
 	public class BackdropFilter extends FilterEffectBase
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/filters/FilterEffect.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/filters/FilterEffect.as
index 1249a2d8ca..fec26b80f3 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/filters/FilterEffect.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/filters/FilterEffect.as
@@ -16,9 +16,10 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.effects
+package org.apache.royale.style.stylebeads.filters
 {
 
+
 	public class FilterEffect extends FilterEffectBase
 	{
 		public function FilterEffect()
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/filters/FilterEffectBase.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/filters/FilterEffectBase.as
index f9dd8af61b..7fdc7acfff 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/filters/FilterEffectBase.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/filters/FilterEffectBase.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.effects
+package org.apache.royale.style.stylebeads.filters
 {
 	import org.apache.royale.style.stylebeads.StyleBeadBase;
 
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/tables/BorderCollapse.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/tables/BorderCollapse.as
index 760ff65380..6af7d013f0 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/tables/BorderCollapse.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/tables/BorderCollapse.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.layout
+package org.apache.royale.style.stylebeads.tables
 {
 	import org.apache.royale.style.stylebeads.SingleStyleBase;
 	import org.apache.royale.debugging.assert;
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/tables/BorderSpacing.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/tables/BorderSpacing.as
index ea180963da..17ac7c7e72 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/tables/BorderSpacing.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/tables/BorderSpacing.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.layout
+package org.apache.royale.style.stylebeads.tables
 {
 	import org.apache.royale.style.stylebeads.SingleStyleBase;
 	import org.apache.royale.debugging.assert;
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/tables/CaptionSide.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/tables/CaptionSide.as
index 36d6767f65..b4e1bafce1 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/tables/CaptionSide.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/tables/CaptionSide.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.layout
+package org.apache.royale.style.stylebeads.tables
 {
 	import org.apache.royale.style.stylebeads.SingleStyleBase;
 	import org.apache.royale.debugging.assert;
diff --git a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/tables/TableLayout.as b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/tables/TableLayout.as
index 9d1f5a6e3a..04aba58235 100644
--- a/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/tables/TableLayout.as
+++ b/frameworks/projects/Style/src/main/royale/org/apache/royale/style/stylebeads/tables/TableLayout.as
@@ -16,7 +16,7 @@
 //  limitations under the License.
 //
 ////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.style.stylebeads.layout
+package org.apache.royale.style.stylebeads.tables
 {
 	import org.apache.royale.style.stylebeads.SingleStyleBase;
 	import org.apache.royale.debugging.assert;