Author: henning
Date: Mon Sep 26 10:04:21 2005
New Revision: 291677

URL: http://svn.apache.org/viewcvs?rev=291677&view=rev
Log:
Remove a number of unused variables, private unused methods and assignments.


Modified:
    jakarta/velocity/core/trunk/src/java/org/apache/velocity/Template.java
    
jakarta/velocity/core/trunk/src/java/org/apache/velocity/io/VelocityWriter.java
    
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/configuration/Configuration.java
    
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Parse.java
    
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/VMProxyArg.java
    
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/PrimordialLogSystem.java
    
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIdentifier.java
    
jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/StringUtils.java
    
jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/ClassMap.java
    
jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/UberspectImpl.java

Modified: jakarta/velocity/core/trunk/src/java/org/apache/velocity/Template.java
URL: 
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/Template.java?rev=291677&r1=291676&r2=291677&view=diff
==============================================================================
--- jakarta/velocity/core/trunk/src/java/org/apache/velocity/Template.java 
(original)
+++ jakarta/velocity/core/trunk/src/java/org/apache/velocity/Template.java Mon 
Sep 26 10:04:21 2005
@@ -58,13 +58,6 @@
  */
 public class Template extends Resource
 {
-    /**
-     *   To keep track of whether this template has been
-     *   initialized. We use the document.init(context)
-     *   to perform this.
-     */
-    private boolean initialized = false;
-
     private Exception errorCondition = null;
 
     /** Default constructor */

Modified: 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/io/VelocityWriter.java
URL: 
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/io/VelocityWriter.java?rev=291677&r1=291676&r2=291677&view=diff
==============================================================================
--- 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/io/VelocityWriter.java 
(original)
+++ 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/io/VelocityWriter.java 
Mon Sep 26 10:04:21 2005
@@ -57,8 +57,6 @@
 
     private static int defaultCharBufferSize = 8 * 1024;
 
-    private boolean flushed = false;
-
     /**
      * Create a buffered character-output stream that uses a default-sized
      * output buffer.
@@ -132,7 +130,6 @@
     {
         if (bufferSize == 0)
             return;
-        flushed = true;
         if (nextChar == 0)
             return;
         writer.write(cb, 0, nextChar);
@@ -329,7 +326,6 @@
     public final void recycle(Writer writer)
     {
         this.writer = writer;
-        flushed = false;
         clear();
     }
 }

Modified: 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/configuration/Configuration.java
URL: 
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/configuration/Configuration.java?rev=291677&r1=291676&r2=291677&view=diff
==============================================================================
--- 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/configuration/Configuration.java
 (original)
+++ 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/configuration/Configuration.java
 Mon Sep 26 10:04:21 2005
@@ -346,17 +346,6 @@
     }
 
     /**
-     * Private initializer method that sets up the generic
-     * resources.
-     *
-     * @exception IOException, if there was an I/O problem.
-     */
-    private void init( Configuration exp ) throws IOException
-    {
-        isInitialized = true;
-    }
-    
-    /**
      * Indicate to client code whether property
      * resources have been initialized or not.
      */

Modified: 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Parse.java
URL: 
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Parse.java?rev=291677&r1=291676&r2=291677&view=diff
==============================================================================
--- 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Parse.java
 (original)
+++ 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/Parse.java
 Mon Sep 26 10:04:21 2005
@@ -54,8 +54,6 @@
  */
 public class Parse extends InputBase
 {
-    private boolean ready = false;
-
     /**
      * Return name of this directive.
      */

Modified: 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/VMProxyArg.java
URL: 
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/VMProxyArg.java?rev=291677&r1=291676&r2=291677&view=diff
==============================================================================
--- 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/VMProxyArg.java
 (original)
+++ 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/directive/VMProxyArg.java
 Mon Sep 26 10:04:21 2005
@@ -87,9 +87,6 @@
     /**  reference for the object if we proxy for a static arg like an 
IntegerLiteral*/
     private Object staticObject = null;
 
-    /** not used in this impl : carries the appropriate user context */
-    private InternalContextAdapter usercontext = null;
-
     /** number of children in our tree if a reference */
     private int numTreeChildren = 0;
 
@@ -491,7 +488,6 @@
      */
     public VMProxyArg( VMProxyArg model, InternalContextAdapter c )
     {
-        usercontext = c;
         contextReference = model.getContextReference();
         callerReference = model.getCallerReference();
         nodeTree = model.getNodeTree();

Modified: 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/PrimordialLogSystem.java
URL: 
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/PrimordialLogSystem.java?rev=291677&r1=291676&r2=291677&view=diff
==============================================================================
--- 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/PrimordialLogSystem.java
 (original)
+++ 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/log/PrimordialLogSystem.java
 Mon Sep 26 10:04:21 2005
@@ -33,7 +33,6 @@
 public class PrimordialLogSystem implements LogSystem
 {
     private Vector pendingMessages = new Vector();    
-    private RuntimeServices rsvc = null;
 
     /**
      *  default CTOR.
@@ -45,7 +44,6 @@
     public void init( RuntimeServices rs )
         throws Exception
     {
-        rsvc = rs;
     }
     
     /**

Modified: 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIdentifier.java
URL: 
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIdentifier.java?rev=291677&r1=291676&r2=291677&view=diff
==============================================================================
--- 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIdentifier.java
 (original)
+++ 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/runtime/parser/node/ASTIdentifier.java
 Mon Sep 26 10:04:21 2005
@@ -158,8 +158,6 @@
         }
         catch(InvocationTargetException ite)
         {
-            EventCartridge ec = context.getEventCartridge();
-
             /*
              *  if we have an event cartridge, see if it wants to veto
              *  also, let non-Exception Throwables go...

Modified: 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/StringUtils.java
URL: 
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/StringUtils.java?rev=291677&r1=291676&r2=291677&view=diff
==============================================================================
--- 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/StringUtils.java 
(original)
+++ 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/StringUtils.java 
Mon Sep 26 10:04:21 2005
@@ -49,11 +49,6 @@
     private static final String EOL = System.getProperty("line.separator");
     
     /**
-     * Length of the line separator.
-     */
-    private static final int EOL_LENGTH = EOL.length();
-
-    /**
      * Concatenates a list of objects as a String.
      *
      * @param list The list of objects to concatenate.

Modified: 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/ClassMap.java
URL: 
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/ClassMap.java?rev=291677&r1=291676&r2=291677&view=diff
==============================================================================
--- 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/ClassMap.java
 (original)
+++ 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/ClassMap.java
 Mon Sep 26 10:04:21 2005
@@ -142,8 +142,6 @@
      */
     private void populateMethodCache()
     {
-        StringBuffer methodKey;
-
         /*
          *  get all publicly accessible methods
          */

Modified: 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/UberspectImpl.java
URL: 
http://svn.apache.org/viewcvs/jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/UberspectImpl.java?rev=291677&r1=291676&r2=291677&view=diff
==============================================================================
--- 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/UberspectImpl.java
 (original)
+++ 
jakarta/velocity/core/trunk/src/java/org/apache/velocity/util/introspection/UberspectImpl.java
 Mon Sep 26 10:04:21 2005
@@ -182,7 +182,6 @@
     {
         Class claz = obj.getClass();
 
-        VelPropertySet vs = null;
         VelMethod vm = null;
         try
         {



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to