diff options
Diffstat (limited to 'bundles/org.eclipse.team.cvs.core/src')
18 files changed, 81 insertions, 81 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java index 91024baba..c91bbef74 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSMergeSubscriber.java @@ -117,7 +117,7 @@ public class CVSMergeSubscriber extends CVSSyncTreeSubscriber implements IResour private static final String UNIQUE_ID_PREFIX = "merge-"; //$NON-NLS-1$ private CVSTag start, end; - private List roots; + private List<IResource> roots; private CVSResourceVariantTree remoteTree; private MergeBaseTree baseTree; private boolean isModelSync; @@ -136,7 +136,7 @@ public class CVSMergeSubscriber extends CVSSyncTreeSubscriber implements IResour super(id, NLS.bind(CVSMessages.CVSMergeSubscriber_2, new String[] { start.getName(), end.getName() })); this.start = start; this.end = end; - this.roots = new ArrayList(Arrays.asList(roots)); + this.roots = new ArrayList<>(Arrays.asList(roots)); initialize(); } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSRepositoryLocationMatcher.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSRepositoryLocationMatcher.java index fd7079f49..d93b040c0 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSRepositoryLocationMatcher.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSRepositoryLocationMatcher.java @@ -52,10 +52,10 @@ public class CVSRepositoryLocationMatcher { return 0; }; - public static Map/* <IProject, List<ICVSRepositoryLocation>> */prepareSuggestedRepositoryLocations( - IProject[] projects, final Map/* <IProject, LoadInfo> */infoMap) { - List/* <IProject> */confirmedProjectsList = Arrays.asList(projects); - Set/* <ICVSRepositoryLocation> */projectSetRepositoryLocations = new HashSet(); + public static Map<IProject, List<ICVSRepositoryLocation>> prepareSuggestedRepositoryLocations( + IProject[] projects, final Map<IProject, LoadInfo> infoMap) { + List<IProject> confirmedProjectsList = Arrays.asList(projects); + Set<ICVSRepositoryLocation> projectSetRepositoryLocations = new HashSet<>(); for (Iterator i = infoMap.keySet().iterator(); i.hasNext();) { IProject project = (IProject) i.next(); if (confirmedProjectsList.contains(project)) { @@ -69,7 +69,7 @@ public class CVSRepositoryLocationMatcher { return null; } - List/* <ICVSRepositoryLocation> */knownRepositories = Arrays + List<ICVSRepositoryLocation> knownRepositories = Arrays .asList(KnownRepositories.getInstance().getRepositories()); if (knownRepositories.isEmpty()) { @@ -80,7 +80,7 @@ public class CVSRepositoryLocationMatcher { .hasNext();) { ICVSRepositoryLocation projectSetRepositoryLocation = (ICVSRepositoryLocation) i .next(); - ArrayList list = new ArrayList(1); + ArrayList<ICVSRepositoryLocation> list = new ArrayList<>(1); list.add(projectSetRepositoryLocation); result.put(projectSetRepositoryLocation, list); } @@ -88,7 +88,7 @@ public class CVSRepositoryLocationMatcher { } else if (knownRepositories.containsAll(projectSetRepositoryLocations)) { // All repositories are known, no need to prompt for additional // information. - return Collections.EMPTY_MAP; + return Collections.emptyMap(); } else { // Not all repositories from the project set are known. Map result = new HashMap(); diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncTreeSubscriber.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncTreeSubscriber.java index a6448a423..5c28a5623 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncTreeSubscriber.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSSyncTreeSubscriber.java @@ -141,8 +141,8 @@ public abstract class CVSSyncTreeSubscriber extends ResourceVariantTreeSubscribe } protected boolean rootsEqual(Subscriber other) { - Set roots1 = new HashSet(Arrays.asList(other.roots())); - Set roots2 = new HashSet(Arrays.asList(roots())); + Set<IResource> roots1 = new HashSet<>(Arrays.asList(other.roots())); + Set<IResource> roots2 = new HashSet<>(Arrays.asList(roots())); if(roots1.size() != roots2.size()) return false; return roots2.containsAll(roots1); } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Update.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Update.java index cf1381bd8..918968259 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Update.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/client/Update.java @@ -104,7 +104,7 @@ public class Update extends Command { } protected LocalOption[] filterLocalOptions(Session session, GlobalOption[] globalOptions, LocalOption[] localOptions) { - List newOptions = new ArrayList(Arrays.asList(localOptions)); + List<LocalOption> newOptions = new ArrayList<>(Arrays.asList(localOptions)); if (shouldRetrieveAbsentDirectories(session) && ! RETRIEVE_ABSENT_DIRECTORIES.isElementOf(localOptions)) { newOptions.add(Update.RETRIEVE_ABSENT_DIRECTORIES); diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filehistory/CVSFileHistory.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filehistory/CVSFileHistory.java index 87c150cfa..b6c537c35 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filehistory/CVSFileHistory.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/filehistory/CVSFileHistory.java @@ -134,7 +134,7 @@ public class CVSFileHistory extends FileHistory { } else if (flag == IFileHistoryProvider.SINGLE_LINE_OF_DESCENT) { CVSTag tempTag = cvsFile.getSyncInfo().getTag(); - ArrayList entriesOfInterest = new ArrayList(); + ArrayList<ILogEntry> entriesOfInterest = new ArrayList<>(); for (int i = 0; i < entries.length; i++) { CVSTag[] tags = entries[i].getTags(); for (int j = 0; j < tags.length; j++) { @@ -260,7 +260,7 @@ public class CVSFileHistory extends FileHistory { //the predecessor is the file with a timestamp that is the largest timestamp //from the set of all timestamps smaller than the root file's timestamp - ArrayList directDescendents = new ArrayList(); + ArrayList<IFileRevision> directDescendents = new ArrayList<>(); for (int i = 0; i < revisions.length; i++) { if (((CVSFileRevision) revisions[i]).isDescendentOf(revision)) { diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java index c25f311e0..56d3f4bdc 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFile.java @@ -359,7 +359,7 @@ public class EclipseFile extends EclipseResource implements ICVSFile { } else if (notifications == NOTIFY_ON_ALL) { internalFormat = NotifyInfo.ALL; } else { - List notificationCharacters = new ArrayList(); + List<Character> notificationCharacters = new ArrayList<>(); if ((notifications & NOTIFY_ON_EDIT) >0) notificationCharacters.add(Character.valueOf(NotifyInfo.EDIT)); if ((notifications & NOTIFY_ON_UNEDIT) >0) diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFolder.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFolder.java index c044d0031..6a94fb5bb 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFolder.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFolder.java @@ -43,7 +43,7 @@ class EclipseFolder extends EclipseResource implements ICVSFolder { * @see ICVSFolder#members(int) */ public ICVSResource[] members(int flags) throws CVSException { - final List result = new ArrayList(); + final List<ICVSResource> result = new ArrayList<>(); IResource[] resources = EclipseSynchronizer.getInstance().members((IContainer)resource); boolean includeFiles = (((flags & FILE_MEMBERS) != 0) || ((flags & (FILE_MEMBERS | FOLDER_MEMBERS)) == 0)); boolean includeFolders = (((flags & FOLDER_MEMBERS) != 0) || ((flags & (FILE_MEMBERS | FOLDER_MEMBERS)) == 0)); diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseSynchronizer.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseSynchronizer.java index 15a690fb8..13bc02680 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseSynchronizer.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseSynchronizer.java @@ -419,7 +419,7 @@ public class EclipseSynchronizer implements IFlushOperation { setCachedFolderIgnores(folder, ignores); SyncFileWriter.writeCVSIgnoreEntries(folder, ignores); // broadcast changes to unmanaged children - they are the only candidates for being ignored - List possibleIgnores = new ArrayList(); + List<IResource> possibleIgnores = new ArrayList<>(); accumulateNonManagedChildren(folder, possibleIgnores); ResourceStateChangeListeners.getListener().resourceSyncInfoChanged((IResource[])possibleIgnores.toArray(new IResource[possibleIgnores.size()])); } finally { @@ -641,7 +641,7 @@ public class EclipseSynchronizer implements IFlushOperation { if (container.exists()) { ISchedulingRule rule = null; try { - Set changed = new HashSet(); + Set<IResource> changed = new HashSet<>(); rule = beginBatching(container, null); try { beginOperation(); @@ -691,7 +691,7 @@ public class EclipseSynchronizer implements IFlushOperation { } public void syncFilesChangedExternally(IContainer[] changedMetaFiles, IFile[] externalDeletions) throws CVSException { - List changed = new ArrayList(); + List<IResource> changed = new ArrayList<>(); for (int i = 0; i < changedMetaFiles.length; i++) { IContainer container = changedMetaFiles[i]; if (!isWithinActiveOperationScope(container)) { @@ -947,7 +947,7 @@ public class EclipseSynchronizer implements IFlushOperation { if (threadInfo.isEmpty()) { return SyncInfoCache.STATUS_OK; } - List errors = new ArrayList(); + List<IStatus> errors = new ArrayList<>(); try { /*** prepare operation ***/ // find parents of changed resources @@ -958,7 +958,7 @@ public class EclipseSynchronizer implements IFlushOperation { } else { changedFolders = new IContainer[0]; } - Set dirtyParents = new HashSet(); + Set<IContainer> dirtyParents = new HashSet<>(); for (int i = 0; i < changedResources.length; i++) { IResource resource = changedResources[i]; IContainer folder = resource.getParent(); @@ -1018,7 +1018,7 @@ public class EclipseSynchronizer implements IFlushOperation { // write sync info for all children in one go try { beginOperation(); - List infos = new ArrayList(); + List<byte[]> infos = new ArrayList<>(); IResource[] children = folder.members(true); for (int i = 0; i < children.length; i++) { IResource resource = children[i]; @@ -1054,7 +1054,7 @@ public class EclipseSynchronizer implements IFlushOperation { /*** broadcast events ***/ monitor.subTask(CVSMessages.EclipseSynchronizer_NotifyingListeners); - Set allChanges = new HashSet(); + Set<IResource> allChanges = new HashSet<>(); allChanges.addAll(Arrays.asList(changedResources)); allChanges.addAll(Arrays.asList(changedFolders)); allChanges.addAll(dirtyParents); @@ -1160,11 +1160,11 @@ public class EclipseSynchronizer implements IFlushOperation { * @param folder the folder to be searched * @param possibleIgnores the list of IResources that can be ignored */ - private void accumulateNonManagedChildren(IContainer folder, List possibleIgnores) throws CVSException { + private void accumulateNonManagedChildren(IContainer folder, List<IResource> possibleIgnores) throws CVSException { try { cacheResourceSyncForChildren(folder, true /* can modify workspace */); IResource[] children = folder.members(); - List folders = new ArrayList(); + List<IResource> folders = new ArrayList<>(); // deal with all files first and then folders to be otimized for caching scheme for (int i = 0; i < children.length; i++) { IResource child = children[i]; @@ -1204,7 +1204,7 @@ public class EclipseSynchronizer implements IFlushOperation { if (info == null) return; infos = new NotifyInfo[] { info }; } else { - Map infoMap = new HashMap(); + Map<String, NotifyInfo> infoMap = new HashMap<>(); for (int i = 0; i < infos.length; i++) { NotifyInfo notifyInfo = infos[i]; infoMap.put(notifyInfo.getName(), notifyInfo); @@ -1251,7 +1251,7 @@ public class EclipseSynchronizer implements IFlushOperation { public void deleteNotifyInfo(IResource resource) throws CVSException { NotifyInfo[] infos = SyncFileWriter.readAllNotifyInfo(resource.getParent()); if (infos == null) return; - Map infoMap = new HashMap(); + Map<String, NotifyInfo> infoMap = new HashMap<>(); for (int i = 0; i < infos.length; i++) { NotifyInfo notifyInfo = infos[i]; infoMap.put(notifyInfo.getName(), notifyInfo); @@ -1281,7 +1281,7 @@ public class EclipseSynchronizer implements IFlushOperation { if (infos == null) { infos = new BaserevInfo[] { info }; } else { - Map infoMap = new HashMap(); + Map<String, BaserevInfo> infoMap = new HashMap<>(); for (int i = 0; i < infos.length; i++) { infoMap.put(infos[i].getName(), infos[i]); } @@ -1320,7 +1320,7 @@ public class EclipseSynchronizer implements IFlushOperation { public void deleteBaserevInfo(IResource resource) throws CVSException { BaserevInfo[] infos = SyncFileWriter.readAllBaserevInfo(resource.getParent()); if (infos == null) return; - Map infoMap = new HashMap(); + Map<String, BaserevInfo> infoMap = new HashMap<>(); for (int i = 0; i < infos.length; i++) { infoMap.put(infos[i].getName(), infos[i]); } @@ -1434,7 +1434,7 @@ public class EclipseSynchronizer implements IFlushOperation { * thats were the sync info is kept. */ private IContainer[] getParentFolders(IResource[] resources, int depth) throws CVSException { - final Set folders = new HashSet(); + final Set<IResource> folders = new HashSet<>(); for (int i = 0; i < resources.length; i++) { IResource resource = resources[i]; folders.add(resource.getProject()); @@ -1820,7 +1820,7 @@ public class EclipseSynchronizer implements IFlushOperation { } private ISchedulingRule getProjectRule(IResource[] resources) { - HashSet set = new HashSet(); + HashSet<IProject> set = new HashSet<>(); for (int i = 0; i < resources.length; i++) { IResource resource = resources[i]; set.add(resource.getProject()); diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/FileContentCachingService.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/FileContentCachingService.java index 4bfb0843b..3a7a14268 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/FileContentCachingService.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/FileContentCachingService.java @@ -121,7 +121,7 @@ public class FileContentCachingService { */ private String[] getUncachedFiles() { if (fileDiffs.length == 0) return fileDiffs; - List existing = new ArrayList(); + List<String> existing = new ArrayList<>(); for (int i = 0; i < fileDiffs.length; i++) { String filePath = fileDiffs[i]; try { diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/FileModificationManager.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/FileModificationManager.java index 9087d57ab..57cefe6cc 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/FileModificationManager.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/FileModificationManager.java @@ -35,7 +35,7 @@ public class FileModificationManager implements IResourceChangeListener { private static final QualifiedName UPDATE_TIMESTAMP = new QualifiedName(CVSProviderPlugin.ID, "update-timestamp"); //$NON-NLS-1$ - /* private */Set modifiedResources = new HashSet(); + /* private */Set<IResource> modifiedResources = new HashSet<>(); // consider the following changes types and ignore the others (e.g. marker and description changes are ignored) protected int INTERESTING_CHANGES = IResourceDelta.CONTENT | diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java index ec058582c..241de7053 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolder.java @@ -156,7 +156,7 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC }; // Build the local options - final List localOptions = new ArrayList(); + final List<LocalOption> localOptions = new ArrayList<>(); localOptions.add(Update.RETRIEVE_ABSENT_DIRECTORIES); if (tag != null && tag.getType() != CVSTag.HEAD) localOptions.add(Update.makeTagOption(tag)); @@ -227,7 +227,7 @@ public class RemoteFolder extends RemoteResource implements ICVSRemoteFolder, IC * @see ICVSFolder#members(int) */ public ICVSResource[] members(int flags) throws CVSException { - final List result = new ArrayList(); + final List<ICVSResource> result = new ArrayList<>(); ICVSRemoteResource[] resources = getChildren(); if (children == null) { return new ICVSResource[0]; diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderMemberFetcher.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderMemberFetcher.java index c23cc5b25..75e9ede66 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderMemberFetcher.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderMemberFetcher.java @@ -34,10 +34,10 @@ public class RemoteFolderMemberFetcher implements IUpdateMessageListener, IStatu private final RemoteFolder parentFolder; private CVSTag tag; - List folders = new ArrayList(); // RemoteFolder - List files = new ArrayList(); // RemoteFile + List<RemoteFolder> folders = new ArrayList<>(); + List<RemoteFile> files = new ArrayList<>(); boolean exists = true; - List exceptions = new ArrayList(); // CVSException + List<CVSException> exceptions = new ArrayList<>(); protected RemoteFolderMemberFetcher(RemoteFolder parentFolder, CVSTag tag) { this.tag = tag; @@ -98,7 +98,7 @@ public class RemoteFolderMemberFetcher implements IUpdateMessageListener, IStatu session.open(Policy.subMonitorFor(progress, 10), false /* read-only */); try { // Build the local options - final List localOptions = new ArrayList(); + final List<LocalOption> localOptions = new ArrayList<>(); localOptions.add(Update.RETRIEVE_ABSENT_DIRECTORIES); if (tag != null) localOptions.add(Update.makeTagOption(tag)); diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderSandbox.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderSandbox.java index 046dd6a40..abe7a19b1 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderSandbox.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderSandbox.java @@ -117,7 +117,7 @@ public class RemoteFolderSandbox extends RemoteFolder { public void remove(RemoteFile file) { ICVSRemoteResource[] children = getChildren(); - ArrayList results = new ArrayList(); + ArrayList<ICVSRemoteResource> results = new ArrayList<>(); for (int i = 0; i < children.length; i++) { if (children[i] != file){ results.add(children[i]); diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTreeBuilder.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTreeBuilder.java index eee273adc..4c2f3a2ae 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTreeBuilder.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteFolderTreeBuilder.java @@ -44,9 +44,9 @@ public class RemoteFolderTreeBuilder { private static final int MAX_REVISION_FETCHES_PER_CONNECTION = 1024; - private Map fileDeltas; - private List changedFiles; - private Map remoteFolderTable; + private Map<String, Map> fileDeltas; + private List<String> changedFiles; + private Map<String, RemoteFolderTree> remoteFolderTable; private ICVSFolder root; private RemoteFolderTree remoteRoot; @@ -96,12 +96,12 @@ public class RemoteFolderTreeBuilder { this.repository = repository; this.root = root; this.tag = tag; - this.fileDeltas = new HashMap(); - this.changedFiles = new ArrayList(); - this.remoteFolderTable = new HashMap(); + this.fileDeltas = new HashMap<String, Map>(); + this.changedFiles = new ArrayList<String>(); + this.remoteFolderTable = new HashMap<String, RemoteFolderTree>(); // Build the local options - List localOptions = new ArrayList(); + List<LocalOption> localOptions = new ArrayList<>(); if (tag != null) { if (tag.getType() == CVSTag.HEAD) { localOptions.add(Update.CLEAR_STICKY); @@ -109,14 +109,14 @@ public class RemoteFolderTreeBuilder { localOptions.add(Update.makeTagOption(tag)); } } - updateLocalOptions = (LocalOption[])localOptions.toArray(new LocalOption[localOptions.size()]); + updateLocalOptions = localOptions.toArray(new LocalOption[localOptions.size()]); } private LocalOption[] getOptionsWithoutTag() { // Build the local options - List localOptions = new ArrayList(); + List<LocalOption> localOptions = new ArrayList<>(); localOptions.add(Update.RETRIEVE_ABSENT_DIRECTORIES); - return (LocalOption[])localOptions.toArray(new LocalOption[localOptions.size()]); + return localOptions.toArray(new LocalOption[localOptions.size()]); } public static RemoteFolder buildBaseTree(CVSRepositoryLocation repository, ICVSFolder root, CVSTag tag, IProgressMonitor progress) throws CVSException { @@ -177,7 +177,7 @@ public class RemoteFolderTreeBuilder { private boolean fetchDelta(ICVSResource[] resources, IProgressMonitor monitor) throws CVSException { // Get the arguments from the files - ArrayList arguments = new ArrayList(); + ArrayList<String> arguments = new ArrayList<>(); for (int i = 0; i < resources.length; i++) { ICVSResource resource = resources[i]; arguments.add(resource.getRelativePath(root)); @@ -190,7 +190,7 @@ public class RemoteFolderTreeBuilder { session.open(Policy.subMonitorFor(monitor, 10), false /* read-only */); try { Policy.checkCanceled(monitor); - fetchDelta(session, (String[]) arguments.toArray(new String[arguments.size()]), Policy.subMonitorFor(monitor, 90)); + fetchDelta(session, arguments.toArray(new String[arguments.size()]), Policy.subMonitorFor(monitor, 90)); if (rootDoesNotExist) { // We cannot handle the case where a project (i.e. the top-most CVS folder) // has been deleted directly on the sever (i.e. deleted using rm -rf) @@ -260,7 +260,7 @@ public class RemoteFolderTreeBuilder { private void fetchFileRevisions(IProgressMonitor monitor) throws CVSException { // 3rd+ Connection: Used to fetch file status in groups of 1024 if (remoteRoot != null && !changedFiles.isEmpty()) { - String[] allChangedFiles = (String[])changedFiles.toArray(new String[changedFiles.size()]); + String[] allChangedFiles = changedFiles.toArray(new String[changedFiles.size()]); int iterations = (allChangedFiles.length / MAX_REVISION_FETCHES_PER_CONNECTION) + (allChangedFiles.length % MAX_REVISION_FETCHES_PER_CONNECTION == 0 ? 0 : 1); for (int i = 0; i < iterations ; i++) { @@ -306,7 +306,7 @@ public class RemoteFolderTreeBuilder { tagForRemoteFolder(root, tag)); // Create the remote resource (using the delta if there is one) RemoteFile remoteFile; - Map deltas = (Map)fileDeltas.get(""); //$NON-NLS-1$ + Map deltas = fileDeltas.get(""); //$NON-NLS-1$ if (deltas == null || deltas.isEmpty()) { // If the file is an addition, return null as the remote // Note: If there was a conflicting addition, the delta would not be empty @@ -340,7 +340,7 @@ public class RemoteFolderTreeBuilder { session = new Session(repository, remoteRoot, false); session.open(Policy.subMonitorFor(monitor, 10), false /* read-only */); try { - fetchFileRevisions(session, (String[])changedFiles.toArray(new String[changedFiles.size()]), Policy.subMonitorFor(monitor, 20)); + fetchFileRevisions(session, changedFiles.toArray(new String[changedFiles.size()]), Policy.subMonitorFor(monitor, 20)); } finally { session.close(); } @@ -377,7 +377,7 @@ public class RemoteFolderTreeBuilder { RemoteFolder remote = createRemoteFolder(local, parent, folderSyncInfo); // Create a List to contain the created children - List children = new ArrayList(); + List<RemoteResource> children = new ArrayList<>(); // Build the child folders corresponding to local folders base ICVSResource[] folders = local.members(ICVSFolder.FOLDER_MEMBERS); @@ -415,7 +415,7 @@ public class RemoteFolderTreeBuilder { return null; // Add the children to the remote folder tree - remote.setChildren((ICVSRemoteResource[])children.toArray(new ICVSRemoteResource[children.size()])); + remote.setChildren(children.toArray(new ICVSRemoteResource[children.size()])); return remote; } @@ -443,7 +443,7 @@ public class RemoteFolderTreeBuilder { recordRemoteFolder(remote); // Create a map to contain the created children - Map children = new HashMap(); + Map<String, RemoteResource> children = new HashMap<>(); // If there's no corresponding local resource then we need to fetch its contents in order to populate the deltas if (local == null) { @@ -451,7 +451,7 @@ public class RemoteFolderTreeBuilder { } // Fetch the delta's for the folder - Map deltas = (Map)fileDeltas.get(localPath); + Map deltas = fileDeltas.get(localPath); if (deltas == null) deltas = EMPTY_MAP; @@ -531,13 +531,13 @@ public class RemoteFolderTreeBuilder { } // Add the children to the remote folder tree - remote.setChildren((ICVSRemoteResource[])children.values().toArray(new ICVSRemoteResource[children.size()])); + remote.setChildren(children.values().toArray(new ICVSRemoteResource[children.size()])); // We have to delay building the child folders to support the proper fetching of new directories // due to the fact that the same CVS home directory (i.e. the same root directory) must // be used for all requests sent over the same connection Iterator childIterator = children.entrySet().iterator(); - List emptyChildren = new ArrayList(); + List<RemoteFolderTree> emptyChildren = new ArrayList<>(); while (childIterator.hasNext()) { Map.Entry entry = (Map.Entry)childIterator.next(); if (((RemoteResource)entry.getValue()).isFolder()) { @@ -568,10 +568,10 @@ public class RemoteFolderTreeBuilder { // Prune any empty child folders if (isPruneEmptyDirectories() && !emptyChildren.isEmpty()) { - List newChildren = new ArrayList(); + List<ICVSRemoteResource> newChildren = new ArrayList<ICVSRemoteResource>(); newChildren.addAll(Arrays.asList(remote.getChildren())); newChildren.removeAll(emptyChildren); - remote.setChildren((ICVSRemoteResource[])newChildren.toArray(new ICVSRemoteResource[newChildren.size()])); + remote.setChildren(newChildren.toArray(new ICVSRemoteResource[newChildren.size()])); } } @@ -582,7 +582,7 @@ public class RemoteFolderTreeBuilder { * * Returns the list of changed files */ - private List fetchDelta(Session session, String[] arguments, final IProgressMonitor monitor) throws CVSException { + private List<String> fetchDelta(Session session, String[] arguments, final IProgressMonitor monitor) throws CVSException { // Create an listener that will accumulate new and removed files and folders IUpdateMessageListener listener = new IUpdateMessageListener() { @@ -614,7 +614,7 @@ public class RemoteFolderTreeBuilder { // The change could be a local change conflicting with a remote deletion. // If so, the deltas may already have a DELETED for the file. // We shouldn't override this DELETED - Map deltas = (Map)fileDeltas.get(Util.removeLastSegment(filename)); + Map deltas = fileDeltas.get(Util.removeLastSegment(filename)); DeltaNode d = deltas != null ? (DeltaNode)deltas.get(Util.getLastSegment(filename)) : null; if ((d!=null) && (d.getRevision() == DELETED)) break; @@ -714,7 +714,7 @@ public class RemoteFolderTreeBuilder { private void fetchFileRevisions(Session session, String[] fileNames, final IProgressMonitor monitor) throws CVSException { // Create a listener for receiving the revision info - final List exceptions = new ArrayList(); + final List<CVSException> exceptions = new ArrayList<CVSException>(); IStatusListener listener = new IStatusListener() { public void fileStatus(ICVSFolder root, String path, String remoteRevision) { try { @@ -740,11 +740,11 @@ public class RemoteFolderTreeBuilder { // Report any exceptions that occurred fetching the revisions if ( ! exceptions.isEmpty()) { if (exceptions.size() == 1) { - throw (CVSException)exceptions.get(0); + throw exceptions.get(0); } else { MultiStatus multi = new MultiStatus(CVSProviderPlugin.ID, 0, CVSMessages.RemoteFolder_errorFetchingRevisions, null); for (int i = 0; i < exceptions.size(); i++) { - multi.merge(((CVSException)exceptions.get(i)).getStatus()); + multi.merge(exceptions.get(i).getStatus()); } throw new CVSException(multi); } @@ -767,9 +767,9 @@ public class RemoteFolderTreeBuilder { newFolderExist = true; } String parent = Util.removeLastSegment(path); - Map deltas = (Map)fileDeltas.get(parent); + Map<String, DeltaNode> deltas = fileDeltas.get(parent); if (deltas == null) { - deltas = new HashMap(); + deltas = new HashMap<>(); fileDeltas.put(parent, deltas); } String name = Util.getLastSegment(path); @@ -810,7 +810,7 @@ public class RemoteFolderTreeBuilder { } private RemoteFolderTree getRecoredRemoteFolder(String path) { - return (RemoteFolderTree)remoteFolderTable.get(Util.asPath(path)); + return remoteFolderTable.get(Util.asPath(path)); } /** @@ -819,6 +819,6 @@ public class RemoteFolderTreeBuilder { * @return an array of differing files */ public String[] getFileDiffs() { - return (String[]) changedFiles.toArray(new String[changedFiles.size()]); + return changedFiles.toArray(new String[changedFiles.size()]); } } diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java index 296213829..629cbd9a8 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/RemoteModule.java @@ -75,11 +75,11 @@ public class RemoteModule extends RemoteFolder { // Read the module name StringTokenizer tokenizer = new StringTokenizer(moduleDefinitionStrings[i]); String moduleName = tokenizer.nextToken(); - List localOptionsList; + List<LocalOption> localOptionsList; String next; try { // Read the options associated with the module - localOptionsList = new ArrayList(); + localOptionsList = new ArrayList<>(); next = tokenizer.nextToken(); while (next.charAt(0) == '-') { switch (next.charAt(1)) { @@ -154,7 +154,7 @@ public class RemoteModule extends RemoteFolder { // Record any referenced modules so that can be cross-referenced below if (next.charAt(0) == '&') { - List children = new ArrayList(10); + List<String> children = new ArrayList<>(10); children.add(next); while (tokenizer.hasMoreTokens()) children.add(tokenizer.nextToken()); @@ -212,7 +212,7 @@ public class RemoteModule extends RemoteFolder { String[] children = (String[])referencedModulesTable.get(moduleName); if (children != null) { RemoteModule module = (RemoteModule)modules.get(moduleName); - List referencedFolders = new ArrayList(); + List<RemoteModule> referencedFolders = new ArrayList<>(); boolean expandable = true; for (int i = 0; i < children.length; i++) { RemoteModule child = (RemoteModule)modules.get(children[i].substring(1)); diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SessionPropertySyncInfoCache.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SessionPropertySyncInfoCache.java index de12a76e2..36246155e 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SessionPropertySyncInfoCache.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SessionPropertySyncInfoCache.java @@ -145,7 +145,7 @@ import org.eclipse.team.internal.ccvs.core.util.SyncFileWriter; /*package*/ IResource[] purgeCache(IContainer container, boolean deep) throws CVSException { if (! container.exists()) return new IResource[0]; try { - Set flushed = new HashSet(); + Set<IResource> flushed = new HashSet<>(); if (container.getType() != IResource.ROOT) { safeSetSessionProperty(container, IGNORE_SYNC_KEY, null); safeSetSessionProperty(container, FOLDER_SYNC_KEY, null); diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SynchronizerSyncInfoCache.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SynchronizerSyncInfoCache.java index 624943916..a9f0268a6 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SynchronizerSyncInfoCache.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/SynchronizerSyncInfoCache.java @@ -39,7 +39,7 @@ import org.eclipse.team.internal.ccvs.core.util.Util; /*package*/ class SynchronizerSyncInfoCache extends SyncInfoCache { // Map of sync bytes that were set without a scheduling rule - Map pendingCacheWrites = new HashMap(); + Map<IResource, Object> pendingCacheWrites = new HashMap<>(); private static final Object BYTES_REMOVED = new byte[0]; public SynchronizerSyncInfoCache() { @@ -324,7 +324,7 @@ import org.eclipse.team.internal.ccvs.core.util.Util; public IResource[] members(IContainer folder) throws CoreException { IResource[] pendingWrites = getPendingCacheWrites(); if (pendingWrites != null){ - HashSet cachedResources = new HashSet(); + HashSet<IResource> cachedResources = new HashSet<>(); for (int i = 0; i < pendingWrites.length; i++) { IResource resource = pendingWrites[i]; if (resource.getParent().equals(folder)) diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/UpdateContentCachingService.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/UpdateContentCachingService.java index be7102fb1..854884c05 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/UpdateContentCachingService.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/UpdateContentCachingService.java @@ -41,7 +41,7 @@ public class UpdateContentCachingService implements IUpdateMessageListener { private final CVSTag tag; private final int depth; private boolean fetchAbsentDirectories = true; - private ArrayList removed = new ArrayList(); + private ArrayList<ICVSResource> removed = new ArrayList<>(); public class SandboxUpdate extends Update { @@ -263,7 +263,7 @@ public class UpdateContentCachingService implements IUpdateMessageListener { } private LocalOption[] getLocalOptions() { - ArrayList options = new ArrayList(); + ArrayList<LocalOption> options = new ArrayList<>(); if (tag != null) options.add(Update.makeTagOption(tag)); |