Author: henning
Date: Mon Aug 29 07:50:22 2005
New Revision: 264152
URL: http://svn.apache.org/viewcvs?rev=264152&view=rev
Log:
Clean a number of Checkstyle issues
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/Turbine.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/modules/Loader.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/UserPeer.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/localization/TurbineLocalizationService.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/RunDataApplicationTool.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/SecurityService.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/UserManager.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/RolePeerManager.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/RolePeerManagerConstants.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorqueObject.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/UserPeerManager.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/UserPeerManagerConstants.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/session/SessionService.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/template/TemplateEngineService.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/BrowserDetector.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/FormMessages.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/SequencedHashtable.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/db/UUIdGenerator.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/security/AccessControlList.java
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/template/TemplateLink.java
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/Turbine.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/Turbine.java?rev=264152&r1=264151&r2=264152&view=diff
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/Turbine.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/Turbine.java
Mon Aug 29 07:50:22 2005
@@ -970,7 +970,7 @@
* @param res Servlet response.
* @param t The exception to report.
*/
- private final void handleException(RunData data, HttpServletResponse res,
+ private void handleException(RunData data, HttpServletResponse res,
Throwable t)
{
// make sure that the stack trace makes it the log
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/modules/Loader.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/modules/Loader.java?rev=264152&r1=264151&r2=264152&view=diff
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/modules/Loader.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/modules/Loader.java
Mon Aug 29 07:50:22 2005
@@ -32,6 +32,6 @@
* @return An Assembler object or null.
* @exception Exception a generic exception.
*/
- public Assembler getAssembler(String name)
+ Assembler getAssembler(String name)
throws Exception;
}
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/UserPeer.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/UserPeer.java?rev=264152&r1=264151&r2=264152&view=diff
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/UserPeer.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/om/security/peer/UserPeer.java
Mon Aug 29 07:50:22 2005
@@ -28,10 +28,10 @@
public interface UserPeer
{
/** The key name for the visitor id field. */
- static String USERNAME = "LOGIN_NAME";
+ String USERNAME = "LOGIN_NAME";
/** The key name for the username field. */
- static String USER_ID = "USER_ID";
+ String USER_ID = "USER_ID";
/**
* Returns the full name of a column.
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/localization/TurbineLocalizationService.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/localization/TurbineLocalizationService.java?rev=264152&r1=264151&r2=264152&view=diff
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/localization/TurbineLocalizationService.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/localization/TurbineLocalizationService.java
Mon Aug 29 07:50:22 2005
@@ -398,8 +398,8 @@
Map bundlesByLocale)
{
ResourceBundle rb = null;
- if ( !StringUtils.isNotEmpty(locale.getCountry()) &&
- defaultLanguage.equals(locale.getLanguage()) )
+ if (!StringUtils.isNotEmpty(locale.getCountry()) &&
+ defaultLanguage.equals(locale.getLanguage()))
{
/*
* log.debug("Requested language '" +
locale.getLanguage() +
@@ -414,8 +414,8 @@
rb = getBundleIgnoreException(bundleName, withDefaultCountry);
}
}
- else if ( !StringUtils.isNotEmpty(locale.getLanguage()) &&
- defaultCountry.equals(locale.getCountry()) )
+ else if (!StringUtils.isNotEmpty(locale.getLanguage()) &&
+ defaultCountry.equals(locale.getCountry()))
{
Locale withDefaultLanguage = new Locale(defaultLanguage,
locale.getCountry());
@@ -440,7 +440,7 @@
* returning <code>null</code> instead of throwing
* <code>MissingResourceException</code>.
*/
- private final ResourceBundle getBundleIgnoreException(String bundleName,
+ private ResourceBundle getBundleIgnoreException(String bundleName,
Locale locale)
{
try
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/RunDataApplicationTool.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/RunDataApplicationTool.java?rev=264152&r1=264151&r2=264152&view=diff
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/RunDataApplicationTool.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/pull/RunDataApplicationTool.java
Mon Aug 29 07:50:22 2005
@@ -47,7 +47,7 @@
*
* @param data initialization data
*/
- public void init(Object data);
+ void init(Object data);
/**
* Refresh the application tool. This is
@@ -58,5 +58,5 @@
*
* @param data The current RunData Object
*/
- public void refresh(RunData data);
+ void refresh(RunData data);
}
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/SecurityService.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/SecurityService.java?rev=264152&r1=264151&r2=264152&view=diff
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/SecurityService.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/SecurityService.java
Mon Aug 29 07:50:22 2005
@@ -63,104 +63,104 @@
extends Service
{
/** The name of the service */
- static final String SERVICE_NAME = "SecurityService";
+ String SERVICE_NAME = "SecurityService";
/**
* the key within services's properties for user implementation
* classname (user.class)
*/
- static final String USER_CLASS_KEY = "user.class";
+ String USER_CLASS_KEY = "user.class";
/**
* the default implementation of User interface
* (org.apache.turbine.om.security.TurbineUser)
*/
- static final String USER_CLASS_DEFAULT
+ String USER_CLASS_DEFAULT
= TurbineUser.class.getName();
/**
* The key within services' properties for the GROUP
* implementation classname (group.class)
*/
- static final String GROUP_CLASS_KEY = "group.class";
+ String GROUP_CLASS_KEY = "group.class";
/**
* The default implementation of the Group interface
* (org.apache.turbine.om.security.TurbineGroup)
*/
- static final String GROUP_CLASS_DEFAULT
+ String GROUP_CLASS_DEFAULT
= TurbineGroup.class.getName();
/**
* The key within services' properties for the PERMISSION
* implementation classname (permission.class)
*/
- static final String PERMISSION_CLASS_KEY = "permission.class";
+ String PERMISSION_CLASS_KEY = "permission.class";
/**
* The default implementation of the Permissions interface
* (org.apache.turbine.om.security.TurbinePermission)
*/
- static final String PERMISSION_CLASS_DEFAULT
+ String PERMISSION_CLASS_DEFAULT
= TurbinePermission.class.getName();
/**
* The key within services' properties for the ROLE
* implementation classname (role.class)
*/
- static final String ROLE_CLASS_KEY = "role.class";
+ String ROLE_CLASS_KEY = "role.class";
/**
* The default implementation of the Role Interface
* (org.apache.turbine.om.security.TurbineRole)
*/
- static final String ROLE_CLASS_DEFAULT
+ String ROLE_CLASS_DEFAULT
= TurbineRole.class.getName();
/**
* The key within services' properties for the
* ACL implementation classname (acl.class)
*/
- static final String ACL_CLASS_KEY = "acl.class";
+ String ACL_CLASS_KEY = "acl.class";
/**
* The default implementation of the Acl Interface
* (org.apache.turbine.util.security.TurbineAccessControlList)
*/
- static final String ACL_CLASS_DEFAULT
+ String ACL_CLASS_DEFAULT
= TurbineAccessControlList.class.getName();
/**
* the key within services's properties for user implementation
* classname (user.manager)
*/
- static final String USER_MANAGER_KEY = "user.manager";
+ String USER_MANAGER_KEY = "user.manager";
/**
* the default implementation of UserManager interface
* (org.apache.turbine.services.security.DBUserManager)
*/
- static final String USER_MANAGER_DEFAULT
+ String USER_MANAGER_DEFAULT
= DBUserManager.class.getName();
/**
* the key within services's properties for secure passwords flag
* (secure.passwords)
*/
- static final String SECURE_PASSWORDS_KEY = "secure.passwords";
+ String SECURE_PASSWORDS_KEY = "secure.passwords";
/** the value of secure passwords flag (false) */
- static final String SECURE_PASSWORDS_DEFAULT = "false";
+ String SECURE_PASSWORDS_DEFAULT = "false";
/**
* the key within services's properties for secure passwords algorithm
* (secure.passwords.algorithm)
*/
- static final String SECURE_PASSWORDS_ALGORITHM_KEY
+ String SECURE_PASSWORDS_ALGORITHM_KEY
= "secure.passwords.algorithm";
/** the default algorithm for password encryption (SHA) */
- static final String SECURE_PASSWORDS_ALGORITHM_DEFAULT = "SHA";
+ String SECURE_PASSWORDS_ALGORITHM_DEFAULT = "SHA";
/*-----------------------------------------------------------------------
Management of User objects
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/UserManager.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/UserManager.java?rev=264152&r1=264151&r2=264152&view=diff
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/UserManager.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/UserManager.java
Mon Aug 29 07:50:22 2005
@@ -184,7 +184,7 @@
* @exception DataBackendException if there is a problem accessing the
* storage.
*/
- public void saveOnSessionUnbind(User user)
+ void saveOnSessionUnbind(User user)
throws UnknownEntityException, DataBackendException;
/**
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/RolePeerManager.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/RolePeerManager.java?rev=264152&r1=264151&r2=264152&view=diff
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/RolePeerManager.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/RolePeerManager.java
Mon Aug 29 07:50:22 2005
@@ -240,7 +240,7 @@
{
Persistent obj = null;
- if(roleObject == null)
+ if (roleObject == null)
{
// This can happen if the Turbine wants to determine the
// name of the anonymous user before the security service
@@ -280,7 +280,7 @@
List results = doSelect(criteria);
RoleSet rs = new RoleSet();
- for(Iterator it = results.iterator(); it.hasNext(); )
+ for (Iterator it = results.iterator(); it.hasNext(); )
{
rs.add((Role) it.next());
}
@@ -517,7 +517,7 @@
*/
public static void setRoleName(Persistent obj, String name)
{
- if(obj == null)
+ if (obj == null)
{
return;
}
@@ -550,7 +550,7 @@
{
String name = null;
- if(obj == null)
+ if (obj == null)
{
return null;
}
@@ -582,7 +582,7 @@
*/
public static void setId(Persistent obj, int id)
{
- if(obj == null)
+ if (obj == null)
{
return;
}
@@ -615,7 +615,7 @@
{
Integer id = null;
- if(obj == null)
+ if (obj == null)
{
return new Integer(0);
}
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/RolePeerManagerConstants.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/RolePeerManagerConstants.java?rev=264152&r1=264151&r2=264152&view=diff
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/RolePeerManagerConstants.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/RolePeerManagerConstants.java
Mon Aug 29 07:50:22 2005
@@ -44,50 +44,50 @@
public interface RolePeerManagerConstants
{
/** The key within the security service properties for the role class
implementation */
- public static final String ROLE_CLASS_KEY =
+ String ROLE_CLASS_KEY =
"torque.role.class";
/** The key within the security service properties for the role peer class
implementation */
- public static final String ROLE_PEER_CLASS_KEY =
+ String ROLE_PEER_CLASS_KEY =
"torque.rolePeer.class";
/** Role peer default class */
- public static final String ROLE_PEER_CLASS_DEFAULT =
+ String ROLE_PEER_CLASS_DEFAULT =
TurbineRolePeer.class.getName();
/** The column name for the login name field. */
- public static final String ROLE_NAME_COLUMN_KEY =
+ String ROLE_NAME_COLUMN_KEY =
"torque.rolePeer.column.name";
/** The column name for the id field. */
- public static final String ROLE_ID_COLUMN_KEY =
+ String ROLE_ID_COLUMN_KEY =
"torque.rolePeer.column.id";
/** The default value for the column name constant for the login name
field. */
- public static final String ROLE_NAME_COLUMN_DEFAULT =
+ String ROLE_NAME_COLUMN_DEFAULT =
"ROLE_NAME";
/** The default value for the column name constant for the id field. */
- public static final String ROLE_ID_COLUMN_DEFAULT =
+ String ROLE_ID_COLUMN_DEFAULT =
"ROLE_ID";
/** The property name of the bean property for the login name field. */
- public static final String ROLE_NAME_PROPERTY_KEY =
+ String ROLE_NAME_PROPERTY_KEY =
"torque.role.property.name";
/** The property name of the bean property for the id field. */
- public static final String ROLE_ID_PROPERTY_KEY =
+ String ROLE_ID_PROPERTY_KEY =
"torque.role.property.id";
/** The default value of the bean property for the login name field. */
- public static final String ROLE_NAME_PROPERTY_DEFAULT =
+ String ROLE_NAME_PROPERTY_DEFAULT =
"Name";
/** The default value of the bean property for the id field. */
- public static final String ROLE_ID_PROPERTY_DEFAULT =
+ String ROLE_ID_PROPERTY_DEFAULT =
"RoleId";
}
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorqueObject.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorqueObject.java?rev=264152&r1=264151&r2=264152&view=diff
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorqueObject.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/TorqueObject.java
Mon Aug 29 07:50:22 2005
@@ -101,7 +101,7 @@
public ObjectKey getPrimaryKey()
{
Persistent p = getPersistentObj();
- if(p != null)
+ if (p != null)
{
return p.getPrimaryKey();
}
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/UserPeerManager.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/UserPeerManager.java?rev=264152&r1=264151&r2=264152&view=diff
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/UserPeerManager.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/UserPeerManager.java
Mon Aug 29 07:50:22 2005
@@ -525,7 +525,7 @@
{
Persistent obj = null;
- if(userObject == null)
+ if (userObject == null)
{
// This can happen if the Turbine wants to determine the
// name of the anonymous user before the security service
@@ -782,7 +782,7 @@
*/
public static void setUserName(Persistent obj, String name)
{
- if(obj == null)
+ if (obj == null)
{
return;
}
@@ -829,7 +829,7 @@
{
String name = null;
- if(obj == null)
+ if (obj == null)
{
return null;
}
@@ -861,7 +861,7 @@
*/
public static void setUserPassword(Persistent obj, String password)
{
- if(obj == null)
+ if (obj == null)
{
return;
}
@@ -894,7 +894,7 @@
{
String password = null;
- if(obj == null)
+ if (obj == null)
{
return null;
}
@@ -926,7 +926,7 @@
*/
public static void setUserFirstName(Persistent obj, String firstName)
{
- if(obj == null)
+ if (obj == null)
{
return;
}
@@ -959,7 +959,7 @@
{
String firstName = null;
- if(obj == null)
+ if (obj == null)
{
return null;
}
@@ -991,7 +991,7 @@
*/
public static void setUserLastName(Persistent obj, String lastName)
{
- if(obj == null)
+ if (obj == null)
{
return;
}
@@ -1024,7 +1024,7 @@
{
String lastName = null;
- if(obj == null)
+ if (obj == null)
{
return null;
}
@@ -1056,7 +1056,7 @@
*/
public static void setUserEmail(Persistent obj, String email)
{
- if(obj == null)
+ if (obj == null)
{
return;
}
@@ -1089,7 +1089,7 @@
{
String email = null;
- if(obj == null)
+ if (obj == null)
{
return null;
}
@@ -1121,7 +1121,7 @@
*/
public static void setUserConfirmed(Persistent obj, String confirm)
{
- if(obj == null)
+ if (obj == null)
{
return;
}
@@ -1154,7 +1154,7 @@
{
String confirm = null;
- if(obj == null)
+ if (obj == null)
{
return null;
}
@@ -1186,7 +1186,7 @@
*/
public static void setUserCreateDate(Persistent obj, java.util.Date
createDate)
{
- if(obj == null)
+ if (obj == null)
{
return;
}
@@ -1219,7 +1219,7 @@
{
java.util.Date createDate = null;
- if(obj == null)
+ if (obj == null)
{
return null;
}
@@ -1251,7 +1251,7 @@
*/
public static void setUserLastLogin(Persistent obj, java.util.Date
lastLogin)
{
- if(obj == null)
+ if (obj == null)
{
return;
}
@@ -1284,7 +1284,7 @@
{
java.util.Date lastLogin = null;
- if(obj == null)
+ if (obj == null)
{
return null;
}
@@ -1316,7 +1316,7 @@
*/
public static void setUserObjectdata(Persistent obj, byte [] objectdata)
{
- if(obj == null)
+ if (obj == null)
{
return;
}
@@ -1349,7 +1349,7 @@
{
byte [] objectdata = null;
- if(obj == null)
+ if (obj == null)
{
return null;
}
@@ -1381,7 +1381,7 @@
*/
public static void setId(Persistent obj, int id)
{
- if(obj == null)
+ if (obj == null)
{
return;
}
@@ -1414,7 +1414,7 @@
{
Integer id = null;
- if(obj == null)
+ if (obj == null)
{
return new Integer(0);
}
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/UserPeerManagerConstants.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/UserPeerManagerConstants.java?rev=264152&r1=264151&r2=264152&view=diff
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/UserPeerManagerConstants.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/security/torque/UserPeerManagerConstants.java
Mon Aug 29 07:50:22 2005
@@ -63,176 +63,176 @@
extends Serializable
{
/** The key within the security service properties for the user class
implementation */
- public static final String USER_CLASS_KEY =
+ String USER_CLASS_KEY =
"torque.user.class";
/** The key within the security service properties for the user peer class
implementation */
- public static final String USER_PEER_CLASS_KEY =
+ String USER_PEER_CLASS_KEY =
"torque.userPeer.class";
/** User peer default class */
- public static final String USER_PEER_CLASS_DEFAULT =
+ String USER_PEER_CLASS_DEFAULT =
TurbineUserPeer.class.getName();
/** The column name for the login name field. */
- public static final String USER_NAME_COLUMN_KEY =
+ String USER_NAME_COLUMN_KEY =
"torque.userPeer.column.name";
/** The column name for the id field. */
- public static final String USER_ID_COLUMN_KEY =
+ String USER_ID_COLUMN_KEY =
"torque.userPeer.column.id";
/** The column name for the password field. */
- public static final String USER_PASSWORD_COLUMN_KEY =
+ String USER_PASSWORD_COLUMN_KEY =
"torque.userPeer.column.password";
/** The column name for the first name field. */
- public static final String USER_FIRST_NAME_COLUMN_KEY =
+ String USER_FIRST_NAME_COLUMN_KEY =
"torque.userPeer.column.firstname";
/** The column name for the last name field. */
- public static final String USER_LAST_NAME_COLUMN_KEY =
+ String USER_LAST_NAME_COLUMN_KEY =
"torque.userPeer.column.lastname";
/** The column name for the email field. */
- public static final String USER_EMAIL_COLUMN_KEY =
+ String USER_EMAIL_COLUMN_KEY =
"torque.userPeer.column.email";
/** The column name for the confirm field. */
- public static final String USER_CONFIRM_COLUMN_KEY =
+ String USER_CONFIRM_COLUMN_KEY =
"torque.userPeer.column.confirm";
/** The column name for the create date field. */
- public static final String USER_CREATE_COLUMN_KEY =
+ String USER_CREATE_COLUMN_KEY =
"torque.userPeer.column.createdate";
/** The column name for the last login field. */
- public static final String USER_LAST_LOGIN_COLUMN_KEY =
+ String USER_LAST_LOGIN_COLUMN_KEY =
"torque.userPeer.column.lastlogin";
/** The column name for the objectdata field. */
- public static final String USER_OBJECTDATA_COLUMN_KEY =
+ String USER_OBJECTDATA_COLUMN_KEY =
"torque.userPeer.column.objectdata";
/** The default value for the column name constant for the login name
field. */
- public static final String USER_NAME_COLUMN_DEFAULT =
+ String USER_NAME_COLUMN_DEFAULT =
"LOGIN_NAME";
/** The default value for the column name constant for the id field. */
- public static final String USER_ID_COLUMN_DEFAULT =
+ String USER_ID_COLUMN_DEFAULT =
"USER_ID";
/** The default value for the column name constant for the password field.
*/
- public static final String USER_PASSWORD_COLUMN_DEFAULT =
+ String USER_PASSWORD_COLUMN_DEFAULT =
"PASSWORD_VALUE";
/** The default value for the column name constant for the first name
field. */
- public static final String USER_FIRST_NAME_COLUMN_DEFAULT =
+ String USER_FIRST_NAME_COLUMN_DEFAULT =
"FIRST_NAME";
/** The default value for the column name constant for the last name
field. */
- public static final String USER_LAST_NAME_COLUMN_DEFAULT =
+ String USER_LAST_NAME_COLUMN_DEFAULT =
"LAST_NAME";
/** The default value for the column name constant for the email field. */
- public static final String USER_EMAIL_COLUMN_DEFAULT =
+ String USER_EMAIL_COLUMN_DEFAULT =
"EMAIL";
/** The default value for the column name constant for the confirm field.
*/
- public static final String USER_CONFIRM_COLUMN_DEFAULT =
+ String USER_CONFIRM_COLUMN_DEFAULT =
"CONFIRM_VALUE";
/** The default value for the column name constant for the create date
field. */
- public static final String USER_CREATE_COLUMN_DEFAULT =
+ String USER_CREATE_COLUMN_DEFAULT =
"CREATED";
/** The default value for the column name constant for the last login
field. */
- public static final String USER_LAST_LOGIN_COLUMN_DEFAULT =
+ String USER_LAST_LOGIN_COLUMN_DEFAULT =
"LAST_LOGIN";
/** The default value for the column name constant for the objectdata
field. */
- public static final String USER_OBJECTDATA_COLUMN_DEFAULT =
+ String USER_OBJECTDATA_COLUMN_DEFAULT =
"OBJECTDATA";
/** The property name of the bean property for the login name field. */
- public static final String USER_NAME_PROPERTY_KEY =
+ String USER_NAME_PROPERTY_KEY =
"torque.user.property.name";
/** The property name of the bean property for the id field. */
- public static final String USER_ID_PROPERTY_KEY =
+ String USER_ID_PROPERTY_KEY =
"torque.user.property.id";
/** The property name of the bean property for the password field. */
- public static final String USER_PASSWORD_PROPERTY_KEY =
+ String USER_PASSWORD_PROPERTY_KEY =
"torque.user.property.password";
/** The property name of the bean property for the first name field. */
- public static final String USER_FIRST_NAME_PROPERTY_KEY =
+ String USER_FIRST_NAME_PROPERTY_KEY =
"torque.user.property.firstname";
/** The property name of the bean property for the last name field. */
- public static final String USER_LAST_NAME_PROPERTY_KEY =
+ String USER_LAST_NAME_PROPERTY_KEY =
"torque.user.property.lastname";
/** The property name of the bean property for the email field. */
- public static final String USER_EMAIL_PROPERTY_KEY =
+ String USER_EMAIL_PROPERTY_KEY =
"torque.user.property.email";
/** The property name of the bean property for the confirm field. */
- public static final String USER_CONFIRM_PROPERTY_KEY =
+ String USER_CONFIRM_PROPERTY_KEY =
"torque.user.property.confirm";
/** The property name of the bean property for the create date field. */
- public static final String USER_CREATE_PROPERTY_KEY =
+ String USER_CREATE_PROPERTY_KEY =
"torque.user.property.createdate";
/** The property name of the bean property for the last login field. */
- public static final String USER_LAST_LOGIN_PROPERTY_KEY =
+ String USER_LAST_LOGIN_PROPERTY_KEY =
"torque.user.property.lastlogin";
/** The property name of the bean property for the last login field. */
- public static final String USER_OBJECTDATA_PROPERTY_KEY =
+ String USER_OBJECTDATA_PROPERTY_KEY =
"torque.user.property.objectdata";
/** The default value of the bean property for the login name field. */
- public static final String USER_NAME_PROPERTY_DEFAULT =
+ String USER_NAME_PROPERTY_DEFAULT =
"UserName";
/** The default value of the bean property for the id field. */
- public static final String USER_ID_PROPERTY_DEFAULT =
+ String USER_ID_PROPERTY_DEFAULT =
"UserId";
/** The default value of the bean property for the password field. */
- public static final String USER_PASSWORD_PROPERTY_DEFAULT =
+ String USER_PASSWORD_PROPERTY_DEFAULT =
"Password";
/** The default value of the bean property for the first name field. */
- public static final String USER_FIRST_NAME_PROPERTY_DEFAULT =
+ String USER_FIRST_NAME_PROPERTY_DEFAULT =
"FirstName";
/** The default value of the bean property for the last name field. */
- public static final String USER_LAST_NAME_PROPERTY_DEFAULT =
+ String USER_LAST_NAME_PROPERTY_DEFAULT =
"LastName";
/** The default value of the bean property for the email field. */
- public static final String USER_EMAIL_PROPERTY_DEFAULT =
+ String USER_EMAIL_PROPERTY_DEFAULT =
"Email";
/** The default value of the bean property for the confirm field. */
- public static final String USER_CONFIRM_PROPERTY_DEFAULT =
+ String USER_CONFIRM_PROPERTY_DEFAULT =
"Confirmed";
/** The default value of the bean property for the create date field. */
- public static final String USER_CREATE_PROPERTY_DEFAULT =
+ String USER_CREATE_PROPERTY_DEFAULT =
"CreateDate";
/** The default value of the bean property for the last login field. */
- public static final String USER_LAST_LOGIN_PROPERTY_DEFAULT =
+ String USER_LAST_LOGIN_PROPERTY_DEFAULT =
"LastLogin";
/** The default value of the bean property for the objectdata field. */
- public static final String USER_OBJECTDATA_PROPERTY_DEFAULT =
+ String USER_OBJECTDATA_PROPERTY_DEFAULT =
"Objectdata";
};
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/session/SessionService.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/session/SessionService.java?rev=264152&r1=264151&r2=264152&view=diff
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/session/SessionService.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/session/SessionService.java
Mon Aug 29 07:50:22 2005
@@ -38,7 +38,7 @@
/**
* The key under which this service is stored in TurbineServices.
*/
- static final String SERVICE_NAME = "SessionService";
+ String SERVICE_NAME = "SessionService";
/**
* Gets all active sessions
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/template/TemplateEngineService.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/template/TemplateEngineService.java?rev=264152&r1=264151&r2=264152&view=diff
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/template/TemplateEngineService.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/template/TemplateEngineService.java
Mon Aug 29 07:50:22 2005
@@ -28,16 +28,16 @@
* @version $Id$ */
public interface TemplateEngineService
{
- static final String TEMPLATE_EXTENSIONS = "template.extension";
- static final String DEFAULT_TEMPLATE_EXTENSION =
"template.default.extension";
- static final String DEFAULT_PAGE = "default.page";
- static final String DEFAULT_SCREEN = "default.screen";
- static final String DEFAULT_LAYOUT = "default.layout";
- static final String DEFAULT_NAVIGATION = "default.navigation";
- static final String DEFAULT_ERROR_SCREEN = "default.error.screen";
- static final String DEFAULT_LAYOUT_TEMPLATE = "default.layout.template";
- static final String DEFAULT_SCREEN_TEMPLATE = "default.screen.template";
- static final String DEFAULT_NAVIGATION_TEMPLATE =
"default.navigation.template";
+ String TEMPLATE_EXTENSIONS = "template.extension";
+ String DEFAULT_TEMPLATE_EXTENSION = "template.default.extension";
+ String DEFAULT_PAGE = "default.page";
+ String DEFAULT_SCREEN = "default.screen";
+ String DEFAULT_LAYOUT = "default.layout";
+ String DEFAULT_NAVIGATION = "default.navigation";
+ String DEFAULT_ERROR_SCREEN = "default.error.screen";
+ String DEFAULT_LAYOUT_TEMPLATE = "default.layout.template";
+ String DEFAULT_SCREEN_TEMPLATE = "default.screen.template";
+ String DEFAULT_NAVIGATION_TEMPLATE = "default.navigation.template";
/**
* Return the configuration of the template engine in
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java?rev=264152&r1=264151&r2=264152&view=diff
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java
Mon Aug 29 07:50:22 2005
@@ -463,7 +463,7 @@
* @exception TurbineException Thrown every time. Adds additional
* information to <code>e</code>.
*/
- private static final void renderingError(String filename, Exception e)
+ private static void renderingError(String filename, Exception e)
throws TurbineException
{
String err = "Error rendering Velocity template: " + filename;
@@ -593,7 +593,7 @@
log.debug("Result (absolute jar path): " + path);
}
}
- else if(path.startsWith(ABSOLUTE_PREFIX))
+ else if (path.startsWith(ABSOLUTE_PREFIX))
{
// skip file:// -> 7 chars
path = Turbine.getRealPath(path.substring(7));
@@ -601,7 +601,7 @@
log.debug("Result (absolute URL Path): " + path);
}
// Test if this might be some sort of URL that we haven't
encountered yet.
- else if(path.indexOf("://") < 0)
+ else if (path.indexOf("://") < 0)
{
path = Turbine.getRealPath(path);
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/BrowserDetector.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/BrowserDetector.java?rev=264152&r1=264151&r2=264152&view=diff
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/BrowserDetector.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/BrowserDetector.java
Mon Aug 29 07:50:22 2005
@@ -358,7 +358,7 @@
* @param s A String.
* @return The String converted to float.
*/
- private static final float toFloat(String s)
+ private static float toFloat(String s)
{
return Float.valueOf(s).floatValue();
}
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/FormMessages.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/FormMessages.java?rev=264152&r1=264151&r2=264152&view=diff
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/FormMessages.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/FormMessages.java
Mon Aug 29 07:50:22 2005
@@ -105,7 +105,9 @@
{
values = ((Vector) table.get(key));
if (!values.contains(value))
+ {
values.addElement(value);
+ }
}
}
@@ -116,7 +118,7 @@
* @param key A String with the key.
* @return A Vector with the pair key/value, or null.
*/
- private final Vector getValues(Hashtable table, String key)
+ private Vector getValues(Hashtable table, String key)
{
return (Vector) table.get(key);
}
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/SequencedHashtable.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/SequencedHashtable.java?rev=264152&r1=264151&r2=264152&view=diff
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/SequencedHashtable.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/SequencedHashtable.java
Mon Aug 29 07:50:22 2005
@@ -246,11 +246,20 @@
* @return The previous value coressponding the <code>key</code>, or
* <code>null</code> if none existed.
*/
- private final synchronized Object remove(int index, Object key)
+ private synchronized Object remove(int index, Object key)
{
- if (index == UNKNOWN_INDEX) index = indexOf(key);
- if (key == null) key = get(index);
- if (index != UNKNOWN_INDEX) keySequence.remove(index);
+ if (index == UNKNOWN_INDEX)
+ {
+ index = indexOf(key);
+ }
+ if (key == null)
+ {
+ key = get(index);
+ }
+ if (index != UNKNOWN_INDEX)
+ {
+ keySequence.remove(index);
+ }
return super.remove(key);
}
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/db/UUIdGenerator.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/db/UUIdGenerator.java?rev=264152&r1=264151&r2=264152&view=diff
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/db/UUIdGenerator.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/db/UUIdGenerator.java
Mon Aug 29 07:50:22 2005
@@ -159,7 +159,7 @@
/**
* Generates the new base id
*/
- private final void generateNewBaseId() throws Exception
+ private void generateNewBaseId() throws Exception
{
long now = System.currentTimeMillis();
byte[] nowBytes = org.apache.java.lang.Bytes.toBytes(now);
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/security/AccessControlList.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/security/AccessControlList.java?rev=264152&r1=264151&r2=264152&view=diff
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/security/AccessControlList.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/security/AccessControlList.java
Mon Aug 29 07:50:22 2005
@@ -39,7 +39,7 @@
extends Serializable
{
/** The default Session key for the Access Control List */
- public static final java.lang.String SESSION_KEY =
"turbine.AccessControlList";
+ String SESSION_KEY = "turbine.AccessControlList";
/**
* Retrieves a set of Roles an user is assigned in a Group.
Modified:
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/template/TemplateLink.java
URL:
http://svn.apache.org/viewcvs/jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/template/TemplateLink.java?rev=264152&r1=264151&r2=264152&view=diff
==============================================================================
---
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/template/TemplateLink.java
(original)
+++
jakarta/turbine/core/branches/TURBINE_2_3_BRANCH/src/java/org/apache/turbine/util/template/TemplateLink.java
Mon Aug 29 07:50:22 2005
@@ -87,7 +87,7 @@
*/
public void init(Object data)
{
- if(!(data instanceof RunData) || data == null)
+ if (!(data instanceof RunData) || data == null)
{
throw new IllegalArgumentException(
"Argument must be an instance of RunData");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
