You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/06/21 15:50:35 UTC
[16/20] git commit: Java 7 diamonds in wicket-util
Java 7 diamonds in wicket-util
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/1d6d597c
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/1d6d597c
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/1d6d597c
Branch: refs/heads/master
Commit: 1d6d597c1aa57ca27b0b4d9b337ad4849b093ab1
Parents: b59bb76
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jun 21 14:47:19 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Jun 21 15:47:38 2013 +0200
----------------------------------------------------------------------
.../main/java/org/apache/wicket/util/ValueProvider.java | 2 +-
.../apache/wicket/util/collections/ClassMetaCache.java | 2 +-
.../wicket/util/collections/ConcurrentHashSet.java | 10 +++++-----
.../org/apache/wicket/util/collections/IntHashMap.java | 4 ++--
.../org/apache/wicket/util/collections/MultiMap.java | 2 +-
.../convert/converter/AbstractDecimalConverter.java | 2 +-
.../convert/converter/AbstractIntegerConverter.java | 2 +-
.../main/java/org/apache/wicket/util/diff/Chunk.java | 4 ++--
.../src/main/java/org/apache/wicket/util/diff/Diff.java | 4 ++--
.../main/java/org/apache/wicket/util/diff/Revision.java | 4 ++--
.../main/java/org/apache/wicket/util/diff/ToString.java | 2 +-
.../main/java/org/apache/wicket/util/file/Folder.java | 2 +-
.../java/org/apache/wicket/util/file/WebXmlFile.java | 6 +++---
.../apache/wicket/util/io/ByteArrayOutputStream.java | 2 +-
.../org/apache/wicket/util/lang/EnumeratedType.java | 2 +-
.../java/org/apache/wicket/util/lang/Exceptions.java | 2 +-
.../main/java/org/apache/wicket/util/lang/Generics.java | 12 ++++++------
.../main/java/org/apache/wicket/util/lang/Threads.java | 2 +-
.../util/license/ApacheLicenseHeaderTestCase.java | 4 ++--
.../apache/wicket/util/listener/ListenerCollection.java | 4 ++--
.../wicket/util/markup/xhtml/WellFormedXmlTestCase.java | 2 +-
.../util/parse/metapattern/parsers/ListParser.java | 2 +-
.../apache/wicket/util/string/AbstractStringList.java | 2 +-
.../java/org/apache/wicket/util/string/StringList.java | 4 ++--
.../java/org/apache/wicket/util/string/Strings.java | 4 ++--
.../main/java/org/apache/wicket/util/time/TimeMap.java | 2 +-
.../org/apache/wicket/util/upload/ParameterParser.java | 10 +++++-----
.../main/java/org/apache/wicket/util/visit/Visits.java | 8 ++++----
.../apache/wicket/util/xml/CustomEntityResolver.java | 2 +-
.../java/org/apache/wicket/util/LongEncoderTest.java | 2 +-
.../apache/wicket/util/collections/MicroMapTest.java | 2 +-
.../org/apache/wicket/util/collections/MiniMapTest.java | 2 +-
.../util/collections/MostRecentlyUsedMapTest.java | 2 +-
.../util/collections/ReverseListIteratorTest.java | 2 +-
.../org/apache/wicket/util/string/StringListTest.java | 4 ++--
.../string/interpolator/VariableInterpolatorTest.java | 8 ++++----
36 files changed, 66 insertions(+), 66 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/ValueProvider.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/ValueProvider.java b/wicket-util/src/main/java/org/apache/wicket/util/ValueProvider.java
index cefd47a..c49662f 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/ValueProvider.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/ValueProvider.java
@@ -55,6 +55,6 @@ public class ValueProvider<T> implements IProvider<T>
*/
public static <T> ValueProvider<T> of(final T value)
{
- return new ValueProvider<T>(value);
+ return new ValueProvider<>(value);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/collections/ClassMetaCache.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/collections/ClassMetaCache.java b/wicket-util/src/main/java/org/apache/wicket/util/collections/ClassMetaCache.java
index 230f5b1..25da5a3 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/collections/ClassMetaCache.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/collections/ClassMetaCache.java
@@ -92,7 +92,7 @@ public class ClassMetaCache<T>
container = cache.get(classLoader);
if (container == null)
{
- container = new ConcurrentHashMap<String, T>();
+ container = new ConcurrentHashMap<>();
/*
* don't write to current cache, copy instead
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/collections/ConcurrentHashSet.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/collections/ConcurrentHashSet.java b/wicket-util/src/main/java/org/apache/wicket/util/collections/ConcurrentHashSet.java
index 3bc1e6c..c0e7578 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/collections/ConcurrentHashSet.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/collections/ConcurrentHashSet.java
@@ -50,7 +50,7 @@ public class ConcurrentHashSet<E> extends AbstractSet<E>
*/
public ConcurrentHashSet()
{
- map = new ConcurrentHashMap<E, Object>();
+ map = new ConcurrentHashMap<>();
}
/**
@@ -65,7 +65,7 @@ public class ConcurrentHashSet<E> extends AbstractSet<E>
*/
public ConcurrentHashSet(final Collection<? extends E> c)
{
- map = new ConcurrentHashMap<E, Object>(Math.max((int)(c.size() / .75f) + 1, 16));
+ map = new ConcurrentHashMap<>(Math.max((int)(c.size() / .75f) + 1, 16));
addAll(c);
}
@@ -82,7 +82,7 @@ public class ConcurrentHashSet<E> extends AbstractSet<E>
*/
public ConcurrentHashSet(final int initialCapacity, final float loadFactor)
{
- map = new ConcurrentHashMap<E, Object>(initialCapacity, loadFactor, 16);
+ map = new ConcurrentHashMap<>(initialCapacity, loadFactor, 16);
}
/**
@@ -96,7 +96,7 @@ public class ConcurrentHashSet<E> extends AbstractSet<E>
*/
public ConcurrentHashSet(final int initialCapacity)
{
- map = new ConcurrentHashMap<E, Object>(initialCapacity);
+ map = new ConcurrentHashMap<>(initialCapacity);
}
/**
@@ -210,7 +210,7 @@ public class ConcurrentHashSet<E> extends AbstractSet<E>
{
inputStream.defaultReadObject();
- map = new ConcurrentHashMap<E, Object>();
+ map = new ConcurrentHashMap<>();
int size = inputStream.readInt();
for (int i = 0; i < size; i++)
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java b/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java
index 299936a..139c814 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/collections/IntHashMap.java
@@ -740,7 +740,7 @@ public class IntHashMap<V> implements Cloneable, Serializable
*/
void addEntry(final int key, final V value, final int bucketIndex)
{
- table[bucketIndex] = new Entry<V>(key, value, table[bucketIndex]);
+ table[bucketIndex] = new Entry<>(key, value, table[bucketIndex]);
if (size++ >= threshold)
{
resize(2 * table.length);
@@ -760,7 +760,7 @@ public class IntHashMap<V> implements Cloneable, Serializable
*/
void createEntry(final int key, final V value, final int bucketIndex)
{
- table[bucketIndex] = new Entry<V>(key, value, table[bucketIndex]);
+ table[bucketIndex] = new Entry<>(key, value, table[bucketIndex]);
size++;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/collections/MultiMap.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/collections/MultiMap.java b/wicket-util/src/main/java/org/apache/wicket/util/collections/MultiMap.java
index ee7bd00..fe4d51b 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/collections/MultiMap.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/collections/MultiMap.java
@@ -89,7 +89,7 @@ public class MultiMap<K, V> extends HashMap<K, List<V>>
List<V> list = get(key);
if (list == null)
{
- list = new ArrayList<V>(1);
+ list = new ArrayList<>(1);
put(key, list);
}
list.add(value);
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractDecimalConverter.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractDecimalConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractDecimalConverter.java
index 50c1a0e..09485fa 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractDecimalConverter.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractDecimalConverter.java
@@ -33,7 +33,7 @@ public abstract class AbstractDecimalConverter<N extends Number> extends Abstrac
private static final long serialVersionUID = 1L;
/** The date format to use */
- private final Map<Locale, NumberFormat> numberFormats = new ConcurrentHashMap<Locale, NumberFormat>();
+ private final Map<Locale, NumberFormat> numberFormats = new ConcurrentHashMap<>();
/**
* @param locale
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractIntegerConverter.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractIntegerConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractIntegerConverter.java
index 5b3d864..88639c0 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractIntegerConverter.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractIntegerConverter.java
@@ -31,7 +31,7 @@ public abstract class AbstractIntegerConverter<I extends Number> extends Abstrac
private static final long serialVersionUID = 1L;
/** The date format to use */
- private final ConcurrentHashMap<Locale, NumberFormat> numberFormats = new ConcurrentHashMap<Locale, NumberFormat>();
+ private final ConcurrentHashMap<Locale, NumberFormat> numberFormats = new ConcurrentHashMap<>();
/**
* @param locale
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/diff/Chunk.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/diff/Chunk.java b/wicket-util/src/main/java/org/apache/wicket/util/diff/Chunk.java
index f74d18e..f88f007 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/diff/Chunk.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/diff/Chunk.java
@@ -336,11 +336,11 @@ public class Chunk extends ToString
{
if (count <= 0)
{
- return new ArrayList<T>();
+ return new ArrayList<>();
}
else
{
- return new ArrayList<T>(seq.subList(pos, pos + count));
+ return new ArrayList<>(seq.subList(pos, pos + count));
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/diff/Diff.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/diff/Diff.java b/wicket-util/src/main/java/org/apache/wicket/util/diff/Diff.java
index 049cfe4..75d983f 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/diff/Diff.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/diff/Diff.java
@@ -303,7 +303,7 @@ public class Diff extends ToString
*/
public static Object[] randomEdit(final Object[] text, final long seed)
{
- List<Object> result = new ArrayList<Object>(Arrays.asList(text));
+ List<Object> result = new ArrayList<>(Arrays.asList(text));
Random r = new Random(seed);
int nops = r.nextInt(10);
for (int i = 0; i < nops; i++)
@@ -349,7 +349,7 @@ public class Diff extends ToString
*/
public static Object[] shuffle(final Object[] text, final long seed)
{
- List<Object> result = new ArrayList<Object>(Arrays.asList(text));
+ List<Object> result = new ArrayList<>(Arrays.asList(text));
Collections.shuffle(result);
return result.toArray();
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/diff/Revision.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/diff/Revision.java b/wicket-util/src/main/java/org/apache/wicket/util/diff/Revision.java
index 0de20c1..82d8662 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/diff/Revision.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/diff/Revision.java
@@ -82,7 +82,7 @@ import java.util.ListIterator;
public class Revision extends ToString
{
- List<Delta> deltas_ = new LinkedList<Delta>();
+ List<Delta> deltas_ = new LinkedList<>();
/**
* Creates an empty Revision.
@@ -154,7 +154,7 @@ public class Revision extends ToString
*/
public Object[] patch(final Object[] src) throws PatchFailedException
{
- List<Object> target = new ArrayList<Object>(Arrays.asList(src));
+ List<Object> target = new ArrayList<>(Arrays.asList(src));
applyTo(target);
return target.toArray();
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/diff/ToString.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/diff/ToString.java b/wicket-util/src/main/java/org/apache/wicket/util/diff/ToString.java
index d05ea14..994c0f2 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/diff/ToString.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/diff/ToString.java
@@ -106,7 +106,7 @@ public class ToString
public static String[] stringToArray(final String value)
{
BufferedReader reader = new BufferedReader(new StringReader(value));
- List<String> l = new LinkedList<String>();
+ List<String> l = new LinkedList<>();
String s;
try
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/file/Folder.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/file/Folder.java b/wicket-util/src/main/java/org/apache/wicket/util/file/Folder.java
index fccfac0..e8dfee6 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/file/Folder.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/file/Folder.java
@@ -193,7 +193,7 @@ public class Folder extends File
*/
public File[] getNestedFiles(final FileFilter filter)
{
- final List<File> files = new ArrayList<File>();
+ final List<File> files = new ArrayList<>();
files.addAll(Arrays.asList(getFiles(filter)));
final Folder[] folders = getFolders();
for (Folder folder : folders)
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/file/WebXmlFile.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/file/WebXmlFile.java b/wicket-util/src/main/java/org/apache/wicket/util/file/WebXmlFile.java
index 191dc02..2b73980 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/file/WebXmlFile.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/file/WebXmlFile.java
@@ -242,7 +242,7 @@ public class WebXmlFile
}
log.info(msg.toString());
}
- Set<String> stripped = new HashSet<String>(urlPatterns.size());
+ Set<String> stripped = new HashSet<>(urlPatterns.size());
for (String urlPattern : urlPatterns)
{
@@ -262,7 +262,7 @@ public class WebXmlFile
*/
private Set<String> getFilterPaths(final String filterName, final String name, final Node node)
{
- Set<String> paths = new HashSet<String>();
+ Set<String> paths = new HashSet<>();
String foundUrlPattern = null;
String foundFilterName = null;
@@ -309,7 +309,7 @@ public class WebXmlFile
private Set<String> getFilterPaths(final String filterName, final String mapping,
final String name, final NodeList nodeList)
{
- Set<String> paths = new HashSet<String>(1);
+ Set<String> paths = new HashSet<>(1);
for (int i = 0; i < nodeList.getLength(); ++i)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/io/ByteArrayOutputStream.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/io/ByteArrayOutputStream.java b/wicket-util/src/main/java/org/apache/wicket/util/io/ByteArrayOutputStream.java
index 22eb940..228c910 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/io/ByteArrayOutputStream.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/io/ByteArrayOutputStream.java
@@ -42,7 +42,7 @@ import java.util.List;
*/
public class ByteArrayOutputStream extends OutputStream
{
- private final List<byte[]> buffers = new java.util.ArrayList<byte[]>();
+ private final List<byte[]> buffers = new java.util.ArrayList<>();
private int count;
private byte[] currentBuffer;
private int currentBufferIndex;
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/lang/EnumeratedType.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/lang/EnumeratedType.java b/wicket-util/src/main/java/org/apache/wicket/util/lang/EnumeratedType.java
index 01d7897..578ac40 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/lang/EnumeratedType.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/lang/EnumeratedType.java
@@ -71,7 +71,7 @@ public abstract class EnumeratedType extends StringValue
if (valueList == null)
{
// create lazily
- valueList = new ArrayList<EnumeratedType>();
+ valueList = new ArrayList<>();
valueListByClass.put(c.getName(), valueList);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/lang/Exceptions.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/lang/Exceptions.java b/wicket-util/src/main/java/org/apache/wicket/util/lang/Exceptions.java
index 76c2235..cc67505 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/lang/Exceptions.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/lang/Exceptions.java
@@ -125,7 +125,7 @@ public class Exceptions
*/
public static <T> T visit(final Throwable throwable, final IThrowableVisitor<T> visitor)
{
- Visit<T> visit = new Visit<T>();
+ Visit<T> visit = new Visit<>();
Throwable cursor = throwable;
while (cursor != null)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/lang/Generics.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/lang/Generics.java b/wicket-util/src/main/java/org/apache/wicket/util/lang/Generics.java
index 80f1c13..c3fb483 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/lang/Generics.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/lang/Generics.java
@@ -55,7 +55,7 @@ public class Generics
*/
public static <K, V> HashMap<K, V> newHashMap()
{
- return new HashMap<K, V>();
+ return new HashMap<>();
}
/**
@@ -69,7 +69,7 @@ public class Generics
*/
public static <K, V> HashMap<K, V> newHashMap(final int capacity)
{
- return new HashMap<K, V>(capacity);
+ return new HashMap<>(capacity);
}
/**
@@ -82,7 +82,7 @@ public class Generics
*/
public static <T> ArrayList<T> newArrayList(final int capacity)
{
- return new ArrayList<T>(capacity);
+ return new ArrayList<>(capacity);
}
/**
@@ -93,7 +93,7 @@ public class Generics
*/
public static <T> ArrayList<T> newArrayList()
{
- return new ArrayList<T>();
+ return new ArrayList<>();
}
/**
@@ -105,7 +105,7 @@ public class Generics
*/
public static <K, V> ConcurrentHashMap<K, V> newConcurrentHashMap()
{
- return new ConcurrentHashMap<K, V>();
+ return new ConcurrentHashMap<>();
}
/**
@@ -119,7 +119,7 @@ public class Generics
*/
public static <K, V> ConcurrentHashMap<K, V> newConcurrentHashMap(final int initialCapacity)
{
- return new ConcurrentHashMap<K, V>(initialCapacity);
+ return new ConcurrentHashMap<>(initialCapacity);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/lang/Threads.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/lang/Threads.java b/wicket-util/src/main/java/org/apache/wicket/util/lang/Threads.java
index fb5ddba..7f0ffdc 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/lang/Threads.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/lang/Threads.java
@@ -102,7 +102,7 @@ public class Threads
private static void dumpSingleThread(Logger logger, Thread thread, StackTraceElement[] trace)
{
- Map<CharSequence, Object> variables = new HashMap<CharSequence, Object>();
+ Map<CharSequence, Object> variables = new HashMap<>();
variables.put("name", thread.getName());
variables.put("isDaemon", thread.isDaemon() ? " daemon" : "");
variables.put("priority", thread.getPriority());
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java b/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
index 5d2c37d..45271c8 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/license/ApacheLicenseHeaderTestCase.java
@@ -268,7 +268,7 @@ public abstract class ApacheLicenseHeaderTestCase extends Assert
new XmlPrologHeaderHandler(xmlPrologIgnore),
new CssLicenseHeaderHandler(cssIgnore), };
- final Map<ILicenseHeaderHandler, List<File>> badFiles = new HashMap<ILicenseHeaderHandler, List<File>>();
+ final Map<ILicenseHeaderHandler, List<File>> badFiles = new HashMap<>();
for (final ILicenseHeaderHandler licenseHeaderHandler : licenseHeaderHandlers)
{
@@ -287,7 +287,7 @@ public abstract class ApacheLicenseHeaderTestCase extends Assert
if (files == null)
{
- files = new ArrayList<File>();
+ files = new ArrayList<>();
badFiles.put(licenseHeaderHandler, files);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/listener/ListenerCollection.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/listener/ListenerCollection.java b/wicket-util/src/main/java/org/apache/wicket/util/listener/ListenerCollection.java
index 582dd0c..0d476bc 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/listener/ListenerCollection.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/listener/ListenerCollection.java
@@ -44,7 +44,7 @@ public abstract class ListenerCollection<T> implements Serializable, Iterable<T>
private static final Logger logger = LoggerFactory.getLogger(ListenerCollection.class);
/** list of listeners */
- private final List<T> listeners = new CopyOnWriteArrayList<T>();
+ private final List<T> listeners = new CopyOnWriteArrayList<>();
/**
* Adds a listener to this set of listeners.
@@ -137,7 +137,7 @@ public abstract class ListenerCollection<T> implements Serializable, Iterable<T>
*/
protected void reversedNotify(final INotifier<T> notifier)
{
- Iterator<T> it = new ReverseListIterator<T>(listeners);
+ Iterator<T> it = new ReverseListIterator<>(listeners);
while (it.hasNext())
{
T listener = it.next();
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java b/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java
index 91f332f..ecdc856 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java
@@ -136,7 +136,7 @@ public class WellFormedXmlTestCase
private static final EntityResolver entityResolver = new EntityResolver()
{
- private final Map<String, String> systemIdToUri = new HashMap<String, String>();
+ private final Map<String, String> systemIdToUri = new HashMap<>();
{
systemIdToUri.put("http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd",
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/ListParser.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/ListParser.java b/wicket-util/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/ListParser.java
index 653a649..9ffec85 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/ListParser.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/parse/metapattern/parsers/ListParser.java
@@ -39,7 +39,7 @@ public class ListParser extends MetaPatternParser
private final MetaPattern separatorPattern;
/** The list elements parsed */
- private final List<String> values = new ArrayList<String>();
+ private final List<String> values = new ArrayList<>();
/**
* Constructs a list parser from an entry MetaPattern, a separator MetaPattern and an input
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/string/AbstractStringList.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/string/AbstractStringList.java b/wicket-util/src/main/java/org/apache/wicket/util/string/AbstractStringList.java
index 00762f5..7725ca4 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/string/AbstractStringList.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/string/AbstractStringList.java
@@ -102,7 +102,7 @@ public abstract class AbstractStringList implements IStringSequence, Serializabl
final int size = size();
// Allocate list of exactly the right size
- final List<String> strings = new ArrayList<String>(size);
+ final List<String> strings = new ArrayList<>(size);
// Add strings to list
for (int i = 0; i < size; i++)
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/string/StringList.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/string/StringList.java b/wicket-util/src/main/java/org/apache/wicket/util/string/StringList.java
index 127f9e8..bc20076 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/string/StringList.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/string/StringList.java
@@ -209,7 +209,7 @@ public final class StringList extends AbstractStringList
*/
public StringList()
{
- strings = new ArrayList<String>();
+ strings = new ArrayList<>();
}
/**
@@ -220,7 +220,7 @@ public final class StringList extends AbstractStringList
*/
public StringList(final int size)
{
- strings = new ArrayList<String>(size);
+ strings = new ArrayList<>(size);
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java b/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java
index 81e96da..ddee80f 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/string/Strings.java
@@ -849,7 +849,7 @@ public final class Strings
{
return NO_STRINGS;
}
- final List<String> strings = new ArrayList<String>();
+ final List<String> strings = new ArrayList<>();
int pos = 0;
while (true)
{
@@ -1181,7 +1181,7 @@ public final class Strings
{
if (throwable != null)
{
- List<Throwable> al = new ArrayList<Throwable>();
+ List<Throwable> al = new ArrayList<>();
Throwable cause = throwable;
al.add(cause);
while ((cause.getCause() != null) && (cause != cause.getCause()))
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/time/TimeMap.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/time/TimeMap.java b/wicket-util/src/main/java/org/apache/wicket/util/time/TimeMap.java
index f667a59..0de939c 100755
--- a/wicket-util/src/main/java/org/apache/wicket/util/time/TimeMap.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/time/TimeMap.java
@@ -44,7 +44,7 @@ public final class TimeMap implements Serializable
* <code>Map</code> from <code>ITimeFrameSource</code> implementing objects to
* <code>Object</code> values.
*/
- private final Map<ITimeFrameSource, Object> sources = new ConcurrentHashMap<ITimeFrameSource, Object>();
+ private final Map<ITimeFrameSource, Object> sources = new ConcurrentHashMap<>();
/**
* Retrieves an <code>Object</code> for the current <code>Time</code> value.
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/upload/ParameterParser.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/upload/ParameterParser.java b/wicket-util/src/main/java/org/apache/wicket/util/upload/ParameterParser.java
index 215a6e8..c3b2163 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/upload/ParameterParser.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/upload/ParameterParser.java
@@ -244,7 +244,7 @@ public class ParameterParser
{
if ((separators == null) || (separators.length == 0))
{
- return new HashMap<String, String>();
+ return new HashMap<>();
}
char separator = separators[0];
if (str != null)
@@ -280,7 +280,7 @@ public class ParameterParser
{
if (str == null)
{
- return new HashMap<String, String>();
+ return new HashMap<>();
}
return parse(str.toCharArray(), separator);
}
@@ -300,7 +300,7 @@ public class ParameterParser
{
if (chars == null)
{
- return new HashMap<String, String>();
+ return new HashMap<>();
}
return parse(chars, 0, chars.length, separator);
}
@@ -326,9 +326,9 @@ public class ParameterParser
if (chars == null)
{
- return new HashMap<String, String>();
+ return new HashMap<>();
}
- Map<String, String> params = new HashMap<String, String>();
+ Map<String, String> params = new HashMap<>();
this.chars = chars;
pos = offset;
len = length;
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/visit/Visits.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/visit/Visits.java b/wicket-util/src/main/java/org/apache/wicket/util/visit/Visits.java
index 474d451..a3f7c7a 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/visit/Visits.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/visit/Visits.java
@@ -119,7 +119,7 @@ public class Visits
public static final <S, R> R visitChildren(final Iterable<? super S> container,
final IVisitor<S, R> visitor, final IVisitFilter filter)
{
- Visit<R> visit = new Visit<R>();
+ Visit<R> visit = new Visit<>();
visitChildren(container, visitor, filter, visit);
return visit.getResult();
}
@@ -137,7 +137,7 @@ public class Visits
// Is the child of the correct class (or was no class specified)?
if (filter.visitObject(child))
{
- Visit<R> childTraversal = new Visit<R>();
+ Visit<R> childTraversal = new Visit<>();
// Call visitor
S s = (S)child;
@@ -241,7 +241,7 @@ public class Visits
{
Args.notNull(visitor, "visitor");
- Visit<R> visit = new Visit<R>();
+ Visit<R> visit = new Visit<>();
visitPostOrderHelper(root, visitor, filter, visit);
return visit.getResult();
}
@@ -256,7 +256,7 @@ public class Visits
final Iterable<?> container = (Iterable<?>)component;
if (filter.visitChildren(container))
{
- Visit<R> childTraversal = new Visit<R>();
+ Visit<R> childTraversal = new Visit<>();
for (final Object child : ((Iterable<?>)component))
{
visitPostOrderHelper(child, visitor, filter, childTraversal);
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/main/java/org/apache/wicket/util/xml/CustomEntityResolver.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/xml/CustomEntityResolver.java b/wicket-util/src/main/java/org/apache/wicket/util/xml/CustomEntityResolver.java
index 1d6b2c4..cb6f33d 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/xml/CustomEntityResolver.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/xml/CustomEntityResolver.java
@@ -36,7 +36,7 @@ import org.xml.sax.SAXException;
*/
public class CustomEntityResolver implements EntityResolver
{
- private final Map<EntityKey, EntityLocator> entities = new HashMap<EntityKey, EntityLocator>(3);
+ private final Map<EntityKey, EntityLocator> entities = new HashMap<>(3);
/**
* get default instances of custom entity resolver with preloaded well-known entities
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/test/java/org/apache/wicket/util/LongEncoderTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/LongEncoderTest.java b/wicket-util/src/test/java/org/apache/wicket/util/LongEncoderTest.java
index 3819bed..c3731bb 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/LongEncoderTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/LongEncoderTest.java
@@ -35,7 +35,7 @@ public class LongEncoderTest
@Test
public void defaultAlphabet()
{
- Set<String> encoded = new HashSet<String>();
+ Set<String> encoded = new HashSet<>();
for (int i = -10000; i < 10000; i++)
{
String enc = LongEncoder.encode(i);
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/test/java/org/apache/wicket/util/collections/MicroMapTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/collections/MicroMapTest.java b/wicket-util/src/test/java/org/apache/wicket/util/collections/MicroMapTest.java
index 4618fd2..a26919b 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/collections/MicroMapTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/collections/MicroMapTest.java
@@ -40,7 +40,7 @@ public class MicroMapTest extends Assert
@Test
public void microMap()
{
- MicroMap<Object, Object> m = new MicroMap<Object, Object>();
+ MicroMap<Object, Object> m = new MicroMap<>();
m.put(FOO, BAR);
// Test .keySet();
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/test/java/org/apache/wicket/util/collections/MiniMapTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/collections/MiniMapTest.java b/wicket-util/src/test/java/org/apache/wicket/util/collections/MiniMapTest.java
index eea941d..ab0896d 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/collections/MiniMapTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/collections/MiniMapTest.java
@@ -40,7 +40,7 @@ public class MiniMapTest extends Assert
@Test
public void miniMap()
{
- MiniMap<Object, Object> m = new MiniMap<Object, Object>(3);
+ MiniMap<Object, Object> m = new MiniMap<>(3);
m.put(FOO, BAR);
// Test .keySet();
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/test/java/org/apache/wicket/util/collections/MostRecentlyUsedMapTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/collections/MostRecentlyUsedMapTest.java b/wicket-util/src/test/java/org/apache/wicket/util/collections/MostRecentlyUsedMapTest.java
index fbd3a07..8a95d73 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/collections/MostRecentlyUsedMapTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/collections/MostRecentlyUsedMapTest.java
@@ -34,7 +34,7 @@ public class MostRecentlyUsedMapTest
@Test
public void max2Entries()
{
- MostRecentlyUsedMap<String, String> map = new MostRecentlyUsedMap<String, String>(2);
+ MostRecentlyUsedMap<String, String> map = new MostRecentlyUsedMap<>(2);
assertEquals(0, map.size());
map.put("1", "one");
assertEquals(1, map.size());
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/test/java/org/apache/wicket/util/collections/ReverseListIteratorTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/collections/ReverseListIteratorTest.java b/wicket-util/src/test/java/org/apache/wicket/util/collections/ReverseListIteratorTest.java
index 2899cd4..4fa5695 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/collections/ReverseListIteratorTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/collections/ReverseListIteratorTest.java
@@ -34,7 +34,7 @@ public class ReverseListIteratorTest extends Assert
@Test
public void reverse()
{
- List<Integer> list = new ArrayList<Integer>();
+ List<Integer> list = new ArrayList<>();
for (int i = 0; i < 10; i++)
{
list.add(i);
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/test/java/org/apache/wicket/util/string/StringListTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/string/StringListTest.java b/wicket-util/src/test/java/org/apache/wicket/util/string/StringListTest.java
index a64ccb4..dfe46ab 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/string/StringListTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/string/StringListTest.java
@@ -42,7 +42,7 @@ public class StringListTest extends Assert
*/
private void checkValueOf(String[] inputs, int expectedNumber, String expectedString)
{
- List<String> list = new ArrayList<String>();
+ List<String> list = new ArrayList<>();
Object[] objects = new Object[inputs.length];
for (int i = 0; i < inputs.length; i++)
{
@@ -183,7 +183,7 @@ public class StringListTest extends Assert
isEmptyList(StringList.valueOf((String)null));
isEmptyList(StringList.valueOf((Object[])null));
isEmptyList(StringList.valueOf((String[])null));
- isEmptyList(StringList.valueOf(new ArrayList<Object>()));
+ isEmptyList(StringList.valueOf(new ArrayList<>()));
isEmptyList(StringList.valueOf(new Object[0]));
isEmptyList(StringList.valueOf(new String[0]));
http://git-wip-us.apache.org/repos/asf/wicket/blob/1d6d597c/wicket-util/src/test/java/org/apache/wicket/util/string/interpolator/VariableInterpolatorTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/string/interpolator/VariableInterpolatorTest.java b/wicket-util/src/test/java/org/apache/wicket/util/string/interpolator/VariableInterpolatorTest.java
index 412952d..67e4cf8 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/string/interpolator/VariableInterpolatorTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/string/interpolator/VariableInterpolatorTest.java
@@ -35,7 +35,7 @@ public class VariableInterpolatorTest extends Assert
@Test
public void withValue()
{
- Map<String, String> params = new HashMap<String, String>();
+ Map<String, String> params = new HashMap<>();
params.put("key", "value");
MapVariableInterpolator in = new MapVariableInterpolator("${key}", params);
assertEquals("value", in.toString());
@@ -47,7 +47,7 @@ public class VariableInterpolatorTest extends Assert
@Test
public void withoutValue()
{
- Map<String, String> params = new HashMap<String, String>();
+ Map<String, String> params = new HashMap<>();
MapVariableInterpolator in = new MapVariableInterpolator("${key}", params);
assertEquals("${key}", in.toString());
}
@@ -58,7 +58,7 @@ public class VariableInterpolatorTest extends Assert
@Test
public void withoutValueAndException()
{
- Map<String, String> params = new HashMap<String, String>();
+ Map<String, String> params = new HashMap<>();
MapVariableInterpolator in = new MapVariableInterpolator("${key}", params, true);
try
{
@@ -77,7 +77,7 @@ public class VariableInterpolatorTest extends Assert
@Test
public void literal()
{
- Map<String, String> params = new HashMap<String, String>();
+ Map<String, String> params = new HashMap<>();
params.put("key", "value");
MapVariableInterpolator in = new MapVariableInterpolator("aaa $${key} bbb", params);
assertEquals("aaa ${key} bbb", in.toString());