Author: jalkanen
Date: Thu Jun 12 14:26:12 2008
New Revision: 667233
URL: http://svn.apache.org/viewvc?rev=667233&view=rev
Log:
Java5 and other checkstyle issues fixed.
Modified:
incubator/jspwiki/trunk/tests/TranslationsCheck.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/AllTests.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestHttpServletRequest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestHttpServletResponse.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestHttpSession.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestJDBCDataSource.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestJNDIContext.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/AuthorizationManagerTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/SecurityEventTrap.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/acl/AclImplTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/AnonymousLoginModuleTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/CookieAssertionLoginModuleTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/UserDatabaseLoginModuleTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/WebContainerLoginModuleTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/content/AllTests.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/CounterProvider.java
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/VerySimpleProvider.java
Modified: incubator/jspwiki/trunk/tests/TranslationsCheck.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/TranslationsCheck.java?rev=667233&r1=667232&r2=667233&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/TranslationsCheck.java (original)
+++ incubator/jspwiki/trunk/tests/TranslationsCheck.java Thu Jun 12 14:26:12
2008
@@ -20,8 +20,8 @@
*/
public class TranslationsCheck
{
- private static final TreeSet allProps = new TreeSet(); // sorted, no
duplicates
- private static final TreeSet duplProps = new TreeSet();
+ private static final TreeSet<String> allProps = new TreeSet<String>(); //
sorted, no duplicates
+ private static final TreeSet<String> duplProps = new TreeSet<String>();
// Change these to your settings...
static String base = ".";
@@ -122,11 +122,11 @@
private static List sortedNames(Properties p)
{
- List list = new ArrayList();
+ List<String> list = new ArrayList<String>();
Enumeration iter = p.propertyNames();
while (iter.hasMoreElements())
{
- list.add(iter.nextElement());
+ list.add( (String)iter.nextElement() );
}
Collections.sort(list);
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/AllTests.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/AllTests.java?rev=667233&r1=667232&r2=667233&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/AllTests.java (original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/AllTests.java Thu Jun 12
14:26:12 2008
@@ -11,8 +11,6 @@
import org.apache.log4j.PropertyConfigurator;
-import com.ecyrd.jspwiki.content.PageRenamerTest;
-
public class AllTests extends TestCase
{
//
Modified:
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestHttpServletRequest.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestHttpServletRequest.java?rev=667233&r1=667232&r2=667233&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestHttpServletRequest.java
(original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestHttpServletRequest.java
Thu Jun 12 14:26:12 2008
@@ -31,13 +31,13 @@
protected Cookie[] m_cookies = new Cookie[0];
- protected Map m_params = new Hashtable();
+ protected Map<String, String> m_params = new Hashtable<String,
String>();
protected String m_remoteAddr = "127.0.0.1";
protected String m_remoteUser = null;
- protected Set m_roles = new HashSet();
+ protected Set<String> m_roles = new HashSet<String>();
protected Principal m_userPrincipal = null;
@@ -187,7 +187,7 @@
*/
public String getParameter( String arg0 )
{
- return (String)m_params.get( arg0 );
+ return m_params.get( arg0 );
}
/**
@@ -211,7 +211,7 @@
*/
public String[] getParameterValues( String arg0 )
{
- return (String[])m_params.entrySet().toArray( new
String[m_params.size()] );
+ return m_params.entrySet().toArray( new String[m_params.size()] );
}
/**
Modified:
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestHttpServletResponse.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestHttpServletResponse.java?rev=667233&r1=667232&r2=667233&view=diff
==============================================================================
---
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestHttpServletResponse.java
(original)
+++
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestHttpServletResponse.java
Thu Jun 12 14:26:12 2008
@@ -38,10 +38,10 @@
*/
public class TestHttpServletResponse implements HttpServletResponse
{
- private Set m_cookies = new HashSet();
+ private Set<Cookie> m_cookies = new HashSet<Cookie>();
public Cookie[] getCookies() {
- return (Cookie[])m_cookies.toArray(new Cookie[m_cookies.size()]);
+ return m_cookies.toArray(new Cookie[m_cookies.size()]);
}
public void addCookie(Cookie arg0)
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestHttpSession.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestHttpSession.java?rev=667233&r1=667232&r2=667233&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestHttpSession.java
(original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestHttpSession.java Thu
Jun 12 14:26:12 2008
@@ -28,7 +28,7 @@
protected final long m_lastAccessTime;
- protected final Map m_attributes;
+ protected final Map<String, Object> m_attributes;
protected int m_inactiveInterval;
@@ -42,7 +42,7 @@
m_createTime = System.currentTimeMillis();
m_lastAccessTime = m_createTime;
m_id = String.valueOf( RANDOM.nextLong() );
- m_attributes = new HashMap();
+ m_attributes = new HashMap<String, Object>();
m_invalidated = false;
m_inactiveInterval = 1800;
}
@@ -134,10 +134,10 @@
*/
public Enumeration getAttributeNames()
{
- Vector items = new Vector();
+ Vector<String> items = new Vector<String>();
for( Iterator it = m_attributes.keySet().iterator(); it.hasNext(); )
{
- items.add( it.next() );
+ items.add( (String)it.next() );
}
return items.elements();
}
@@ -148,12 +148,12 @@
*/
public String[] getValueNames()
{
- Vector items = new Vector();
+ Vector<String> items = new Vector<String>();
for( Iterator it = m_attributes.keySet().iterator(); it.hasNext(); )
{
- items.add( it.next() );
+ items.add( (String)it.next() );
}
- return (String[]) items.toArray( new String[items.size()] );
+ return items.toArray( new String[items.size()] );
}
/**
Modified:
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestJDBCDataSource.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestJDBCDataSource.java?rev=667233&r1=667232&r2=667233&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestJDBCDataSource.java
(original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestJDBCDataSource.java Thu
Jun 12 14:26:12 2008
@@ -150,8 +150,8 @@
// Load the driver using the sytem class loader
final ClassLoader parent = ClassLoader.getSystemClassLoader();
- URLClassLoader loader = (URLClassLoader)AccessController.doPrivileged(
new PrivilegedAction() {
- public Object run() {
+ URLClassLoader loader = AccessController.doPrivileged( new
PrivilegedAction<URLClassLoader>() {
+ public URLClassLoader run() {
return new URLClassLoader( new URL[] { driverURL }, parent );
}
});
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestJNDIContext.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestJNDIContext.java?rev=667233&r1=667232&r2=667233&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestJNDIContext.java
(original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/TestJNDIContext.java Thu
Jun 12 14:26:12 2008
@@ -4,11 +4,7 @@
import java.util.Hashtable;
import java.util.Map;
-import javax.naming.Context;
-import javax.naming.Name;
-import javax.naming.NameParser;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
+import javax.naming.*;
import javax.naming.spi.InitialContextFactory;
/**
@@ -37,7 +33,7 @@
public class TestJNDIContext implements Context
{
- private final Map m_bindings = new HashMap();
+ private final Map<String, Object> m_bindings = new HashMap<String,
Object>();
private static boolean initialized = false;
@@ -171,6 +167,7 @@
* No-op; always returns <code>null</code>.
* @see javax.naming.Context#getEnvironment()
*/
+ @SuppressWarnings("unchecked")
public Hashtable getEnvironment() throws NamingException
{
// TODO Auto-generated method stub
@@ -208,7 +205,7 @@
* No-op; always returns <code>null</code>.
* @see javax.naming.Context#list(javax.naming.Name)
*/
- public NamingEnumeration list( Name name ) throws NamingException
+ public NamingEnumeration<NameClassPair> list( Name name ) throws
NamingException
{
return null;
}
@@ -217,7 +214,7 @@
* No-op; always returns <code>null</code>.
* @see javax.naming.Context#list(java.lang.String)
*/
- public NamingEnumeration list( String name ) throws NamingException
+ public NamingEnumeration<NameClassPair> list( String name ) throws
NamingException
{
return null;
}
@@ -226,7 +223,7 @@
* No-op; always returns <code>null</code>.
* @see javax.naming.Context#listBindings(javax.naming.Name)
*/
- public NamingEnumeration listBindings( Name name ) throws NamingException
+ public NamingEnumeration<Binding> listBindings( Name name ) throws
NamingException
{
return null;
}
@@ -235,7 +232,7 @@
* No-op; always returns <code>null</code>.
* @see javax.naming.Context#listBindings(java.lang.String)
*/
- public NamingEnumeration listBindings( String name ) throws NamingException
+ public NamingEnumeration<Binding> listBindings( String name ) throws
NamingException
{
return null;
}
Modified:
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/AuthorizationManagerTest.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/AuthorizationManagerTest.java?rev=667233&r1=667232&r2=667233&view=diff
==============================================================================
---
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/AuthorizationManagerTest.java
(original)
+++
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/AuthorizationManagerTest.java
Thu Jun 12 14:26:12 2008
@@ -11,11 +11,7 @@
import org.apache.commons.lang.ArrayUtils;
-import com.ecyrd.jspwiki.TestEngine;
-import com.ecyrd.jspwiki.WikiException;
-import com.ecyrd.jspwiki.WikiPage;
-import com.ecyrd.jspwiki.WikiSession;
-import com.ecyrd.jspwiki.WikiSessionTest;
+import com.ecyrd.jspwiki.*;
import com.ecyrd.jspwiki.attachment.Attachment;
import com.ecyrd.jspwiki.auth.acl.UnresolvedPrincipal;
import com.ecyrd.jspwiki.auth.authorize.Group;
@@ -25,7 +21,6 @@
import com.ecyrd.jspwiki.auth.permissions.PagePermission;
import com.ecyrd.jspwiki.auth.permissions.PermissionFactory;
import com.ecyrd.jspwiki.auth.permissions.WikiPermission;
-import com.ecyrd.jspwiki.auth.user.DefaultUserProfile;
import com.ecyrd.jspwiki.auth.user.UserProfile;
import com.ecyrd.jspwiki.providers.ProviderException;
Modified:
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/SecurityEventTrap.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/SecurityEventTrap.java?rev=667233&r1=667232&r2=667233&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/SecurityEventTrap.java
(original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/SecurityEventTrap.java
Thu Jun 12 14:26:12 2008
@@ -15,7 +15,7 @@
public class SecurityEventTrap implements WikiEventListener
{
private WikiSecurityEvent m_lastEvent = null;
- private List m_events = new ArrayList();
+ private List<WikiEvent> m_events = new
ArrayList<WikiEvent>();
public void actionPerformed( WikiEvent event )
{
@@ -42,7 +42,7 @@
public WikiSecurityEvent[] events()
{
- return (WikiSecurityEvent[])m_events.toArray(new
WikiSecurityEvent[m_events.size()]);
+ return m_events.toArray(new WikiSecurityEvent[m_events.size()]);
}
}
Modified:
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/acl/AclImplTest.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/acl/AclImplTest.java?rev=667233&r1=667232&r2=667233&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/acl/AclImplTest.java
(original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/acl/AclImplTest.java
Thu Jun 12 14:26:12 2008
@@ -49,7 +49,7 @@
private AclImpl m_aclGroup;
- private Map m_groups;
+ private Map<String, Group> m_groups;
private GroupManager m_groupMgr;
@@ -76,7 +76,7 @@
m_acl = new AclImpl();
m_aclGroup = new AclImpl();
- m_groups = new HashMap();
+ m_groups = new HashMap<String, Group>();
Principal uAlice = new WikiPrincipal( "Alice" );
Principal uBob = new WikiPrincipal( "Bob" );
Principal uCharlie = new WikiPrincipal( "Charlie" );
@@ -158,7 +158,7 @@
if ( array[i] instanceof GroupPrincipal )
{
String groupName = ((GroupPrincipal)array[i]).getName();
- Group group = (Group)m_groups.get( groupName );
+ Group group = m_groups.get( groupName );
if ( group != null && group.isMember( key ) )
{
return true;
Modified:
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/AnonymousLoginModuleTest.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/AnonymousLoginModuleTest.java?rev=667233&r1=667232&r2=667233&view=diff
==============================================================================
---
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/AnonymousLoginModuleTest.java
(original)
+++
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/AnonymousLoginModuleTest.java
Thu Jun 12 14:26:12 2008
@@ -64,7 +64,7 @@
// Test using IP address (AnonymousLoginModule succeeds)
CallbackHandler handler = new WebContainerCallbackHandler(
m_engine, request, authorizer );
LoginModule module = new AnonymousLoginModule();
- module.initialize(subject, handler, new HashMap(), new HashMap());
+ module.initialize(subject, handler, new HashMap<String, Object>(),
new HashMap<String, Object>());
module.login();
module.commit();
Set principals = subject.getPrincipals();
@@ -88,7 +88,9 @@
{
CallbackHandler handler = new WebContainerCallbackHandler(
m_engine, request, authorizer );
LoginModule module = new AnonymousLoginModule();
- module.initialize(subject, handler, new HashMap(), new HashMap());
+ module.initialize(subject, handler,
+ new HashMap<String, Object>(),
+ new HashMap<String, Object>());
module.login();
module.commit();
Set principals = subject.getPrincipals();
Modified:
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/CookieAssertionLoginModuleTest.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/CookieAssertionLoginModuleTest.java?rev=667233&r1=667232&r2=667233&view=diff
==============================================================================
---
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/CookieAssertionLoginModuleTest.java
(original)
+++
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/CookieAssertionLoginModuleTest.java
Thu Jun 12 14:26:12 2008
@@ -71,7 +71,9 @@
subject = new Subject();
CallbackHandler handler = new WebContainerCallbackHandler(
m_engine, request, authorizer );
LoginModule module = new CookieAssertionLoginModule();
- module.initialize(subject, handler, new HashMap(), new HashMap());
+ module.initialize(subject, handler,
+ new HashMap<String, Object>(),
+ new HashMap<String, Object>());
module.login();
module.commit();
Set principals = subject.getPrincipals();
@@ -97,7 +99,9 @@
{
CallbackHandler handler = new WebContainerCallbackHandler(
m_engine, request, authorizer );
LoginModule module = new CookieAssertionLoginModule();
- module.initialize(subject, handler, new HashMap(), new HashMap());
+ module.initialize(subject, handler,
+ new HashMap<String, Object>(),
+ new HashMap<String, Object>());
module.login();
module.commit();
Set principals = subject.getPrincipals();
Modified:
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/UserDatabaseLoginModuleTest.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/UserDatabaseLoginModuleTest.java?rev=667233&r1=667232&r2=667233&view=diff
==============================================================================
---
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/UserDatabaseLoginModuleTest.java
(original)
+++
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/UserDatabaseLoginModuleTest.java
Thu Jun 12 14:26:12 2008
@@ -55,7 +55,9 @@
// Log in with a user that isn't in the database
CallbackHandler handler = new WikiCallbackHandler( db, "user",
"password" );
LoginModule module = new UserDatabaseLoginModule();
- module.initialize(subject, handler, new HashMap(), new HashMap());
+ module.initialize(subject, handler,
+ new HashMap<String, Object>(),
+ new HashMap<String, Object>());
module.login();
module.commit();
Set principals = subject.getPrincipals();
@@ -68,7 +70,9 @@
subject = new Subject();
handler = new WikiCallbackHandler( db, "janne", "[EMAIL
PROTECTED]" );
module = new UserDatabaseLoginModule();
- module.initialize(subject, handler, new HashMap(), new HashMap());
+ module.initialize(subject, handler,
+ new HashMap<String, Object>(),
+ new HashMap<String, Object>());
module.login();
module.commit();
principals = subject.getPrincipals();
@@ -90,7 +94,9 @@
{
CallbackHandler handler = new WikiCallbackHandler( db, "user",
"password" );
LoginModule module = new UserDatabaseLoginModule();
- module.initialize(subject, handler, new HashMap(), new HashMap());
+ module.initialize(subject, handler,
+ new HashMap<String, Object>(),
+ new HashMap<String, Object>());
module.login();
module.commit();
Set principals = subject.getPrincipals();
Modified:
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/WebContainerLoginModuleTest.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/WebContainerLoginModuleTest.java?rev=667233&r1=667232&r2=667233&view=diff
==============================================================================
---
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/WebContainerLoginModuleTest.java
(original)
+++
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/auth/login/WebContainerLoginModuleTest.java
Thu Jun 12 14:26:12 2008
@@ -66,7 +66,9 @@
// Test using Principal (WebContainerLoginModule succeeds)
CallbackHandler handler = new WebContainerCallbackHandler(
m_engine, request, authorizer );
LoginModule module = new WebContainerLoginModule();
- module.initialize(subject, handler, new HashMap(), new HashMap());
+ module.initialize(subject, handler,
+ new HashMap<String, Object>(),
+ new HashMap<String, Object>());
module.login();
module.commit();
Set principals = subject.getPrincipals();
@@ -83,7 +85,9 @@
request.setRemoteUser( "Andrew Jaquith" );
handler = new WebContainerCallbackHandler( m_engine, request,
authorizer );
module = new WebContainerLoginModule();
- module.initialize(subject, handler, new HashMap(), new HashMap());
+ module.initialize(subject, handler,
+ new HashMap<String, Object>(),
+ new HashMap<String, Object>());
module.login();
module.commit();
principals = subject.getPrincipals();
@@ -100,7 +104,9 @@
request.setRemoteAddr( "53.33.128.9" );
handler = new WebContainerCallbackHandler( m_engine, request,
authorizer );
module = new WebContainerLoginModule();
- module.initialize(subject, handler, new HashMap(), new HashMap());
+ module.initialize(subject, handler,
+ new HashMap<String, Object>(),
+ new HashMap<String, Object>());
try
{
module.login();
@@ -131,7 +137,9 @@
// Test using Principal (WebContainerLoginModule succeeds)
CallbackHandler handler = new WebContainerCallbackHandler( m_engine,
request, authorizer );
LoginModule module = new WebContainerLoginModule();
- module.initialize(subject, handler, new HashMap(), new HashMap());
+ module.initialize(subject, handler,
+ new HashMap<String, Object>(),
+ new HashMap<String, Object>());
module.login();
module.commit();
Set principals = subject.getPrincipals();
@@ -154,7 +162,9 @@
{
CallbackHandler handler = new WebContainerCallbackHandler(
m_engine, request, authorizer );
LoginModule module = new WebContainerLoginModule();
- module.initialize(subject, handler, new HashMap(), new HashMap());
+ module.initialize(subject, handler,
+ new HashMap<String, Object>(),
+ new HashMap<String, Object>());
module.login();
module.commit();
Set principals = subject.getPrincipals();
Modified: incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/content/AllTests.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/content/AllTests.java?rev=667233&r1=667232&r2=667233&view=diff
==============================================================================
--- incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/content/AllTests.java
(original)
+++ incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/content/AllTests.java Thu
Jun 12 14:26:12 2008
@@ -1,8 +1,6 @@
package com.ecyrd.jspwiki.content;
-import com.ecyrd.jspwiki.PageManagerTest;
-
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
Modified:
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java?rev=667233&r1=667232&r2=667233&view=diff
==============================================================================
---
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java
(original)
+++
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/parser/JSPWikiMarkupParserTest.java
Thu Jun 12 14:26:12 2008
@@ -24,7 +24,7 @@
public class JSPWikiMarkupParserTest extends TestCase
{
Properties props = new Properties();
- Vector created = new Vector();
+ Vector<String> created = new Vector<String>();
static final String PAGE_NAME = "testpage";
Modified:
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/CounterProvider.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/CounterProvider.java?rev=667233&r1=667232&r2=667233&view=diff
==============================================================================
---
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/CounterProvider.java
(original)
+++
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/CounterProvider.java
Thu Jun 12 14:26:12 2008
@@ -115,7 +115,7 @@
{
m_getAllPagesCalls++;
- Vector v = new Vector();
+ Vector<WikiPage> v = new Vector<WikiPage>();
for( int i = 0; i < m_pages.length; i++ )
{
Modified:
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/VerySimpleProvider.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/VerySimpleProvider.java?rev=667233&r1=667232&r2=667233&view=diff
==============================================================================
---
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/VerySimpleProvider.java
(original)
+++
incubator/jspwiki/trunk/tests/com/ecyrd/jspwiki/providers/VerySimpleProvider.java
Thu Jun 12 14:26:12 2008
@@ -78,7 +78,7 @@
*/
public Collection getAllPages()
{
- Vector v = new Vector();
+ Vector<WikiPage> v = new Vector<WikiPage>();
v.add( getPageInfo( PAGENAME, 5 ) );
return v;
}
