W3C home > Mailing lists > Public > www-validator-cvs@w3.org > August 2012

2002/css-validator/org/w3c/css/css StyleSheetGenerator.java,1.33,1.34

From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
Date: Sat, 04 Aug 2012 21:17:05 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1Sxlj5-00089N-2B@lionel-hutz.w3.org>
Update of /sources/public/2002/css-validator/org/w3c/css/css
In directory hutz:/tmp/cvs-serv31218/w3c/css/css

Modified Files:
	StyleSheetGenerator.java 
Log Message:
font revamp, still some missing properties for CSS3 and @font-face for CSS2 and CSS3

Index: StyleSheetGenerator.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/css/StyleSheetGenerator.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- StyleSheetGenerator.java	7 Feb 2012 14:16:44 -0000	1.33
+++ StyleSheetGenerator.java	4 Aug 2012 21:17:02 -0000	1.34
@@ -128,22 +128,18 @@
 
         // Setting all the variables of the velocity context
         ApplContext ac_default = new ApplContext(default_lang);
-        String k;
+        String k, v;
         if (ac.getLang() == null || ac.getLang().equals(default_lang)) {
-            Iterator it = ac_default.getMsg().properties.keySet().iterator();
-            while (it.hasNext()) {
-                k = String.valueOf(it.next());
-                context.put(k, ac.getMsg().getString(k));
-            }
+			for (Object s: ac_default.getMsg().properties.keySet()) {
+				k = String.valueOf(s);
+				context.put(k, ac.getMsg().getString(k));
+			}
         } else {
-            Iterator it = ac_default.getMsg().properties.keySet().iterator();
-            while (it.hasNext()) {
-                k = String.valueOf(it.next());
-                if (ac.getMsg().getString(k) == null)
-                    context.put(k, ac_default.getMsg().getString(k));
-                else
-                    context.put(k, ac.getMsg().getString(k));
-            }
+			for (Object s: ac_default.getMsg().properties.keySet()) {
+				k = String.valueOf(s);
+				v = ac.getMsg().getString(k);
+				context.put(k, (v == null) ? ac_default.getMsg().getString(k) : v);
+			}
         }
 
         if (ac.getLink() != null) {
Received on Saturday, 4 August 2012 21:17:36 UTC

This archive was generated by hypermail 2.3.1 : Wednesday, 7 January 2015 15:17:50 UTC