You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jspwiki.apache.org by ju...@apache.org on 2018/11/02 23:59:30 UTC
[jspwiki] 01/17: use generics when possible
This is an automated email from the ASF dual-hosted git repository.
juanpablo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jspwiki.git
commit 28cd3d9a5b7d19386e2ed7c1e3661902dcb6ea95
Author: juanpablo <ju...@apache.org>
AuthorDate: Fri Nov 2 21:54:30 2018 +0100
use generics when possible
---
jspwiki-war/src/main/webapp/Workflow.jsp | 14 +++++++-------
jspwiki-war/src/main/webapp/rss.jsp | 6 +++---
jspwiki-war/src/main/webapp/templates/210/AJAXSearch.jsp | 8 ++++----
3 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/jspwiki-war/src/main/webapp/Workflow.jsp b/jspwiki-war/src/main/webapp/Workflow.jsp
index fbf70f3..9f33f12 100644
--- a/jspwiki-war/src/main/webapp/Workflow.jsp
+++ b/jspwiki-war/src/main/webapp/Workflow.jsp
@@ -36,7 +36,7 @@
%>
<%
- WikiEngine wiki = WikiEngine.getInstance( getServletConfig() );
+ WikiEngine wiki = WikiEngine.getInstance( request.getServletConfig() );
// Create wiki context and check for authorization
WikiContext wikiContext = wiki.createContext( request, WikiContext.WORKFLOW );
if(!wiki.getAuthorizationManager().hasAccess( wikiContext, response )) return;
@@ -56,10 +56,10 @@
String outcomeKey = request.getParameter("outcome");
Outcome outcome = Outcome.forName( outcomeKey );
// Iterate through our actor decisions and see if we can find an ID match
- Collection decisions = dq.getActorDecisions(wikiSession);
- for (Iterator it = decisions.iterator(); it.hasNext();)
+ Collection< Decision > decisions = dq.getActorDecisions(wikiSession);
+ for (Iterator< Decision > it = decisions.iterator(); it.hasNext();)
{
- Decision d = (Decision)it.next();
+ Decision d = it.next();
if (d.getId() == id)
{
// Cool, we found it. Now make the decision.
@@ -83,10 +83,10 @@
// Extract parameters for decision ID & decision outcome
int id = Integer.parseInt( request.getParameter( "id" ) );
// Iterate through our owner decisions and see if we can find an ID match
- Collection workflows = wiki.getWorkflowManager().getOwnerWorkflows(wikiSession);
- for (Iterator it = workflows.iterator(); it.hasNext();)
+ Collection< Workflow > workflows = wiki.getWorkflowManager().getOwnerWorkflows(wikiSession);
+ for (Iterator< Workflow > it = workflows.iterator(); it.hasNext();)
{
- Workflow w = (Workflow)it.next();
+ Workflow w = it.next();
if (w.getId() == id)
{
// Cool, we found it. Now kill the workflow.
diff --git a/jspwiki-war/src/main/webapp/rss.jsp b/jspwiki-war/src/main/webapp/rss.jsp
index 9912b3c..3f55b54 100644
--- a/jspwiki-war/src/main/webapp/rss.jsp
+++ b/jspwiki-war/src/main/webapp/rss.jsp
@@ -96,7 +96,7 @@
//
// Now, list items.
//
- List changed;
+ List< WikiPage > changed;
if( mode.equals("blog") )
{
@@ -117,9 +117,9 @@
boolean hasChanged = false;
Date latest = new Date(0);
- for( Iterator i = changed.iterator(); i.hasNext(); )
+ for( Iterator< WikiPage > i = changed.iterator(); i.hasNext(); )
{
- WikiPage p = (WikiPage) i.next();
+ WikiPage p = i.next();
if( !HttpUtil.checkFor304( request, p.getName(), p.getLastModified() ) ) hasChanged = true;
if( p.getLastModified().after( latest ) ) latest = p.getLastModified();
diff --git a/jspwiki-war/src/main/webapp/templates/210/AJAXSearch.jsp b/jspwiki-war/src/main/webapp/templates/210/AJAXSearch.jsp
index 2e42cf5..2f5831e 100644
--- a/jspwiki-war/src/main/webapp/templates/210/AJAXSearch.jsp
+++ b/jspwiki-war/src/main/webapp/templates/210/AJAXSearch.jsp
@@ -56,16 +56,16 @@
{
try
{
- Collection list = wiki.getSearchManager().findPages( query, wikiContext );
+ Collection< SearchResult > list = wiki.getSearchManager().findPages( query, wikiContext );
// Filter down to only those that we actually have a permission to view
AuthorizationManager mgr = wiki.getAuthorizationManager();
- ArrayList items = new ArrayList();
+ ArrayList< SearchResult > items = new ArrayList<>();
- for( Iterator i = list.iterator(); i.hasNext(); )
+ for( Iterator< SearchResult > i = list.iterator(); i.hasNext(); )
{
- SearchResult r = (SearchResult)i.next();
+ SearchResult r = i.next();
WikiPage p = r.getPage();