W3C home > Mailing lists > Public > www-validator-cvs@w3.org > February 2009

2002/css-validator/org/w3c/css/util Messages.java,1.24,1.25

From: Yves Lafon via cvs-syncmail <cvsmail@w3.org>
Date: Thu, 12 Feb 2009 10:30:30 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1LXYpy-0008SY-Bk@lionel-hutz.w3.org>

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

Modified Files:
	Messages.java 
Log Message:
generics

Index: Messages.java
===================================================================
RCS file: /sources/public/2002/css-validator/org/w3c/css/util/Messages.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- Messages.java	20 Jan 2009 14:47:24 -0000	1.24
+++ Messages.java	12 Feb 2009 10:30:28 -0000	1.25
@@ -23,373 +23,373 @@
      */
     public Utf8Properties properties;
     
-	public static Hashtable languages = new Hashtable();
-	public static ArrayList languages_name = new ArrayList();
+    public static Hashtable<String, Utf8Properties> languages = new Hashtable<String, Utf8Properties>();
+    public static ArrayList<String> languages_name = new ArrayList<String>();
 	
-	/**
-	 * Creates a new Messages
-	 */
-	public Messages(String lang) {
-		if (lang != null) {
-			StringTokenizer lanTok = new StringTokenizer(lang, ",");
-			int maxTok = lanTok.countTokens();
+    /**
+     * Creates a new Messages
+     */
+    public Messages(String lang) {
+	if (lang != null) {
+	    StringTokenizer lanTok = new StringTokenizer(lang, ",");
+	    int maxTok = lanTok.countTokens();
 
-			String slang[] = new String[maxTok];
-			float qlang[] = new float[maxTok];
+	    String slang[] = new String[maxTok];
+	    float qlang[] = new float[maxTok];
 
-			// quick and dirty, it would be better to use Jigsaw's classes
-			while (lanTok.hasMoreTokens()) {
-				String l = lanTok.nextToken().trim().toLowerCase();
-				int qualsep = l.indexOf(';');
-				float qval = 1;
-				if (qualsep != -1) {
-					String p = l.substring(qualsep + 1);
-					l = l.substring(0, qualsep);
-					if (p.startsWith("q=")) {
-						qval = Float.parseFloat(p.substring(2));
-					}
-				}
-				for (int i = 0; i < maxTok; i++) {
-					if (slang[i] == null) {
-						slang[i] = l;
-						qlang[i] = qval;
-						break;
-					} else if (qval > qlang[i]) {
-						System.arraycopy(slang, i, slang, i + 1, (maxTok - i - 1));
-						System.arraycopy(qlang, i, qlang, i + 1, (maxTok - i - 1));
-						slang[i] = l;
-						qlang[i] = qval;
-						break;
-					}
+	    // quick and dirty, it would be better to use Jigsaw's classes
+	    while (lanTok.hasMoreTokens()) {
+		String l = lanTok.nextToken().trim().toLowerCase();
+		int qualsep = l.indexOf(';');
+		float qval = 1;
+		if (qualsep != -1) {
+		    String p = l.substring(qualsep + 1);
+		    l = l.substring(0, qualsep);
+		    if (p.startsWith("q=")) {
+			qval = Float.parseFloat(p.substring(2));
+		    }
+		}
+		for (int i = 0; i < maxTok; i++) {
+		    if (slang[i] == null) {
+			slang[i] = l;
+			qlang[i] = qval;
+			break;
+		    } else if (qval > qlang[i]) {
+			System.arraycopy(slang, i, slang, i + 1, (maxTok - i - 1));
+			System.arraycopy(qlang, i, qlang, i + 1, (maxTok - i - 1));
+			slang[i] = l;
+			qlang[i] = qval;
+			break;
+		    }
 
-				}
-			}
-			for (int i = 0; i < maxTok; i++) {
-				String l = slang[i];
-				properties = (Utf8Properties) languages.get(l);
-				if (properties != null) {
-					break;
-				}
-				int minusIndex = l.indexOf('-');
-				if (minusIndex != -1) {
-					// suppressed -cn in zh-cn (example)
-					l = l.substring(0, minusIndex);
-					properties = (Utf8Properties) languages.get(l);
-				}
-				if (properties != null) {
-					break;
-				}
-			}
 		}
-		if (properties == null) {
-			properties = (Utf8Properties) languages.get("en");
+	    }
+	    for (int i = 0; i < maxTok; i++) {
+		String l = slang[i];
+		properties = (Utf8Properties) languages.get(l);
+		if (properties != null) {
+		    break;
+		}
+		int minusIndex = l.indexOf('-');
+		if (minusIndex != -1) {
+		    // suppressed -cn in zh-cn (example)
+		    l = l.substring(0, minusIndex);
+		    properties = (Utf8Properties) languages.get(l);
 		}
+		if (properties != null) {
+		    break;
+		}
+	    }
 	}
-
-	/**
-	 * Get a property.
-	 */
-	public String getString(String message) {
-		return properties.getProperty(message);
+	if (properties == null) {
+	    properties = (Utf8Properties) languages.get("en");
 	}
+    }
 
-	/**
-	 * Get a warning property.
-	 * 
-	 * @param message
-	 *            the warning property.
-	 */
-	public String getWarningString(String message) {
-		return getString(new StringBuffer("warning.").append(message).toString());
-	}
+    /**
+     * Get a property.
+     */
+    public String getString(String message) {
+	return properties.getProperty(message);
+    }
 
-	/**
-	 * Get a warning level property.
-	 * 
-	 * @param message
-	 *            the warning property.
-	 */
-	public String getWarningLevelString(String message) {
-		return getString(new StringBuffer("warning.").append(message).append(".level").toString());
-	}
+    /**
+     * Get a warning property.
+     * 
+     * @param message
+     *            the warning property.
+     */
+    public String getWarningString(String message) {
+	return getString(new StringBuffer("warning.").append(message).toString());
+    }
 
-	/**
-	 * Get an error property.
-	 * 
-	 * @param message
-	 *            the error property.
-	 */
-	public String getErrorString(String message) {
-		return getString(new StringBuffer("error.").append(message).toString());
-	}
+    /**
+     * Get a warning level property.
+     * 
+     * @param message
+     *            the warning property.
+     */
+    public String getWarningLevelString(String message) {
+	return getString(new StringBuffer("warning.").append(message).append(".level").toString());
+    }
 
-	/**
-	 * Get an generator property.
-	 * 
-	 * @param message
-	 *            the generator property.
-	 */
-	public String getGeneratorString(String message) {
-		return getString(new StringBuffer("generator.").append(message).toString());
-	}
+    /**
+     * Get an error property.
+     * 
+     * @param message
+     *            the error property.
+     */
+    public String getErrorString(String message) {
+	return getString(new StringBuffer("error.").append(message).toString());
+    }
 
-	/**
-	 * Get an generator property.
-	 * 
-	 * @param message
-	 *            the generator property.
-	 */
-	public String getGeneratorString(String message, String param) {
-		String str = getString(new StringBuffer("generator.").append(message).toString());
+    /**
+     * Get an generator property.
+     * 
+     * @param message
+     *            the generator property.
+     */
+    public String getGeneratorString(String message) {
+	return getString(new StringBuffer("generator.").append(message).toString());
+    }
 
-		// replace all parameters
-		int i = str.indexOf("%s");
-		if (i >= 0) {
-			str = str.substring(0, i) + param + str.substring(i + 2);
-		}
-		return str;
-	}
+    /**
+     * Get an generator property.
+     * 
+     * @param message
+     *            the generator property.
+     */
+    public String getGeneratorString(String message, String param) {
+	String str = getString(new StringBuffer("generator.").append(message).toString());
 
-	/**
-	 * Get an generator property.
-	 * 
-	 * @param message
-	 *            the generator property.
-	 */
-	public String getServletString(String message) {
-		return getString(new StringBuffer("servlet.").append(message).toString());
+	// replace all parameters
+	int i = str.indexOf("%s");
+	if (i >= 0) {
+	    str = str.substring(0, i) + param + str.substring(i + 2);
 	}
+	return str;
+    }
 
-	static {
-		Utf8Properties tmp;
-		try {
-      java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.de");
-			try {
-				tmp = new Utf8Properties();
-				tmp.load(f);
-				languages_name.add("de");
-				languages.put("de", tmp);
-				languages.put("de_DE", tmp);
-				languages.put("de_AT", tmp);
-				languages.put("de_CH", tmp);
-			} finally {
-				f.close();
-			}
-		} catch (Exception e) {
-			System.err.println("org.w3c.css.util.Messages: " + "couldn't load properties de");
-			System.err.println("  " + e.toString());
-		}
+    /**
+     * Get an generator property.
+     * 
+     * @param message
+     *            the generator property.
+     */
+    public String getServletString(String message) {
+	return getString(new StringBuffer("servlet.").append(message).toString());
+    }
 
-		// ------------------------------------------------
+    static {
+	Utf8Properties tmp;
+	try {
+	    java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.de");
+	    try {
+		tmp = new Utf8Properties();
+		tmp.load(f);
+		languages_name.add("de");
+		languages.put("de", tmp);
+		languages.put("de_DE", tmp);
+		languages.put("de_AT", tmp);
+		languages.put("de_CH", tmp);
+	    } finally {
+		f.close();
+	    }
+	} catch (Exception e) {
+	    System.err.println("org.w3c.css.util.Messages: " + "couldn't load properties de");
+	    System.err.println("  " + e.toString());
+	}
 
-		try {
-			java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.en");
-			try {
-				tmp = new Utf8Properties();
-				tmp.load(f);
-				languages_name.add("en");
-				languages.put("en", tmp);
-			} finally {
-				f.close();
-			}
-		} catch (Exception e) {
-			System.err.println("org.w3c.css.util.Messages: " + "couldn't load properties en");
-			System.err.println("  " + e.toString());
-		}
+	// ------------------------------------------------
 
-		// ------------------------------------------------
+	try {
+	    java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.en");
+	    try {
+		tmp = new Utf8Properties();
+		tmp.load(f);
+		languages_name.add("en");
+		languages.put("en", tmp);
+	    } finally {
+		f.close();
+	    }
+	} catch (Exception e) {
+	    System.err.println("org.w3c.css.util.Messages: " + "couldn't load properties en");
+	    System.err.println("  " + e.toString());
+	}
 
-		try {
-			java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.es");
-			try {
-				tmp = new Utf8Properties();
-				tmp.load(f);
-				languages_name.add("es");
-				languages.put("es", tmp);
-				languages.put("es_ES", tmp);
-			} finally {
-				f.close();
-			}
-		} catch (Exception e) {
-			System.err.println("org.w3c.css.util.Messages: " + "couldn't load properties es");
-			System.err.println("  " + e.toString());
-		}
+	// ------------------------------------------------
 
-		// -----------------------
+	try {
+	    java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.es");
+	    try {
+		tmp = new Utf8Properties();
+		tmp.load(f);
+		languages_name.add("es");
+		languages.put("es", tmp);
+		languages.put("es_ES", tmp);
+	    } finally {
+		f.close();
+	    }
+	} catch (Exception e) {
+	    System.err.println("org.w3c.css.util.Messages: " + "couldn't load properties es");
+	    System.err.println("  " + e.toString());
+	}
 
-		try {
-			java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.fr");
-			try {
-				tmp = new Utf8Properties();
-				tmp.load(f);
-				languages_name.add("fr");
-				languages.put("fr", tmp);
-				languages.put("fr_FR", tmp);
-			} finally {
-				f.close();
-			}
-		} catch (Exception e) {
-			System.err.println("org.w3c.css.util.Messages: " + "couldn't load properties fr");
-			System.err.println("  " + e.toString());
-		}
+	// -----------------------
 
-		// -----------------------
+	try {
+	    java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.fr");
+	    try {
+		tmp = new Utf8Properties();
+		tmp.load(f);
+		languages_name.add("fr");
+		languages.put("fr", tmp);
+		languages.put("fr_FR", tmp);
+	    } finally {
+		f.close();
+	    }
+	} catch (Exception e) {
+	    System.err.println("org.w3c.css.util.Messages: " + "couldn't load properties fr");
+	    System.err.println("  " + e.toString());
+	}
 
-		try {
-			java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.ko");
-			try {
-				tmp = new Utf8Properties();
-				tmp.load(f);
-				languages_name.add("ko");
-				languages.put("ko", tmp);
-			} finally {
-				f.close();
-			}
-		} catch (Exception e) {
-			System.err.println("org.w3c.css.util.Messages: " + "couldn't load properties ko");
-			System.err.println("  " + e.toString());
-		}
+	// -----------------------
 
-		// -----------------------
+	try {
+	    java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.ko");
+	    try {
+		tmp = new Utf8Properties();
+		tmp.load(f);
+		languages_name.add("ko");
+		languages.put("ko", tmp);
+	    } finally {
+		f.close();
+	    }
+	} catch (Exception e) {
+	    System.err.println("org.w3c.css.util.Messages: " + "couldn't load properties ko");
+	    System.err.println("  " + e.toString());
+	}
+
+	// -----------------------
 		
-		try {
-			java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.it");
-			try {
-				tmp = new Utf8Properties();
-				tmp.load(f);
-				languages_name.add("it");
-				languages.put("it", tmp);
-			} finally {
-				f.close();
-			}
-		} catch (Exception e) {
-			System.err.println("org.w3c.css.util.Messages: " + "couldn't load properties it");
-			System.err.println("  " + e.toString());
-		}
+	try {
+	    java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.it");
+	    try {
+		tmp = new Utf8Properties();
+		tmp.load(f);
+		languages_name.add("it");
+		languages.put("it", tmp);
+	    } finally {
+		f.close();
+	    }
+	} catch (Exception e) {
+	    System.err.println("org.w3c.css.util.Messages: " + "couldn't load properties it");
+	    System.err.println("  " + e.toString());
+	}
 
-		// -----------------------
+	// -----------------------
 
-		try {
-			java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.nl");
-			try {
-				tmp = new Utf8Properties();
-				tmp.load(f);
-				languages_name.add("nl");
-				languages.put("nl", tmp);
-			} finally {
-				f.close();
-			}
-		} catch (Exception e) {
-			System.err.println("org.w3c.css.util.Messages: " + "couldn't load properties nl");
-			System.err.println("  " + e.toString());
-		}
+	try {
+	    java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.nl");
+	    try {
+		tmp = new Utf8Properties();
+		tmp.load(f);
+		languages_name.add("nl");
+		languages.put("nl", tmp);
+	    } finally {
+		f.close();
+	    }
+	} catch (Exception e) {
+	    System.err.println("org.w3c.css.util.Messages: " + "couldn't load properties nl");
+	    System.err.println("  " + e.toString());
+	}
 
-		// -----------------------
+	// -----------------------
 
-		try {
-			java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.ja");
-			try {
-				tmp = new Utf8Properties();
-				tmp.load(f);
-				languages_name.add("ja");
-				languages.put("ja", tmp);
-			} finally {
-				f.close();
-			}
-		} catch (Exception e) {
-			System.err.println("org.w3c.css.util.Messages:" + " couldn't load properties ja");
-			System.err.println("  " + e.toString());
-		}
+	try {
+	    java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.ja");
+	    try {
+		tmp = new Utf8Properties();
+		tmp.load(f);
+		languages_name.add("ja");
+		languages.put("ja", tmp);
+	    } finally {
+		f.close();
+	    }
+	} catch (Exception e) {
+	    System.err.println("org.w3c.css.util.Messages:" + " couldn't load properties ja");
+	    System.err.println("  " + e.toString());
+	}
 
-		// -----------------------
+	// -----------------------
 		
-		try {
-			java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.pl-PL");
-			try {
-				tmp = new Utf8Properties();
-				tmp.load(f);
-				languages_name.add("pl-PL");
-				languages.put("pl", tmp);
-				languages.put("pl_PL", tmp);
-				languages.put("pl-PL", tmp);
-			} finally {
-				f.close();
-			}
-		} catch (Exception e) {
-			System.err.println("org.w3c.css.util.Messages: " + "couldn't load properties pl");
-			System.err.println("  " + e.toString());
-		}
+	try {
+	    java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.pl-PL");
+	    try {
+		tmp = new Utf8Properties();
+		tmp.load(f);
+		languages_name.add("pl-PL");
+		languages.put("pl", tmp);
+		languages.put("pl_PL", tmp);
+		languages.put("pl-PL", tmp);
+	    } finally {
+		f.close();
+	    }
+	} catch (Exception e) {
+	    System.err.println("org.w3c.css.util.Messages: " + "couldn't load properties pl");
+	    System.err.println("  " + e.toString());
+	}
 
-		// -----------------------
+	// -----------------------
 		
-		try {
-			java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.pt-BR");
-			try {
-				tmp = new Utf8Properties();
-				tmp.load(f);
-				languages_name.add("pt-BR");
-				languages.put("pt-br", tmp);
-				languages.put("pt-BR", tmp);
-				languages.put("pt_BR", tmp);
-				languages.put("pt", tmp);
-			} finally {
-				f.close();
-			}
-		} catch (Exception e) {
-			System.err.println("org.w3c.css.util.Messages: " + "couldn't load properties pt-br");
-			System.err.println("  " + e.toString());
-		}
-		// -----------------------
-		try {
-			java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.ru");
-			try {
-				tmp = new Utf8Properties();
-				tmp.load(f);
-				languages_name.add("ru");
-				languages.put("ru", tmp);
-			} finally {
-				f.close();
-			}
-		} catch (Exception e) {
-			System.err.println("org.w3c.css.util.Messages: " + "couldn't load properties ru");
-			System.err.println("  " + e.toString());
-		}
-
-		// -----------------------
-		try {
-			java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.sv");
-			try {
-				tmp = new Utf8Properties();
-				tmp.load(f);
-				languages_name.add("sv");
-				languages.put("sv", tmp);
-			} finally {
-				f.close();
-			}
-		} catch (Exception e) {
-			System.err.println("org.w3c.css.util.Messages: " + "couldn't load properties sv");
-			System.err.println("  " + e.toString());
-		}
+	try {
+	    java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.pt-BR");
+	    try {
+		tmp = new Utf8Properties();
+		tmp.load(f);
+		languages_name.add("pt-BR");
+		languages.put("pt-br", tmp);
+		languages.put("pt-BR", tmp);
+		languages.put("pt_BR", tmp);
+		languages.put("pt", tmp);
+	    } finally {
+		f.close();
+	    }
+	} catch (Exception e) {
+	    System.err.println("org.w3c.css.util.Messages: " + "couldn't load properties pt-br");
+	    System.err.println("  " + e.toString());
+	}
+	// -----------------------
+	try {
+	    java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.ru");
+	    try {
+		tmp = new Utf8Properties();
+		tmp.load(f);
+		languages_name.add("ru");
+		languages.put("ru", tmp);
+	    } finally {
+		f.close();
+	    }
+	} catch (Exception e) {
+	    System.err.println("org.w3c.css.util.Messages: " + "couldn't load properties ru");
+	    System.err.println("  " + e.toString());
+	}
 
-		// -----------------------
+	// -----------------------
+	try {
+	    java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.sv");
+	    try {
+		tmp = new Utf8Properties();
+		tmp.load(f);
+		languages_name.add("sv");
+		languages.put("sv", tmp);
+	    } finally {
+		f.close();
+	    }
+	} catch (Exception e) {
+	    System.err.println("org.w3c.css.util.Messages: " + "couldn't load properties sv");
+	    System.err.println("  " + e.toString());
+	}
 
-		try {
-			java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.zh-cn");
-			try {
-				tmp = new Utf8Properties();
-				tmp.load(f);
-				languages_name.add("zh-cn");
-				languages.put("zh-cn", tmp);
-				languages.put("zh", tmp); // for now we have no other
-											// alternative for chinese
-			} finally {
-				f.close();
-			}
-		} catch (Exception e) {
-			System.err.println("org.w3c.css.util.Messages: " + "couldn't load properties cn");
-			System.err.println("  " + e.toString());
-		}
+	// -----------------------
 
+	try {
+	    java.io.InputStream f = Messages.class.getResourceAsStream("Messages.properties.zh-cn");
+	    try {
+		tmp = new Utf8Properties();
+		tmp.load(f);
+		languages_name.add("zh-cn");
+		languages.put("zh-cn", tmp);
+		languages.put("zh", tmp); // for now we have no other
+		// alternative for chinese
+	    } finally {
+		f.close();
+	    }
+	} catch (Exception e) {
+	    System.err.println("org.w3c.css.util.Messages: " + "couldn't load properties cn");
+	    System.err.println("  " + e.toString());
 	}
 
+    }
+
 }
Received on Thursday, 12 February 2009 10:30:40 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Thursday, 26 April 2012 12:55:08 GMT