2006/unicorn/src/org/w3c/unicorn/util Property.java,1.1.2.4,1.1.2.5 TemplateHelper.java,1.1.2.1,1.1.2.2

• From: Thomas Gambet via cvs-syncmail <cvsmail@w3.org>
• Date: Wed, 12 Aug 2009 17:28:06 +0000
• To: www-validator-cvs@w3.org
• Message-Id: <E1MbHcM-0005c9-MN@lionel-hutz.w3.org>

Update of /sources/public/2006/unicorn/src/org/w3c/unicorn/util
In directory hutz:/tmp/cvs-serv21455/src/org/w3c/unicorn/util

Modified Files:
      Tag: dev2
	Property.java TemplateHelper.java 
Log Message:
language initialization

Index: Property.java
===================================================================
RCS file: /sources/public/2006/unicorn/src/org/w3c/unicorn/util/Attic/Property.java,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- Property.java	11 Aug 2009 16:05:35 -0000	1.1.2.4
+++ Property.java	12 Aug 2009 17:28:04 -0000	1.1.2.5
@@ -1,33 +1,21 @@
 package org.w3c.unicorn.util;
 
-import java.util.Hashtable;
 import java.util.Properties;
 
+import org.w3c.unicorn.Framework;
+
 public class Property {
 	
-	private static Hashtable<String, Properties> unicornPropertiesFiles = new Hashtable<String, Properties>();
-	
 	public static String get(String key) {
-		return unicornPropertiesFiles.get("unicorn.properties").getProperty(key);
+		return Framework.getUnicornPropertiesFiles().get("unicorn.properties").getProperty(key);
 	}
 	
 	public static String get(String key1, String key2) {
-		return unicornPropertiesFiles.get("unicorn.properties").getProperty(key1) 
-			 + unicornPropertiesFiles.get("unicorn.properties").getProperty(key2);
+		return Framework.getUnicornPropertiesFiles().get("unicorn.properties").getProperty(key1) 
+			 + Framework.getUnicornPropertiesFiles().get("unicorn.properties").getProperty(key2);
 	}
 
 	public static Properties getProps(String fileName) {
-		return unicornPropertiesFiles.get(fileName);
-	}
-	
-	public static Hashtable<String, Properties> getUnicornPropertiesFiles() {
-		return unicornPropertiesFiles;
-	}
-
-	public static void setUnicornPropertiesFiles(
-			Hashtable<String, Properties> unicornPropertiesFiles) {
-		Property.unicornPropertiesFiles = unicornPropertiesFiles;
+		return Framework.getUnicornPropertiesFiles().get(fileName);
 	}
-
-	
 }

Index: TemplateHelper.java
===================================================================
RCS file: /sources/public/2006/unicorn/src/org/w3c/unicorn/util/Attic/TemplateHelper.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -d -r1.1.2.1 -r1.1.2.2
--- TemplateHelper.java	11 Aug 2009 16:05:35 -0000	1.1.2.1
+++ TemplateHelper.java	12 Aug 2009 17:28:04 -0000	1.1.2.2
@@ -73,8 +73,9 @@
 		}
 	}
 
-	public static Properties getMergeProps(Properties defaultProps,
+	public static Properties getMergeProps(Properties defaultProps, 
 			Properties sourceProps) {
+		
 		Properties propMerge = new Properties();
 
 		Set<Object> keys = defaultProps.keySet();

Received on Wednesday, 12 August 2009 17:28:15 UTC