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:32 UTC

[13/20] git commit: Java 7 diamonds for wicket-common-tests

Java 7 diamonds for wicket-common-tests


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f1c8153b
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f1c8153b
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f1c8153b

Branch: refs/heads/master
Commit: f1c8153bcb3ab49d0ef3ca8624d0035580d07cfe
Parents: cf2c3af
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jun 21 15:02:27 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Jun 21 15:47:38 2013 +0200

----------------------------------------------------------------------
 .../java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/f1c8153b/testing/wicket-common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java
----------------------------------------------------------------------
diff --git a/testing/wicket-common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java b/testing/wicket-common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java
index 8e335a6..993c8d4 100644
--- a/testing/wicket-common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java
+++ b/testing/wicket-common-tests/src/test/java/org/apache/wicket/osgi/OsgiClashingPackagesTest.java
@@ -34,7 +34,7 @@ public class OsgiClashingPackagesTest extends Assert
 		String[] dependencies = Strings.split(classpath, pathSeparator);
 
 		// packageName -> projects containing a package with this name
-		Map<String, List<Project>> projectBuckets = new HashMap<String, List<Project>>();
+		Map<String, List<Project>> projectBuckets = new HashMap<>();
 
 		for (String dependency : dependencies)
 		{
@@ -87,7 +87,7 @@ public class OsgiClashingPackagesTest extends Assert
 
 	private static class Project {
 		// a set with all package names in a dependency
-		private final Set<String> packagesWithContent = new TreeSet<String>();
+		private final Set<String> packagesWithContent = new TreeSet<>();
 
 		// the name of the dependency
 		private final String name;
@@ -105,7 +105,7 @@ public class OsgiClashingPackagesTest extends Assert
 		public void addTo(Map<String, List<Project>> projectBuckets) {
 			for (String packageWithContent : packagesWithContent) {
 				if (!projectBuckets.containsKey(packageWithContent)) {
-					projectBuckets.put(packageWithContent, new ArrayList<OsgiClashingPackagesTest.Project>());
+					projectBuckets.put(packageWithContent, new ArrayList<Project>());
 				}
 				projectBuckets.get(packageWithContent).add(this);
 			}