[Swift-commit] r3613 - trunk/src/org/griphyn/vdl/util

[noreply at svn.ci.uchicago.edu]

Author: wozniak
Date: 2010-09-08 13:56:26 -0500 (Wed, 08 Sep 2010)
New Revision: 3613

Modified:
   trunk/src/org/griphyn/vdl/util/VDL2Config.java
Log:
Minor fixes to warnings


Modified: trunk/src/org/griphyn/vdl/util/VDL2Config.java
===================================================================
--- trunk/src/org/griphyn/vdl/util/VDL2Config.java	2010-09-08 01:04:16 UTC (rev 3612)
+++ trunk/src/org/griphyn/vdl/util/VDL2Config.java	2010-09-08 18:56:26 UTC (rev 3613)
@@ -18,8 +18,10 @@
 
 public class VDL2Config extends Properties {
 
-	public static final Logger logger = Logger.getLogger(VDL2Config.class);
+    private static final long serialVersionUID = 1L;
 
+    public static final Logger logger = Logger.getLogger(VDL2Config.class);
+
 	public static final String CONFIG_FILE_NAME = "swift.properties";
 	public static final String[] CONFIG_FILE_SEARCH_PATH = new String[] {
 			System.getProperty("swift.home") + File.separator + "etc" + File.separator
@@ -62,11 +64,11 @@
 		return config.check();
 	}
 
-	private List files, tried;
+	private List<String> files, tried;
 
 	private VDL2Config() {
-		files = new LinkedList();
-		tried = new LinkedList();
+		files = new LinkedList<String>();
+		tried = new LinkedList<String>();
 		put(VDL2ConfigProperties.POOL_FILE, "${vds.home}/etc/sites.xml");
 		put(VDL2ConfigProperties.TC_FILE, "${vds.home}/var/tc.data");
 		put(VDL2ConfigProperties.LAZY_ERRORS, "false");
@@ -131,7 +133,7 @@
 	}
 
 	/**
-	 * Overriden to do variable expansion. Variables will be expanded if there
+	 * Overridden to do variable expansion. Variables will be expanded if there
 	 * is a system property with that name. Otherwise, the expansion will not
 	 * occur.
 	 */
@@ -228,12 +230,11 @@
 			String prop = (String) bc.getProperty(name);
 			if(prop != null) {
 				return prop;
-                	}
+			}
 		}
 		if(logger.isDebugEnabled()) {
 			logger.debug("Getting property "+name+" from global configuration");
 		}
 		return getProperty(name);
 	}
-
 }