A lot of almost purely cosmetic code cleanups

3 files changed, 55 insertions, 8 deletions

diff --git a/velocity-engine-examples/src/main/java/org/apache/velocity/example/DBContext.java b/velocity-engine-examples/src/main/java/org/apache/velocity/example/DBContext.java
index b7b409b4..c6e64ea6 100644
--- a/velocity-engine-examples/src/main/java/org/apache/velocity/example/DBContext.java
+++ b/velocity-engine-examples/src/main/java/org/apache/velocity/example/DBContext.java
@@ -70,7 +70,8 @@ public class DBContext extends AbstractContext
      *  and returns the living instance to the
      *  caller.
      */
-    public Object internalGet( String key )
+    @Override
+    public Object internalGet(String key )
     {
         try
         {
@@ -108,7 +109,8 @@ public class DBContext extends AbstractContext
      *  cause problems.  The right way is to use a
      *  prepared statement...
      */
-    public Object internalPut( String key, Object value )
+    @Override
+    public Object internalPut(String key, Object value )
     {
         try
         {
@@ -143,6 +145,7 @@ public class DBContext extends AbstractContext
      *  operation, so not bothering.  As we say above :
      *  "very fragile, crappy code..."
      */
+    @Override
     public  boolean internalContainsKey(String key)
     {
         return false;
@@ -153,6 +156,7 @@ public class DBContext extends AbstractContext
      *  operation, so not bothering.  As we say above :
      *  "very fragile, crappy code..."
      */
+    @Override
     public  String[] internalGetKeys()
     {
         return null;
@@ -163,6 +167,7 @@ public class DBContext extends AbstractContext
      *  operation, so not bothering.  As we say above :
      *  "very fragile, crappy code..."
      */
+    @Override
     public  Object internalRemove(String key)
     {
         return null;
diff --git a/velocity-engine-examples/src/main/java/org/apache/velocity/example/EventExample.java b/velocity-engine-examples/src/main/java/org/apache/velocity/example/EventExample.java
index 7013439e..610039b1 100644
--- a/velocity-engine-examples/src/main/java/org/apache/velocity/example/EventExample.java
+++ b/velocity-engine-examples/src/main/java/org/apache/velocity/example/EventExample.java
@@ -242,7 +242,8 @@ public class EventExample extends MarkerIgnoringBase
     /**
      *  Event handler for when a reference is inserted into the output stream.
      */
-    public Object referenceInsert( Context context, String reference, Object value  )
+    @Override
+    public Object referenceInsert(Context context, String reference, Object value  )
     {
         /*
          *  if we have a value
@@ -272,12 +273,14 @@ public class EventExample extends MarkerIgnoringBase
     /**
      */
 
+    @Override
     public Object invalidGetMethod(Context context, String reference, Object object, String property, Info info)
     {
         /* NOP */
         return null;
     }
 
+    @Override
     public Object invalidMethod(Context context, String reference, Object object, String method, Info info)
     {
         /* NOP */
@@ -290,6 +293,7 @@ public class EventExample extends MarkerIgnoringBase
      *  a log message.  This method gives the application
      *  a chance to 'vote' on msg generation
      */
+    @Override
     public boolean invalidSetMethod(Context context, String leftreference, String rightreference, Info info)
     {
         if (leftreference.equals("logthis"))
@@ -299,7 +303,8 @@ public class EventExample extends MarkerIgnoringBase
         return false;
     }
     
-    public Object methodException( Context context, Class claz, String method, Exception e, Info info )   {
+    @Override
+    public Object methodException(Context context, Class claz, String method, Exception e, Info info )   {
         /*
          *  only do processing if the switch is on
          */
@@ -312,7 +317,7 @@ public class EventExample extends MarkerIgnoringBase
         throw new RuntimeException(e);
     }
 
-    /**
+    /*
      *  Our own logging towards System.out
      */
 
@@ -373,154 +378,185 @@ public class EventExample extends MarkerIgnoringBase
      *  Required init methods for Logger interface
      */
 
+    @Override
     public String getName()
     {
         return "EventExample";
     }
 
+    @Override
     public boolean isTraceEnabled() {
         return isLevelEnabled(LOG_LEVEL_TRACE);
     }
 
+    @Override
     public void trace(String msg) {
         log(LOG_LEVEL_TRACE, msg);
     }
 
+    @Override
     public void trace(String format, Object param1)
     {
         formatAndLog(LOG_LEVEL_TRACE, format, param1);
     }
 
+    @Override
     public void trace(String format, Object param1, Object param2)
     {
         formatAndLog(LOG_LEVEL_TRACE, format, param1, param2);
     }
 
+    @Override
     public void trace(String format, Object... argArray)
     {
         formatAndLog(LOG_LEVEL_TRACE, format, argArray);
     }
 
+    @Override
     public void trace(String msg, Throwable t)
     {
         log(LOG_LEVEL_TRACE, msg, t);
     }
 
+    @Override
     public boolean isDebugEnabled()
     {
         return isLevelEnabled(LOG_LEVEL_DEBUG);
     }
 
+    @Override
     public void debug(String msg)
     {
         log(LOG_LEVEL_DEBUG, msg);
     }
 
+    @Override
     public void debug(String format, Object param1)
     {
         formatAndLog(LOG_LEVEL_DEBUG, format, param1);
     }
 
+    @Override
     public void debug(String format, Object param1, Object param2)
     {
         formatAndLog(LOG_LEVEL_DEBUG, format, param1, param2);
     }
 
+    @Override
     public void debug(String format, Object... argArray)
     {
         formatAndLog(LOG_LEVEL_DEBUG, format, argArray);
     }
 
+    @Override
     public void debug(String msg, Throwable t)
     {
         log(LOG_LEVEL_DEBUG, msg, t);
     }
 
+    @Override
     public boolean isInfoEnabled()
     {
         return isLevelEnabled(LOG_LEVEL_INFO);
     }
 
+    @Override
     public void info(String msg)
     {
         log(LOG_LEVEL_INFO, msg);
     }
 
+    @Override
     public void info(String format, Object arg)
     {
         formatAndLog(LOG_LEVEL_INFO, format, arg);
     }
 
+    @Override
     public void info(String format, Object arg1, Object arg2)
     {
         formatAndLog(LOG_LEVEL_INFO, format, arg1, arg2);
     }
 
+    @Override
     public void info(String format, Object... argArray)
     {
         formatAndLog(LOG_LEVEL_INFO, format, argArray);
     }
 
+    @Override
     public void info(String msg, Throwable t)
     {
         log(LOG_LEVEL_INFO, msg, t);
     }
 
+    @Override
     public boolean isWarnEnabled()
     {
         return isLevelEnabled(LOG_LEVEL_WARN);
     }
 
+    @Override
     public void warn(String msg)
     {
         log(LOG_LEVEL_WARN, msg);
     }
 
+    @Override
     public void warn(String format, Object arg)
     {
         formatAndLog(LOG_LEVEL_WARN, format, arg);
     }
 
+    @Override
     public void warn(String format, Object arg1, Object arg2)
     {
         formatAndLog(LOG_LEVEL_WARN, format, arg1, arg2);
     }
 
+    @Override
     public void warn(String format, Object... argArray)
     {
         formatAndLog(LOG_LEVEL_WARN, format, argArray);
     }
 
+    @Override
     public void warn(String msg, Throwable t)
     {
         log(LOG_LEVEL_WARN, msg, t);
     }
 
+    @Override
     public boolean isErrorEnabled()
     {
         return isLevelEnabled(LOG_LEVEL_ERROR);
     }
 
+    @Override
     public void error(String msg)
     {
         log(LOG_LEVEL_ERROR, msg);
     }
 
+    @Override
     public void error(String format, Object arg)
     {
         formatAndLog(LOG_LEVEL_ERROR, format, arg);
     }
 
+    @Override
     public void error(String format, Object arg1, Object arg2)
     {
         formatAndLog(LOG_LEVEL_ERROR, format, arg1, arg2);
     }
 
+    @Override
     public void error(String format, Object... argArray)
     {
         formatAndLog(LOG_LEVEL_ERROR, format, argArray);
     }
 
+    @Override
     public void error(String msg, Throwable t)
     {
         log(LOG_LEVEL_ERROR, msg, t);
diff --git a/velocity-engine-examples/src/main/java/org/apache/velocity/example/TreeMapContext.java b/velocity-engine-examples/src/main/java/org/apache/velocity/example/TreeMapContext.java
index acfdb35b..40a6dce5 100644
--- a/velocity-engine-examples/src/main/java/org/apache/velocity/example/TreeMapContext.java
+++ b/velocity-engine-examples/src/main/java/org/apache/velocity/example/TreeMapContext.java
@@ -21,6 +21,7 @@ package org.apache.velocity.example;
 import org.apache.velocity.context.AbstractContext;
 import org.apache.velocity.context.Context;
 
+import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 
@@ -37,7 +38,7 @@ import java.util.TreeMap;
 
 public class TreeMapContext extends AbstractContext
 {
-    private TreeMap context = new TreeMap();
+    private Map<String, Object> context = new TreeMap<>();
 
     public TreeMapContext()
     {
@@ -49,27 +50,32 @@ public class TreeMapContext extends AbstractContext
         super( inner );
     }
 
-    public Object internalGet( String key )
+    @Override
+    public Object internalGet(String key )
     {
         return context.get( key );
     }
 
-    public Object internalPut( String key, Object value )
+    @Override
+    public Object internalPut(String key, Object value )
     {
         return context.put( key, value );
     }
 
+    @Override
     public  boolean internalContainsKey(String key)
     {
         return context.containsKey( key );
     }
 
+    @Override
     public  String[] internalGetKeys()
     {
         Set<String> keys = context.keySet();
         return keys.toArray(new String[keys.size()]);
     }
 
+    @Override
     public  Object internalRemove(String key)
     {
         return context.remove( key );