[Ils-source] r1613 - in trunk: . webapp
scribe at crosswire.org
scribe at crosswire.org
Mon Jul 30 13:48:27 MST 2018
Author: scribe
Date: 2018-07-30 13:48:27 -0700 (Mon, 30 Jul 2018)
New Revision: 1613
Modified:
trunk/build.xml
trunk/webapp/admin_coursenew.jsp
trunk/webapp/admin_curricnew.jsp
trunk/webapp/admin_groupedit.jsp
trunk/webapp/admin_profile.jsp
trunk/webapp/admin_profilemanagement.jsp
trunk/webapp/admin_roleedit.jsp
trunk/webapp/admin_studentrecords.jsp
Log:
Merged back upstream to trunk the changes from production for 1.7 JDK compliance
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2018-07-30 20:43:15 UTC (rev 1612)
+++ trunk/build.xml 2018-07-30 20:48:27 UTC (rev 1613)
@@ -46,7 +46,8 @@
includes="**/*.java"
destdir="classes"
classpathref="classpath"
- source="1.8"
+ source="1.7"
+ target="1.7"
includeantruntime="false">
</javac>
<copy todir="webapp/WEB-INF/classes" includeEmptyDirs="false" >
Modified: trunk/webapp/admin_coursenew.jsp
===================================================================
--- trunk/webapp/admin_coursenew.jsp 2018-07-30 20:43:15 UTC (rev 1612)
+++ trunk/webapp/admin_coursenew.jsp 2018-07-30 20:48:27 UTC (rev 1613)
@@ -5,7 +5,6 @@
<%@ page import="com.resolutions.ils.*" %>
<%@ page import="com.resolutions.ils.data.*" %>
<%@ page import="java.util.Comparator" %>
-<%@ page import="java.util.stream.Collectors" %>
<%@ page import="java.util.Date" %>
<%@ page import="java.io.File" %>
<%@ page import="java.util.List" %>
@@ -555,7 +554,7 @@
});
}
}
- List<Integer> inCourse = Group.getCourseGroups(ilsSession, current.getCourseID()).stream().map(Group::getGroupID).collect(Collectors.toList());
+ List<Integer> inCourse = new ArrayList<Integer>(); for (Group g : Group.getCourseGroups(ilsSession, current.getCourseID())) { inCourse.add(g.getGroupID()); }
%>
<form name="courserolesave" method="post" action="admin_coursenew.jsp">
<input type="hidden" name="action" value="SaveRoles"/>
Modified: trunk/webapp/admin_curricnew.jsp
===================================================================
--- trunk/webapp/admin_curricnew.jsp 2018-07-30 20:43:15 UTC (rev 1612)
+++ trunk/webapp/admin_curricnew.jsp 2018-07-30 20:48:27 UTC (rev 1613)
@@ -5,7 +5,7 @@
<%@ page import="com.resolutions.ils.*" %>
<%@ page import="com.resolutions.ils.data.*" %>
<%@ page import="java.util.List" %>
-<%@ page import="java.util.stream.Collectors" %>
+<%@ page import="java.util.ArrayList" %>
<%@ page import="java.util.HashMap" %>
<%@ page import="java.util.Comparator" %>
<%@ page import="java.util.Date" %>
@@ -422,7 +422,7 @@
}
}
- List<Integer> inCourse = Group.getCourseGroups(ilsSession, current.getCourseID()).stream().map(Group::getGroupID).collect(Collectors.toList());
+ List<Integer> inCourse = new ArrayList<Integer>(); for (Group g : Group.getCourseGroups(ilsSession, current.getCourseID())) { inCourse.add(g.getGroupID()); }
%>
<form name="courserolesave" method="post" action="admin_curricnew.jsp">
<input type="hidden" name="action" value="SaveRoles"/>
Modified: trunk/webapp/admin_groupedit.jsp
===================================================================
--- trunk/webapp/admin_groupedit.jsp 2018-07-30 20:43:15 UTC (rev 1612)
+++ trunk/webapp/admin_groupedit.jsp 2018-07-30 20:48:27 UTC (rev 1613)
@@ -5,8 +5,8 @@
<%@ page import="com.resolutions.ils.*" %>
<%@ page import="com.resolutions.ils.data.*" %>
<%@ page import="java.util.List" %>
+<%@ page import="java.util.ArrayList" %>
<%@ page import="java.util.Comparator" %>
-<%@ page import="java.util.stream.Collectors" %>
<%@ page import="java.util.Date" %>
<%@ page import="java.io.File" %>
<%@ page import="java.net.URL" %>
@@ -157,7 +157,7 @@
}
}
courses.addAll(Course.getAllCurricula(ilsSession));
- List<Integer> inGroup = Course.getGroupCourses(ilsSession, current.getGroupID()).stream().map(Course::getCourseID).collect(Collectors.toList());
+ List<Integer> inGroup = new ArrayList<Integer>(); for (Course c : Course.getGroupCourses(ilsSession, current.getGroupID())) { inGroup.add(c.getCourseID()); }
%>
</p>
<form name="groupcoursesave" method="post" action="admin_groupedit.jsp">
Modified: trunk/webapp/admin_profile.jsp
===================================================================
--- trunk/webapp/admin_profile.jsp 2018-07-30 20:43:15 UTC (rev 1612)
+++ trunk/webapp/admin_profile.jsp 2018-07-30 20:48:27 UTC (rev 1613)
@@ -7,7 +7,6 @@
<%@ page import="com.resolutions.ils.*" %>
<%@ page import="com.resolutions.ils.data.*" %>
<%@ page import="java.util.List" %>
-<%@ page import="java.util.stream.Collectors" %>
<%@ page import="java.util.Set" %>
<%@ page import="java.util.Arrays" %>
<%@ page import="java.util.ArrayList" %>
@@ -69,13 +68,15 @@
List<Integer> currentRoles = null;
List<Group> tmp = Group.getUserGroups(ilsSession, Group.GROUPTYPE_ROLE, current.getUserProfileID());
if (tmp != null && !tmp.isEmpty()) {
- currentRoles = tmp.stream().map(Group::getGroupID).collect(Collectors.toList());
+ currentRoles = new ArrayList<Integer>();
+ for (Group g: tmp) currentRoles.add(g.getGroupID());
if (currentRoles.isEmpty()) currentRoles = null;
}
List<Integer> currentLocations = null;
tmp = Group.getUserGroups(ilsSession, Group.GROUPTYPE_LOCATION, current.getUserProfileID());
if (tmp != null && tmp.size() > 0) {
- currentLocations = tmp.stream().map(Group::getGroupID).collect(Collectors.toList());
+ currentLocations = new ArrayList<Integer>();
+ for (Group g: tmp) currentLocations.add(g.getGroupID());
if (currentLocations.isEmpty()) currentLocations = null;
}
@@ -96,18 +97,20 @@
String vals[] = request.getParameterValues("role");
List<Integer> requestedRoles = null;
if (vals != null && vals.length > 0) {
- requestedRoles = Arrays.stream(vals)
- .map(s -> { try { return Integer.parseInt(s); } catch(Exception e) { return null; }})
- .filter(i -> i != null).collect(Collectors.toList());
+ requestedRoles = new ArrayList<Integer>();
+ for (String s : vals) {
+ try { requestedRoles.add(Integer.parseInt(s)); } catch(Exception e) {}
+ }
if (requestedRoles.isEmpty()) requestedRoles = null;
}
vals = request.getParameterValues("location");
List<Integer> requestedLocations = null;
if (vals != null && vals.length > 0) {
- requestedLocations = Arrays.stream(vals)
- .map(s -> { try { return Integer.parseInt(s); } catch(Exception e) { return null; }})
- .filter(i -> i != null).collect(Collectors.toList());
+ requestedLocations = new ArrayList<Integer>();
+ for (String s : vals) {
+ try { requestedLocations.add(Integer.parseInt(s)); } catch(Exception e) {}
+ }
if (requestedLocations.isEmpty()) requestedLocations = null;
}
@@ -312,14 +315,16 @@
currentRoles = null;
tmp = Group.getUserGroups(ilsSession, Group.GROUPTYPE_ROLE, current.getUserProfileID());
if (tmp != null && !tmp.isEmpty()) {
- currentRoles = tmp.stream().map(Group::getGroupID).collect(Collectors.toList());
+ currentRoles = new ArrayList<Integer>();
+ for (Group g: tmp) currentRoles.add(g.getGroupID());
if (currentRoles.isEmpty()) currentRoles = null;
}
currentLocations = null;
tmp = Group.getUserGroups(ilsSession, Group.GROUPTYPE_LOCATION, current.getUserProfileID());
if (tmp != null && !tmp.isEmpty()) {
- currentLocations = tmp.stream().map(Group::getGroupID).collect(Collectors.toList());
+ currentLocations = new ArrayList<Integer>();
+ for (Group g: tmp) currentLocations.add(g.getGroupID());
if (currentLocations.isEmpty()) currentLocations = null;
}
@@ -958,7 +963,7 @@
)
)
) {
- List<Integer> inMgrGroup = Group.getManagerGroups(ilsSession, Group.GROUPTYPE_LOCATION, current.getUserProfileID()).stream().map(Group::getGroupID).collect(Collectors.toList());
+ List<Integer> inMgrGroup = new ArrayList<Integer>(); for (Group g : Group.getManagerGroups(ilsSession, Group.GROUPTYPE_LOCATION, current.getUserProfileID())) inMgrGroup.add(g.getGroupID());
%>
Modified: trunk/webapp/admin_profilemanagement.jsp
===================================================================
--- trunk/webapp/admin_profilemanagement.jsp 2018-07-30 20:43:15 UTC (rev 1612)
+++ trunk/webapp/admin_profilemanagement.jsp 2018-07-30 20:48:27 UTC (rev 1613)
@@ -11,7 +11,6 @@
<%@ page import="java.util.List" %>
<%@ page import="java.util.ArrayList" %>
<%@ page import="java.util.Arrays" %>
-<%@ page import="java.util.stream.Collectors" %>
<%@ page import="java.util.Map" %>
<%@ page import="java.util.HashMap" %>
<%@ page import="java.lang.Comparable" %>
@@ -164,9 +163,11 @@
if ("Send Email To Selected Results".equals(modaction)) {
String []profids = request.getParameterValues("profid");
if (profids != null) {
- List<UserProfile> users = Arrays.stream(profids).map(Integer::parseInt).map(i -> UserProfile.getUserProfile(ilsSession, i)).collect(Collectors.toList());
- session.setAttribute("lastDataset", users);
- session.setAttribute("lastDatasetType", "PMuserProfiles");
+ List<UserProfile> users = new ArrayList<UserProfile>(); for (String pid : profids) {
+ try { users.add(UserProfile.getUserProfile(ilsSession, Integer.parseInt(pid))); } catch (Exception e) {}
+ }
+ session.setAttribute("lastDataset", users);
+ session.setAttribute("lastDatasetType", "PMuserProfiles");
out.print("<html><head><META HTTP-EQUIV=\"Refresh\" CONTENT=\"0;URL=admin_sendemail.jsp\"></head></html>");
return;
}
Modified: trunk/webapp/admin_roleedit.jsp
===================================================================
--- trunk/webapp/admin_roleedit.jsp 2018-07-30 20:43:15 UTC (rev 1612)
+++ trunk/webapp/admin_roleedit.jsp 2018-07-30 20:48:27 UTC (rev 1613)
@@ -5,9 +5,9 @@
<%@ page import="com.resolutions.ils.*" %>
<%@ page import="com.resolutions.ils.data.*" %>
<%@ page import="java.util.List" %>
+<%@ page import="java.util.ArrayList" %>
<%@ page import="java.util.Comparator" %>
<%@ page import="java.util.Arrays" %>
-<%@ page import="java.util.stream.Collectors" %>
<%@ page import="java.util.Date" %>
<%@ page import="java.io.File" %>
<%@ page import="java.net.URL" %>
@@ -74,7 +74,9 @@
String []courseids = request.getParameterValues("courseid");
if (courseids != null) {
final int gid = current.getGroupID();
- Arrays.stream(courseids).map(Integer::parseInt).forEach(cid -> Group.addCourseGroup(ilsSession, gid, cid));
+ for (String cid : courseids) {
+ try { Group.addCourseGroup(ilsSession, gid, Integer.parseInt(cid)); } catch (Exception e) {}
+ }
}
statusMsg = "Your changes have been saved.";
}
@@ -151,7 +153,7 @@
}
}
courses.addAll(Course.getAllCurricula(ilsSession));
- List<Integer> inGroup = Course.getGroupCourses(ilsSession, current.getGroupID()).stream().map(Course::getCourseID).collect(Collectors.toList());
+ List<Integer> inGroup = new ArrayList<Integer>(); for (Course c : Course.getGroupCourses(ilsSession, current.getGroupID())) inGroup.add(c.getCourseID());
%>
</p>
<form name="groupcoursesave" method="post" action="admin_roleedit.jsp">
Modified: trunk/webapp/admin_studentrecords.jsp
===================================================================
--- trunk/webapp/admin_studentrecords.jsp 2018-07-30 20:43:15 UTC (rev 1612)
+++ trunk/webapp/admin_studentrecords.jsp 2018-07-30 20:48:27 UTC (rev 1613)
@@ -6,7 +6,6 @@
<%@ page import="java.util.List" %>
<%@ page import="java.util.ArrayList" %>
<%@ page import="java.util.Set" %>
-<%@ page import="java.util.stream.Collectors" %>
<%@ page import="java.util.HashSet" %>
<%@ page import="java.util.Comparator" %>
<%@ page import="java.util.Date" %>
@@ -362,7 +361,8 @@
if (requestedLocations == null) {
List<Group> tmpg = Group.getUserGroups(ilsSession, Group.GROUPTYPE_LOCATION, user.getUserProfileID());
- requestedLocations = ((tmpg != null) && (tmpg.size()>0))? tmpg.stream().map(g -> g.getGroupID()).collect(Collectors.toSet()): null;
+ requestedLocations = null;
+ if ((tmpg != null) && (tmpg.size()>0)) { requestedLocations = new HashSet(); for (Group g : tmpg) requestedLocations.add(g.getGroupID()); }
if (user.getUserProfileAccessLevel() >= UserProfile.ACCESS_MANAGER) {
requestedLocations = null;
}
More information about the Ils-source
mailing list