From 3b4448637fbb9d74e0c9d44048ba76bb7c1214ce Mon Sep 17 00:00:00 2001 From: David Pursehouse Date: Mon, 20 Feb 2017 13:17:27 +0900 Subject: Enable and fix warnings about redundant specification of type arguments Since the introduction of generic type parameter inference in Java 7, it's not necessary to explicitly specify the type of generic parameters. Enable the warning in Eclipse, and fix all occurrences. Change-Id: I9158caf1beca5e4980b6240ac401f3868520aad0 Signed-off-by: David Pursehouse --- .../src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java | 6 +++--- .../src/org/eclipse/jgit/junit/MockSystemReader.java | 2 +- .../src/org/eclipse/jgit/junit/TestRepository.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'org.eclipse.jgit.junit/src') diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java index b7929424f2..933faf9bfa 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/LocalDiskRepositoryTestCase.java @@ -286,7 +286,7 @@ public abstract class LocalDiskRepositoryTestCase { throws IllegalStateException, IOException { DirCache dc = repo.readDirCache(); StringBuilder sb = new StringBuilder(); - TreeSet timeStamps = new TreeSet(); + TreeSet timeStamps = new TreeSet<>(); // iterate once over the dircache just to collect all time stamps if (0 != (includedOptions & MOD_TIME)) { @@ -552,7 +552,7 @@ public abstract class LocalDiskRepositoryTestCase { } private static HashMap cloneEnv() { - return new HashMap(System.getenv()); + return new HashMap<>(System.getenv()); } private static final class CleanupThread extends Thread { @@ -574,7 +574,7 @@ public abstract class LocalDiskRepositoryTestCase { } } - private final List toDelete = new ArrayList(); + private final List toDelete = new ArrayList<>(); @Override public void run() { diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java index 6faa2ece48..68482c6c27 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/MockSystemReader.java @@ -88,7 +88,7 @@ public class MockSystemReader extends SystemReader { long now = 1250379778668L; // Sat Aug 15 20:12:58 GMT-03:30 2009 - final Map values = new HashMap(); + final Map values = new HashMap<>(); FileBasedConfig userGitConfig; diff --git a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java index a44e999378..d1358ee2a5 100644 --- a/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java +++ b/org.eclipse.jgit.junit/src/org/eclipse/jgit/junit/TestRepository.java @@ -876,7 +876,7 @@ public class TestRepository { final File pack, idx; try (PackWriter pw = new PackWriter(db)) { - Set all = new HashSet(); + Set all = new HashSet<>(); for (Ref r : db.getAllRefs().values()) all.add(r.getObjectId()); pw.preparePack(m, all, PackWriter.NONE); @@ -992,7 +992,7 @@ public class TestRepository { private ObjectId topLevelTree; - private final List parents = new ArrayList(2); + private final List parents = new ArrayList<>(2); private int tick = 1; -- cgit v1.2.3