[Ils-source] r1423 - in trunk/src/com/resolutions/ils: . data

[scribe at crosswire.org]

Author: scribe
Date: 2016-04-06 12:16:50 -0700 (Wed, 06 Apr 2016)
New Revision: 1423

Modified:
   trunk/src/com/resolutions/ils/Utils.java
   trunk/src/com/resolutions/ils/data/UserProfile.java
Log:
Updated to use newer HashMap container over deprecated Hashtable


Modified: trunk/src/com/resolutions/ils/Utils.java
===================================================================
--- trunk/src/com/resolutions/ils/Utils.java	2016-04-06 18:58:14 UTC (rev 1422)
+++ trunk/src/com/resolutions/ils/Utils.java	2016-04-06 19:16:50 UTC (rev 1423)
@@ -7,7 +7,7 @@
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
-import java.util.Hashtable;
+import java.util.HashMap;
 import java.util.Properties;
 
 import javax.mail.Message;
@@ -62,7 +62,7 @@
         return sysConfig;
     }
     
-    public static String replaceParams(String inString, Hashtable values) {
+    public static String replaceParams(String inString, HashMap values) {
     	int i = 1;
         for (int offset = inString.indexOf('{', i); offset > -1; offset = inString.indexOf('{', i)) {
 			int end = inString.indexOf('}', offset);

Modified: trunk/src/com/resolutions/ils/data/UserProfile.java
===================================================================
--- trunk/src/com/resolutions/ils/data/UserProfile.java	2016-04-06 18:58:14 UTC (rev 1422)
+++ trunk/src/com/resolutions/ils/data/UserProfile.java	2016-04-06 19:16:50 UTC (rev 1423)
@@ -28,7 +28,7 @@
 
 import com.resolutions.ils.ILSSession;
 import com.resolutions.ils.Utils;
-import java.util.Hashtable;
+import java.util.HashMap;
 import java.io.StringWriter;
 
 public class UserProfile extends DataObject {
@@ -178,7 +178,7 @@
 	    			try {
 						String subject = Utils.getSysConfig(email).getProperty("EmailTemplate1Subject");
 						String body    = Utils.getSysConfig(email).getProperty("EmailTemplate1Body");
-						Hashtable<String, String> params = new Hashtable<String, String>();
+						HashMap<String, Object> params = new HashMap<String, Object>();
 						params.put("SITEURL", Utils.getSysConfig(email).getProperty("SiteURL", "your training site"));
 						params.put("ADMINCONTACTNAME", session.getCurrentCompany().getCompanyAdminContactName());
 						params.put("ADMINCONTACTPHONE", session.getCurrentCompany().getCompanyAdminContactPhone());
@@ -226,7 +226,7 @@
 				    if (emailNotice) {
 						String subject = sysConfig.getProperty("EmailTemplate6Subject");
 						String body    = sysConfig.getProperty("EmailTemplate6Body");
-						Hashtable<String, String> params = new Hashtable<String, String>();
+						HashMap<String, Object> params = new HashMap<String, Object>();
 						params.put("SITEURL", sysConfig.getProperty("SiteURL", "your training site"));
 						params.put("ADMINCONTACTNAME", session.getCurrentCompany().getCompanyAdminContactName());
 						params.put("ADMINCONTACTPHONE", session.getCurrentCompany().getCompanyAdminContactPhone());
@@ -947,7 +947,7 @@
         	UserProfile p = (UserProfile)o;
 			String subject = Utils.getSysConfig(httpSession).getProperty("EmailTemplate0Subject");
 			String body    = Utils.getSysConfig(httpSession).getProperty("EmailTemplate0Body");
-			Hashtable<String, String> params = new Hashtable<String, String>();
+			HashMap<String, Object> params = new HashMap<String, Object>();
 			params.putAll(company.getData());
 			params.putAll(p.getData());
 			subject = Utils.replaceParams(subject, params);
@@ -1041,7 +1041,7 @@
 		}
 		try {
 			String to = getUserProfileEMail();
-			java.util.Hashtable params = new java.util.Hashtable();
+			java.util.HashMap params = new java.util.HashMap();
 			params.put("CONAME", companyName);
 			params.put("SITEURL", sysConfig.getProperty("SiteURL", "your training site"));
 			params.putAll(this.getData());