Author: jalkanen
Date: Fri Jun 13 14:55:19 2008
New Revision: 667665
URL: http://svn.apache.org/viewvc?rev=667665&view=rev
Log:
Java5 fixes.
Modified:
incubator/jspwiki/trunk/.classpath
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/items/DirectoryItem.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/htmltowiki/PersistentMapDecorator.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/IndexPlugin.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/InsertPage.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogArchivePlugin.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSSGenerator.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/BasicSearchProvider.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/AdminBeanIteratorTag.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/ContentTag.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/CookieTag.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/EditorIteratorTag.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/LinkTag.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PluginTag.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/ClassUtil.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/AbstractRPCHandler.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCHandler.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCHandlerUTF8.java
Modified: incubator/jspwiki/trunk/.classpath
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.classpath?rev=667665&r1=667664&r2=667665&view=diff
==============================================================================
--- incubator/jspwiki/trunk/.classpath (original)
+++ incubator/jspwiki/trunk/.classpath Fri Jun 13 14:55:19 2008
@@ -38,8 +38,8 @@
<classpathentry kind="lib" path="tests/lib/jetty-jmx-5.1.14.jar"/>
<classpathentry kind="lib" path="tests/lib/jetty-plus-5.1.14.jar"
sourcepath="/Users/arj/workspace/lib/jetty-5.1.14/extra/plus/src"/>
<classpathentry kind="lib" path="tests/lib/jetty-servlet-5.1.14.jar"/>
- <classpathentry kind="lib"
path="/Users/arj/workspace/JSPWiki-SVN-2.8/tests/lib/selenium-server-1.0-beta1.jar"
sourcepath="/Users/arj/workspace/lib/jetty-5.1.14/src"/>
<classpathentry kind="lib" path="tests/lib/stripes-1.4.3.jar"
sourcepath="/stripes-1.4.3-src"/>
+ <classpathentry kind="lib"
path="tests/lib/selenium-server-1.0-beta1.jar"/>
<classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/JVM
1.5.0"/>
<classpathentry kind="output" path="classes"/>
</classpath>
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/items/DirectoryItem.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/items/DirectoryItem.java?rev=667665&r1=667664&r2=667665&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/items/DirectoryItem.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/items/DirectoryItem.java
Fri Jun 13 14:55:19 2008
@@ -81,6 +81,7 @@
m_items.add( di );
}
+ @SuppressWarnings("unchecked")
public void addDavItems( Collection c )
{
m_items.addAll( c );
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/htmltowiki/PersistentMapDecorator.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/htmltowiki/PersistentMapDecorator.java?rev=667665&r1=667664&r2=667665&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/htmltowiki/PersistentMapDecorator.java
(original)
+++
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/htmltowiki/PersistentMapDecorator.java
Fri Jun 13 14:55:19 2008
@@ -77,6 +77,7 @@
/**
* [EMAIL PROTECTED]
*/
+ @SuppressWarnings("unchecked")
@Override
public Set entrySet()
{
@@ -122,6 +123,7 @@
/**
* [EMAIL PROTECTED]
*/
+ @SuppressWarnings("unchecked")
@Override
public Set keySet()
{
@@ -131,6 +133,7 @@
/**
* [EMAIL PROTECTED]
*/
+ @SuppressWarnings("unchecked")
@Override
public Object put( Object arg0, Object arg1 )
{
@@ -140,6 +143,7 @@
/**
* [EMAIL PROTECTED]
*/
+ @SuppressWarnings("unchecked")
@Override
public void putAll( Map arg0 )
{
@@ -176,6 +180,7 @@
/**
* [EMAIL PROTECTED]
*/
+ @SuppressWarnings("unchecked")
@Override
public Collection values()
{
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/IndexPlugin.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/IndexPlugin.java?rev=667665&r1=667664&r2=667665&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/IndexPlugin.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/IndexPlugin.java Fri
Jun 13 14:55:19 2008
@@ -150,6 +150,7 @@
/**
* Gets all pages, then sorts them.
*/
+ @SuppressWarnings("unchecked")
static Collection getAllPagesSortedByName( WikiContext wikiContext )
{
final WikiEngine engine = wikiContext.getEngine();
@@ -158,13 +159,10 @@
if( pageManager == null )
return null;
- Collection result = new TreeSet( new Comparator() {
- public int compare( Object o1, Object o2 )
+ Collection<WikiPage> result = new TreeSet<WikiPage>( new
Comparator<WikiPage>() {
+ public int compare( WikiPage page1, WikiPage page2 )
{
- if( o1 == null || o2 == null ) return 0;
-
- WikiPage page1 = (WikiPage)o1;
- WikiPage page2 = (WikiPage)o2;
+ if( page1 == null || page2 == null ) return 0;
return page1.getName().compareTo( page2.getName() );
}
@@ -172,7 +170,7 @@
try
{
- Collection allPages = pageManager.getAllPages();
+ Collection<WikiPage> allPages = pageManager.getAllPages();
result.addAll( allPages );
}
catch( ProviderException e )
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/InsertPage.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/InsertPage.java?rev=667665&r1=667664&r2=667665&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/InsertPage.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/InsertPage.java Fri
Jun 13 14:55:19 2008
@@ -46,6 +46,7 @@
public static final String ATTR_RECURSE =
"com.ecyrd.jspwiki.plugin.InsertPage.recurseCheck";
+ @SuppressWarnings("unchecked")
public String execute( WikiContext context, Map params )
throws PluginException
{
@@ -77,7 +78,7 @@
// Check for recursivity
//
- List previousIncludes = (List)context.getVariable(
ATTR_RECURSE );
+ List<String> previousIncludes = (List)context.getVariable(
ATTR_RECURSE );
if( previousIncludes != null )
{
@@ -88,7 +89,7 @@
}
else
{
- previousIncludes = new ArrayList();
+ previousIncludes = new ArrayList<String>();
}
previousIncludes.add( page.getName() );
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogArchivePlugin.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogArchivePlugin.java?rev=667665&r1=667664&r2=667665&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogArchivePlugin.java
(original)
+++
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/WeblogArchivePlugin.java
Fri Jun 13 14:55:19 2008
@@ -114,11 +114,12 @@
return sb.toString();
}
+ @SuppressWarnings("unchecked")
private SortedSet collectMonths( WikiEngine engine, String page )
throws ProviderException
{
Comparator comp = new ArchiveComparator();
- TreeSet res = new TreeSet( comp );
+ TreeSet<Calendar> res = new TreeSet<Calendar>( comp );
WeblogPlugin pl = new WeblogPlugin();
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSSGenerator.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSSGenerator.java?rev=667665&r1=667664&r2=667665&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSSGenerator.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/rss/RSSGenerator.java Fri Jun
13 14:55:19 2008
@@ -454,6 +454,7 @@
* @param feed A Feed object to fill.
* @return the RSS representation of the wiki context
*/
+ @SuppressWarnings("unchecked")
protected String generateWikiPageRSS( WikiContext wikiContext, List
changed, Feed feed )
{
feed.setChannelTitle( m_engine.getApplicationName()+":
"+wikiContext.getPage().getName() );
@@ -527,6 +528,7 @@
* @return A String of valid RSS or Atom.
* @throws ProviderException If reading of pages was not possible.
*/
+ @SuppressWarnings("unchecked")
protected String generateBlogRSS( WikiContext wikiContext, List changed,
Feed feed )
throws ProviderException
{
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/BasicSearchProvider.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/BasicSearchProvider.java?rev=667665&r1=667664&r2=667665&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/BasicSearchProvider.java
(original)
+++
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/BasicSearchProvider.java
Fri Jun 13 14:55:19 2008
@@ -139,7 +139,7 @@
private Collection findPages( QueryItem[] query )
{
- TreeSet res = new TreeSet( new SearchResultComparator() );
+ TreeSet<SearchResult> res = new TreeSet<SearchResult>( new
SearchResultComparator() );
SearchMatcher matcher = new SearchMatcher( m_engine, query );
Collection allPages = null;
@@ -185,13 +185,16 @@
return res;
}
+ /**
+ * [EMAIL PROTECTED]
+ */
public Collection findPages(String query)
{
return findPages(parseQuery(query));
}
/**
- * @see com.ecyrd.jspwiki.WikiProvider#getProviderInfo()
+ * [EMAIL PROTECTED]
*/
public String getProviderInfo()
{
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/AdminBeanIteratorTag.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/AdminBeanIteratorTag.java?rev=667665&r1=667664&r2=667665&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/AdminBeanIteratorTag.java
(original)
+++
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/AdminBeanIteratorTag.java
Fri Jun 13 14:55:19 2008
@@ -57,7 +57,7 @@
Collection beans = mgr.getAllBeans();
- ArrayList typedBeans = new ArrayList();
+ ArrayList<AdminBean> typedBeans = new ArrayList<AdminBean>();
for( Iterator i = beans.iterator(); i.hasNext(); )
{
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/ContentTag.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/ContentTag.java?rev=667665&r1=667664&r2=667665&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/ContentTag.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/ContentTag.java Fri Jun
13 14:55:19 2008
@@ -40,7 +40,7 @@
{
private static final long serialVersionUID = 0L;
- private Map m_mappings = new HashMap();
+ private Map<String, String> m_mappings = new HashMap<String, String>();
public void setView( String s )
{
@@ -106,7 +106,7 @@
{
// Check the overridden templates first
String requestContext = m_wikiContext.getRequestContext();
- String contentTemplate = (String)m_mappings.get( requestContext );
+ String contentTemplate = m_mappings.get( requestContext );
// If not found, use the defaults
if ( contentTemplate == null )
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/CookieTag.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/CookieTag.java?rev=667665&r1=667664&r2=667665&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/CookieTag.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/CookieTag.java Fri Jun
13 14:55:19 2008
@@ -267,7 +267,7 @@
return;
}
String in = c.getValue();
- Map values = parseCookieValues( in );
+ Map<String, String> values = parseCookieValues( in );
values.put( item, value );
String cv = encodeValues( values );
c.setValue( cv );
@@ -292,9 +292,9 @@
* Parses a cookie value, of format name1%3Fvalue1&name2%3Fvalue2...,
* into a Map<String,String>.
*/
- private Map parseCookieValues( String s )
+ private Map<String, String> parseCookieValues( String s )
{
- Map rval = new HashMap();
+ Map<String, String> rval = new HashMap<String, String>();
if( s == null )
{
return rval;
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/EditorIteratorTag.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/EditorIteratorTag.java?rev=667665&r1=667664&r2=667665&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/EditorIteratorTag.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/EditorIteratorTag.java
Fri Jun 13 14:55:19 2008
@@ -52,7 +52,7 @@
String[] editorList = mgr.getEditorList();
- Collection editors = new ArrayList();
+ Collection<Editor> editors = new ArrayList<Editor>();
for ( int i = 0; i < editorList.length; i++ )
{
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/LinkTag.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/LinkTag.java?rev=667665&r1=667664&r2=667665&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/LinkTag.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/LinkTag.java Fri Jun 13
14:55:19 2008
@@ -68,7 +68,7 @@
private boolean m_absolute = false;
private boolean m_overrideAbsolute = false;
- private Map m_containedParams;
+ private Map<String, String> m_containedParams;
private BodyContent m_bodyContent;
@@ -160,7 +160,7 @@
{
if( m_containedParams == null )
{
- m_containedParams = new HashMap();
+ m_containedParams = new HashMap<String, String>();
}
m_containedParams.put( name, value );
}
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PluginTag.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PluginTag.java?rev=667665&r1=667664&r2=667665&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PluginTag.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/PluginTag.java Fri Jun
13 14:55:19 2008
@@ -92,6 +92,7 @@
return EVAL_BODY_BUFFERED;
}
+ @SuppressWarnings("unchecked")
private String executePlugin( String plugin, String args, String body )
throws PluginException, IOException
{
@@ -100,7 +101,7 @@
m_evaluated = true;
- Map argmap = pm.parseArgs( args );
+ Map<String, String> argmap = pm.parseArgs( args );
if( body != null )
{
@@ -145,7 +146,7 @@
{
BodyContent bc = getBodyContent();
- getPreviousOut().write( executePlugin( m_plugin, m_args, ((bc !=
null) ? bc.getString() : null) ) );
+ getPreviousOut().write( executePlugin( m_plugin, m_args, (bc !=
null) ? bc.getString() : null) );
}
catch( Exception e )
{
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/ClassUtil.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/ClassUtil.java?rev=667665&r1=667664&r2=667665&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/ClassUtil.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/ClassUtil.java Fri Jun
13 14:55:19 2008
@@ -252,7 +252,7 @@
{
try
{
- Class cl = getMappedClass( requestedClass );
+ Class<?> cl = getMappedClass( requestedClass );
Constructor[] ctors = cl.getConstructors();
@@ -262,7 +262,7 @@
//
for( int c = 0; c < ctors.length; c++ )
{
- Class[] params = ctors[c].getParameterTypes();
+ Class<?>[] params = ctors[c].getParameterTypes();
if( params.length == initargs.length )
{
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/AbstractRPCHandler.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/AbstractRPCHandler.java?rev=667665&r1=667664&r2=667665&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/AbstractRPCHandler.java
(original)
+++
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/AbstractRPCHandler.java
Fri Jun 13 14:55:19 2008
@@ -81,7 +81,7 @@
{
checkPermission( PagePermission.VIEW );
Collection pages = m_engine.getRecentChanges();
- Vector result = new Vector();
+ Vector<Hashtable<?, ?>> result = new Vector<Hashtable<?, ?>>();
// Transform UTC into local time.
Calendar cal = Calendar.getInstance();
@@ -107,7 +107,6 @@
* Checks whether the current user has permission to perform the RPC
action;
* throws an exception if not allowed by [EMAIL PROTECTED]
com.ecyrd.jspwiki.auth.AuthorizationManager}.
*
- * @throws AuthenticationFailed A RuntimeException, if the authentication
fails and the user has no permission.
* @param perm the Permission to check
*/
protected void checkPermission( Permission perm )
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCHandler.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCHandler.java?rev=667665&r1=667664&r2=667665&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCHandler.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCHandler.java Fri
Jun 13 14:55:19 2008
@@ -42,8 +42,11 @@
public class RPCHandler
extends AbstractRPCHandler
{
- Logger log = Logger.getLogger( RPCHandler.class );
+ private static Logger log = Logger.getLogger( RPCHandler.class );
+ /**
+ * [EMAIL PROTECTED]
+ */
public void initialize( WikiContext ctx )
{
super.initialize( ctx );
@@ -96,7 +99,7 @@
{
checkPermission( PagePermission.VIEW );
Collection pages = m_engine.getRecentChanges();
- Vector result = new Vector();
+ Vector<String> result = new Vector<String>();
for( Iterator i = pages.iterator(); i.hasNext(); )
{
@@ -113,9 +116,9 @@
/**
* Encodes a single wiki page info into a Hashtable.
*/
- protected Hashtable encodeWikiPage( WikiPage page )
+ protected Hashtable<String,Object> encodeWikiPage( WikiPage page )
{
- Hashtable ht = new Hashtable();
+ Hashtable<String, Object> ht = new Hashtable<String, Object>();
ht.put( "name", toRPCString(page.getName()) );
@@ -149,7 +152,7 @@
{
checkPermission( PagePermission.VIEW );
Collection pages = m_engine.getRecentChanges();
- Vector result = new Vector();
+ Vector<Hashtable<String, Object>> result = new
Vector<Hashtable<String, Object>>();
Calendar cal = Calendar.getInstance();
cal.setTime( since );
@@ -270,7 +273,7 @@
extCollector,
attCollector );
- Vector result = new Vector();
+ Vector<Hashtable<String, String>> result = new
Vector<Hashtable<String, String>>();
//
// Add local links.
@@ -278,7 +281,7 @@
for( Iterator i = localCollector.getLinks().iterator(); i.hasNext(); )
{
String link = (String) i.next();
- Hashtable ht = new Hashtable();
+ Hashtable<String, String> ht = new Hashtable<String, String>();
ht.put( "page", toRPCString( link ) );
ht.put( "type", LINK_LOCAL );
@@ -312,7 +315,7 @@
{
String link = (String) i.next();
- Hashtable ht = new Hashtable();
+ Hashtable<String, String> ht = new Hashtable<String, String>();
ht.put( "page", toRPCString( link ) );
ht.put( "type", LINK_LOCAL );
@@ -330,7 +333,7 @@
{
String link = (String) i.next();
- Hashtable ht = new Hashtable();
+ Hashtable<String, String> ht = new Hashtable<String, String>();
ht.put( "page", link );
ht.put( "type", LINK_EXTERNAL );
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCHandlerUTF8.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCHandlerUTF8.java?rev=667665&r1=667664&r2=667665&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCHandlerUTF8.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCHandlerUTF8.java
Fri Jun 13 14:55:19 2008
@@ -54,7 +54,7 @@
checkPermission( PagePermission.VIEW );
Collection pages = m_engine.getRecentChanges();
- Vector result = new Vector();
+ Vector<String> result = new Vector<String>();
for( Iterator i = pages.iterator(); i.hasNext(); )
{
@@ -72,9 +72,9 @@
/**
* Encodes a single wiki page info into a Hashtable.
*/
- protected Hashtable encodeWikiPage( WikiPage page )
+ protected Hashtable<String, Object> encodeWikiPage( WikiPage page )
{
- Hashtable ht = new Hashtable();
+ Hashtable<String, Object> ht = new Hashtable<String, Object>();
ht.put( "name", page.getName() );
@@ -109,7 +109,7 @@
checkPermission( PagePermission.VIEW );
Collection pages = m_engine.getRecentChanges();
- Vector result = new Vector();
+ Vector<Hashtable<String, Object>> result = new
Vector<Hashtable<String, Object>>();
Calendar cal = Calendar.getInstance();
cal.setTime( since );
@@ -228,7 +228,7 @@
extCollector,
attCollector );
- Vector result = new Vector();
+ Vector<Hashtable<String, String>> result = new
Vector<Hashtable<String, String>>();
// FIXME: Contains far too much common with RPCHandler. Refactor!
@@ -238,7 +238,7 @@
for( Iterator i = localCollector.getLinks().iterator(); i.hasNext(); )
{
String link = (String) i.next();
- Hashtable ht = new Hashtable();
+ Hashtable<String, String> ht = new Hashtable<String, String>();
ht.put( "page", link );
ht.put( "type", LINK_LOCAL );
@@ -261,7 +261,7 @@
{
String link = (String) i.next();
- Hashtable ht = new Hashtable();
+ Hashtable<String, String> ht = new Hashtable<String, String>();
ht.put( "page", link );
ht.put( "type", LINK_LOCAL );
@@ -279,7 +279,7 @@
{
String link = (String) i.next();
- Hashtable ht = new Hashtable();
+ Hashtable<String, String> ht = new Hashtable<String, String>();
ht.put( "page", link );
ht.put( "type", LINK_EXTERNAL );
