Remove redundant type arguments in [svn4idea]

This commit is contained in:
Konstantin Kolosovsky
2017-03-07 14:11:05 +03:00
parent 68bdb1d9c6
commit 620d5bed2f
9 changed files with 13 additions and 13 deletions
@@ -103,7 +103,7 @@ public class NewRootBunch {
}
public void reloadBranches(@NotNull VirtualFile root, @Nullable SvnBranchConfigurationNew prev, @NotNull SvnBranchConfigurationNew next) {
final Set<String> oldUrls = (prev == null) ? Collections.<String>emptySet() : new HashSet<>(prev.getBranchUrls());
final Set<String> oldUrls = (prev == null) ? Collections.emptySet() : new HashSet<>(prev.getBranchUrls());
final SvnVcs vcs = SvnVcs.getInstance(myProject);
if (!vcs.isVcsBackgroundOperationsAllowed(root)) return;
@@ -86,7 +86,7 @@ public class SvnConfigureProxiesComponent extends MasterDetailsComponent {
private void addGroup(final ProxyGroup template) {
final ProxyGroup group;
if (template == null) {
group = new ProxyGroup(getNewName(), "", ContainerUtil.<String, String>newHashMap());
group = new ProxyGroup(getNewName(), "", ContainerUtil.newHashMap());
} else {
group = new ProxyGroup(getNewName(), template.getPatterns(), template.getProperties());
}
@@ -256,7 +256,7 @@ public class SvnConfigureProxiesComponent extends MasterDetailsComponent {
myRoot.removeAllChildren();
DefaultProxyGroup defaultProxyGroup = myManager.getDefaultGroup();
defaultProxyGroup = (defaultProxyGroup == null) ? new DefaultProxyGroup(Collections.<String, String>emptyMap()) : defaultProxyGroup;
defaultProxyGroup = (defaultProxyGroup == null) ? new DefaultProxyGroup(Collections.emptyMap()) : defaultProxyGroup;
final Map<String, ProxyGroup> userGroups = myManager.getGroups();
myRoot.add(createNodeForObject(defaultProxyGroup));
@@ -440,13 +440,13 @@ public class SvnPropertiesDiffViewer extends TwosideTextDiffViewer {
@NotNull
@Override
public List<DiffContent> getContents() {
return ContainerUtil.<DiffContent>list(myContent1, myContent2);
return ContainerUtil.list(myContent1, myContent2);
}
@NotNull
@Override
public List<String> getContentTitles() {
return myEmbedded ? ContainerUtil.<String>list(null, null) : myRequest.getContentTitles();
return myEmbedded ? ContainerUtil.list(null, null) : myRequest.getContentTitles();
}
@Nullable
@@ -243,7 +243,7 @@ public class SvnHistoryProvider
}
final SvnHistorySession historySession =
new SvnHistorySession(myVcs, Collections.<VcsFileRevision>emptyList(), committedPath, showMergeSources && Boolean.TRUE.equals(logLoader.mySupport15), null, false,
new SvnHistorySession(myVcs, Collections.emptyList(), committedPath, showMergeSources && Boolean.TRUE.equals(logLoader.mySupport15), null, false,
! path.isNonLocal());
final Ref<Boolean> sessionReported = new Ref<>();
@@ -181,7 +181,7 @@ public class Merger implements IMerger {
@Nullable
public String getSkipped() {
return getSkippedMessage(myMergeChunk != null ? myMergeChunk.chunkAndAfterLists() : ContainerUtil.<CommittedChangeList>emptyList());
return getSkippedMessage(myMergeChunk != null ? myMergeChunk.chunkAndAfterLists() : ContainerUtil.emptyList());
}
@Nullable
@@ -221,7 +221,7 @@ public class Merger implements IMerger {
List<CommittedChangeList> processed =
myMergeChunk != null
? ContainerUtil.newArrayList(myMergeChunk.chunkAndBeforeLists())
: ContainerUtil.<CommittedChangeList>emptyList();
: ContainerUtil.emptyList();
myProject.getMessageBus().syncPublisher(COMMITTED_CHANGES_MERGED_STATE).event(processed);
}
@@ -335,7 +335,7 @@ public class BranchInfo {
result = SvnMergeInfoCache.MergeCheckResult.getInstance(isAskedRevisionMerged);
}
else {
myPathMergedMap.put(pathWithRevisionNumber, Collections.<Long>emptySet());
myPathMergedMap.put(pathWithRevisionNumber, Collections.emptySet());
result = SvnMergeInfoCache.MergeCheckResult.NOT_MERGED;
}
@@ -118,7 +118,7 @@ public class SvnTreeConflictResolver {
updateFile(ioFile, SVNRevision.HEAD);
FileUtil.delete(ioFile);
} else {
Set<File> usedToBeAdded = myPath.isDirectory() ? getDescendantsWithAddedStatus(ioFile) : ContainerUtil.<File>newHashSet();
Set<File> usedToBeAdded = myPath.isDirectory() ? getDescendantsWithAddedStatus(ioFile) : ContainerUtil.newHashSet();
revert(ioFile);
for (File wasAdded : usedToBeAdded) {
@@ -95,7 +95,7 @@ public abstract class AbstractSvnUpdateIntegrateEnvironment implements UpdateEnv
WaitForProgressToShow.runOrInvokeLaterAboveProgress(() -> Messages
.showErrorDialog(myVcs.getProject(), SvnBundle.message("message.text.update.no.directories.found"),
SvnBundle.message("messate.text.update.error")), null, myVcs.getProject());
return new UpdateSessionAdapter(Collections.<VcsException>emptyList(), true);
return new UpdateSessionAdapter(Collections.emptyList(), true);
}
return new MyUpdateSessionAdapter(contentRoots, updatedFiles, exceptions);
@@ -89,7 +89,7 @@ public class UpdateEventHandler implements ProgressTracker {
* TODO: UPDATE_STARTED event in some code paths.
*/
public void startUpdate() {
myFilesWaitingForRevision.push(ContainerUtil.<Pair<String, String>>newArrayList());
myFilesWaitingForRevision.push(ContainerUtil.newArrayList());
}
public void finishUpdate() {
@@ -189,7 +189,7 @@ public class UpdateEventHandler implements ProgressTracker {
if (mySequentialUpdatesContext != null) {
mySequentialUpdatesContext.registerExternalRootBeingUpdated(event.getFile());
}
myFilesWaitingForRevision.push(ContainerUtil.<Pair<String, String>>newArrayList());
myFilesWaitingForRevision.push(ContainerUtil.newArrayList());
myExternalsCount++;
myText = SvnBundle.message("progress.text.updating.external.location", event.getFile().getAbsolutePath());
}