svn commit: r1770714 - /velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/CollectionTool.java

[sdumitriu]

Author: sdumitriu
Date: Mon Nov 21 15:51:06 2016
New Revision: 1770714

URL: http://svn.apache.org/viewvc?rev=1770714&view=rev
Log:
[misc] Added missing @Override annotations, use diamond operators, use better 
list initialization

Modified:
    
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/CollectionTool.java

Modified: 
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/CollectionTool.java
URL: 
http://svn.apache.org/viewvc/velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/CollectionTool.java?rev=1770714&r1=1770713&r2=1770714&view=diff
==============================================================================
--- 
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/CollectionTool.java
 (original)
+++ 
velocity/tools/trunk/velocity-tools-generic/src/main/java/org/apache/velocity/tools/generic/CollectionTool.java
 Mon Nov 21 15:51:06 2016
@@ -166,6 +166,7 @@ public class CollectionTool extends Safe
      * at any time, while preventing templates from doing so when
      * configure(Map) is locked.
      */
+    @Override
     protected void configure(ValueParser values)
     {
         super.configure(values);
@@ -227,7 +228,7 @@ public class CollectionTool extends Safe
     public <T> Collection<T> sort(final Collection<T> c,
                                   final Comparator<T> comparator)
     {
-        final ArrayList<T> list = new ArrayList<T>(c);
+        final ArrayList<T> list = new ArrayList<>(c);
         Collections.sort(list, comparator);
         return list;
     }
@@ -345,8 +346,7 @@ public class CollectionTool extends Safe
      */
     public Collection sort(Object object, String property)
     {
-        List properties = new ArrayList(1);
-        properties.add(property);
+        List<String> properties = Collections.singletonList(property);
 
         if (object instanceof Collection)
         {
@@ -367,8 +367,7 @@ public class CollectionTool extends Safe
 
     public Collection sort(Collection collection, List properties)
     {
-        List list = new ArrayList(collection.size());
-        list.addAll(collection);
+        List<?> list = new ArrayList<>(collection);
         return internalSort(list, properties);
     }
 
@@ -468,6 +467,7 @@ public class CollectionTool extends Safe
             }
         }
 
+        @Override
         public int compare(Object lhs, Object rhs)
         {
             for (int i = 0; i < properties.size(); i++)