You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by lu...@apache.org on 2011/02/02 19:15:37 UTC
svn commit: r1066561 - in
/turbine/core/trunk/src/java/org/apache/turbine/modules/navigations:
BaseJspNavigation.java TemplateNavigation.java VelocityNavigation.java
Author: ludwig
Date: Wed Feb 2 18:15:37 2011
New Revision: 1066561
URL: http://svn.apache.org/viewvc?rev=1066561&view=rev
Log:
Removed all warnings from package org.apache.turbine.modules.navigations
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/BaseJspNavigation.java
turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/TemplateNavigation.java
turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/VelocityNavigation.java
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/BaseJspNavigation.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/BaseJspNavigation.java?rev=1066561&r1=1066560&r2=1066561&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/BaseJspNavigation.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/BaseJspNavigation.java Wed Feb 2 18:15:37 2011
@@ -51,6 +51,8 @@ public class BaseJspNavigation
* @param data the Rundata object
* @throws Exception a generic exception.
*/
+ @Deprecated
+ @Override
protected void doBuildTemplate(RunData data)
throws Exception
{
@@ -62,6 +64,7 @@ public class BaseJspNavigation
* @param data the PipelineData object
* @throws Exception a generic exception.
*/
+ @Override
protected void doBuildTemplate(PipelineData pipelineData)
throws Exception
{
@@ -77,6 +80,8 @@ public class BaseJspNavigation
* @return null - the JSP sends the information
* @throws Exception a generic exception.
*/
+ @Deprecated
+ @Override
public ConcreteElement buildTemplate(RunData data)
throws Exception
{
@@ -95,10 +100,11 @@ public class BaseJspNavigation
* @return null - the JSP sends the information
* @throws Exception a generic exception.
*/
+ @Override
public ConcreteElement buildTemplate(PipelineData pipelineData)
throws Exception
{
- RunData data = (RunData) getRunData(pipelineData);
+ RunData data = getRunData(pipelineData);
// get the name of the JSP we want to use
String templateName = data.getTemplateInfo().getNavigationTemplate();
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/TemplateNavigation.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/TemplateNavigation.java?rev=1066561&r1=1066560&r2=1066561&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/TemplateNavigation.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/TemplateNavigation.java Wed Feb 2 18:15:37 2011
@@ -47,6 +47,7 @@ public abstract class TemplateNavigation
* @param data Turbine information.
* @throws Exception a generic exception.
*/
+ @Deprecated
protected abstract void doBuildTemplate(RunData data)
throws Exception;
@@ -61,7 +62,7 @@ public abstract class TemplateNavigation
protected void doBuildTemplate(PipelineData pipelineData)
throws Exception
{
- RunData data = (RunData) getRunData(pipelineData);
+ RunData data = getRunData(pipelineData);
doBuildTemplate(data);
}
@@ -73,6 +74,7 @@ public abstract class TemplateNavigation
* @return A ConcreteElement.
* @throws Exception a generic exception.
*/
+ @Deprecated
public abstract ConcreteElement buildTemplate(RunData data)
throws Exception;
@@ -86,7 +88,7 @@ public abstract class TemplateNavigation
public ConcreteElement buildTemplate(PipelineData pipelineData)
throws Exception
{
- RunData data = (RunData) getRunData(pipelineData);
+ RunData data = getRunData(pipelineData);
return buildTemplate(data);
}
@@ -97,6 +99,7 @@ public abstract class TemplateNavigation
* @return A ConcreteElement.
* @throws Exception a generic exception.
*/
+ @Override
protected ConcreteElement doBuild(RunData data)
throws Exception
{
@@ -111,10 +114,11 @@ public abstract class TemplateNavigation
* @return A ConcreteElement.
* @throws Exception a generic exception.
*/
+ @Override
protected ConcreteElement doBuild(PipelineData pipelineData)
throws Exception
{
- RunData data = (RunData) getRunData(pipelineData);
+ RunData data = getRunData(pipelineData);
return doBuild(data);
}
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/VelocityNavigation.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/VelocityNavigation.java?rev=1066561&r1=1066560&r2=1066561&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/VelocityNavigation.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/navigations/VelocityNavigation.java Wed Feb 2 18:15:37 2011
@@ -61,6 +61,7 @@ public class VelocityNavigation
* @param context Context for web pages.
* @exception Exception, a generic exception.
*/
+ @Deprecated
protected void doBuildTemplate(RunData data,
Context context)
throws Exception
@@ -91,6 +92,8 @@ public class VelocityNavigation
* @param data Turbine information.
* @exception Exception, a generic exception.
*/
+ @Deprecated
+ @Override
protected void doBuildTemplate(RunData data)
throws Exception
{
@@ -106,6 +109,7 @@ public class VelocityNavigation
* @param pipelineData Turbine information.
* @exception Exception, a generic exception.
*/
+ @Override
protected void doBuildTemplate(PipelineData pipelineData)
throws Exception
{
@@ -120,6 +124,8 @@ public class VelocityNavigation
* @return A ConcreteElement.
* @exception Exception, a generic exception.
*/
+ @Deprecated
+ @Override
public ConcreteElement buildTemplate(RunData data)
throws Exception
{
@@ -143,6 +149,7 @@ public class VelocityNavigation
* @return A ConcreteElement.
* @exception Exception, a generic exception.
*/
+ @Override
public ConcreteElement buildTemplate(PipelineData pipelineData)
throws Exception
{