dlr 01/06/19 19:50:11
Modified: src/java/org/apache/turbine/services/velocity
TurbineVelocityService.java
Log:
Cosmetic cleanup.
Revision Changes Path
1.49 +6 -9
jakarta-turbine/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java
Index: TurbineVelocityService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/velocity/TurbineVelocityService.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- TurbineVelocityService.java 2001/06/14 14:45:10 1.48
+++ TurbineVelocityService.java 2001/06/20 02:50:08 1.49
@@ -98,7 +98,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sean Legassick</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
- * @version $Id: TurbineVelocityService.java,v 1.48 2001/06/14 14:45:10 jvanzyl Exp
$
+ * @version $Id: TurbineVelocityService.java,v 1.49 2001/06/20 02:50:08 dlr Exp $
*/
public class TurbineVelocityService
extends BaseTemplateEngineService
@@ -111,7 +111,8 @@
".resource.loader.path";
/**
- * Default character encoding to use if not specified in the RunData object.
+ * Default character encoding to use if not specified in the
+ * RunData object.
*/
private String defaultCharSet = "ISO-8859-1";
@@ -321,7 +322,7 @@
Object data = context.get("data");
- if ((data != null) && (data instanceof RunData))
+ if (data != null && data instanceof RunData)
{
charset = ((RunData) data).getCharSet();
if (charset == null)
@@ -366,11 +367,8 @@
writer.flush();
}
}
- catch (Exception e)
+ catch (Exception ignored)
{
- /*
- * do nothing.
- */
}
}
@@ -474,8 +472,7 @@
entry = "!/";
path = path.substring(9);
}
- path = "jar:file:" +
- getRealPath(path) + entry;
+ path = "jar:file:" + getRealPath(path) + entry;
}
else if (!path.startsWith("jar:"))
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
