[Ils-source] r1333 - in branches/1.6: . src/com/resolutions/ils/data webapp/WEB-INF/lib

[scribe at crosswire.org]

Author: scribe
Date: 2015-06-10 11:50:24 -0700 (Wed, 10 Jun 2015)
New Revision: 1333

Modified:
   branches/1.6/
   branches/1.6/src/com/resolutions/ils/data/Group.java
   branches/1.6/src/com/resolutions/ils/data/UserProfile.java
   branches/1.6/webapp/WEB-INF/lib/ils.jar
Log:
Merged over changed to force getGroupUsers to return a typed container



Property changes on: branches/1.6
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:796-1303,1306-1307,1309-1311,1319-1320,1322-1323,1325,1328-1330
   + /trunk:796-1303,1306-1307,1309-1311,1319-1320,1322-1323,1325,1328-1330,1332

Modified: branches/1.6/src/com/resolutions/ils/data/Group.java
===================================================================
--- branches/1.6/src/com/resolutions/ils/data/Group.java	2015-06-10 18:44:44 UTC (rev 1332)
+++ branches/1.6/src/com/resolutions/ils/data/Group.java	2015-06-10 18:50:24 UTC (rev 1333)
@@ -80,12 +80,13 @@
 		return (rows.size() > 0) ? (Group) rows.get(0) : null;
 	}
 
-    public Vector getGroupUsers() {
-        UserProfile query = new UserProfile();
-        query.setValue("COMPANYID", getCompanyID());
-        query.setValue("ILSGROUPID", getGroupID());
-        return query.getDataSet(LOOKUPGROUPUSERS);
-    }
+	public Vector<UserProfile> getGroupUsers() {
+		UserProfile query = new UserProfile();
+		query.setValue("COMPANYID", getCompanyID());
+		query.setValue("ILSGROUPID", getGroupID());
+		return (Vector<UserProfile>)query.getDataSet(LOOKUPGROUPUSERS);
+	}
+
     static public Vector getUserGroups(ILSSession session, int groupTypeID, int userID) {
         Group query = new Group();
         query.setValue("COMPANYID", new Integer(session.getCompanyID()));
@@ -261,10 +262,9 @@
 			xml.append(">\n");
 			xml.append(" <groupDescription>"+HTTPUtils.canonize(getGroupDescription())+"</groupDescription>\n");
 			if (detail == DETAIL_EXTRA) {
-				Vector<Object> users = getGroupUsers();
+				Vector<UserProfile> users = getGroupUsers();
 				xml.append("<userProfiles count=\""+users.size()+"\">");
-				for (Object o2 : users) {
-					UserProfile u = (UserProfile)o2;
+				for (UserProfile u: users) {
 					xml.append(u.toXML(DETAIL_HEADERONLY));
 				}
 				xml.append("</userProfiles>");

Modified: branches/1.6/src/com/resolutions/ils/data/UserProfile.java
===================================================================
--- branches/1.6/src/com/resolutions/ils/data/UserProfile.java	2015-06-10 18:44:44 UTC (rev 1332)
+++ branches/1.6/src/com/resolutions/ils/data/UserProfile.java	2015-06-10 18:50:24 UTC (rev 1333)
@@ -394,8 +394,8 @@
         // we've precached all our delay loads, so let's set our bits high to say so.
         for (UserProfile up: results) {
                 up.isCourseSummaryDataLoaded = (preloadCourseData);
-        	up.isRoleLoaded = true;
-        	up.isWorkgroupLoaded = true;
+                up.isRoleLoaded = true;
+                up.isWorkgroupLoaded = true;
         }
     	logger.debug("getSearchUserProfiles end ("+(System.currentTimeMillis() - timer)+")"); timer = System.currentTimeMillis();
         return results;

Modified: branches/1.6/webapp/WEB-INF/lib/ils.jar
===================================================================
(Binary files differ)