- From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
- Date: Tue, 16 Oct 2012 20:44:02 +0000
- To: www-validator-cvs@w3.org
Update of /sources/public/2002/css-validator/org/w3c/css/properties/css2/user
In directory hutz:/tmp/cvs-serv19650/css2/user
Modified Files:
Css2Style.java
Removed Files:
Outline.java OutlineATSC.java OutlineColor.java
OutlineColorATSC.java OutlineStyle.java OutlineStyleATSC.java
OutlineWidth.java OutlineWidthATSC.java
Log Message:
outline/outline-color/outline-width/outline-style per css2 2.1 and http://www.w3.org/TR/2012/WD-css3-ui-20120117/ outline-offset per http://www.w3.org/TR/2012/WD-css3-ui-20120117/
Index: Css2Style.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css2/user/Css2Style.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Css2Style.java 9 Sep 2011 12:16:45 -0000 1.3
+++ Css2Style.java 16 Oct 2012 20:43:59 -0000 1.4
@@ -13,130 +13,36 @@
*/
public class Css2Style extends org.w3c.css.properties.css2.table.Css2Style {
- CursorCSS2 cursorCSS2;
- Cursor cursor;
- CursorATSC cursorATSC;
-
- Outline outline = new Outline();
- OutlineATSC outlineATSC = new OutlineATSC();
-
- /**
- * Get the cursor property
- */
- public final CursorCSS2 getCursorCSS2() {
- if (cursorCSS2 == null) {
- cursorCSS2 = (CursorCSS2) style.CascadingOrder(new CursorCSS2(),
- style, selector);
- }
- return cursorCSS2;
- }
+ CursorCSS2 cursorCSS2;
+ Cursor cursor;
+ CursorATSC cursorATSC;
- public final Cursor getCursor() {
- if (cursor == null) {
- cursor = (Cursor) style.CascadingOrder(new Cursor(), style,
- selector);
+ /**
+ * Get the cursor property
+ */
+ public final CursorCSS2 getCursorCSS2() {
+ if (cursorCSS2 == null) {
+ cursorCSS2 = (CursorCSS2) style.CascadingOrder(new CursorCSS2(),
+ style, selector);
+ }
+ return cursorCSS2;
}
- return cursor;
- }
- public final CursorATSC getCursorATSC() {
- if (cursorATSC == null) {
- cursorATSC = (CursorATSC) style.CascadingOrder(new CursorATSC(), style,
- selector);
+ public final Cursor getCursor() {
+ if (cursor == null) {
+ cursor = (Cursor) style.CascadingOrder(new Cursor(), style,
+ selector);
+ }
+ return cursor;
}
- return cursorATSC;
- }
-
- /**
- * Get the outline-style property
- */
- public final OutlineStyle getOutlineStyle() {
- if (outline.style == null) {
- outline.style =
- (OutlineStyle) style.CascadingOrder(new OutlineStyle(),
- style, selector);
- }
- return outline.style;
- }
-
- public final OutlineStyleATSC getOutlineStyleATSC() {
- if (outlineATSC.style == null) {
- outlineATSC.style =
- (OutlineStyleATSC) style.CascadingOrder(new OutlineStyleATSC(),
- style, selector);
- }
- return outlineATSC.style;
- }
-
- /**
- * Get the outline-width property
- */
- public final OutlineWidth getOutlineWidth() {
- if (outline.width == null) {
- outline.width =
- (OutlineWidth) style.CascadingOrder(new OutlineWidth(),
- style, selector);
- }
- return outline.width;
- }
-
- public final OutlineWidthATSC getOutlineWidthATSC() {
- if (outlineATSC.width == null) {
- outlineATSC.width =
- (OutlineWidthATSC) style.CascadingOrder(new OutlineWidthATSC(),
- style, selector);
- }
- return outlineATSC.width;
- }
- /**
- * Get the outline-color property
- */
- public final OutlineColor getOutlineColor() {
- if (outline.color == null) {
- outline.color =
- (OutlineColor) style.CascadingOrder(new OutlineColor(),
- style, selector);
- }
- return outline.color;
- }
-
- public final OutlineColorATSC getOutlineColorATSC() {
- if (outlineATSC.color == null) {
- outlineATSC.color =
- (OutlineColorATSC) style.CascadingOrder(new OutlineColorATSC(),
- style, selector);
- }
- return outlineATSC.color;
- }
-
- /**
- * Get the outline property
- */
- public final Outline getOutline() {
- if (outline.style == null) {
- outline.style = getOutlineStyle();
- }
- if (outline.width == null) {
- outline.width = getOutlineWidth();
- }
- if (outline.color == null) {
- outline.color = getOutlineColor();
+ public final CursorATSC getCursorATSC() {
+ if (cursorATSC == null) {
+ cursorATSC = (CursorATSC) style.CascadingOrder(new CursorATSC(), style,
+ selector);
+ }
+ return cursorATSC;
}
- return outline;
- }
- public final OutlineATSC getOutlineATSC() {
- if (outlineATSC.style == null) {
- outlineATSC.style = getOutlineStyleATSC();
- }
- if (outlineATSC.width == null) {
- outlineATSC.width = getOutlineWidthATSC();
- }
- if (outlineATSC.color == null) {
- outlineATSC.color = getOutlineColorATSC();
- }
- return outlineATSC;
- }
}
--- OutlineColor.java DELETED ---
--- OutlineATSC.java DELETED ---
--- OutlineStyleATSC.java DELETED ---
--- OutlineColorATSC.java DELETED ---
--- OutlineStyle.java DELETED ---
--- OutlineWidth.java DELETED ---
--- Outline.java DELETED ---
--- OutlineWidthATSC.java DELETED ---
Received on Tuesday, 16 October 2012 20:44:03 UTC