2002/css-validator/org/w3c/css/properties/css CssBackground.java,1.7,1.8

• From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
• Date: Fri, 22 Jan 2010 20:49:19 +0000
• To: www-validator-cvs@w3.org
• Message-Id: <E1NYQRT-0005BO-6t@lionel-hutz.w3.org>

Update of /sources/public/2002/css-validator/org/w3c/css/properties/css
In directory hutz:/tmp/cvs-serv19907/org/w3c/css/properties/css

Modified Files:
	CssBackground.java 
Log Message:
more alignment

Index: CssBackground.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/properties/css/CssBackground.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- CssBackground.java	22 Jan 2010 10:51:16 -0000	1.7
+++ CssBackground.java	22 Jan 2010 20:49:16 -0000	1.8
@@ -757,6 +757,9 @@
         if (position != null) {
             position.important = true;
         }
+        if (size != null) {
+            size.important = true;
+        }
     }
 
     /**
@@ -769,28 +772,37 @@
     public void print(CssPrinterStyle printer) {
         if ((color != null && image != null &&
                 repeat != null && attachment != null &&
-                position != null) &&
+                position != null && size != null) &&
                 (getImportant() ||
                         (!image.important &&
                                 !color.important &&
                                 !repeat.important &&
                                 !attachment.important &&
+                                !size.important &&
                                 !position.important))) {
             if (color.byUser || image.byUser || repeat.byUser
-                    || attachment.byUser || position.byUser) {
+                    || attachment.byUser || size.byUser || position.byUser) {
                 printer.print(this);
             }
         } else {
-            if (color != null)
+            if (color != null) {
                 color.print(printer);
-            if (image != null)
+            }
+            if (image != null) {
                 image.print(printer);
-            if (repeat != null)
+            }
+            if (repeat != null) {
                 repeat.print(printer);
-            if (attachment != null)
+            }
+            if (attachment != null) {
                 attachment.print(printer);
-            if (position != null)
+            }
+            if (position != null) {
                 position.print(printer);
+            }
+            if (size != null) {
+                size.print(printer);
+            }
         }
     }
 
@@ -818,6 +830,9 @@
         if (position != null) {
             position.setSelectors(selector);
         }
+        if (size != null) {
+            size.setSelectors(selector);
+        }
     }
 
     /**
@@ -844,6 +859,9 @@
         if (position != null) {
             position.addToStyle(ac, style);
         }
+        if (size != null) {
+            size.addToStyle(ac, style);
+        }
     }
 
     /**
@@ -893,6 +911,9 @@
         if (position != null) {
             position.setInfo(line, source);
         }
+        if (size != null) {
+            size.setInfo(line, source);
+        }
     }
 
 // placeholder for the different values

Received on Friday, 22 January 2010 20:49:20 UTC