You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by tv...@apache.org on 2011/11/09 18:06:05 UTC
svn commit: r1199856 - in /turbine/core/trunk/src/java/org/apache/turbine:
./ modules/actions/ modules/screens/ om/security/ pipeline/
services/intake/ services/schedule/ services/security/ldap/
services/security/torque/ services/velocity/ util/ util/s...
Author: tv
Date: Wed Nov 9 17:06:04 2011
New Revision: 1199856
URL: http://svn.apache.org/viewvc?rev=1199856&view=rev
Log:
Fix a number of problems reported by FindBugs
Modified:
turbine/core/trunk/src/java/org/apache/turbine/Turbine.java
turbine/core/trunk/src/java/org/apache/turbine/modules/actions/InitContextsAction.java
turbine/core/trunk/src/java/org/apache/turbine/modules/screens/TemplateScreen.java
turbine/core/trunk/src/java/org/apache/turbine/om/security/SecurityObject.java
turbine/core/trunk/src/java/org/apache/turbine/om/security/TurbineUser.java
turbine/core/trunk/src/java/org/apache/turbine/pipeline/TurbinePipeline.java
turbine/core/trunk/src/java/org/apache/turbine/services/intake/IntakeTool.java
turbine/core/trunk/src/java/org/apache/turbine/services/schedule/JobQueue.java
turbine/core/trunk/src/java/org/apache/turbine/services/security/ldap/LDAPUser.java
turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/GroupPeerManager.java
turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/PermissionPeerManager.java
turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/RolePeerManager.java
turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/TorqueUser.java
turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/UserPeerManager.java
turbine/core/trunk/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java
turbine/core/trunk/src/java/org/apache/turbine/util/DateSelector.java
turbine/core/trunk/src/java/org/apache/turbine/util/security/GroupSet.java
turbine/core/trunk/src/java/org/apache/turbine/util/security/PermissionSet.java
turbine/core/trunk/src/java/org/apache/turbine/util/security/RoleSet.java
turbine/core/trunk/src/java/org/apache/turbine/util/security/SecuritySet.java
turbine/core/trunk/src/java/org/apache/turbine/util/template/HtmlPageAttributes.java
turbine/core/trunk/src/java/org/apache/turbine/util/template/SelectorBox.java
Modified: turbine/core/trunk/src/java/org/apache/turbine/Turbine.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/Turbine.java?rev=1199856&r1=1199855&r2=1199856&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/Turbine.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/Turbine.java Wed Nov 9 17:06:04 2011
@@ -178,7 +178,7 @@ public class Turbine
*/
public final void init() throws ServletException
{
- synchronized (this.getClass())
+ synchronized (Turbine.class)
{
super.init();
ServletConfig config = getServletConfig();
@@ -219,7 +219,7 @@ public class Turbine
log.fatal("Turbine: init() failed: ", e);
throw new ServletException("Turbine: init() failed", e);
}
-
+
log.info("Turbine: init() Ready to Rumble!");
}
}
@@ -231,7 +231,7 @@ public class Turbine
* @param config The Servlet Configuration supplied by the container
* @param context The Servlet Context supplied by the container
*
- * @throws Exception A problem occured while reading the configuration or performing early startup
+ * @throws Exception A problem occurred while reading the configuration or performing early startup
*/
private void configure(ServletConfig config, ServletContext context)
@@ -332,22 +332,25 @@ public class Turbine
!log4jFile.equalsIgnoreCase("none"))
{
log4jFile = getRealPath(log4jFile);
-
+
//
// Load the config file above into a Properties object and
// fix up the Application root
//
Properties p = new Properties();
+ FileInputStream fis = null;
+
try
{
- p.load(new FileInputStream(log4jFile));
+ fis = new FileInputStream(log4jFile);
+ p.load(fis);
p.setProperty(TurbineConstants.APPLICATION_ROOT_KEY, getApplicationRoot());
PropertyConfigurator.configure(p);
-
+
//
// Rebuild our log object with a configured commons-logging
log = LogFactory.getLog(this.getClass());
-
+
log.info("Configured log4j from " + log4jFile);
}
catch (FileNotFoundException fnf)
@@ -356,6 +359,13 @@ public class Turbine
+ log4jFile + ": ");
fnf.printStackTrace();
}
+ finally
+ {
+ if (fis != null)
+ {
+ fis.close();
+ }
+ }
}
// Now report our successful configuration to the world
@@ -382,8 +392,8 @@ public class Turbine
if (log.isDebugEnabled())
{
log.debug("Input Encoding has been set to " + inputEncoding);
- }
-
+ }
+
getServiceManager().setConfiguration(configuration);
// Initialize the service manager. Services
@@ -509,25 +519,25 @@ public class Turbine
// Initialize services with the PipelineData instance
TurbineServices services = (TurbineServices)TurbineServices.getInstance();
-
+
for (Iterator i = services.getServiceNames(); i.hasNext();)
{
String serviceName = (String)i.next();
Object service = services.getService(serviceName);
-
+
if (service instanceof Initable)
{
- try
+ try
{
((Initable)service).init(data);
- }
- catch (InitializationException e)
+ }
+ catch (InitializationException e)
{
log.warn("Could not initialize Initable " + serviceName + " with PipelineData", e);
}
}
}
-
+
// Mark that we're done.
firstDoGet = false;
log.info("Turbine: first Request successful");
@@ -682,7 +692,6 @@ public class Turbine
{
// Shut down all Turbine Services.
getServiceManager().shutdownServices();
- System.gc();
firstInit = true;
firstDoGet = true;
@@ -729,7 +738,7 @@ public class Turbine
log.warn("Could not change request encoding to " + inputEncoding, uee);
}
}
-
+
// Get general RunData here...
// Perform turbine specific initialization below.
pipelineData = getRunDataService().getRunData(req, res, getServletConfig());
@@ -745,7 +754,7 @@ public class Turbine
{
init(pipelineData);
}
-
+
// Stages of Pipeline implementation execution
// configurable via attached Valve implementations in a
// XML properties file.
@@ -828,7 +837,7 @@ public class Turbine
{
data.getTemplateInfo()
.setScreenTemplate(configuration.getString(
- TurbineConstants.TEMPLATE_ERROR_KEY,
+ TurbineConstants.TEMPLATE_ERROR_KEY,
TurbineConstants.TEMPLATE_ERROR_VM));
}
@@ -912,7 +921,7 @@ public class Turbine
//
// Bundle all the information above up into a convenient structure
//
- ServerData requestServerData = (ServerData) data.get(Turbine.class, ServerData.class);
+ ServerData requestServerData = data.get(Turbine.class, ServerData.class);
serverData = (ServerData) requestServerData.clone();
}
@@ -984,13 +993,13 @@ public class Turbine
/**
* Returns the default input encoding for the servlet.
- *
+ *
* @return the default input encoding.
*/
public String getDefaultInputEncoding() {
return inputEncoding;
}
-
+
/**
* Static Helper method for looking up the RunDataService
* @return A RunDataService
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/actions/InitContextsAction.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/actions/InitContextsAction.java?rev=1199856&r1=1199855&r2=1199856&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/actions/InitContextsAction.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/actions/InitContextsAction.java Wed Nov 9 17:06:04 2011
@@ -21,12 +21,13 @@ package org.apache.turbine.modules.actio
import java.util.Hashtable;
import java.util.Iterator;
+import java.util.Map.Entry;
import java.util.Properties;
+
import javax.naming.InitialContext;
import javax.naming.NamingException;
import org.apache.commons.configuration.Configuration;
-
import org.apache.turbine.Turbine;
import org.apache.turbine.modules.Action;
import org.apache.turbine.pipeline.PipelineData;
@@ -88,13 +89,11 @@ public class InitContextsAction
conf.getString(key));
contextPropsList.put(contextName, contextProps);
}
- for (Iterator<String> contextPropsKeys = contextPropsList.keySet().iterator();
- contextPropsKeys.hasNext();)
+
+ for (Entry<String, Properties> contextProps : contextPropsList.entrySet())
{
- String key = contextPropsKeys.next();
- Properties contextProps = contextPropsList.get(key);
- InitialContext context = new InitialContext(contextProps);
- data.getJNDIContexts().put(key, context);
+ InitialContext context = new InitialContext(contextProps.getValue());
+ data.getJNDIContexts().put(contextProps.getKey(), context);
}
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/screens/TemplateScreen.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/screens/TemplateScreen.java?rev=1199856&r1=1199855&r2=1199856&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/screens/TemplateScreen.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/screens/TemplateScreen.java Wed Nov 9 17:06:04 2011
@@ -76,7 +76,7 @@ public abstract class TemplateScreen
throws Exception;
/**
- * This method should be overidden by subclasses that wish to add
+ * This method should be overridden by subclasses that wish to add
* specific business logic.
* Should revert to abstract when RunData has gone.
* @param data Turbine information.
@@ -349,7 +349,7 @@ public abstract class TemplateScreen
public void doRedirect(PipelineData pipelineData, String template)
throws Exception
{
- doRedirect(pipelineData, template);
+ doRedirect(pipelineData, TurbineTemplate.getScreenName(template), template);
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/om/security/SecurityObject.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/om/security/SecurityObject.java?rev=1199856&r1=1199855&r2=1199856&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/om/security/SecurityObject.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/om/security/SecurityObject.java Wed Nov 9 17:06:04 2011
@@ -146,7 +146,7 @@ public abstract class SecurityObject<T e
*/
public Integer getIdAsObj()
{
- return new Integer(id);
+ return Integer.valueOf(id);
}
/**
Modified: turbine/core/trunk/src/java/org/apache/turbine/om/security/TurbineUser.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/om/security/TurbineUser.java?rev=1199856&r1=1199855&r2=1199856&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/om/security/TurbineUser.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/om/security/TurbineUser.java Wed Nov 9 17:06:04 2011
@@ -354,7 +354,7 @@ public class TurbineUser extends Securit
*/
public void setAccessCounter(int cnt)
{
- setPerm(User.ACCESS_COUNTER, new Integer(cnt));
+ setPerm(User.ACCESS_COUNTER, Integer.valueOf(cnt));
}
/**
@@ -365,7 +365,7 @@ public class TurbineUser extends Securit
*/
public void setAccessCounterForSession(int cnt)
{
- setTemp(User.SESSION_ACCESS_COUNTER, new Integer(cnt));
+ setTemp(User.SESSION_ACCESS_COUNTER, Integer.valueOf(cnt));
}
/**
Modified: turbine/core/trunk/src/java/org/apache/turbine/pipeline/TurbinePipeline.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/pipeline/TurbinePipeline.java?rev=1199856&r1=1199855&r2=1199856&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/pipeline/TurbinePipeline.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/pipeline/TurbinePipeline.java Wed Nov 9 17:06:04 2011
@@ -40,7 +40,7 @@ public class TurbinePipeline
/**
* The "Turbine Classic" pipeline.
*/
- public static String CLASSIC_PIPELINE =
+ public static final String CLASSIC_PIPELINE =
"WEB-INF/conf/turbine-classic-pipeline.xml";
/**
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/intake/IntakeTool.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/intake/IntakeTool.java?rev=1199856&r1=1199855&r2=1199856&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/intake/IntakeTool.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/intake/IntakeTool.java Wed Nov 9 17:06:04 2011
@@ -52,7 +52,7 @@ public class IntakeTool
implements ApplicationTool, Recyclable
{
/** Used for logging */
- protected static Log log = LogFactory.getLog(IntakeTool.class);
+ protected static final Log log = LogFactory.getLog(IntakeTool.class);
/** Constant for default key */
public static final String DEFAULT_KEY = "_0";
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/schedule/JobQueue.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/schedule/JobQueue.java?rev=1199856&r1=1199855&r2=1199856&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/schedule/JobQueue.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/schedule/JobQueue.java Wed Nov 9 17:06:04 2011
@@ -184,8 +184,8 @@ public class JobQueue
{
public int compare(JobEntry o1, JobEntry o2)
{
- Long time1 = new Long(o1.getNextRuntime());
- Long time2 = new Long(o2.getNextRuntime());
+ Long time1 = Long.valueOf(o1.getNextRuntime());
+ Long time2 = Long.valueOf(o2.getNextRuntime());
return (time1.compareTo(time2));
}
};
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/security/ldap/LDAPUser.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/security/ldap/LDAPUser.java?rev=1199856&r1=1199855&r2=1199856&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/security/ldap/LDAPUser.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/security/ldap/LDAPUser.java Wed Nov 9 17:06:04 2011
@@ -608,7 +608,7 @@ public class LDAPUser implements User
*/
public void setAccessCounter(int cnt)
{
- setPerm(User.ACCESS_COUNTER, new Integer(cnt));
+ setPerm(User.ACCESS_COUNTER, Integer.valueOf(cnt));
}
/**
@@ -619,7 +619,7 @@ public class LDAPUser implements User
*/
public void setAccessCounterForSession(int cnt)
{
- setTemp(User.SESSION_ACCESS_COUNTER, new Integer(cnt));
+ setTemp(User.SESSION_ACCESS_COUNTER, Integer.valueOf(cnt));
}
/**
@@ -893,7 +893,7 @@ public class LDAPUser implements User
*/
public Integer getIdAsObj()
{
- return new Integer(0);
+ return Integer.valueOf(0);
}
/**
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/GroupPeerManager.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/GroupPeerManager.java?rev=1199856&r1=1199855&r2=1199856&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/GroupPeerManager.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/GroupPeerManager.java Wed Nov 9 17:06:04 2011
@@ -584,7 +584,7 @@ public class GroupPeerManager
if(obj == null)
{
- return new Integer(0);
+ return Integer.valueOf(0);
}
try
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/PermissionPeerManager.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/PermissionPeerManager.java?rev=1199856&r1=1199855&r2=1199856&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/PermissionPeerManager.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/PermissionPeerManager.java Wed Nov 9 17:06:04 2011
@@ -640,7 +640,7 @@ public class PermissionPeerManager
if(obj == null)
{
- return new Integer(0);
+ return Integer.valueOf(0);
}
try
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/RolePeerManager.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/RolePeerManager.java?rev=1199856&r1=1199855&r2=1199856&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/RolePeerManager.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/RolePeerManager.java Wed Nov 9 17:06:04 2011
@@ -620,7 +620,7 @@ public class RolePeerManager
if (obj == null)
{
- return new Integer(0);
+ return Integer.valueOf(0);
}
try
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/TorqueUser.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/TorqueUser.java?rev=1199856&r1=1199855&r2=1199856&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/TorqueUser.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/TorqueUser.java Wed Nov 9 17:06:04 2011
@@ -469,7 +469,7 @@ public class TorqueUser
*/
public void setAccessCounter(int cnt)
{
- setPerm(User.ACCESS_COUNTER, new Integer(cnt));
+ setPerm(User.ACCESS_COUNTER, Integer.valueOf(cnt));
}
/**
@@ -480,7 +480,7 @@ public class TorqueUser
*/
public void setAccessCounterForSession(int cnt)
{
- setTemp(User.SESSION_ACCESS_COUNTER, new Integer(cnt));
+ setTemp(User.SESSION_ACCESS_COUNTER, Integer.valueOf(cnt));
}
/**
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/UserPeerManager.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/UserPeerManager.java?rev=1199856&r1=1199855&r2=1199856&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/UserPeerManager.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/security/torque/UserPeerManager.java Wed Nov 9 17:06:04 2011
@@ -1419,7 +1419,7 @@ public class UserPeerManager
if (obj == null)
{
- return new Integer(0);
+ return Integer.valueOf(0);
}
try
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java?rev=1199856&r1=1199855&r2=1199856&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java Wed Nov 9 17:06:04 2011
@@ -88,12 +88,6 @@ public class TurbineVelocityService
/** Default character set to use if not specified in the RunData object. */
private static final String DEFAULT_CHAR_SET = "ISO-8859-1";
- /** Encoding used when reading the templates. */
- private static String defaultInputEncoding;
-
- /** Encoding used by the outputstream when handling the requests. */
- private static String defaultOutputEncoding;
-
/** The prefix used for URIs which are of type <code>jar</code>. */
private static final String JAR_PREFIX = "jar:";
@@ -101,7 +95,13 @@ public class TurbineVelocityService
private static final String ABSOLUTE_PREFIX = "file://";
/** Logging */
- private static Log log = LogFactory.getLog(TurbineVelocityService.class);
+ private static final Log log = LogFactory.getLog(TurbineVelocityService.class);
+
+ /** Encoding used when reading the templates. */
+ private String defaultInputEncoding;
+
+ /** Encoding used by the outputstream when handling the requests. */
+ private String defaultOutputEncoding;
/** Is the pullModelActive? */
private boolean pullModelActive = false;
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/DateSelector.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/DateSelector.java?rev=1199856&r1=1199855&r2=1199856&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/DateSelector.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/DateSelector.java Wed Nov 9 17:06:04 2011
@@ -23,7 +23,6 @@ package org.apache.turbine.util;
import java.text.DateFormatSymbols;
import java.util.Calendar;
-import java.util.Date;
import org.apache.ecs.ConcreteElement;
import org.apache.ecs.ElementContainer;
@@ -93,34 +92,30 @@ public class DateSelector
*/
public DateSelector()
{
- this.selName = DEFAULT_PREFIX;
- this.useDate = Calendar.getInstance();
- this.useDate.setTime(new Date());
+ this(DEFAULT_PREFIX);
}
/**
- * Constructor, uses the date set in a calendar that has been
- * already passed in (with the date set correctly).
+ * Constructor defaults to current date.
*
* @param selName A String with the selector name.
- * @param useDate A Calendar with a date.
*/
- public DateSelector(String selName, Calendar useDate)
+ public DateSelector(String selName)
{
- this.useDate = useDate;
- this.selName = selName;
+ this(selName, Calendar.getInstance());
}
/**
- * Constructor defaults to current date.
+ * Constructor, uses the date set in a calendar that has been
+ * already passed in (with the date set correctly).
*
* @param selName A String with the selector name.
+ * @param useDate A Calendar with a date.
*/
- public DateSelector(String selName)
+ public DateSelector(String selName, Calendar useDate)
{
+ this.useDate = useDate;
this.selName = selName;
- this.useDate = Calendar.getInstance();
- this.useDate.setTime(new Date());
}
/**
@@ -414,7 +409,7 @@ public class DateSelector
{
if (this.useDate == null)
{
- this.useDate.setTime(new Date());
+ this.useDate = Calendar.getInstance();
}
Select monthSelect = getMonthSelector(selName + MONTH_SUFFIX, useDate);
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/security/GroupSet.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/security/GroupSet.java?rev=1199856&r1=1199855&r2=1199856&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/security/GroupSet.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/security/GroupSet.java Wed Nov 9 17:06:04 2011
@@ -170,7 +170,7 @@ public class GroupSet
public Group getGroupById(int groupId)
{
return (groupId != 0)
- ? (Group) idMap.get(new Integer(groupId)) : null;
+ ? (Group) idMap.get(Integer.valueOf(groupId)) : null;
}
/**
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/security/PermissionSet.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/security/PermissionSet.java?rev=1199856&r1=1199855&r2=1199856&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/security/PermissionSet.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/security/PermissionSet.java Wed Nov 9 17:06:04 2011
@@ -172,7 +172,7 @@ public class PermissionSet
public Permission getPermissionById(int permissionId)
{
return (permissionId != 0)
- ? (Permission) idMap.get(new Integer(permissionId)) : null;
+ ? (Permission) idMap.get(Integer.valueOf(permissionId)) : null;
}
/**
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/security/RoleSet.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/security/RoleSet.java?rev=1199856&r1=1199855&r2=1199856&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/security/RoleSet.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/security/RoleSet.java Wed Nov 9 17:06:04 2011
@@ -170,7 +170,7 @@ public class RoleSet
public Role getRoleById(int roleId)
{
return (roleId != 0)
- ? (Role) idMap.get(new Integer(roleId)) : null;
+ ? (Role) idMap.get(Integer.valueOf(roleId)) : null;
}
/**
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/security/SecuritySet.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/security/SecuritySet.java?rev=1199856&r1=1199855&r2=1199856&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/security/SecuritySet.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/security/SecuritySet.java Wed Nov 9 17:06:04 2011
@@ -128,7 +128,7 @@ public abstract class SecuritySet<T>
*/
public boolean containsId(int id)
{
- return (id == 0) ? false: idMap.containsKey(new Integer(id));
+ return (id == 0) ? false: idMap.containsKey(Integer.valueOf(id));
}
/**
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/template/HtmlPageAttributes.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/template/HtmlPageAttributes.java?rev=1199856&r1=1199855&r2=1199856&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/template/HtmlPageAttributes.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/template/HtmlPageAttributes.java Wed Nov 9 17:06:04 2011
@@ -499,7 +499,7 @@ public class HtmlPageAttributes
/**
* Helper class to hold data about a <link ... /> html header tag
*/
- public class LinkTag
+ public static class LinkTag
{
private String relation;
private String url;
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/template/SelectorBox.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/template/SelectorBox.java?rev=1199856&r1=1199855&r2=1199856&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/template/SelectorBox.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/template/SelectorBox.java Wed Nov 9 17:06:04 2011
@@ -50,7 +50,7 @@ import org.apache.ecs.html.Select;
* Object[] values = new Object[allRoles.length];
* for ( int i=0;i<allRoles.length; i++ )
* {
- * names[i] = new Integer(allRoles[i].getPrimaryKey()).toString();
+ * names[i] = Integer.valueOf(allRoles[i].getPrimaryKey()).toString();
* values[i] = allRoles[i].getName();
* }
*