diff options
Diffstat (limited to 'org.eclipse.egit.core/src/org/eclipse/egit')
15 files changed, 49 insertions, 49 deletions
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/EclipseProxySelector.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/EclipseProxySelector.java index e606ba4a43..8ec130a1ed 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/EclipseProxySelector.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/EclipseProxySelector.java @@ -34,7 +34,7 @@ class EclipseProxySelector extends ProxySelector { @Override public List<Proxy> select(final URI uri) { - final ArrayList<Proxy> r = new ArrayList<Proxy>(); + final ArrayList<Proxy> r = new ArrayList<>(); final String host = uri.getHost(); if (host != null) { diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/FileChecker.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/FileChecker.java index e67ca613c7..bd10a04112 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/FileChecker.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/FileChecker.java @@ -41,7 +41,7 @@ public class FileChecker { private boolean containsNotSharedResources = false; - private Map<String, CheckResultEntry> problems = new HashMap<String, FileChecker.CheckResultEntry>(); + private Map<String, CheckResultEntry> problems = new HashMap<>(); /** * @return true if there are no problems diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/ProjectReferenceImporter.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/ProjectReferenceImporter.java index 1482680970..513589fb08 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/ProjectReferenceImporter.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/ProjectReferenceImporter.java @@ -130,7 +130,7 @@ public class ProjectReferenceImporter { if (repositoryAlreadyExistsForUrl(repositoryPath, gitUrl)) return repositoryPath; else { - final Collection<String> projectNames = new LinkedList<String>(); + final Collection<String> projectNames = new LinkedList<>(); for (final ProjectReference projectReference : projects) projectNames.add(projectReference.getProjectDir()); throw new TeamException( @@ -168,14 +168,14 @@ public class ProjectReferenceImporter { Map<String, Set<ProjectReference>> repositoryBranches = repositories .get(projectReference.getRepository()); if (repositoryBranches == null) { - repositoryBranches = new HashMap<String, Set<ProjectReference>>(); + repositoryBranches = new HashMap<>(); repositories.put(projectReference.getRepository(), repositoryBranches); } Set<ProjectReference> projectReferences = repositoryBranches .get(projectReference.getBranch()); if (projectReferences == null) { - projectReferences = new LinkedHashSet<ProjectReference>(); + projectReferences = new LinkedHashSet<>(); repositoryBranches.put(projectReference.getBranch(), projectReferences); } diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/indexdiff/GitResourceDeltaVisitor.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/indexdiff/GitResourceDeltaVisitor.java index d0c88e7578..332af49269 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/indexdiff/GitResourceDeltaVisitor.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/indexdiff/GitResourceDeltaVisitor.java @@ -88,7 +88,7 @@ public class GitResourceDeltaVisitor implements IResourceDeltaVisitor { Map<IProject, IPath> deletedProjects) { this.repository = repository; - filesToUpdate = new HashSet<String>(); + filesToUpdate = new HashSet<>(); resourcesToUpdate = new HashSet<IResource>(); this.deletedProjects = deletedProjects; } diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffData.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffData.java index 1f8a88bb77..a3f9f8a884 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffData.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffData.java @@ -78,34 +78,34 @@ public class IndexDiffData { * @param indexDiff */ public IndexDiffData(IndexDiff indexDiff) { - added = Collections.unmodifiableSet(new HashSet<String>(indexDiff + added = Collections.unmodifiableSet(new HashSet<>(indexDiff .getAdded())); assumeUnchanged = Collections.unmodifiableSet( - new HashSet<String>(indexDiff.getAssumeUnchanged())); - changed = Collections.unmodifiableSet(new HashSet<String>(indexDiff + new HashSet<>(indexDiff.getAssumeUnchanged())); + changed = Collections.unmodifiableSet(new HashSet<>(indexDiff .getChanged())); - removed = Collections.unmodifiableSet(new HashSet<String>(indexDiff + removed = Collections.unmodifiableSet(new HashSet<>(indexDiff .getRemoved())); - missing = Collections.unmodifiableSet(new HashSet<String>(indexDiff + missing = Collections.unmodifiableSet(new HashSet<>(indexDiff .getMissing())); - modified = Collections.unmodifiableSet(new HashSet<String>(indexDiff + modified = Collections.unmodifiableSet(new HashSet<>(indexDiff .getModified())); - untracked = Collections.unmodifiableSet(new HashSet<String>(indexDiff + untracked = Collections.unmodifiableSet(new HashSet<>(indexDiff .getUntracked())); untrackedFolders = Collections.unmodifiableSet(getUntrackedFolders(indexDiff)); - conflicts = Collections.unmodifiableSet(new HashSet<String>(indexDiff + conflicts = Collections.unmodifiableSet(new HashSet<>(indexDiff .getConflicting())); - ignored = Collections.unmodifiableSet(new HashSet<String>(indexDiff + ignored = Collections.unmodifiableSet(new HashSet<>(indexDiff .getIgnoredNotInIndex())); - symlinks = Collections.unmodifiableSet(new HashSet<String>(indexDiff + symlinks = Collections.unmodifiableSet(new HashSet<>(indexDiff .getPathsWithIndexMode(FileMode.SYMLINK))); - submodules = Collections.unmodifiableSet(new HashSet<String>(indexDiff + submodules = Collections.unmodifiableSet(new HashSet<>(indexDiff .getPathsWithIndexMode(FileMode.GITLINK))); changedResources = Collections.emptySet(); } private Set<String> getUntrackedFolders(IndexDiff indexDiff) { - HashSet<String> result = new HashSet<String>(); + HashSet<String> result = new HashSet<>(); for (String folder:indexDiff.getUntrackedFolders()) result.add(folder + "/"); //$NON-NLS-1$ return result; @@ -128,17 +128,17 @@ public class IndexDiffData { IndexDiff diffForChangedFiles) { this.changedResources = Collections .unmodifiableCollection(new HashSet<IResource>(changedResources)); - Set<String> added2 = new HashSet<String>(baseDiff.getAdded()); - Set<String> assumeUnchanged2 = new HashSet<String>( + Set<String> added2 = new HashSet<>(baseDiff.getAdded()); + Set<String> assumeUnchanged2 = new HashSet<>( baseDiff.getAssumeUnchanged()); - Set<String> changed2 = new HashSet<String>(baseDiff.getChanged()); - Set<String> removed2 = new HashSet<String>(baseDiff.getRemoved()); - Set<String> missing2 = new HashSet<String>(baseDiff.getMissing()); - Set<String> modified2 = new HashSet<String>(baseDiff.getModified()); - Set<String> untracked2 = new HashSet<String>(baseDiff.getUntracked()); - Set<String> conflicts2 = new HashSet<String>(baseDiff.getConflicting()); - Set<String> symlinks2 = new HashSet<String>(baseDiff.getSymlinks()); - Set<String> submodules2 = new HashSet<String>(baseDiff.getSubmodules()); + Set<String> changed2 = new HashSet<>(baseDiff.getChanged()); + Set<String> removed2 = new HashSet<>(baseDiff.getRemoved()); + Set<String> missing2 = new HashSet<>(baseDiff.getMissing()); + Set<String> modified2 = new HashSet<>(baseDiff.getModified()); + Set<String> untracked2 = new HashSet<>(baseDiff.getUntracked()); + Set<String> conflicts2 = new HashSet<>(baseDiff.getConflicting()); + Set<String> symlinks2 = new HashSet<>(baseDiff.getSymlinks()); + Set<String> submodules2 = new HashSet<>(baseDiff.getSubmodules()); mergeList(added2, changedFiles, diffForChangedFiles.getAdded()); mergeList(assumeUnchanged2, changedFiles, @@ -189,7 +189,7 @@ public class IndexDiffData { private static Set<String> mergeUntrackedFolders(Set<String> oldUntrackedFolders, Collection<String> changedFiles, Set<String> newUntrackedFolders) { - Set<String> merged = new HashSet<String>(); + Set<String> merged = new HashSet<>(); for (String oldUntrackedFolder : oldUntrackedFolders) { boolean changeInUntrackedFolder = isAnyFileContainedInFolder( oldUntrackedFolder, changedFiles); @@ -218,7 +218,7 @@ public class IndexDiffData { */ protected static Set<String> mergeIgnored(Set<String> oldIgnoredPaths, Collection<String> changedPaths, Set<String> newIgnoredPaths) { - Set<String> merged = new HashSet<String>(); + Set<String> merged = new HashSet<>(); for (String oldIgnoredPath : oldIgnoredPaths) { boolean changed = isAnyPrefixOf(oldIgnoredPath, changedPaths); if (!changed) { diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffUpdateJob.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffUpdateJob.java index f65f7ff00e..0f8339aff0 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffUpdateJob.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/indexdiff/IndexDiffUpdateJob.java @@ -111,7 +111,7 @@ abstract class IndexDiffUpdateJob extends Job { private void cleanup() { synchronized (lock) { - files = new HashSet<String>(); + files = new HashSet<>(); resources = new HashSet<IResource>(); } } diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/util/ResourceUtil.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/util/ResourceUtil.java index 085e3002df..3172693260 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/util/ResourceUtil.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/util/ResourceUtil.java @@ -609,7 +609,7 @@ public class ResourceUtil { if (path != null) { Collection<String> resourcesList = result.get(repository); if (resourcesList == null) { - resourcesList = new ArrayList<String>(); + resourcesList = new ArrayList<>(); result.put(repository, resourcesList); } resourcesList.add(path); diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/CloneOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/CloneOperation.java index 30528aecc8..b9d6b73e38 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/CloneOperation.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/CloneOperation.java @@ -171,7 +171,7 @@ public class CloneOperation { cloneRepository.setCallback(callback); } if (selectedBranches != null) { - List<String> branches = new ArrayList<String>(); + List<String> branches = new ArrayList<>(); for (Ref branch : selectedBranches) { branches.add(branch.getName()); } diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/CreatePatchOperation.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/CreatePatchOperation.java index 0adff06ee9..38b71bc85e 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/op/CreatePatchOperation.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/op/CreatePatchOperation.java @@ -292,7 +292,7 @@ public class CreatePatchOperation implements IEGitOperation { private void writeGitPatchHeader(StringBuilder sb) { String template = headerFormat.getTemplate(); String[] segments = template.split("\\$\\{"); //$NON-NLS-1$ - Stack<String> evaluated = new Stack<String>(); + Stack<String> evaluated = new Stack<>(); evaluated.add(segments[0]); for (int i = 1; i < segments.length; i++) { diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/project/RepositoryFinder.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/project/RepositoryFinder.java index f0ea1b97fa..99ef8e9848 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/project/RepositoryFinder.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/project/RepositoryFinder.java @@ -57,10 +57,10 @@ import org.eclipse.jgit.util.SystemReader; public class RepositoryFinder { private final IProject proj; - private final List<RepositoryMapping> results = new ArrayList<RepositoryMapping>(); - private final Set<File> gitdirs = new HashSet<File>(); + private final List<RepositoryMapping> results = new ArrayList<>(); + private final Set<File> gitdirs = new HashSet<>(); - private final Set<File> ceilingDirectories = new HashSet<File>(); + private final Set<File> ceilingDirectories = new HashSet<>(); private boolean findInChildren = true; diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/GitCommitsModelCache.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/GitCommitsModelCache.java index f9c7db9011..c93e7579b7 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/GitCommitsModelCache.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/GitCommitsModelCache.java @@ -331,7 +331,7 @@ public class GitCommitsModelCache { public static List<Commit> build(Repository repo, ObjectId srcId, ObjectId dstId, TreeFilter pathFilter) throws IOException { if (dstId.equals(srcId)) - return new ArrayList<Commit>(0); + return new ArrayList<>(0); try (RevWalk rw = new RevWalk(repo)) { @@ -355,7 +355,7 @@ public class GitCommitsModelCache { if (pathFilter != null) rw.setTreeFilter(pathFilter); - List<Commit> result = new ArrayList<Commit>(); + List<Commit> result = new ArrayList<>(); for (RevCommit revCommit : rw) { if (revCommit.hasAll(allFlags)) break; @@ -398,7 +398,7 @@ public class GitCommitsModelCache { private static Map<String, Change> getChangedObjects(Repository repo, RevCommit commit, RevCommit parentCommit, TreeFilter pathFilter, final int direction) throws IOException { - final Map<String, Change> result = new HashMap<String, GitCommitsModelCache.Change>(); + final Map<String, Change> result = new HashMap<>(); try (final TreeWalk tw = new TreeWalk(repo)) { int commitIndex = addTree(tw, commit); int parentCommitIndex = addTree(tw, parentCommit); diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/GitSyncObjectCache.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/GitSyncObjectCache.java index 28a67f298d..24fe9e6f7e 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/GitSyncObjectCache.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/GitSyncObjectCache.java @@ -74,7 +74,7 @@ class GitSyncObjectCache { String memberPath = entry.getPath(); if (members == null) - members = new HashMap<String, GitSyncObjectCache>(); + members = new HashMap<>(); int start = -1; Map<String, GitSyncObjectCache> parent = members; @@ -89,7 +89,7 @@ class GitSyncObjectCache { start = separatorIdx; separatorIdx = memberPath.indexOf("/", separatorIdx + 1); //$NON-NLS-1$ if (cacheObject.members == null) - cacheObject.members = new HashMap<String, GitSyncObjectCache>(); + cacheObject.members = new HashMap<>(); parent = cacheObject.members; } @@ -171,7 +171,7 @@ class GitSyncObjectCache { void merge(GitSyncObjectCache other, Set<String> filterPaths) { if (other.members != null) { if (members == null) - members = new HashMap<String, GitSyncObjectCache>(); + members = new HashMap<>(); for (Entry<String, GitSyncObjectCache> entry : members.entrySet()) { String key = entry.getKey(); diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/StagedChangeCache.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/StagedChangeCache.java index a11ea7eae7..f027bd3e4c 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/StagedChangeCache.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/StagedChangeCache.java @@ -67,7 +67,7 @@ public class StagedChangeCache { headCommit = null; MutableObjectId idBuf = new MutableObjectId(); - Map<String, Change> result = new HashMap<String, Change>(); + Map<String, Change> result = new HashMap<>(); while(tw.next()) { if (!shouldIncludeEntry(tw)) continue; @@ -89,7 +89,7 @@ public class StagedChangeCache { return result; } catch (IOException e) { Activator.logError(e.getMessage(), e); - return new HashMap<String, Change>(0); + return new HashMap<>(0); } } diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/WorkingTreeChangeCache.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/WorkingTreeChangeCache.java index a46d688509..b178cea1af 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/WorkingTreeChangeCache.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/WorkingTreeChangeCache.java @@ -44,7 +44,7 @@ public class WorkingTreeChangeCache { tw.setFilter(new IndexDiffFilter(cacheNth, fileNth)); tw.setRecursive(true); - Map<String, Change> result = new HashMap<String, Change>(); + Map<String, Change> result = new HashMap<>(); MutableObjectId idBuf = new MutableObjectId(); while (tw.next()) { Change change = new Change(); @@ -61,7 +61,7 @@ public class WorkingTreeChangeCache { return result; } catch (IOException e) { Activator.logError(e.getMessage(), e); - return new HashMap<String, GitCommitsModelCache.Change>(0); + return new HashMap<>(0); } } diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/dto/GitSynchronizeDataSet.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/dto/GitSynchronizeDataSet.java index b40de828ea..3455dff8a2 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/dto/GitSynchronizeDataSet.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/synchronize/dto/GitSynchronizeDataSet.java @@ -48,8 +48,8 @@ public class GitSynchronizeDataSet implements Iterable<GitSynchronizeData> { */ public GitSynchronizeDataSet(boolean forceFetch) { this.forceFetch = forceFetch; - gsdSet = new HashSet<GitSynchronizeData>(); - projectMapping = new HashMap<String, GitSynchronizeData>(); + gsdSet = new HashSet<>(); + projectMapping = new HashMap<>(); } /** |