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

2006/unicorn/src/org/w3c/unicorn Framework.java,1.7,1.8

From: Thomas Gambet via cvs-syncmail <cvsmail@w3.org>
Date: Wed, 02 Sep 2009 10:39:17 +0000
To: www-validator-cvs@w3.org
Message-Id: <E1MinFF-00078X-Rb@lionel-hutz.w3.org>
Update of /sources/public/2006/unicorn/src/org/w3c/unicorn
In directory hutz:/tmp/cvs-serv27415/src/org/w3c/unicorn

Modified Files:
	Framework.java 
Log Message:
cleaned

Index: Framework.java
===================================================================
RCS file: /sources/public/2006/unicorn/src/org/w3c/unicorn/Framework.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Framework.java	1 Sep 2009 16:00:24 -0000	1.7
+++ Framework.java	2 Sep 2009 10:39:15 -0000	1.8
@@ -439,7 +439,6 @@
 		for (File langFile : languageFiles) {
 			if (langFile.equals(defaultLanguageFile))
 				continue;
-			
 			try {
 				Properties props = Language.load(langFile);
 				logger.debug("> Found language: " + props.getProperty("lang") + " - " + props.getProperty("language"));
@@ -453,51 +452,8 @@
 			} catch (IOException e) {
 				logger.error("Unable to read language file. " + langFile + ". This file will be skiped.");
 			}
-			
 		}
 		
-		/*for (File langFile : languageFiles) {
-			if (langFile == defaultLanguageFile)
-				continue;
-
-			String localeString = langFile.getName().split("\\.")[0];
-			if (!Language.isISOLanguageCode(localeString))
-				logger.warn("Invalid language file: " + langFile.getName() + "" +
-						". \"" + localeString + "\" is not a valid locale.");
-			else {
-				try {
-					FileInputStream fis = new FileInputStream(langFile);
-					InputStreamReader isr = new InputStreamReader(fis, "UTF-8");
-					Properties props = new Properties();
-					props.load(isr);
-					props.put("lang", localeString);
-					//props.put("tasklist", mapOfTask);
-					//Language.complete(props);
-					languageProperties.put(localeString, props);
-					String s;
-					if (localeString.equals(Property.get("DEFAULT_LANGUAGE")))
-						s = " (default)";
-					else
-						s = "";
-					logger.debug("> Added language"+s+": " + localeString + " - " + props.getProperty("language"));
-				} catch (FileNotFoundException e) {
-					// Should not happen
-					logger.error(e.getMessage(), e);
-				} catch (UnsupportedEncodingException e) {
-					// Should not happen
-					logger.error(e.getMessage(), e);
-				} catch (IOException e) {
-					if (!localeString.equals(Property.get("DEFAULT_LANGUAGE"))) {
-						logger.error("Unable to read language file. " + langFile + ". This file will be skiped.");
-						continue;
-					}
-					else {
-						throw new InitializationFailedException("Unable to read default language file. " + langFile);
-					}
-				}
-			}
-		}*/
-		
 		if (languageProperties.size() == 0) {
 			throw new InitializationFailedException("No language have been loaded. Check language files in: " + Property.get("PATH_TO_LANGUAGE_FILES"));
 		} else {
Received on Wednesday, 2 September 2009 10:39:30 GMT

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