Skip to content

Commit

Permalink
Updated loops in JSP code to Java5 syntax.
Browse files Browse the repository at this point in the history
  • Loading branch information
@soleger
soleger committed Dec 8, 2013
1 parent 7c4618f commit ef988fe
Show file tree
Hide file tree
Showing 24 changed files with 68 additions and 161 deletions.
11 changes: 4 additions & 7 deletions opennms-webapp/src/main/webapp/WEB-INF/jsp/admin/userGroupView/groups/groupDetail.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,11 +113,10 @@
<% }
else { %>
<table width="50%" border="1" cellspacing="0" cellpadding="2" >
<% Iterator<String> usersIter = users.iterator();
while (usersIter != null && usersIter.hasNext()) { %>
<% for (String user : users) { %>
<tr>
<td>
<%=usersIter.next()%>
<%=user%>
</td>
</tr>
<% } %>
Expand All @@ -132,10 +131,8 @@
<% Collection<String> dutySchedules = group.getDutySchedules(); %>
<%
int i =0;
Iterator<String> iter = dutySchedules.iterator();
while(iter.hasNext())
{
DutySchedule tmp = new DutySchedule(iter.next());
for (String dutySchedule : dutySchedules) {
DutySchedule tmp = new DutySchedule(dutySchedule);
Vector<Object> curSched = tmp.getAsVector();
i++;
%>
Expand Down
41 changes: 13 additions & 28 deletions opennms-webapp/src/main/webapp/admin/notification/chooseTargets.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,11 +191,9 @@ action="admin/notification/destinationWizard" >
<td width="25%" valign="top" align="left">
<select width="200" style="width: 200px" name="users" size="10" multiple>
<%
Map<String,Boolean> users = getUsers(targets);
Iterator<String> iterator = users.keySet().iterator();
while (iterator.hasNext()) {
String key = iterator.next();
if ((users.get(key)).booleanValue()) {
for (Map.Entry<String,Boolean> entry : getUsers(targets).entrySet()) {
String key = entry.getKey();
if (entry.getValue().booleanValue()) {
%>
<option selected VALUE=<%=key%>><%=key%></option>
<%
Expand All @@ -212,11 +210,9 @@ action="admin/notification/destinationWizard" >
<td width="25%" valign="top" align="left">
<select width="200" style="width: 200px" name="groups" size="10" multiple>
<%
Map<String,Boolean> groups = getGroups(targets);
iterator = groups.keySet().iterator();
while (iterator.hasNext()) {
String key = iterator.next();
if (groups.get(key).booleanValue()) {
for (Map.Entry<String,Boolean> entry : getGroups(targets).entrySet()) {
String key = entry.getKey();
if (entry.getValue().booleanValue()) {
%>
<option selected VALUE=<%=key%>><%=key%></option>
<%
Expand All @@ -233,11 +229,9 @@ action="admin/notification/destinationWizard" >
<td width="25%" valign="top" align="left">
<select WIDTH="200" STYLE="width: 200px" NAME="roles" SIZE="10" multiple>
<%
Map<String,Boolean> roles = getRoles(targets);
iterator = roles.keySet().iterator();
while (iterator.hasNext()) {
String key = iterator.next();
if (roles.get(key).booleanValue()) {
for (Map.Entry<String,Boolean> entry : getRoles(targets).entrySet()) {
String key = entry.getKey();
if (entry.getValue().booleanValue()) {
%>
<option selected VALUE=<%=key%>><%=key%></option>
<%
Expand All @@ -256,10 +250,7 @@ action="admin/notification/destinationWizard" >
<br/>&nbsp;<br/>
<select width="200" style="width: 200px" name="emails" size="7" multiple>
<%
Map<String,String> emails = getEmails(targets);
iterator = emails.keySet().iterator();
while (iterator.hasNext()) {
String key = iterator.next();
for (String key : getEmails(targets).keySet()) {
%>
<option VALUE=<%=key%>><%=key%></option>
<%
Expand Down Expand Up @@ -345,11 +336,7 @@ public Map<String,Boolean> getUsers(Collection<Target> targets) throws ServletEx
Map<String, String> emails = new TreeMap<String, String>();
try {
Collection<String> targetNames = getTargetNames(targets);
Iterator<String> i = targetNames.iterator();
while (i.hasNext()) {
String key = i.next();
for (String key : getTargetNames(targets)) {
if (key.indexOf("@") > -1) {
emails.put(key, key);
}
Expand All @@ -364,10 +351,8 @@ public Map<String,Boolean> getUsers(Collection<Target> targets) throws ServletEx
public Collection<String> getTargetNames(Collection<Target> targets) {
Collection<String> targetNames = new ArrayList<String>();
Iterator<Target> i = targets.iterator();
while (i.hasNext()) {
targetNames.add(i.next().getName());
for (Target target : targets) {
targetNames.add(target.getName());
}
return targetNames;
}%>
8 changes: 4 additions & 4 deletions opennms-webapp/src/main/webapp/admin/notification/noticeWizard/buildRule.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,17 +160,17 @@
List<String> services = NotificationFactory.getInstance().getServiceNames();
StringBuffer buffer = new StringBuffer();
for (int i = 0; i < services.size(); i++)
for (String service : services)
{
int serviceIndex = rule.indexOf((String)services.get(i));
int serviceIndex = rule.indexOf(service);
//check for !is<service name>
if (serviceIndex>0 && rule.charAt(serviceIndex-3) != '!')
{
buffer.append("<option selected VALUE='" + services.get(i) + "'>" + services.get(i) + "</option>");
buffer.append("<option selected VALUE='" + service + "'>" + service + "</option>");
}
else
{
buffer.append("<option VALUE='" + services.get(i) + "'>" + services.get(i) + "</option>");
buffer.append("<option VALUE='" + service + "'>" + service + "</option>");
}
}
Expand Down
9 changes: 3 additions & 6 deletions opennms-webapp/src/main/webapp/admin/notification/noticeWizard/choosePath.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -234,11 +234,8 @@
Map<String, Path> pathsMap = null;
try {
pathsMap = new TreeMap<String, Path>(DestinationPathFactory.getInstance().getPaths());
Iterator<String> iterator = pathsMap.keySet().iterator();
while(iterator.hasNext())
{
String key = iterator.next();
pathsMap = new TreeMap<String, Path>(DestinationPathFactory.getInstance().getPaths());
for (String key : pathsMap.keySet()) {
if (key.equals(currentPath))
{
buffer.append("<option SELECTED VALUE=" + key + ">" + key + "</option>");
Expand All @@ -247,7 +244,7 @@
{
buffer.append("<option VALUE=" + key + ">" + key + "</option>");
}
}
}
} catch (Throwable e)
{
throw new ServletException("couldn't get destination path list.", e);
Expand Down
17 changes: 6 additions & 11 deletions opennms-webapp/src/main/webapp/admin/notification/noticeWizard/chooseUeis.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,13 +129,9 @@
StringBuffer buffer = new StringBuffer();
List<String> excludeList = getExcludeList();
TreeMap<String, String> sortedMap = new TreeMap<String, String>();
TreeMap<String, String> sortedMap = new TreeMap<String, String>();
Iterator<Event> i = events.iterator();
while(i.hasNext()) //for (int i = 0; i < events.size(); i++)
{
Event e = i.next();
for (Event e : events) {
String uei = e.getUei();
//System.out.println(uei);
Expand All @@ -146,12 +142,11 @@
//System.out.println(trimmedUei);
if (!excludeList.contains(trimmedUei)) {
sortedMap.put(label,uei);
sortedMap.put(label,uei);
}
}
Iterator<String> it = sortedMap.keySet().iterator();
while(i.hasNext()) {
String label = it.next();
}
for (String label : sortedMap.keySet()) {
String uei=(String)sortedMap.get(label);
if (uei.equals(notice.getUei())) {
buffer.append("<option selected VALUE=" + uei + ">" + label + "</option>");
Expand Down
5 changes: 1 addition & 4 deletions opennms-webapp/src/main/webapp/admin/notification/noticeWizard/validatePathOutage.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,7 @@
{
StringBuffer buffer = new StringBuffer();
SortedMap<Integer,String> nodes = FilterDaoFactory.getInstance().getNodeMap(rule);
Iterator<Integer> i = nodes.keySet().iterator();
while(i.hasNext())
{
Integer key = (Integer)i.next();
for (Integer key : nodes.keySet()) {
buffer.append("<tr><td width=\"50%\" valign=\"top\">").append(key).append("</td>");
buffer.append("<td width=\"50%\">");
buffer.append(nodes.get(key));
Expand Down
14 changes: 4 additions & 10 deletions opennms-webapp/src/main/webapp/admin/pollerConfig/addPollerConfig.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,13 +80,10 @@
Collection<org.opennms.netmgt.config.poller.Service> svcCollection = pkg.getServiceCollection();
if(svcCollection != null)
{
Iterator<org.opennms.netmgt.config.poller.Service> svcIter = svcCollection.iterator();
while(svcIter.hasNext())
{
org.opennms.netmgt.config.poller.Service svcs = svcIter.next();
for (Service svcs : svcCollection) {
if(svcs != null)
{
if(svcs.getUserDefined().equals("true"))
if("true".equals(svcs.getUserDefined()))
{
scanableUserPlugin.put(svcs.getName(), svcs);
}
Expand All @@ -96,7 +93,7 @@
}
String status = svcs.getStatus();
if(status != null && status.equals("on"))
if(status != null && "on".equals(status))
{
polledPlugins.add(svcs.getName());
}
Expand Down Expand Up @@ -138,11 +135,8 @@
}
Set<String> keys = sortTmp.keySet();
Iterator<String> sortIter = keys.iterator();
int i = 0;
while(sortIter.hasNext())
{
String key = (String)sortIter.next();
for (String key : keys) {
sortedProtocols[i++] = key;
}
}
Expand Down
20 changes: 4 additions & 16 deletions opennms-webapp/src/main/webapp/admin/pollerConfig/index.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,7 @@
Collection<org.opennms.netmgt.config.poller.Service> svcCollection = pkg.getServiceCollection();
if(svcCollection != null)
{
Iterator<org.opennms.netmgt.config.poller.Service> svcIter = svcCollection.iterator();
while(svcIter.hasNext())
{
org.opennms.netmgt.config.poller.Service svcs = svcIter.next();
for (Service svcs : svcCollection) {
if(svcs != null)
{
if(svcs.getUserDefined().equals("true"))
Expand Down Expand Up @@ -141,11 +138,8 @@
}
Set<String> keys = sortTmp.keySet();
Iterator<String> sortIter = keys.iterator();
int i = 0;
while(sortIter.hasNext())
{
String key = sortIter.next();
for (String key : keys) {
sortedProtocols[i++] = key;
}
}
Expand Down Expand Up @@ -217,11 +211,8 @@
</tr>
<%
Set<String> scanned = scanablePlugin.keySet();
Iterator<String> iterator = scanned.iterator();
int rowCounter = 0;
while(iterator.hasNext())
{
String servicename = (String)iterator.next();
for (String servicename : scanned) {
Service svc = (Service)scanablePlugin.get(servicename);
if(svc != null)
{
Expand Down Expand Up @@ -286,10 +277,7 @@
</tr>
<%
iterator = userscanned.iterator();
while(iterator.hasNext())
{
String servicename = iterator.next();
for (String servicename : userscanned) {
Service svc = (Service)scanableUserPlugin.get(servicename);
if(svc != null)
{
Expand Down
5 changes: 1 addition & 4 deletions opennms-webapp/src/main/webapp/admin/sendevent.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,10 +295,7 @@
List<String> excludeList = getExcludeList();
TreeMap<String, String> sortedMap = new TreeMap<String, String>();
Iterator<Event> i = events.iterator();
while(i.hasNext()) {
Event e = i.next();
for (Event e : events) {
String uei = e.getUei();
//System.out.println(uei);
Expand Down
4 changes: 1 addition & 3 deletions opennms-webapp/src/main/webapp/admin/userGroupView/roles/list.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,7 @@
throw new ServletException("User:list " + e.getMessage());
}
Iterator<String> i = users.keySet().iterator();
while (i.hasNext()) {
User curUser = (User)users.get(i.next());
for (User curUser : users.values()) {
usersHash.put(curUser.getUserId(), curUser.getFullName());
}
Expand Down
4 changes: 1 addition & 3 deletions opennms-webapp/src/main/webapp/admin/userGroupView/roles/view.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,7 @@
throw new ServletException("User:list " + e.getMessage());
}
Iterator<String> i = users.keySet().iterator();
while (i.hasNext()) {
User curUser = (User)users.get(i.next());
for (User curUser : users.values()) {
usersHash.put(curUser.getUserId(), curUser.getFullName());
}
Expand Down
6 changes: 2 additions & 4 deletions opennms-webapp/src/main/webapp/admin/userGroupView/users/list.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,11 +145,9 @@
<td width="15%"><b>Text Pin</b></td>
-->
</tr>
<% Iterator<String> i = users.keySet().iterator();
<%
int row = 0;
while(i.hasNext())
{
User curUser = users.get(i.next());
for (User curUser : users.values()) {
String userid = curUser.getUserId();
String email = userFactory.getEmail(userid);
String pagerEmail = userFactory.getPagerEmail(userid);
Expand Down
7 changes: 3 additions & 4 deletions opennms-webapp/src/main/webapp/admin/userGroupView/users/modifyUser.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -471,10 +471,9 @@ Collection<String> dutySchedules = user.getDutyScheduleCollection();
<td><b>End Time</b></td>
</tr>
<%
int i = 0;
Iterator<String> iter = dutySchedules.iterator();
while (iter.hasNext()) {
DutySchedule tmp = new DutySchedule(iter.next());
int i = 0;
for (String dutySchedule : dutySchedules) {
DutySchedule tmp = new DutySchedule(dutySchedule);
Vector<Object> curSched = tmp.getAsVector();
%>
Expand Down
6 changes: 2 additions & 4 deletions opennms-webapp/src/main/webapp/admin/userGroupView/users/userDetail.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -208,10 +208,8 @@
<% Collection<String> dutySchedules = user.getDutyScheduleCollection(); %>
<%
int i =0;
Iterator<String> iter = dutySchedules.iterator();
while(iter.hasNext())
{
DutySchedule tmp = new DutySchedule(iter.next());
for (String dutySchedule : dutySchedules) {
DutySchedule tmp = new DutySchedule(dutySchedule);
Vector<Object> curSched = tmp.getAsVector();
i++;
Expand Down
6 changes: 2 additions & 4 deletions opennms-webapp/src/main/webapp/admin/userGroupView/views/list.jsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,11 +121,9 @@
<td width="5%"><b>View Name</b></td>
<td width="5%"><b>View Title</b></td>
</tr>
<% Iterator<String> i = views.keySet().iterator();
<%
int row = 0;
while(i.hasNext())
{
View curView = (View)views.get(i.next());
for (View curView : views.values()) {
%>
<tr bgcolor=<%=row%2==0 ? "#ffffff" : "#cccccc"%>>
<td width="5%" rowspan="2" align="center">
Expand Down
Loading

0 comments on commit ef988fe

Please sign in to comment.