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/03/06 20:58:49 UTC
svn commit: r1078552 [3/3] - in /turbine/core/trunk/src:
java/org/apache/turbine/modules/
java/org/apache/turbine/modules/actions/sessionvalidator/
java/org/apache/turbine/modules/navigations/
java/org/apache/turbine/modules/pages/ java/org/apache/turb...
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/template/BaseTemplateEngineService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/BaseTemplateEngineService.java?rev=1078552&r1=1078551&r2=1078552&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/template/BaseTemplateEngineService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/template/BaseTemplateEngineService.java Sun Mar 6 19:58:46 2011
@@ -24,7 +24,6 @@ package org.apache.turbine.services.temp
import java.util.Hashtable;
import org.apache.commons.configuration.Configuration;
-
import org.apache.turbine.services.TurbineBaseService;
/**
@@ -50,7 +49,7 @@ public abstract class BaseTemplateEngine
* 5) default navigation
* 6) default error screen
*/
- private Hashtable configuration = new Hashtable();
+ private final Hashtable<String, Object> configuration = new Hashtable<String, Object>();
/**
* @see org.apache.turbine.services.template.TemplateEngineService#registerConfiguration
@@ -64,7 +63,7 @@ public abstract class BaseTemplateEngine
/**
* @see org.apache.turbine.services.template.TemplateEngineService#getTemplateEngineServiceConfiguration
*/
- public Hashtable getTemplateEngineServiceConfiguration()
+ public Hashtable<String, Object> getTemplateEngineServiceConfiguration()
{
return configuration;
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/template/TemplateEngineService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/TemplateEngineService.java?rev=1078552&r1=1078551&r2=1078552&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/template/TemplateEngineService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/template/TemplateEngineService.java Sun Mar 6 19:58:46 2011
@@ -48,7 +48,7 @@ public interface TemplateEngineService
* Return the configuration of the template engine in
* the form of a Hashtable.
*/
- Hashtable getTemplateEngineServiceConfiguration();
+ Hashtable<String, Object> getTemplateEngineServiceConfiguration();
/**
* Initializes file extension associations and registers with the
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplateService.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplateService.java?rev=1078552&r1=1078551&r2=1078552&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplateService.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/template/TurbineTemplateService.java Sun Mar 6 19:58:46 2011
@@ -243,7 +243,7 @@ public class TurbineTemplateService
* may possess, and other template engines are stuck with file
* based template hierarchy only.
*/
- private Map templateEngineRegistry = null;
+ private Map<String, TemplateEngineService> templateEngineRegistry = null;
/**
* C'tor
@@ -259,6 +259,7 @@ public class TurbineTemplateService
* @exception InitializationException Something went wrong when
* setting up the Template Service.
*/
+ @Override
public void init()
throws InitializationException
{
@@ -281,7 +282,7 @@ public class TurbineTemplateService
log.debug("Default Template: " + defaultTemplate);
log.debug("Use Caching: " + useCache);
- templateEngineRegistry = Collections.synchronizedMap(new HashMap());
+ templateEngineRegistry = Collections.synchronizedMap(new HashMap<String, TemplateEngineService>());
initMapper(config);
setInit(true);
@@ -592,6 +593,7 @@ public class TurbineTemplateService
* @deprecated Each template engine service should know how to translate
* a request onto a file.
*/
+ @Deprecated
public String[] translateTemplatePaths(String[] templatePaths)
{
for (int i = 0; i < templatePaths.length; i++)
@@ -610,6 +612,7 @@ public class TurbineTemplateService
* @param templatePaths The paths to check for the template.
* @deprecated Use templateExists from the various Templating Engines
*/
+ @Deprecated
public boolean templateExists(String template,
String[] templatePaths)
{
@@ -648,7 +651,7 @@ public class TurbineTemplateService
*/
public TemplateEngineService getTemplateEngineService(String template)
{
- return (TemplateEngineService) templateEngineRegistry.get(getExtension(template));
+ return templateEngineRegistry.get(getExtension(template));
}
/**
@@ -682,12 +685,12 @@ public class TurbineTemplateService
mapperRegistry = new Mapper[TEMPLATE_TYPES];
String [] mapperNames = new String [] {
- Page.NAME, Screen.NAME, Layout.NAME, Navigation.NAME,
+ Page.NAME, Screen.NAME, Layout.NAME, Navigation.NAME,
LAYOUT_TEMPLATE_NAME, SCREEN_TEMPLATE_NAME, NAVIGATION_TEMPLATE_NAME
};
String [] mapperKeys = new String [] {
- Page.NAME, Screen.NAME, Layout.NAME, Navigation.NAME,
+ Page.NAME, Screen.NAME, Layout.NAME, Navigation.NAME,
Layout.NAME, Screen.NAME, Navigation.NAME
};
@@ -700,24 +703,24 @@ public class TurbineTemplateService
ScreenTemplateMapper.class.getName(),
DirectTemplateMapper.class.getName()
};
-
+
AssemblerBrokerService ab = (AssemblerBrokerService)TurbineServices.getInstance()
.getService(AssemblerBrokerService.SERVICE_NAME);
-
+
int [] mapperCacheSize = new int [mapperKeys.length];
Loader [] mapperLoader = new Loader [mapperKeys.length];
-
+
for (int i = 0; i < mapperKeys.length; i++)
{
mapperLoader[i] = ab.getLoader(mapperKeys[i]);
mapperCacheSize[i] = (mapperLoader[i] != null) ? mapperLoader[i].getCacheSize() : 0;
}
-
+
// HACK: to achieve the same behaviour as before
mapperLoader[LAYOUT_TEMPLATE_KEY] = null;
mapperLoader[SCREEN_TEMPLATE_KEY] = null;
mapperLoader[NAVIGATION_TEMPLATE_KEY] = null;
-
+
String [] mapperDefaultProperty = new String [] {
TemplateEngineService.DEFAULT_PAGE,
TemplateEngineService.DEFAULT_SCREEN,
@@ -755,7 +758,7 @@ public class TurbineTemplateService
FactoryService factory = (FactoryService)TurbineServices.getInstance().getService(FactoryService.ROLE);
tm = (Mapper) factory.getInstance(mapperClass);
}
- catch (FactoryException e)
+ catch (FactoryException e)
{
throw new InitializationException("", e);
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/DirectMapper.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/DirectMapper.java?rev=1078552&r1=1078551&r2=1078552&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/DirectMapper.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/DirectMapper.java Sun Mar 6 19:58:46 2011
@@ -22,7 +22,6 @@ package org.apache.turbine.services.temp
import org.apache.commons.lang.StringUtils;
-
import org.apache.turbine.services.template.TemplateService;
/**
@@ -43,6 +42,7 @@ public class DirectMapper
*/
public DirectMapper()
{
+ super();
}
/**
@@ -53,6 +53,7 @@ public class DirectMapper
* @param template The template name.
* @return A class name for the given template.
*/
+ @Override
public String doMapping(String template)
{
String [] components
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/DirectTemplateMapper.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/DirectTemplateMapper.java?rev=1078552&r1=1078551&r2=1078552&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/DirectTemplateMapper.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/DirectTemplateMapper.java Sun Mar 6 19:58:46 2011
@@ -22,7 +22,6 @@ package org.apache.turbine.services.temp
import org.apache.commons.lang.StringUtils;
-
import org.apache.turbine.services.template.TemplateService;
/**
@@ -44,6 +43,7 @@ public class DirectTemplateMapper
*/
public DirectTemplateMapper()
{
+ super();
}
/**
@@ -54,6 +54,7 @@ public class DirectTemplateMapper
* @param template The template name.
* @return A class name for the given template.
*/
+ @Override
public String doMapping(String template)
{
String [] components
Modified: turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ScreenTemplateMapper.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ScreenTemplateMapper.java?rev=1078552&r1=1078551&r2=1078552&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ScreenTemplateMapper.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/services/template/mapper/ScreenTemplateMapper.java Sun Mar 6 19:58:46 2011
@@ -22,7 +22,6 @@ package org.apache.turbine.services.temp
import org.apache.commons.lang.StringUtils;
-
import org.apache.turbine.services.template.TemplateEngineService;
import org.apache.turbine.services.template.TemplateService;
import org.apache.turbine.services.template.TurbineTemplate;
@@ -47,6 +46,7 @@ public class ScreenTemplateMapper
*/
public ScreenTemplateMapper()
{
+ super();
}
/**
@@ -56,6 +56,7 @@ public class ScreenTemplateMapper
* @param template The template name.
* @return The matching screen name.
*/
+ @Override
public String doMapping(String template)
{
String [] components = StringUtils.split(template, String.valueOf(TemplateService.TEMPLATE_PARTS_SEPARATOR));
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/TimeSelector.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/TimeSelector.java?rev=1078552&r1=1078551&r2=1078552&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/TimeSelector.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/TimeSelector.java Sun Mar 6 19:58:46 2011
@@ -411,6 +411,7 @@ public class TimeSelector
* @param format Time format.
* @return A select object with all the hours.
*/
+ @SuppressWarnings("cast")
public static Select getHourSelector(String name, Calendar now, int format)
{
Select hourSelect = new Select().setName(name);
@@ -572,6 +573,7 @@ public class TimeSelector
*
* @return A String with the correct HTML for the date selector.
*/
+ @Override
public String toString()
{
return (ecsOutput().toString());
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/TurbineException.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/TurbineException.java?rev=1078552&r1=1078551&r2=1078552&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/TurbineException.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/TurbineException.java Sun Mar 6 19:58:46 2011
@@ -86,6 +86,9 @@ package org.apache.turbine.util;
*/
public class TurbineException extends Exception
{
+ /** Serial version */
+ private static final long serialVersionUID = 6287570348053189763L;
+
/**
* Constructs a new <code>TurbineException</code> without specified
* detail message.
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/TurbineRuntimeException.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/TurbineRuntimeException.java?rev=1078552&r1=1078551&r2=1078552&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/TurbineRuntimeException.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/TurbineRuntimeException.java Sun Mar 6 19:58:46 2011
@@ -20,7 +20,6 @@ package org.apache.turbine.util;
* under the License.
*/
-import org.apache.commons.lang.exception.NestableRuntimeException;
/**
* This is a base class of runtime exeptions thrown by Turbine.
@@ -33,14 +32,18 @@ import org.apache.commons.lang.exception
* @author <a href="mailto:dlr@finemaltcoding.com">Daniel Rall</a>
* @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
*/
-public class TurbineRuntimeException extends NestableRuntimeException
+public class TurbineRuntimeException extends RuntimeException
{
+ /** Serial version */
+ private static final long serialVersionUID = 2538372732215566444L;
+
/**
* Constructs a new <code>TurbineRuntimeException</code> without specified
* detail message.
*/
public TurbineRuntimeException()
{
+ super();
}
/**
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/security/AccessControlException.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/security/AccessControlException.java?rev=1078552&r1=1078551&r2=1078552&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/security/AccessControlException.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/security/AccessControlException.java Sun Mar 6 19:58:46 2011
@@ -31,7 +31,7 @@ package org.apache.turbine.util.security
public class AccessControlException
extends TurbineSecurityException
{
- /** TODO serialVersionUID */
+ /** Serial version */
private static final long serialVersionUID = -594555809858627271L;
/**
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/security/DataBackendException.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/security/DataBackendException.java?rev=1078552&r1=1078551&r2=1078552&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/security/DataBackendException.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/security/DataBackendException.java Sun Mar 6 19:58:46 2011
@@ -32,7 +32,7 @@ package org.apache.turbine.util.security
public class DataBackendException
extends TurbineSecurityException
{
- /** TODO serialVersionUID */
+ /** Serial version */
private static final long serialVersionUID = 3069718405955172641L;
/**
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/security/EntityExistsException.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/security/EntityExistsException.java?rev=1078552&r1=1078551&r2=1078552&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/security/EntityExistsException.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/security/EntityExistsException.java Sun Mar 6 19:58:46 2011
@@ -32,7 +32,7 @@ package org.apache.turbine.util.security
public class EntityExistsException
extends TurbineSecurityException
{
- /** TODO serialVersionUID */
+ /** Serial version */
private static final long serialVersionUID = -1599279419997911108L;
/**
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/security/PasswordMismatchException.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/security/PasswordMismatchException.java?rev=1078552&r1=1078551&r2=1078552&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/security/PasswordMismatchException.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/security/PasswordMismatchException.java Sun Mar 6 19:58:46 2011
@@ -31,7 +31,7 @@ package org.apache.turbine.util.security
public class PasswordMismatchException
extends TurbineSecurityException
{
- /** TODO serialVersionUID */
+ /** Serial version */
private static final long serialVersionUID = -4679484661449307344L;
/**
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/security/TurbineSecurityException.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/security/TurbineSecurityException.java?rev=1078552&r1=1078551&r2=1078552&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/security/TurbineSecurityException.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/security/TurbineSecurityException.java Sun Mar 6 19:58:46 2011
@@ -33,7 +33,7 @@ import org.apache.turbine.util.TurbineEx
public class TurbineSecurityException
extends TurbineException
{
- /** TODO serialVersionUID */
+ /** Serial version */
private static final long serialVersionUID = 3932095155241924973L;
/**
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/security/UnknownEntityException.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/security/UnknownEntityException.java?rev=1078552&r1=1078551&r2=1078552&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/security/UnknownEntityException.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/security/UnknownEntityException.java Sun Mar 6 19:58:46 2011
@@ -32,7 +32,7 @@ package org.apache.turbine.util.security
public class UnknownEntityException
extends TurbineSecurityException
{
- /** TODO serialVersionUID */
+ /** Serial version */
private static final long serialVersionUID = 292295293154904822L;
/**
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/uri/TurbineURI.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/uri/TurbineURI.java?rev=1078552&r1=1078551&r2=1078552&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/uri/TurbineURI.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/uri/TurbineURI.java Sun Mar 6 19:58:46 2011
@@ -56,7 +56,7 @@ public class TurbineURI
/** Contains the PathInfo and QueryData vectors */
private List<URIParam> [] dataVectors = null;
-
+
/** Local reference to the parser service for URI parameter folding */
private ParserService parserService;
@@ -254,6 +254,7 @@ public class TurbineURI
/**
* Init the TurbineURI.
*/
+ @SuppressWarnings("unchecked")
private void init()
{
dataVectors = new List[2];
@@ -728,6 +729,7 @@ public class TurbineURI
* @return This URI as a String
*
*/
+ @Override
public String toString()
{
return getAbsoluteLink();
@@ -775,10 +777,10 @@ public class TurbineURI
if(!list.isEmpty())
{
String encoding = parserService.getParameterEncoding();
-
+
for(Iterator<URIParam> it = list.iterator(); it.hasNext();)
{
- try
+ try
{
URIParam uriParam = it.next();
String key = URLEncoder.encode(uriParam.getKey(), encoding);
@@ -810,8 +812,8 @@ public class TurbineURI
{
output.append(fieldDelim);
}
- }
- catch (UnsupportedEncodingException e)
+ }
+ catch (UnsupportedEncodingException e)
{
log.warn("Unsupported encoding " + encoding);
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityEmail.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityEmail.java?rev=1078552&r1=1078551&r2=1078552&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityEmail.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityEmail.java Sun Mar 6 19:58:46 2011
@@ -122,6 +122,7 @@ public class VelocityEmail extends Simpl
*/
public VelocityEmail()
{
+ super();
}
/**
@@ -129,6 +130,7 @@ public class VelocityEmail extends Simpl
*/
public VelocityEmail(Context context)
{
+ this();
this.context = context;
}
@@ -141,6 +143,7 @@ public class VelocityEmail extends Simpl
* @throws EmailException email address could not be parsed
* @return A VelocityEmail (self).
*/
+ @Deprecated
public VelocityEmail setTo(String toName, String toEmail)
throws EmailException
{
@@ -240,6 +243,7 @@ public class VelocityEmail extends Simpl
* @throws EmailException Failure during merging the velocity
* template or sending the email.
*/
+ @Override
public String send() throws EmailException
{
String body = null;
@@ -272,6 +276,7 @@ public class VelocityEmail extends Simpl
*
* @return An empty string.
*/
+ @Override
public String toString()
{
try
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityEmailException.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityEmailException.java?rev=1078552&r1=1078551&r2=1078552&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityEmailException.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityEmailException.java Sun Mar 6 19:58:46 2011
@@ -32,12 +32,16 @@ import org.apache.turbine.util.TurbineEx
*/
public class VelocityEmailException extends TurbineException
{
+ /** Serial version */
+ private static final long serialVersionUID = 4657494114757749486L;
+
/**
* Constructs a new <code>VelocityEmailException</code> without specified
* detail message.
*/
public VelocityEmailException()
{
+ super();
}
/**