Author: jalkanen
Date: Wed Jun 11 13:58:56 2008
New Revision: 666835
URL: http://svn.apache.org/viewvc?rev=666835&view=rev
Log:
Fixed some inefficiencies (found by FindBugs) by taking autoboxing into use.
Modified:
incubator/jspwiki/trunk/.settings/org.eclipse.jdt.core.prefs
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PageManager.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiSession.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/RawPagesDavProvider.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/diff/TraditionalDiffProvider.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/SpamFilter.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/CreoleToJSPWikiTranslator.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Counter.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginManager.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/SessionsPlugin.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/UnusedPagesPlugin.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchManager.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/SetPaginationTag.java
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/WatchDog.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/.settings/org.eclipse.jdt.core.prefs
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/.settings/org.eclipse.jdt.core.prefs?rev=666835&r1=666834&r2=666835&view=diff
==============================================================================
--- incubator/jspwiki/trunk/.settings/org.eclipse.jdt.core.prefs (original)
+++ incubator/jspwiki/trunk/.settings/org.eclipse.jdt.core.prefs Wed Jun 11
13:58:56 2008
@@ -1,4 +1,4 @@
-#Mon Jun 09 22:36:43 EEST 2008
+#Wed Jun 11 23:34:20 EEST 2008
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
@@ -35,10 +35,10 @@
org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingJavadocComments=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
-org.eclipse.jdt.core.compiler.problem.missingJavadocTags=warning
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PageManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PageManager.java?rev=666835&r1=666834&r2=666835&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PageManager.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/PageManager.java Wed Jun 11
13:58:56 2008
@@ -612,6 +612,11 @@
*/
private class LockReaper extends WikiBackgroundThread
{
+ /**
+ * Create a LockReaper for a given engine.
+ *
+ * @param engine WikiEngine to own this thread.
+ */
public LockReaper( WikiEngine engine )
{
super( engine, 60 );
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiSession.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiSession.java?rev=666835&r1=666834&r2=666835&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiSession.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/WikiSession.java Wed Jun 11
13:58:56 2008
@@ -479,7 +479,7 @@
case WikiSecurityEvent.PRINCIPAL_ADD:
{
WikiSession target = (WikiSession)e.getTarget();
- if ( this.equals( target ) & m_status == AUTHENTICATED
)
+ if ( this.equals( target ) && m_status ==
AUTHENTICATED )
{
Set<Principal> principals =
m_subject.getPrincipals();
principals.add( (Principal)e.getPrincipal());
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/RawPagesDavProvider.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/RawPagesDavProvider.java?rev=666835&r1=666834&r2=666835&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/RawPagesDavProvider.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/dav/RawPagesDavProvider.java
Wed Jun 11 13:58:56 2008
@@ -69,7 +69,7 @@
{
String pageName = ((WikiPage)i.next()).getName();
- Character firstChar = new
Character(Character.toLowerCase(pageName.charAt(0)));
+ Character firstChar =
Character.valueOf(Character.toLowerCase(pageName.charAt(0)));
if( !charList.contains( firstChar ) )
{
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/diff/TraditionalDiffProvider.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/diff/TraditionalDiffProvider.java?rev=666835&r1=666834&r2=666835&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/diff/TraditionalDiffProvider.java
(original)
+++
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/diff/TraditionalDiffProvider.java
Wed Jun 11 13:58:56 2008
@@ -187,9 +187,9 @@
Format[] formats = { NumberFormat.getInstance(), cfmt,
NumberFormat.getInstance() };
fmt.setFormats( formats );
- Object[] params = { new Integer(changed.first() + 1),
- new Integer(changed.size()),
- new Integer(changed.size()) };
+ Object[] params = { changed.first() + 1,
+ changed.size(),
+ changed.size() };
m_result.append( fmt.format(params) );
m_result.append(CSS_DIFF_CLOSE);
}
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/SpamFilter.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/SpamFilter.java?rev=666835&r1=666834&r2=666835&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/SpamFilter.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/filters/SpamFilter.java Wed
Jun 11 13:58:56 2008
@@ -333,9 +333,9 @@
Integer score = (Integer)context.getVariable( ATTR_SPAMFILTER_SCORE );
if( score != null )
- score = new Integer( score.intValue()+1 );
+ score = score+1;
else
- score = new Integer( 1 );
+ score = 1;
context.setVariable( ATTR_SPAMFILTER_SCORE, score );
}
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/CreoleToJSPWikiTranslator.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/CreoleToJSPWikiTranslator.java?rev=666835&r1=666834&r2=666835&view=diff
==============================================================================
---
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/CreoleToJSPWikiTranslator.java
(original)
+++
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/parser/CreoleToJSPWikiTranslator.java
Wed Jun 11 13:58:56 2008
@@ -64,13 +64,13 @@
// [{$creolepagefilter.creoleversion}]
// [{$creolepagefilter.linebreak}] -> bloglike/wikilike
- public static String VAR_VERSION = "1.0.3";
+ public static final String VAR_VERSION = "1.0.3";
- public static String VAR_CREOLE_VERSION = "1.0";
+ public static final String VAR_CREOLE_VERSION = "1.0";
- public static String VAR_LINEBREAK_BLOGLIKE = "bloglike";
+ public static final String VAR_LINEBREAK_BLOGLIKE = "bloglike";
- public static String VAR_LINEBREAK_C2LIKE = "c2like";
+ public static final String VAR_LINEBREAK_C2LIKE = "c2like";
private static final String CREOLE_BOLD =
"\\*\\*((?s:.)*?)(\\*\\*|(\n\n|\r\r|\r\n\r\n))";
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Counter.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Counter.java?rev=666835&r1=666834&r2=666835&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Counter.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/Counter.java Wed Jun
11 13:58:56 2008
@@ -79,7 +79,7 @@
if( val == null )
{
- val = new Integer( 0 );
+ val = 0;
}
//
@@ -106,7 +106,7 @@
increment = (new Integer((String)incrementObj)).intValue();
}
- val = new Integer( val.intValue() + increment );
+ val = val + increment;
}
context.setVariable( countername, val );
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginManager.java?rev=666835&r1=666834&r2=666835&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginManager.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/PluginManager.java Wed
Jun 11 13:58:56 2008
@@ -490,7 +490,7 @@
break;
case StreamTokenizer.TT_NUMBER:
- s = Integer.toString( new Double(tok.nval).intValue() );
+ s = Integer.toString( (int) tok.nval );
potentialEmptyLine = false;
break;
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/SessionsPlugin.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/SessionsPlugin.java?rev=666835&r1=666834&r2=666835&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/SessionsPlugin.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/SessionsPlugin.java
Wed Jun 11 13:58:56 2008
@@ -89,13 +89,13 @@
// we already have an entry, increase the counter:
int numSessions =
distinctPrincipals.get(principalName).intValue();
// store the new value:
- distinctPrincipals.put(principalName, new
Integer(++numSessions));
+ distinctPrincipals.put(principalName, ++numSessions);
}
else
{
// first time we see this entry, add entry to HashMap with
// value 1
- distinctPrincipals.put(principalName, new Integer(1));
+ distinctPrincipals.put(principalName, 1);
}
}
//
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/UnusedPagesPlugin.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/UnusedPagesPlugin.java?rev=666835&r1=666834&r2=666835&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/UnusedPagesPlugin.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/plugin/UnusedPagesPlugin.java
Wed Jun 11 13:58:56 2008
@@ -82,7 +82,7 @@
if (m_show.equals(PARAM_SHOW_VALUE_COUNT))
{
wikitext = "" + links.size();
- if (m_lastModified & links.size()!=0)
+ if (m_lastModified && links.size()!=0)
{
wikitext = links.size() + " (" +
m_dateFormat.format(m_dateLastModified) + ")";
}
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchManager.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchManager.java?rev=666835&r1=666834&r2=666835&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchManager.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/search/SearchManager.java Wed
Jun 11 13:58:56 2008
@@ -166,7 +166,7 @@
SearchResult sr = (SearchResult)i.next();
HashMap<String,Object> hm = new
HashMap<String,Object>();
hm.put( "page", sr.getPage().getName() );
- hm.put( "score", new Integer(sr.getScore()) );
+ hm.put( "score", sr.getScore() );
list.add( hm );
}
}
Modified:
incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/SetPaginationTag.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/SetPaginationTag.java?rev=666835&r1=666834&r2=666835&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/SetPaginationTag.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/tags/SetPaginationTag.java
Wed Jun 11 13:58:56 2008
@@ -195,14 +195,14 @@
//(Total items: " + m_total + ")" );
pagination.append( LocaleSupport.getLocalizedMessage(pageContext,
m_fmtkey + ".total",
- new Object[]{ new Integer( m_total ) } ) );
+ new Object[]{ m_total } ) );
pagination.append( "</div>" );
/* +++ processing done +++ */
- String p = pagination.toString();
+ String p = pagination.toString();
pageContext.getOut().println( p );
@@ -225,11 +225,11 @@
**/
private void appendLink( StringBuffer sb, int page, String fmttextkey )
{
- appendLink2( sb, page, LocaleSupport.getLocalizedMessage(
pageContext, fmttextkey ) );
+ appendLink2( sb, page, LocaleSupport.getLocalizedMessage( pageContext,
fmttextkey ) );
}
private void appendLink( StringBuffer sb, int page, int paginationblock )
{
- appendLink2( sb, page, Integer.toString( paginationblock ) );
+ appendLink2( sb, page, Integer.toString( paginationblock ) );
}
private void appendLink2( StringBuffer sb, int page, String text )
{
@@ -241,7 +241,7 @@
else
{
sb.append( LocaleSupport.getLocalizedMessage( pageContext,
m_fmtkey + ".show.title",
- new Object[]{ new Integer( page + 1 ), new Integer(
page + m_pagesize ) } ) );
+ new Object[]{ page + 1, page + m_pagesize } ) );
}
sb.append( "\" " );
@@ -264,4 +264,4 @@
sb.append( "</a> " );
}
-}
\ No newline at end of file
+}
Modified: incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/WatchDog.java
URL:
http://svn.apache.org/viewvc/incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/WatchDog.java?rev=666835&r1=666834&r2=666835&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/WatchDog.java (original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/util/WatchDog.java Wed Jun 11
13:58:56 2008
@@ -76,7 +76,7 @@
Thread t = Thread.currentThread();
WatchDog wd = null;
- WeakReference<WatchDog> w = c_kennel.get( new Integer(t.hashCode()) );
+ WeakReference<WatchDog> w = c_kennel.get( t.hashCode() );
if( w != null ) wd = w.get();
@@ -87,7 +87,7 @@
synchronized( c_kennel )
{
- c_kennel.put( new Integer(t.hashCode()), w );
+ c_kennel.put( t.hashCode(), w );
}
}
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=666835&r1=666834&r2=666835&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCHandler.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCHandler.java Wed
Jun 11 13:58:56 2008
@@ -135,7 +135,7 @@
(cal.getTimeZone().inDaylightTime( d ) ? cal.get(
Calendar.DST_OFFSET ) : 0 )) );
ht.put( "lastModified", cal.getTime() );
- ht.put( "version", new Integer(page.getVersion()) );
+ ht.put( "version", page.getVersion() );
if( page.getAuthor() != null )
{
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=666835&r1=666834&r2=666835&view=diff
==============================================================================
--- incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCHandlerUTF8.java
(original)
+++ incubator/jspwiki/trunk/src/com/ecyrd/jspwiki/xmlrpc/RPCHandlerUTF8.java
Wed Jun 11 13:58:56 2008
@@ -94,7 +94,7 @@
(cal.getTimeZone().inDaylightTime( d ) ? cal.get(
Calendar.DST_OFFSET ) : 0 )) );
ht.put( "lastModified", cal.getTime() );
- ht.put( "version", new Integer(page.getVersion()) );
+ ht.put( "version", page.getVersion() );
if( page.getAuthor() != null )
{
