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

[noreply at svn.ci.uchicago.edu]

Author: benc
Date: 2008-08-08 10:04:15 -0500 (Fri, 08 Aug 2008)
New Revision: 2184

Modified:
   trunk/src/org/griphyn/vdl/util/VDL2Config.java
Log:
remove check for old config file that was deprecated some time ago. This removes the error message that previous appeared, but does not otherwise change config file behaviour.

Modified: trunk/src/org/griphyn/vdl/util/VDL2Config.java
===================================================================
--- trunk/src/org/griphyn/vdl/util/VDL2Config.java	2008-08-08 08:25:42 UTC (rev 2183)
+++ trunk/src/org/griphyn/vdl/util/VDL2Config.java	2008-08-08 15:04:15 UTC (rev 2184)
@@ -31,7 +31,6 @@
 	}
 
 	private static synchronized VDL2Config getDefaultConfig() throws IOException {
-		checkDeprecatedConfigFile();
 		if (config == null) {
 			config = new VDL2Config();
 			for (int i = 0; i < CONFIG_FILE_SEARCH_PATH.length; i++) {
@@ -205,13 +204,4 @@
 		return conf;
 	}
 
-	// TODO this can be removed after 0.5 is released
-	static public void checkDeprecatedConfigFile() {
-		String fn = System.getProperty("user.home") + File.separator + ".vdl2" + File.separator + "vdl2.properties"; 
-		File f = new File(fn);
-		if(f.exists()) {
-			System.err.println("The .vdl2 directory is deprecated. Swift has detected the presence of a now-unsupported configuration file, "+fn+". Configuration information will not be loaded from that file. Remove that file to suppress this message.");
-		}
-	}
-
 }