From 258e6d6274bc644ead7f875248ffb45be94dbec8 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Wed, 27 Apr 2016 18:48:31 +0300 Subject: [PATCH] diff: diamondify --- .../intellij/ide/diff/DirDiffSettings.java | 4 ++-- .../com/intellij/diff/DiffManagerImpl.java | 4 ++-- .../intellij/diff/DiffRequestFactoryImpl.java | 12 +++++----- .../diff/actions/BufferedLineIterator.java | 2 +- .../actions/impl/SetEditorSettingsAction.java | 2 +- .../applications/ApplicationStarterBase.java | 2 +- .../com/intellij/diff/comparison/ByChar.java | 2 +- .../com/intellij/diff/comparison/ByLine.java | 10 ++++----- .../com/intellij/diff/comparison/ByWord.java | 20 ++++++++--------- .../diff/comparison/ChunkOptimizer.java | 2 +- .../comparison/ComparisonManagerImpl.java | 8 +++---- .../diff/comparison/ComparisonMergeUtil.java | 6 ++--- .../diff/comparison/LineFragmentSplitter.java | 2 +- .../iterables/DiffIterableUtil.java | 8 +++---- .../diff/impl/CacheDiffRequestProcessor.java | 2 +- .../diff/impl/DiffRequestProcessor.java | 16 +++++++------- .../diff/impl/DiffSettingsHolder.java | 4 ++-- .../intellij/diff/merge/TextMergeChange.java | 2 +- .../intellij/diff/merge/TextMergeViewer.java | 20 ++++++++--------- .../diff/settings/DiffSettingsPanel.java | 2 +- .../tools/binary/OnesideBinaryDiffViewer.java | 2 +- .../binary/ThreesideBinaryDiffViewer.java | 2 +- .../tools/binary/TwosideBinaryDiffViewer.java | 2 +- .../diff/tools/external/ExternalDiffTool.java | 10 ++++----- .../tools/external/ExternalDiffToolUtil.java | 10 ++++----- .../tools/fragmented/LineNumberConvertor.java | 10 ++++----- .../tools/fragmented/UnifiedDiffChange.java | 4 ++-- .../tools/fragmented/UnifiedDiffViewer.java | 14 ++++++------ .../fragmented/UnifiedEditorHighlighter.java | 2 +- .../UnifiedEditorRangeHighlighter.java | 2 +- .../fragmented/UnifiedFragmentBuilder.java | 6 ++--- .../diff/tools/simple/SimpleDiffChange.java | 4 ++-- .../diff/tools/simple/SimpleDiffViewer.java | 16 +++++++------- .../tools/simple/SimpleOnesideDiffViewer.java | 8 +++---- .../simple/SimpleThreesideDiffViewer.java | 12 +++++----- .../tools/simple/ThreesideDiffChangeBase.java | 4 ++-- .../diff/tools/util/FoldingModelSupport.java | 10 ++++----- .../diff/tools/util/SoftHardCacheMap.java | 4 ++-- .../diff/tools/util/base/DiffPanelBase.java | 4 ++-- .../diff/tools/util/base/DiffViewerBase.java | 6 ++--- .../util/base/ListenerDiffViewerBase.java | 4 ++-- .../util/base/TextDiffSettingsHolder.java | 2 +- .../tools/util/base/TextDiffViewerUtil.java | 2 +- .../util/side/ThreesideContentPanel.java | 2 +- .../tools/util/side/ThreesideDiffViewer.java | 2 +- .../tools/util/side/TwosideDiffViewer.java | 2 +- .../diff/util/DiffDividerDrawUtil.java | 4 ++-- .../src/com/intellij/diff/util/DiffUtil.java | 12 +++++----- .../diff/util/TextDiffTypeFactory.java | 2 +- .../intellij/openapi/diff/impl/dir/DTree.java | 4 ++-- .../openapi/diff/impl/dir/DirDiffPanel.java | 2 +- .../diff/impl/dir/DirDiffTableModel.java | 22 +++++++++---------- .../dir/actions/ChangeCompareModeGroup.java | 2 +- .../dir/actions/DirDiffToolbarActions.java | 2 +- 54 files changed, 163 insertions(+), 163 deletions(-) diff --git a/platform/diff-api/src/com/intellij/ide/diff/DirDiffSettings.java b/platform/diff-api/src/com/intellij/ide/diff/DirDiffSettings.java index 8e5b8506bd70..015aa07ab9ae 100644 --- a/platform/diff-api/src/com/intellij/ide/diff/DirDiffSettings.java +++ b/platform/diff-api/src/com/intellij/ide/diff/DirDiffSettings.java @@ -46,10 +46,10 @@ public class DirDiffSettings { public boolean showInFrame = true; // in dialog otherwise //Usually used to set additional compare settings - private final List extraToolbarActions = new ArrayList(); + private final List extraToolbarActions = new ArrayList<>(); //Non-standard diff tools can store additional data here to use it while building data model - public final HashMap customSettings = new HashMap(); + public final HashMap customSettings = new HashMap<>(); private String filter = ""; private Pattern filterPattern = PatternUtil.fromMask("*"); diff --git a/platform/diff-impl/src/com/intellij/diff/DiffManagerImpl.java b/platform/diff-impl/src/com/intellij/diff/DiffManagerImpl.java index f9bea70ca2dd..b5a5cac2c8fb 100644 --- a/platform/diff-impl/src/com/intellij/diff/DiffManagerImpl.java +++ b/platform/diff-impl/src/com/intellij/diff/DiffManagerImpl.java @@ -88,7 +88,7 @@ public class DiffManagerImpl extends DiffManagerEx { @NotNull @Override public List getDiffTools() { - List result = new ArrayList(); + List result = new ArrayList<>(); Collections.addAll(result, DiffTool.EP_NAME.getExtensions()); result.add(SimpleDiffTool.INSTANCE); result.add(UnifiedDiffTool.INSTANCE); @@ -100,7 +100,7 @@ public class DiffManagerImpl extends DiffManagerEx { @NotNull @Override public List getMergeTools() { - List result = new ArrayList(); + List result = new ArrayList<>(); Collections.addAll(result, MergeTool.EP_NAME.getExtensions()); result.add(TextMergeTool.INSTANCE); result.add(BinaryMergeTool.INSTANCE); diff --git a/platform/diff-impl/src/com/intellij/diff/DiffRequestFactoryImpl.java b/platform/diff-impl/src/com/intellij/diff/DiffRequestFactoryImpl.java index c1d745ef9ee8..2d1dec6b1c44 100644 --- a/platform/diff-impl/src/com/intellij/diff/DiffRequestFactoryImpl.java +++ b/platform/diff-impl/src/com/intellij/diff/DiffRequestFactoryImpl.java @@ -213,7 +213,7 @@ public class DiffRequestFactoryImpl extends DiffRequestFactory { DocumentContent outputContent = myContentFactory.create(project, outputDocument, fileType); CharSequence originalContent = outputDocument.getImmutableCharSequence(); - List contents = new ArrayList(3); + List contents = new ArrayList<>(3); for (String text : textContents) { contents.add(myContentFactory.create(text, fileType)); } @@ -258,7 +258,7 @@ public class DiffRequestFactoryImpl extends DiffRequestFactory { DocumentContent outputContent = myContentFactory.create(project, outputDocument); CharSequence originalContent = outputDocument.getImmutableCharSequence(); - List contents = new ArrayList(3); + List contents = new ArrayList<>(3); for (byte[] bytes : byteContents) { contents.add(FileAwareDocumentContent.create(project, bytes, output)); } @@ -282,7 +282,7 @@ public class DiffRequestFactoryImpl extends DiffRequestFactory { if (outputContent == null) throw new InvalidDiffRequestException("Can't process file: " + output); byte[] originalContent = output.contentsToByteArray(); - List contents = new ArrayList(3); + List contents = new ArrayList<>(3); for (byte[] bytes : byteContents) { contents.add(myContentFactory.createFromBytes(project, output, bytes)); } @@ -332,7 +332,7 @@ public class DiffRequestFactoryImpl extends DiffRequestFactory { @Nullable String title, @NotNull List contentTitles, @Nullable Consumer applyCallback) throws InvalidDiffRequestException { - List byteContents = new ArrayList(3); + List byteContents = new ArrayList<>(3); for (VirtualFile file : fileContents) { try { byteContents.add(file.contentsToByteArray()); @@ -361,8 +361,8 @@ public class DiffRequestFactoryImpl extends DiffRequestFactory { if (outputContent == null) throw new InvalidDiffRequestException("Can't process file: " + output.getPresentableUrl()); byte[] originalContent = output.contentsToByteArray(); - List contents = new ArrayList(3); - List byteContents = new ArrayList(3); + List contents = new ArrayList<>(3); + List byteContents = new ArrayList<>(3); for (VirtualFile file : fileContents) { FileContent content = myContentFactory.createFile(project, file); if (content == null) throw new InvalidDiffRequestException("Can't process file: " + file.getPresentableUrl()); diff --git a/platform/diff-impl/src/com/intellij/diff/actions/BufferedLineIterator.java b/platform/diff-impl/src/com/intellij/diff/actions/BufferedLineIterator.java index f69ee836b6c3..56c9271d45e9 100644 --- a/platform/diff-impl/src/com/intellij/diff/actions/BufferedLineIterator.java +++ b/platform/diff-impl/src/com/intellij/diff/actions/BufferedLineIterator.java @@ -26,7 +26,7 @@ public abstract class BufferedLineIterator implements Iterator> myBuffer; public BufferedLineIterator() { - myBuffer = new LinkedList>(); + myBuffer = new LinkedList<>(); } public abstract boolean hasNextBlock(); diff --git a/platform/diff-impl/src/com/intellij/diff/actions/impl/SetEditorSettingsAction.java b/platform/diff-impl/src/com/intellij/diff/actions/impl/SetEditorSettingsAction.java index a318bb6c2932..5b8776c288e1 100644 --- a/platform/diff-impl/src/com/intellij/diff/actions/impl/SetEditorSettingsAction.java +++ b/platform/diff-impl/src/com/intellij/diff/actions/impl/SetEditorSettingsAction.java @@ -151,7 +151,7 @@ public class SetEditorSettingsAction extends ActionGroup implements DumbAware { @NotNull @Override public AnAction[] getChildren(@Nullable AnActionEvent e) { - List result = new ArrayList(); + List result = new ArrayList<>(); ContainerUtil.addAll(result, myActions); result.add(Separator.getInstance()); result.add(ActionManager.getInstance().getAction(IdeActions.GROUP_DIFF_EDITOR_GUTTER_POPUP)); diff --git a/platform/diff-impl/src/com/intellij/diff/applications/ApplicationStarterBase.java b/platform/diff-impl/src/com/intellij/diff/applications/ApplicationStarterBase.java index dfb5e85bd3d9..5a6fe1d2518c 100644 --- a/platform/diff-impl/src/com/intellij/diff/applications/ApplicationStarterBase.java +++ b/platform/diff-impl/src/com/intellij/diff/applications/ApplicationStarterBase.java @@ -109,7 +109,7 @@ public abstract class ApplicationStarterBase extends ApplicationStarterEx { @NotNull public static List findFiles(@NotNull List filePaths, @Nullable String currentDirectory) throws Exception { - List files = new ArrayList(); + List files = new ArrayList<>(); for (String path : filePaths) { VirtualFile virtualFile = findFile(path, currentDirectory); diff --git a/platform/diff-impl/src/com/intellij/diff/comparison/ByChar.java b/platform/diff-impl/src/com/intellij/diff/comparison/ByChar.java index 3570efb6a145..dcf45202a8a7 100644 --- a/platform/diff-impl/src/com/intellij/diff/comparison/ByChar.java +++ b/platform/diff-impl/src/com/intellij/diff/comparison/ByChar.java @@ -136,7 +136,7 @@ public class ByChar { @NotNull CharSequence text1, @NotNull CharSequence text2, @NotNull FairDiffIterable changes) { - final List ranges = new ArrayList(); + final List ranges = new ArrayList<>(); for (Range ch : changes.iterateChanges()) { int startOffset1; diff --git a/platform/diff-impl/src/com/intellij/diff/comparison/ByLine.java b/platform/diff-impl/src/com/intellij/diff/comparison/ByLine.java index f763f5042a9c..df500afa2e5a 100644 --- a/platform/diff-impl/src/com/intellij/diff/comparison/ByLine.java +++ b/platform/diff-impl/src/com/intellij/diff/comparison/ByLine.java @@ -293,7 +293,7 @@ public class ByLine { private static List convertIntoFragments(@NotNull List lines1, @NotNull List lines2, @NotNull FairDiffIterable changes) { - List fragments = new ArrayList(); + List fragments = new ArrayList<>(); for (Range ch : changes.iterateChanges()) { IntPair offsets1 = getOffsets(lines1, ch.start1, ch.end1); IntPair offsets2 = getOffsets(lines2, ch.start2, ch.end2); @@ -354,7 +354,7 @@ public class ByLine { @NotNull private static Pair, TIntArrayList> getBigLines(@NotNull List lines, int threshold) { - List bigLines = new ArrayList(lines.size()); + List bigLines = new ArrayList<>(lines.size()); TIntArrayList indexes = new TIntArrayList(lines.size()); for (int i = 0; i < lines.size(); i++) { @@ -372,7 +372,7 @@ public class ByLine { @NotNull List lines2, @NotNull FairDiffIterable iterable, @NotNull ProgressIndicator indicator) { - List changes = new ArrayList(); + List changes = new ArrayList<>(); for (Range ch : iterable.iterateChanges()) { Range expanded = TrimUtil.expand(lines1, lines2, ch.start1, ch.start2, ch.end1, ch.end2); @@ -388,7 +388,7 @@ public class ByLine { @NotNull private static List getLines(@NotNull CharSequence text, @NotNull ComparisonPolicy policy) { - List lines = new ArrayList(); + List lines = new ArrayList<>(); int offset = 0; while (true) { @@ -417,7 +417,7 @@ public class ByLine { @NotNull private static List convertToIgnoreWhitespace(@NotNull List original) { - List result = new ArrayList(original.size()); + List result = new ArrayList<>(original.size()); for (Line line : original) { result.add(Line.createIgnore(line.getOriginalText(), line.getOffset1())); diff --git a/platform/diff-impl/src/com/intellij/diff/comparison/ByWord.java b/platform/diff-impl/src/com/intellij/diff/comparison/ByWord.java index c738c6cb0993..b5a6e9d7ce5b 100644 --- a/platform/diff-impl/src/com/intellij/diff/comparison/ByWord.java +++ b/platform/diff-impl/src/com/intellij/diff/comparison/ByWord.java @@ -128,7 +128,7 @@ public class ByWord { List wordBlocks = new LineFragmentSplitter(text1, text2, words1, words2, wordChanges, indicator).run(); - List lineBlocks = new ArrayList(wordBlocks.size()); + List lineBlocks = new ArrayList<>(wordBlocks.size()); for (WordBlock block : wordBlocks) { Range offsets = block.offsets; Range words = block.words; @@ -485,8 +485,8 @@ public class ByWord { @NotNull private static Couple> splitIterable2Side(@NotNull FairDiffIterable changes, int offset) { - final List ranges1 = new ArrayList(); - final List ranges2 = new ArrayList(); + final List ranges1 = new ArrayList<>(); + final List ranges2 = new ArrayList<>(); for (Range ch : changes.iterateUnchanged()) { if (ch.end2 <= offset) { ranges1.add(new Range(ch.start1, ch.end1, ch.start2, ch.end2)); @@ -524,7 +524,7 @@ public class ByWord { myText2 = text2; myIndicator = indicator; - myChanges = new ArrayList(); + myChanges = new ArrayList<>(); } @NotNull @@ -564,7 +564,7 @@ public class ByWord { myText3 = text3; myIndicator = indicator; - myChanges = new ArrayList(); + myChanges = new ArrayList<>(); } @NotNull @@ -607,7 +607,7 @@ public class ByWord { myText2 = text2; myIndicator = indicator; - myChanges = new ArrayList(); + myChanges = new ArrayList<>(); } @NotNull @@ -644,7 +644,7 @@ public class ByWord { myText3 = text3; myIndicator = indicator; - myChanges = new ArrayList(); + myChanges = new ArrayList<>(); } @NotNull @@ -678,7 +678,7 @@ public class ByWord { myText2 = text2; myIndicator = indicator; - myChanges = new ArrayList(); + myChanges = new ArrayList<>(); } @NotNull @@ -733,7 +733,7 @@ public class ByWord { myText3 = text3; myIndicator = indicator; - myChanges = new ArrayList(); + myChanges = new ArrayList<>(); } @NotNull @@ -823,7 +823,7 @@ public class ByWord { @NotNull public static List getInlineChunks(@NotNull final CharSequence text) { - final List chunks = new ArrayList(); + final List chunks = new ArrayList<>(); final int len = text.length(); diff --git a/platform/diff-impl/src/com/intellij/diff/comparison/ChunkOptimizer.java b/platform/diff-impl/src/com/intellij/diff/comparison/ChunkOptimizer.java index f762d86637ee..5473af0c275a 100644 --- a/platform/diff-impl/src/com/intellij/diff/comparison/ChunkOptimizer.java +++ b/platform/diff-impl/src/com/intellij/diff/comparison/ChunkOptimizer.java @@ -53,7 +53,7 @@ abstract class ChunkOptimizer { myIterable = iterable; myIndicator = indicator; - myRanges = new ArrayList(); + myRanges = new ArrayList<>(); } @NotNull diff --git a/platform/diff-impl/src/com/intellij/diff/comparison/ComparisonManagerImpl.java b/platform/diff-impl/src/com/intellij/diff/comparison/ComparisonManagerImpl.java index 53128b5c9f76..3e03914dacdb 100644 --- a/platform/diff-impl/src/com/intellij/diff/comparison/ComparisonManagerImpl.java +++ b/platform/diff-impl/src/com/intellij/diff/comparison/ComparisonManagerImpl.java @@ -61,7 +61,7 @@ public class ComparisonManagerImpl extends ComparisonManager { @NotNull ProgressIndicator indicator) throws DiffTooBigException { List lineFragments = compareLines(text1, text2, policy, indicator); - List fineFragments = new ArrayList(lineFragments.size()); + List fineFragments = new ArrayList<>(lineFragments.size()); int tooBigChunksCount = 0; for (LineFragment fragment : lineFragments) { @@ -209,7 +209,7 @@ public class ComparisonManagerImpl extends ComparisonManager { public List squash(@NotNull List oldFragments) { if (oldFragments.isEmpty()) return oldFragments; - final List newFragments = new ArrayList(); + final List newFragments = new ArrayList<>(); processAdjoining(oldFragments, new Consumer>() { @Override public void consume(List fragments) { @@ -228,7 +228,7 @@ public class ComparisonManagerImpl extends ComparisonManager { if (!squash && !trim) return oldFragments; if (oldFragments.isEmpty()) return oldFragments; - final List newFragments = new ArrayList(); + final List newFragments = new ArrayList<>(); processAdjoining(oldFragments, new Consumer>() { @Override public void consume(List fragments) { @@ -300,7 +300,7 @@ public class ComparisonManagerImpl extends ComparisonManager { LineFragment firstFragment = oldFragments.get(0); LineFragment lastFragment = oldFragments.get(oldFragments.size() - 1); - List newInnerFragments = new ArrayList(); + List newInnerFragments = new ArrayList<>(); for (LineFragment fragment : oldFragments) { for (DiffFragment innerFragment : extractInnerFragments(fragment)) { int shift1 = fragment.getStartOffset1() - firstFragment.getStartOffset1(); diff --git a/platform/diff-impl/src/com/intellij/diff/comparison/ComparisonMergeUtil.java b/platform/diff-impl/src/com/intellij/diff/comparison/ComparisonMergeUtil.java index c5e9c358376b..cf531d50e866 100644 --- a/platform/diff-impl/src/com/intellij/diff/comparison/ComparisonMergeUtil.java +++ b/platform/diff-impl/src/com/intellij/diff/comparison/ComparisonMergeUtil.java @@ -35,8 +35,8 @@ public class ComparisonMergeUtil { FairMergeBuilder builder = new FairMergeBuilder(); - PeekIterator unchanged1 = new PeekIterator(fragments1.unchanged()); - PeekIterator unchanged2 = new PeekIterator(fragments2.unchanged()); + PeekIterator unchanged1 = new PeekIterator<>(fragments1.unchanged()); + PeekIterator unchanged2 = new PeekIterator<>(fragments2.unchanged()); while (!unchanged1.atEnd() || !unchanged2.atEnd()) { indicator.checkCanceled(); @@ -69,7 +69,7 @@ public class ComparisonMergeUtil { } private static class FairMergeBuilder { - @NotNull private final ArrayList myResult = new ArrayList(); + @NotNull private final ArrayList myResult = new ArrayList<>(); @NotNull private final EqualPair[] myPairs = new EqualPair[2]; // LEFT, RIGHT @NotNull private final int[] myProcessed = new int[]{0, 0, 0}; // LEFT, RIGHT, BASE diff --git a/platform/diff-impl/src/com/intellij/diff/comparison/LineFragmentSplitter.java b/platform/diff-impl/src/com/intellij/diff/comparison/LineFragmentSplitter.java index 4a822a3ac4a9..39dade48257c 100644 --- a/platform/diff-impl/src/com/intellij/diff/comparison/LineFragmentSplitter.java +++ b/platform/diff-impl/src/com/intellij/diff/comparison/LineFragmentSplitter.java @@ -38,7 +38,7 @@ class LineFragmentSplitter { @NotNull private final FairDiffIterable myIterable; @NotNull private final ProgressIndicator myIndicator; - @NotNull private final List myResult = new ArrayList(); + @NotNull private final List myResult = new ArrayList<>(); public LineFragmentSplitter(@NotNull CharSequence text1, @NotNull CharSequence text2, diff --git a/platform/diff-impl/src/com/intellij/diff/comparison/iterables/DiffIterableUtil.java b/platform/diff-impl/src/com/intellij/diff/comparison/iterables/DiffIterableUtil.java index 5cee140c10f6..e91247ac9897 100644 --- a/platform/diff-impl/src/com/intellij/diff/comparison/iterables/DiffIterableUtil.java +++ b/platform/diff-impl/src/com/intellij/diff/comparison/iterables/DiffIterableUtil.java @@ -143,7 +143,7 @@ public class DiffIterableUtil { @NotNull public static List convertIntoFragments(@NotNull DiffIterable changes) { - final List fragments = new ArrayList(); + final List fragments = new ArrayList<>(); for (Range ch : changes.iterateChanges()) { fragments.add(new DiffFragmentImpl(ch.start1, ch.end1, ch.start2, ch.end2)); } @@ -368,8 +368,8 @@ public class DiffIterableUtil { Range range = pair.first; boolean equals = pair.second; - List data1 = new ArrayList(); - List data2 = new ArrayList(); + List data1 = new ArrayList<>(); + List data2 = new ArrayList<>(); for (int i = range.start1; i < range.end1; i++) { data1.add(objects1.get(i)); @@ -378,7 +378,7 @@ public class DiffIterableUtil { data2.add(objects2.get(i)); } - result.add(new LineRangeData(data1, data2, equals)); + result.add(new LineRangeData<>(data1, data2, equals)); } return result; diff --git a/platform/diff-impl/src/com/intellij/diff/impl/CacheDiffRequestProcessor.java b/platform/diff-impl/src/com/intellij/diff/impl/CacheDiffRequestProcessor.java index 790e85a7f551..da33a7a1eba9 100644 --- a/platform/diff-impl/src/com/intellij/diff/impl/CacheDiffRequestProcessor.java +++ b/platform/diff-impl/src/com/intellij/diff/impl/CacheDiffRequestProcessor.java @@ -44,7 +44,7 @@ public abstract class CacheDiffRequestProcessor extends DiffRequestProcessor private static final Logger LOG = Logger.getInstance(CacheDiffRequestProcessor.class); @NotNull private final SoftHardCacheMap myRequestCache = - new SoftHardCacheMap(5, 5); + new SoftHardCacheMap<>(5, 5); @NotNull private final DiffTaskQueue myQueue = new DiffTaskQueue(); diff --git a/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java b/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java index def1fb25b190..752e2ca40ac2 100644 --- a/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java +++ b/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java @@ -115,7 +115,7 @@ public abstract class DiffRequestProcessor implements Disposable { mySettings = DiffSettingsHolder.getInstance().getSettings(myContext.getUserData(DiffUserDataKeys.PLACE)); myAvailableTools = DiffManagerEx.getInstance().getDiffTools(); - myToolOrder = new ArrayList(getToolOrderFromSettings(myAvailableTools)); + myToolOrder = new ArrayList<>(getToolOrderFromSettings(myAvailableTools)); // UI @@ -187,7 +187,7 @@ public abstract class DiffRequestProcessor implements Disposable { @NotNull private List filterFittedTools(@NotNull List tools) { - List result = new ArrayList(); + List result = new ArrayList<>(); for (DiffTool tool : tools) { try { if (tool instanceof FrameDiffTool && tool.canShow(myContext, myActiveRequest)) { @@ -349,7 +349,7 @@ public abstract class DiffRequestProcessor implements Disposable { @NotNull protected List getToolOrderFromSettings(@NotNull List availableTools) { - List result = new ArrayList(); + List result = new ArrayList<>(); List savedOrder = getSettings().getDiffToolsOrder(); for (final String clazz : savedOrder) { @@ -370,7 +370,7 @@ public abstract class DiffRequestProcessor implements Disposable { } protected void updateToolOrderSettings(@NotNull List toolOrder) { - List savedOrder = new ArrayList(); + List savedOrder = new ArrayList<>(); for (DiffTool tool : toolOrder) { savedOrder.add(tool.getClass().getCanonicalName()); } @@ -405,7 +405,7 @@ public abstract class DiffRequestProcessor implements Disposable { protected DefaultActionGroup collectToolbarActions(@Nullable List viewerActions) { DefaultActionGroup group = new DefaultActionGroup(); - List navigationActions = new ArrayList(); + List navigationActions = new ArrayList<>(); navigationActions.addAll(getNavigationActions()); navigationActions.add(myOpenInEditorAction); navigationActions.add(new MyChangeDiffToolAction()); @@ -432,7 +432,7 @@ public abstract class DiffRequestProcessor implements Disposable { protected DefaultActionGroup collectPopupActions(@Nullable List viewerActions) { DefaultActionGroup group = new DefaultActionGroup(); - List selectToolActions = new ArrayList(); + List selectToolActions = new ArrayList<>(); for (DiffTool tool : getAvailableFittedTools()) { if (tool == myState.getActiveTool()) continue; selectToolActions.add(new DiffToolToggleAction(tool)); @@ -1172,7 +1172,7 @@ public abstract class DiffRequestProcessor implements Disposable { FrameDiffTool.ToolbarComponents toolbarComponents1 = myViewer.init(); FrameDiffTool.ToolbarComponents toolbarComponents2 = myWrapperViewer.init(); - List toolbarActions = new ArrayList(); + List toolbarActions = new ArrayList<>(); if (toolbarComponents1.toolbarActions != null) toolbarActions.addAll(toolbarComponents1.toolbarActions); if (toolbarComponents2.toolbarActions != null) { if (!toolbarActions.isEmpty() && !toolbarComponents2.toolbarActions.isEmpty()) toolbarActions.add(Separator.getInstance()); @@ -1180,7 +1180,7 @@ public abstract class DiffRequestProcessor implements Disposable { } buildToolbar(toolbarActions); - List popupActions = new ArrayList(); + List popupActions = new ArrayList<>(); if (toolbarComponents1.popupActions != null) popupActions.addAll(toolbarComponents1.popupActions); if (toolbarComponents2.popupActions != null) { if (!popupActions.isEmpty() && !toolbarComponents2.popupActions.isEmpty()) popupActions.add(Separator.getInstance()); diff --git a/platform/diff-impl/src/com/intellij/diff/impl/DiffSettingsHolder.java b/platform/diff-impl/src/com/intellij/diff/impl/DiffSettingsHolder.java index f669f8ab4a93..233320827d5e 100644 --- a/platform/diff-impl/src/com/intellij/diff/impl/DiffSettingsHolder.java +++ b/platform/diff-impl/src/com/intellij/diff/impl/DiffSettingsHolder.java @@ -43,7 +43,7 @@ public class DiffSettingsHolder implements PersistentStateComponent DIFF_TOOLS_ORDER = new ArrayList(); + @NotNull public List DIFF_TOOLS_ORDER = new ArrayList<>(); public boolean SYNC_BINARY_EDITOR_SETTINGS = true; } @@ -114,7 +114,7 @@ public class DiffSettingsHolder implements PersistentStateComponent PLACES_MAP = new HashMap(); + public Map PLACES_MAP = new HashMap<>(); public SharedSettings SHARED_SETTINGS = new SharedSettings(); } diff --git a/platform/diff-impl/src/com/intellij/diff/merge/TextMergeChange.java b/platform/diff-impl/src/com/intellij/diff/merge/TextMergeChange.java index ab74baa42318..2a44bb1e1dd6 100644 --- a/platform/diff-impl/src/com/intellij/diff/merge/TextMergeChange.java +++ b/platform/diff-impl/src/com/intellij/diff/merge/TextMergeChange.java @@ -47,7 +47,7 @@ public class TextMergeChange extends ThreesideDiffChangeBase { @NotNull private final TextMergeViewer myMergeViewer; @NotNull private final TextMergeViewer.MyThreesideViewer myViewer; - @NotNull private final List myOperations = new ArrayList(); + @NotNull private final List myOperations = new ArrayList<>(); @NotNull private final MergeLineFragment myFragment; diff --git a/platform/diff-impl/src/com/intellij/diff/merge/TextMergeViewer.java b/platform/diff-impl/src/com/intellij/diff/merge/TextMergeViewer.java index f0d75cedbefe..aa5e6fefc5c6 100644 --- a/platform/diff-impl/src/com/intellij/diff/merge/TextMergeViewer.java +++ b/platform/diff-impl/src/com/intellij/diff/merge/TextMergeViewer.java @@ -180,7 +180,7 @@ public class TextMergeViewer implements MergeTool.MergeViewer { @NotNull private final MyInnerDiffWorker myInnerDiffWorker; // all changes - both applied and unapplied ones - @NotNull private final List myAllMergeChanges = new ArrayList(); + @NotNull private final List myAllMergeChanges = new ArrayList<>(); private boolean myInitialRediffStarted; private boolean myInitialRediffFinished; @@ -189,7 +189,7 @@ public class TextMergeViewer implements MergeTool.MergeViewer { @Nullable private MergeCommandAction myCurrentMergeCommand; private int myBulkChangeUpdateDepth; - private final Set myChangesToUpdate = new HashSet(); + private final Set myChangesToUpdate = new HashSet<>(); public MyThreesideViewer(@NotNull DiffContext context, @NotNull ContentDiffRequest request) { super(context, request); @@ -221,7 +221,7 @@ public class TextMergeViewer implements MergeTool.MergeViewer { @NotNull @Override protected List createToolbarActions() { - List group = new ArrayList(); + List group = new ArrayList<>(); group.add(new MyHighlightPolicySettingAction()); group.add(new MyToggleAutoScrollAction()); @@ -243,7 +243,7 @@ public class TextMergeViewer implements MergeTool.MergeViewer { @NotNull @Override protected List createEditorPopupActions() { - List group = new ArrayList(); + List group = new ArrayList<>(); group.add(new ApplySelectedChangesAction(Side.LEFT, false)); group.add(new ApplySelectedChangesAction(Side.RIGHT, false)); @@ -262,7 +262,7 @@ public class TextMergeViewer implements MergeTool.MergeViewer { @Nullable @Override protected List createPopupActions() { - List group = new ArrayList(); + List group = new ArrayList<>(); group.add(Separator.getInstance()); group.add(new MyToggleAutoScrollAction()); @@ -557,7 +557,7 @@ public class TextMergeViewer implements MergeTool.MergeViewer { private void performRediff(@NotNull final List scheduled, @NotNull final List data, @NotNull final ProgressIndicator indicator) { - final List> result = new ArrayList>(data.size()); + final List> result = new ArrayList<>(data.size()); for (InnerChunkData chunkData : data) { result.add(DiffUtil.compareThreesideInner(chunkData.text, ComparisonPolicy.DEFAULT, indicator)); } @@ -821,7 +821,7 @@ public class TextMergeViewer implements MergeTool.MergeViewer { if (myUndoManager == null) return; List affectedChanges = getAffectedChanges(); - final List states = new ArrayList(affectedChanges.size()); + final List states = new ArrayList<>(affectedChanges.size()); for (TextMergeChange change : affectedChanges) { states.add(change.storeState()); } @@ -990,7 +990,7 @@ public class TextMergeViewer implements MergeTool.MergeViewer { private List collectAffectedChanges(@Nullable List directChanges) { if (directChanges == null || directChanges.isEmpty()) return null; - List result = new ArrayList(directChanges.size()); + List result = new ArrayList<>(directChanges.size()); int directIndex = 0; int otherIndex = 0; @@ -1132,7 +1132,7 @@ public class TextMergeViewer implements MergeTool.MergeViewer { final BitSet lines = DiffUtil.getSelectedLines(getEditor(side)); List changes = getChanges(); - List affectedChanges = new ArrayList(); + List affectedChanges = new ArrayList<>(); for (TextMergeChange change : changes) { if (!isEnabled(change)) continue; int line1 = change.getStartLine(side); @@ -1422,7 +1422,7 @@ public class TextMergeViewer implements MergeTool.MergeViewer { public MyUndoableAction(@NotNull TextMergeViewer viewer, @NotNull List states, boolean undo) { super(viewer.getViewer().getEditor().getDocument()); - myViewerRef = new WeakReference(viewer); + myViewerRef = new WeakReference<>(viewer); myStates = states; myUndo = undo; diff --git a/platform/diff-impl/src/com/intellij/diff/settings/DiffSettingsPanel.java b/platform/diff-impl/src/com/intellij/diff/settings/DiffSettingsPanel.java index 4257af2a09d9..e466b7de9366 100644 --- a/platform/diff-impl/src/com/intellij/diff/settings/DiffSettingsPanel.java +++ b/platform/diff-impl/src/com/intellij/diff/settings/DiffSettingsPanel.java @@ -69,7 +69,7 @@ public class DiffSettingsPanel { setPaintLabels(true); //noinspection UseOfObsoleteCollectionType - Dictionary sliderLabels = new Hashtable(); + Dictionary sliderLabels = new Hashtable<>(); for (int i = 0; i < TextDiffSettingsHolder.CONTEXT_RANGE_MODES.length; i++) { sliderLabels.put(i, new JLabel(TextDiffSettingsHolder.CONTEXT_RANGE_MODE_LABELS[i])); } diff --git a/platform/diff-impl/src/com/intellij/diff/tools/binary/OnesideBinaryDiffViewer.java b/platform/diff-impl/src/com/intellij/diff/tools/binary/OnesideBinaryDiffViewer.java index 2023ca0bbe12..28b87fba1659 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/binary/OnesideBinaryDiffViewer.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/binary/OnesideBinaryDiffViewer.java @@ -61,7 +61,7 @@ public class OnesideBinaryDiffViewer extends OnesideDiffViewer createToolbarActions() { - List group = new ArrayList(); + List group = new ArrayList<>(); group.add(myTransferableStateSupport.createToggleAction()); group.addAll(super.createToolbarActions()); return group; diff --git a/platform/diff-impl/src/com/intellij/diff/tools/binary/ThreesideBinaryDiffViewer.java b/platform/diff-impl/src/com/intellij/diff/tools/binary/ThreesideBinaryDiffViewer.java index 110787a4147a..311dfd20364d 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/binary/ThreesideBinaryDiffViewer.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/binary/ThreesideBinaryDiffViewer.java @@ -54,7 +54,7 @@ public class ThreesideBinaryDiffViewer extends ThreesideDiffViewer createToolbarActions() { - List group = new ArrayList(); + List group = new ArrayList<>(); group.add(myTransferableStateSupport.createToggleAction()); group.addAll(super.createToolbarActions()); return group; diff --git a/platform/diff-impl/src/com/intellij/diff/tools/binary/TwosideBinaryDiffViewer.java b/platform/diff-impl/src/com/intellij/diff/tools/binary/TwosideBinaryDiffViewer.java index 2819e88e4399..3f3e2ded8774 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/binary/TwosideBinaryDiffViewer.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/binary/TwosideBinaryDiffViewer.java @@ -86,7 +86,7 @@ public class TwosideBinaryDiffViewer extends TwosideDiffViewer createToolbarActions() { - List group = new ArrayList(); + List group = new ArrayList<>(); group.add(new MyAcceptSideAction(Side.LEFT)); group.add(new MyAcceptSideAction(Side.RIGHT)); diff --git a/platform/diff-impl/src/com/intellij/diff/tools/external/ExternalDiffTool.java b/platform/diff-impl/src/com/intellij/diff/tools/external/ExternalDiffTool.java index 65d610d3c69a..9a7485a4b5c3 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/external/ExternalDiffTool.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/external/ExternalDiffTool.java @@ -61,8 +61,8 @@ public class ExternalDiffTool { @NotNull final DiffDialogHints hints) { try { //noinspection unchecked - final Ref> requestsRef = new Ref>(); - final Ref exceptionRef = new Ref(); + final Ref> requestsRef = new Ref<>(); + final Ref exceptionRef = new Ref<>(); ProgressManager.getInstance().run(new Task.Modal(project, "Loading Requests", true) { @Override public void run(@NotNull ProgressIndicator indicator) { @@ -77,7 +77,7 @@ public class ExternalDiffTool { if (!exceptionRef.isNull()) throw exceptionRef.get(); - List showInBuiltin = new ArrayList(); + List showInBuiltin = new ArrayList<>(); for (DiffRequest request : requestsRef.get()) { if (canShow(request)) { showRequest(project, request); @@ -103,10 +103,10 @@ public class ExternalDiffTool { private static List collectRequests(@Nullable Project project, @NotNull final DiffRequestChain chain, @NotNull ProgressIndicator indicator) { - List requests = new ArrayList(); + List requests = new ArrayList<>(); UserDataHolderBase context = new UserDataHolderBase(); - List errorRequests = new ArrayList(); + List errorRequests = new ArrayList<>(); // TODO: show all changes on explicit selection List producers = Collections.singletonList(chain.getRequests().get(chain.getIndex())); diff --git a/platform/diff-impl/src/com/intellij/diff/tools/external/ExternalDiffToolUtil.java b/platform/diff-impl/src/com/intellij/diff/tools/external/ExternalDiffToolUtil.java index ef7f335aec4c..af90cc587452 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/external/ExternalDiffToolUtil.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/external/ExternalDiffToolUtil.java @@ -182,14 +182,14 @@ public class ExternalDiffToolUtil { assert contents.size() == 2 || contents.size() == 3; assert titles.size() == contents.size(); - List files = new ArrayList(); + List files = new ArrayList<>(); for (int i = 0; i < contents.size(); i++) { files.add(createFile(contents.get(i), titles.get(i), windowTitle)); } CommandLineTokenizer parameterTokenizer = new CommandLineTokenizer(settings.getDiffParameters(), true); - List args = new ArrayList(); + List args = new ArrayList<>(); while (parameterTokenizer.hasMoreTokens()) { String arg = parameterTokenizer.nextToken(); if ("%1".equals(arg)) { @@ -224,7 +224,7 @@ public class ExternalDiffToolUtil { throws IOException, ExecutionException { boolean success = false; OutputFile outputFile = null; - List inputFiles = new ArrayList(); + List inputFiles = new ArrayList<>(); try { DiffContent outputContent = request.getOutputContent(); List contents = request.getContents(); @@ -242,7 +242,7 @@ public class ExternalDiffToolUtil { CommandLineTokenizer parameterTokenizer = new CommandLineTokenizer(settings.getMergeParameters(), true); - List args = new ArrayList(); + List args = new ArrayList<>(); while (parameterTokenizer.hasMoreTokens()) { String arg = parameterTokenizer.nextToken(); if ("%1".equals(arg)) { @@ -269,7 +269,7 @@ public class ExternalDiffToolUtil { final Process process = commandLine.createProcess(); if (settings.isMergeTrustExitCode()) { - final Ref resultRef = new Ref(); + final Ref resultRef = new Ref<>(); ProgressManager.getInstance().run(new Task.Modal(project, "Waiting for external tool", true) { @Override diff --git a/platform/diff-impl/src/com/intellij/diff/tools/fragmented/LineNumberConvertor.java b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/LineNumberConvertor.java index 16df5ae84a83..19662b1ddba1 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/fragmented/LineNumberConvertor.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/LineNumberConvertor.java @@ -147,11 +147,11 @@ public class LineNumberConvertor { } public static class Builder { - @NotNull private final TreeMap myFragments1 = new TreeMap(); - @NotNull private final TreeMap myFragments2 = new TreeMap(); + @NotNull private final TreeMap myFragments1 = new TreeMap<>(); + @NotNull private final TreeMap myFragments2 = new TreeMap<>(); - @NotNull private final TreeMap myInvertedFragments1 = new TreeMap(); - @NotNull private final TreeMap myInvertedFragments2 = new TreeMap(); + @NotNull private final TreeMap myInvertedFragments1 = new TreeMap<>(); + @NotNull private final TreeMap myInvertedFragments2 = new TreeMap<>(); public void put1(int start, int newStart, int length) { myFragments1.put(start, newStart); @@ -219,7 +219,7 @@ public class LineNumberConvertor { * */ private class Corrector { - private final List myChanges = new SmartList(); + private final List myChanges = new SmartList<>(); @SuppressWarnings("UnnecessaryLocalVariable") public void handleOnesideChange(int startLine, int endLine, int shift, @NotNull Side masterSide) { diff --git a/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffChange.java b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffChange.java index c68b9454223d..62417e5cba9d 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffChange.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffChange.java @@ -45,8 +45,8 @@ public class UnifiedDiffChange { @NotNull private final LineFragment myLineFragment; - @NotNull private final List myHighlighters = new ArrayList(); - @NotNull private final List myOperations = new ArrayList(); + @NotNull private final List myHighlighters = new ArrayList<>(); + @NotNull private final List myOperations = new ArrayList<>(); public UnifiedDiffChange(@NotNull UnifiedDiffViewer viewer, @NotNull ChangedBlock block) { myViewer = viewer; diff --git a/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffViewer.java b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffViewer.java index a48e1444ef3c..b2f4626637cc 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffViewer.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffViewer.java @@ -186,7 +186,7 @@ public class UnifiedDiffViewer extends ListenerDiffViewerBase { @Override @CalledInAwt public List createToolbarActions() { - List group = new ArrayList(); + List group = new ArrayList<>(); // TODO: allow to choose myMasterSide group.add(new MyIgnorePolicySettingAction()); @@ -205,7 +205,7 @@ public class UnifiedDiffViewer extends ListenerDiffViewerBase { @Override @CalledInAwt public List createPopupActions() { - List group = new ArrayList(); + List group = new ArrayList<>(); group.add(Separator.getInstance()); group.add(new MyIgnorePolicySettingAction().getPopupGroup()); @@ -222,7 +222,7 @@ public class UnifiedDiffViewer extends ListenerDiffViewerBase { @NotNull protected List createEditorPopupActions() { - List group = new ArrayList(); + List group = new ArrayList<>(); if (isEditable(Side.RIGHT, false)) { group.add(new ReplaceSelectedChangesAction(Side.LEFT, false)); @@ -420,12 +420,12 @@ public class UnifiedDiffViewer extends ListenerDiffViewerBase { if (data.getRangeHighlighter() != null) data.getRangeHighlighter().apply(myProject, myDocument); - ArrayList diffChanges = new ArrayList(blocks.size()); + ArrayList diffChanges = new ArrayList<>(blocks.size()); for (ChangedBlock block : blocks) { diffChanges.add(new UnifiedDiffChange(UnifiedDiffViewer.this, block)); } - List guarderRangeBlocks = new ArrayList(); + List guarderRangeBlocks = new ArrayList<>(); if (!myEditor.isViewer()) { for (ChangedBlock block : blocks) { LineRange range = myMasterSide.select(block.getRange2(), block.getRange1()); @@ -947,7 +947,7 @@ public class UnifiedDiffViewer extends ListenerDiffViewerBase { final BitSet lines = DiffUtil.getSelectedLines(myEditor); List changes = myChangedBlockData.getDiffChanges(); - List affectedChanges = new ArrayList(); + List affectedChanges = new ArrayList<>(); for (int i = changes.size() - 1; i >= 0; i--) { UnifiedDiffChange change = changes.get(i); int line1 = change.getLine1(); @@ -1136,7 +1136,7 @@ public class UnifiedDiffViewer extends ListenerDiffViewerBase { CharSequence text = myDocument.getImmutableCharSequence().subSequence(offset1, offset2); - Pair pair = new Pair(myLine, text); + Pair pair = new Pair<>(myLine, text); myLine++; return pair; diff --git a/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedEditorHighlighter.java b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedEditorHighlighter.java index 3099af0d0e47..c31391c612b1 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedEditorHighlighter.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedEditorHighlighter.java @@ -46,7 +46,7 @@ class UnifiedEditorHighlighter implements EditorHighlighter { @NotNull List ranges, int textLength) { myDocument = document; - myPieces = new ArrayList(); + myPieces = new ArrayList<>(); init(highlighter1.createIterator(0), highlighter2.createIterator(0), ranges, textLength); } diff --git a/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedEditorRangeHighlighter.java b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedEditorRangeHighlighter.java index 740027bb11c2..b07d6468ab02 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedEditorRangeHighlighter.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedEditorRangeHighlighter.java @@ -35,7 +35,7 @@ import java.util.List; class UnifiedEditorRangeHighlighter { public static final Logger LOG = UnifiedDiffViewer.LOG; - @NotNull private final List myPieces = new ArrayList(); + @NotNull private final List myPieces = new ArrayList<>(); public UnifiedEditorRangeHighlighter(@Nullable Project project, @NotNull Document document) { ApplicationManager.getApplication().assertReadAccessAllowed(); diff --git a/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedFragmentBuilder.java b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedFragmentBuilder.java index 37cac428f465..8710e8bfffe8 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedFragmentBuilder.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedFragmentBuilder.java @@ -33,10 +33,10 @@ class UnifiedFragmentBuilder { @NotNull private final Side myMasterSide; @NotNull private final StringBuilder myBuilder = new StringBuilder(); - @NotNull private final List myBlocks = new ArrayList(); - @NotNull private final List myRanges = new ArrayList(); + @NotNull private final List myBlocks = new ArrayList<>(); + @NotNull private final List myRanges = new ArrayList<>(); @NotNull private final LineNumberConvertor.Builder myConvertor = new LineNumberConvertor.Builder(); - @NotNull private final List myChangedLines = new ArrayList(); + @NotNull private final List myChangedLines = new ArrayList<>(); public UnifiedFragmentBuilder(@NotNull List fragments, @NotNull Document document1, diff --git a/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffChange.java b/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffChange.java index dfd771c32a33..9efeac3e4183 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffChange.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffChange.java @@ -41,8 +41,8 @@ public class SimpleDiffChange { @NotNull private final LineFragment myFragment; @Nullable private final List myInnerFragments; - @NotNull private final List myHighlighters = new ArrayList(); - @NotNull private final List myOperations = new ArrayList(); + @NotNull private final List myHighlighters = new ArrayList<>(); + @NotNull private final List myOperations = new ArrayList<>(); private boolean myIsValid = true; private int[] myLineStartShifts = new int[2]; diff --git a/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffViewer.java b/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffViewer.java index 0ef1c17f858c..d0109601eee1 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffViewer.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffViewer.java @@ -67,8 +67,8 @@ public class SimpleDiffViewer extends TwosideTextDiffViewer { @NotNull private final PrevNextDifferenceIterable myPrevNextDifferenceIterable; @NotNull private final StatusPanel myStatusPanel; - @NotNull private final List myDiffChanges = new ArrayList(); - @NotNull private final List myInvalidDiffChanges = new ArrayList(); + @NotNull private final List myDiffChanges = new ArrayList<>(); + @NotNull private final List myInvalidDiffChanges = new ArrayList<>(); private boolean myIsContentsEqual; @NotNull private final MyFoldingModel myFoldingModel; @@ -109,7 +109,7 @@ public class SimpleDiffViewer extends TwosideTextDiffViewer { @NotNull @Override protected List createToolbarActions() { - List group = new ArrayList(); + List group = new ArrayList<>(); group.add(new MyIgnorePolicySettingAction()); group.add(new MyHighlightPolicySettingAction()); @@ -127,7 +127,7 @@ public class SimpleDiffViewer extends TwosideTextDiffViewer { @NotNull @Override protected List createPopupActions() { - List group = new ArrayList(); + List group = new ArrayList<>(); group.add(Separator.getInstance()); group.add(new MyIgnorePolicySettingAction().getPopupGroup()); @@ -146,7 +146,7 @@ public class SimpleDiffViewer extends TwosideTextDiffViewer { @NotNull @Override protected List createEditorPopupActions() { - List group = new ArrayList(); + List group = new ArrayList<>(); group.add(new ReplaceSelectedChangesAction(Side.LEFT, false)); group.add(new AppendSelectedChangesAction(Side.LEFT, false)); @@ -325,7 +325,7 @@ public class SimpleDiffViewer extends TwosideTextDiffViewer { LineRange lineRange = DiffUtil.getAffectedLineRange(e); int shift = DiffUtil.countLinesShift(e); - List invalid = new ArrayList(); + List invalid = new ArrayList<>(); for (SimpleDiffChange change : myDiffChanges) { if (change.processChange(lineRange.start, lineRange.end, shift, side)) { invalid.add(change); @@ -427,7 +427,7 @@ public class SimpleDiffViewer extends TwosideTextDiffViewer { private List getSelectedChanges(@NotNull Side side) { final BitSet lines = DiffUtil.getSelectedLines(getEditor(side)); - List affectedChanges = new ArrayList(); + List affectedChanges = new ArrayList<>(); for (int i = myDiffChanges.size() - 1; i >= 0; i--) { SimpleDiffChange change = myDiffChanges.get(i); int line1 = change.getStartLine(side); @@ -738,7 +738,7 @@ public class SimpleDiffViewer extends TwosideTextDiffViewer { CharSequence text = myDocument.getImmutableCharSequence().subSequence(offset1, offset2); - Pair pair = new Pair(myLine, text); + Pair pair = new Pair<>(myLine, text); myLine++; return pair; diff --git a/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleOnesideDiffViewer.java b/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleOnesideDiffViewer.java index 4c098fe2df87..d0a80ed8ad5a 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleOnesideDiffViewer.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleOnesideDiffViewer.java @@ -53,7 +53,7 @@ public class SimpleOnesideDiffViewer extends OnesideTextDiffViewer { @NotNull private final MyInitialScrollHelper myInitialScrollHelper = new MyInitialScrollHelper(); - @NotNull private final List myHighlighters = new ArrayList(); + @NotNull private final List myHighlighters = new ArrayList<>(); public SimpleOnesideDiffViewer(@NotNull DiffContext context, @NotNull DiffRequest request) { super(context, (ContentDiffRequest)request); @@ -72,7 +72,7 @@ public class SimpleOnesideDiffViewer extends OnesideTextDiffViewer { @NotNull @Override protected List createToolbarActions() { - List group = new ArrayList(); + List group = new ArrayList<>(); group.add(new MyIgnorePolicySettingAction()); group.add(new MyHighlightPolicySettingAction()); @@ -88,7 +88,7 @@ public class SimpleOnesideDiffViewer extends OnesideTextDiffViewer { @NotNull @Override protected List createPopupActions() { - List group = new ArrayList(); + List group = new ArrayList<>(); group.add(Separator.getInstance()); group.add(new MyIgnorePolicySettingAction().getPopupGroup()); @@ -251,7 +251,7 @@ public class SimpleOnesideDiffViewer extends OnesideTextDiffViewer { CharSequence text = myDocument.getImmutableCharSequence().subSequence(offset1, offset2); - Pair pair = new Pair(myLine, text); + Pair pair = new Pair<>(myLine, text); myLine++; return pair; diff --git a/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleThreesideDiffViewer.java b/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleThreesideDiffViewer.java index 94b70e92ff66..28df74547436 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleThreesideDiffViewer.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleThreesideDiffViewer.java @@ -55,8 +55,8 @@ import java.util.List; public class SimpleThreesideDiffViewer extends ThreesideTextDiffViewerEx { public static final Logger LOG = Logger.getInstance(SimpleThreesideDiffViewer.class); - @NotNull private final List myDiffChanges = new ArrayList(); - @NotNull private final List myInvalidDiffChanges = new ArrayList(); + @NotNull private final List myDiffChanges = new ArrayList<>(); + @NotNull private final List myInvalidDiffChanges = new ArrayList<>(); public SimpleThreesideDiffViewer(@NotNull DiffContext context, @NotNull DiffRequest request) { super(context, (ContentDiffRequest)request); @@ -65,7 +65,7 @@ public class SimpleThreesideDiffViewer extends ThreesideTextDiffViewerEx { @NotNull @Override protected List createToolbarActions() { - List group = new ArrayList(); + List group = new ArrayList<>(); group.add(new MyIgnorePolicySettingAction()); group.add(new MyHighlightPolicySettingAction()); @@ -88,7 +88,7 @@ public class SimpleThreesideDiffViewer extends ThreesideTextDiffViewerEx { @NotNull @Override protected List createPopupActions() { - List group = new ArrayList(); + List group = new ArrayList<>(); group.add(Separator.getInstance()); group.add(new MyIgnorePolicySettingAction().getPopupGroup()); @@ -143,7 +143,7 @@ public class SimpleThreesideDiffViewer extends ThreesideTextDiffViewerEx { comparisonPolicy, indicator); if (getHighlightPolicy().isFineFragments()) { - List fineLineFragments = new ArrayList(lineFragments.size()); + List fineLineFragments = new ArrayList<>(lineFragments.size()); for (final MergeLineFragment fragment : lineFragments) { CharSequence[] chunks = ApplicationManager.getApplication().runReadAction(new Computable() { @@ -251,7 +251,7 @@ public class SimpleThreesideDiffViewer extends ThreesideTextDiffViewerEx { LineRange lineRange = DiffUtil.getAffectedLineRange(e); int shift = DiffUtil.countLinesShift(e); - List invalid = new ArrayList(); + List invalid = new ArrayList<>(); for (SimpleThreesideDiffChange change : myDiffChanges) { if (change.processChange(lineRange.start, lineRange.end, shift, side)) { invalid.add(change); diff --git a/platform/diff-impl/src/com/intellij/diff/tools/simple/ThreesideDiffChangeBase.java b/platform/diff-impl/src/com/intellij/diff/tools/simple/ThreesideDiffChangeBase.java index 6b552fa1e5b0..ea81de34a28e 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/simple/ThreesideDiffChangeBase.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/simple/ThreesideDiffChangeBase.java @@ -36,8 +36,8 @@ import java.util.List; public abstract class ThreesideDiffChangeBase { @NotNull private final ConflictType myType; - @NotNull protected final List myHighlighters = new ArrayList(); - @NotNull protected final List myInnerHighlighters = new ArrayList(); + @NotNull protected final List myHighlighters = new ArrayList<>(); + @NotNull protected final List myInnerHighlighters = new ArrayList<>(); public ThreesideDiffChangeBase(@NotNull MergeLineFragment fragment, @NotNull List editors, diff --git a/platform/diff-impl/src/com/intellij/diff/tools/util/FoldingModelSupport.java b/platform/diff-impl/src/com/intellij/diff/tools/util/FoldingModelSupport.java index 90458b614f06..da7fc20257b0 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/util/FoldingModelSupport.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/FoldingModelSupport.java @@ -64,7 +64,7 @@ public class FoldingModelSupport { protected final int myCount; @NotNull protected final EditorEx[] myEditors; - @NotNull protected final List myFoldings = new ArrayList(); + @NotNull protected final List myFoldings = new ArrayList<>(); private boolean myDuringSynchronize; private final boolean[] myShouldUpdateLineNumbers; @@ -155,7 +155,7 @@ public class FoldingModelSupport { } private void addRange(int[] starts, int[] ends) { - List result = new ArrayList(3); + List result = new ArrayList<>(3); int[] rangeStarts = new int[myCount]; int[] rangeEnds = new int[myCount]; @@ -350,7 +350,7 @@ public class FoldingModelSupport { private class MyFoldingListener implements FoldingListener { private final int myIndex; - @NotNull Set myModifiedRegions = new HashSet(); + @NotNull Set myModifiedRegions = new HashSet<>(); public MyFoldingListener(int index) { myIndex = index; @@ -514,7 +514,7 @@ public class FoldingModelSupport { @NotNull private List getFoldedRanges(int index, @NotNull Settings settings) { ApplicationManager.getApplication().assertReadAccessAllowed(); - List ranges = new ArrayList(); + List ranges = new ArrayList<>(); DocumentEx document = myEditors[index].getDocument(); for (FoldedBlock[] blocks : myFoldings) { @@ -622,7 +622,7 @@ public class FoldingModelSupport { protected class FoldedBlock { @NotNull private final FoldRegion[] myRegions; @NotNull private final int[] myLines; - @NotNull private final List myHighlighters = new ArrayList(myCount); + @NotNull private final List myHighlighters = new ArrayList<>(myCount); public FoldedBlock(@NotNull FoldRegion[] regions) { assert regions.length == myCount; diff --git a/platform/diff-impl/src/com/intellij/diff/tools/util/SoftHardCacheMap.java b/platform/diff-impl/src/com/intellij/diff/tools/util/SoftHardCacheMap.java index 8ded7c1e0566..edd15dbc0f1d 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/util/SoftHardCacheMap.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/SoftHardCacheMap.java @@ -25,8 +25,8 @@ public class SoftHardCacheMap { @NotNull private final SoftValueHashMap mySoftLinkMap; public SoftHardCacheMap(final int protectedQueueSize, final int probationalQueueSize) { - mySLRUMap = new SLRUMap(protectedQueueSize, probationalQueueSize); - mySoftLinkMap = new SoftValueHashMap(); + mySLRUMap = new SLRUMap<>(protectedQueueSize, probationalQueueSize); + mySoftLinkMap = new SoftValueHashMap<>(); } @Nullable diff --git a/platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffPanelBase.java b/platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffPanelBase.java index e0e6f22833a4..ea9628bb3d48 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffPanelBase.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffPanelBase.java @@ -35,8 +35,8 @@ public abstract class DiffPanelBase extends JPanel implements DataProvider { @NotNull private final DataProvider myDataProvider; @NotNull protected final DiffContext myContext; - @NotNull private final List myPersistentNotifications = new ArrayList(); - @NotNull private final List myNotifications = new ArrayList(); + @NotNull private final List myPersistentNotifications = new ArrayList<>(); + @NotNull private final List myNotifications = new ArrayList<>(); @NotNull protected final JPanel myContentPanel; @NotNull protected final Wrapper myNotificationsPanel; diff --git a/platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffViewerBase.java b/platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffViewerBase.java index 96929ad2e752..f2c2da661f41 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffViewerBase.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffViewerBase.java @@ -43,7 +43,7 @@ import java.util.List; public abstract class DiffViewerBase implements DiffViewer, DataProvider { protected static final Logger LOG = Logger.getInstance(DiffViewerBase.class); - @NotNull private final List myListeners = new SmartList(); + @NotNull private final List myListeners = new SmartList<>(); @Nullable protected final Project myProject; @NotNull protected final DiffContext myContext; @@ -209,13 +209,13 @@ public abstract class DiffViewerBase implements DiffViewer, DataProvider { } protected List createToolbarActions() { - List group = new ArrayList(); + List group = new ArrayList<>(); ContainerUtil.addAll(group, ((ActionGroup)ActionManager.getInstance().getAction(IdeActions.DIFF_VIEWER_TOOLBAR)).getChildren(null)); return group; } protected List createPopupActions() { - List group = new ArrayList(); + List group = new ArrayList<>(); ContainerUtil.addAll(group, ((ActionGroup)ActionManager.getInstance().getAction(IdeActions.DIFF_VIEWER_POPUP)).getChildren(null)); return group; } diff --git a/platform/diff-impl/src/com/intellij/diff/tools/util/base/ListenerDiffViewerBase.java b/platform/diff-impl/src/com/intellij/diff/tools/util/base/ListenerDiffViewerBase.java index 4b9bff7c64a9..1c74e4f84a3e 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/util/base/ListenerDiffViewerBase.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/base/ListenerDiffViewerBase.java @@ -81,7 +81,7 @@ public abstract class ListenerDiffViewerBase extends DiffViewerBase { @Nullable protected VirtualFileListener createFileListener(@NotNull ContentDiffRequest request) { - final List files = new ArrayList(0); + final List files = new ArrayList<>(0); for (DiffContent content : request.getContents()) { if (content instanceof FileContent && !(content instanceof DocumentContent)) { files.add(((FileContent)content).getFile()); @@ -131,7 +131,7 @@ public abstract class ListenerDiffViewerBase extends DiffViewerBase { @NotNull private Set getDocuments() { - Set documents = new HashSet(); + Set documents = new HashSet<>(); for (DiffContent content : myRequest.getContents()) { if (content instanceof DocumentContent) { documents.add(((DocumentContent)content).getDocument()); diff --git a/platform/diff-impl/src/com/intellij/diff/tools/util/base/TextDiffSettingsHolder.java b/platform/diff-impl/src/com/intellij/diff/tools/util/base/TextDiffSettingsHolder.java index 841cd4ba2d01..e237ffc44d58 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/util/base/TextDiffSettingsHolder.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/base/TextDiffSettingsHolder.java @@ -226,7 +226,7 @@ public class TextDiffSettingsHolder implements PersistentStateComponent getDefaultPlaceSettings() { - Map map = new TreeMap(); + Map map = new TreeMap<>(); PlaceSettings changes = new PlaceSettings(); changes.EXPAND_BY_DEFAULT = false; diff --git a/platform/diff-impl/src/com/intellij/diff/tools/util/base/TextDiffViewerUtil.java b/platform/diff-impl/src/com/intellij/diff/tools/util/base/TextDiffViewerUtil.java index e01dbfc101c0..f72f601759e5 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/util/base/TextDiffViewerUtil.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/base/TextDiffViewerUtil.java @@ -54,7 +54,7 @@ public class TextDiffViewerUtil { @NotNull public static List createEditorPopupActions() { - List result = new ArrayList(); + List result = new ArrayList<>(); result.add(ActionManager.getInstance().getAction("CompareClipboardWithSelection")); result.add(Separator.getInstance()); diff --git a/platform/diff-impl/src/com/intellij/diff/tools/util/side/ThreesideContentPanel.java b/platform/diff-impl/src/com/intellij/diff/tools/util/side/ThreesideContentPanel.java index f3120bce4652..7ccb46b47c91 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/util/side/ThreesideContentPanel.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/side/ThreesideContentPanel.java @@ -44,7 +44,7 @@ public class ThreesideContentPanel extends JPanel { EditorHolder baseHolder = ThreeSide.BASE.select(holders); myBaseEditor = baseHolder instanceof TextEditorHolder ? ((TextEditorHolder)baseHolder).getEditor() : null; - ArrayList components = new ArrayList(3); + ArrayList components = new ArrayList<>(3); for (int i = 0; i < 3; i++) { components.add(new HolderPanel(holders.get(i), titleComponents.get(i))); } diff --git a/platform/diff-impl/src/com/intellij/diff/tools/util/side/ThreesideDiffViewer.java b/platform/diff-impl/src/com/intellij/diff/tools/util/side/ThreesideDiffViewer.java index 404246c2dc97..44e1319252e6 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/util/side/ThreesideDiffViewer.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/side/ThreesideDiffViewer.java @@ -97,7 +97,7 @@ public abstract class ThreesideDiffViewer extends Listen protected List createEditorHolders(@NotNull EditorHolderFactory factory) { List contents = myRequest.getContents(); - List holders = new ArrayList(3); + List holders = new ArrayList<>(3); for (int i = 0; i < 3; i++) { DiffContent content = contents.get(i); holders.add(factory.create(content, myContext)); diff --git a/platform/diff-impl/src/com/intellij/diff/tools/util/side/TwosideDiffViewer.java b/platform/diff-impl/src/com/intellij/diff/tools/util/side/TwosideDiffViewer.java index 85db70b7e657..26e80c570daf 100644 --- a/platform/diff-impl/src/com/intellij/diff/tools/util/side/TwosideDiffViewer.java +++ b/platform/diff-impl/src/com/intellij/diff/tools/util/side/TwosideDiffViewer.java @@ -94,7 +94,7 @@ public abstract class TwosideDiffViewer extends Listener protected List createEditorHolders(@NotNull EditorHolderFactory factory) { List contents = myRequest.getContents(); - List holders = new ArrayList(2); + List holders = new ArrayList<>(2); for (int i = 0; i < 2; i++) { DiffContent content = contents.get(i); holders.add(factory.create(content, myContext)); diff --git a/platform/diff-impl/src/com/intellij/diff/util/DiffDividerDrawUtil.java b/platform/diff-impl/src/com/intellij/diff/util/DiffDividerDrawUtil.java index 1ec8502f8b05..2bb1713b45a1 100644 --- a/platform/diff-impl/src/com/intellij/diff/util/DiffDividerDrawUtil.java +++ b/platform/diff-impl/src/com/intellij/diff/util/DiffDividerDrawUtil.java @@ -95,7 +95,7 @@ public class DiffDividerDrawUtil { public static List createVisiblePolygons(@NotNull Editor editor1, @NotNull Editor editor2, @NotNull DividerPaintable paintable) { - final List polygons = new ArrayList(); + final List polygons = new ArrayList<>(); final Transformation[] transformations = new Transformation[]{getTransformation(editor1), getTransformation(editor2)}; @@ -125,7 +125,7 @@ public class DiffDividerDrawUtil { public static List createVisibleSeparators(@NotNull Editor editor1, @NotNull Editor editor2, @NotNull DividerSeparatorPaintable paintable) { - final List separators = new ArrayList(); + final List separators = new ArrayList<>(); final Transformation[] transformations = new Transformation[]{getTransformation(editor1), getTransformation(editor2)}; diff --git a/platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java b/platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java index aba0d70fc09d..f93f2ed14f48 100644 --- a/platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java +++ b/platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java @@ -369,7 +369,7 @@ public class DiffUtil { return Collections.nCopies(titles.size(), null); } - List components = new ArrayList(titles.size()); + List components = new ArrayList<>(titles.size()); for (int i = 0; i < contents.size(); i++) { JComponent title = createTitle(StringUtil.notNullize(titles.get(i))); title = createTitleWithNotifications(title, contents.get(i)); @@ -387,7 +387,7 @@ public class DiffUtil { boolean equalCharsets = TextDiffViewerUtil.areEqualCharsets(contents); boolean equalSeparators = TextDiffViewerUtil.areEqualLineSeparators(contents); - List result = new ArrayList(contents.size()); + List result = new ArrayList<>(contents.size()); if (equalCharsets && equalSeparators && !ContainerUtil.exists(titles, Condition.NOT_NULL)) { return Collections.nCopies(titles.size(), null); @@ -408,7 +408,7 @@ public class DiffUtil { List notifications = getCustomNotifications(content); if (notifications.isEmpty()) return title; - List components = new ArrayList(); + List components = new ArrayList<>(); if (title != null) components.add(title); components.addAll(notifications); return createStackedComponents(components, TITLE_GAP); @@ -500,7 +500,7 @@ public class DiffUtil { @NotNull public static List createSyncHeightComponents(@NotNull final List components) { if (!ContainerUtil.exists(components, Condition.NOT_NULL)) return components; - List result = new ArrayList(); + List result = new ArrayList<>(); for (int i = 0; i < components.size(); i++) { result.add(new SyncHeightComponent(components, i)); } @@ -783,7 +783,7 @@ public class DiffUtil { startLine, endLine, document.getLineCount())); } - List result = new ArrayList(); + List result = new ArrayList<>(); for (int i = startLine; i < endLine; i++) { int start = document.getLineStartOffset(i); int end = document.getLineEndOffset(i); @@ -1180,7 +1180,7 @@ public class DiffUtil { public static List filterSuppressedTools(@NotNull List tools) { if (tools.size() < 2) return tools; - final List> suppressedTools = new ArrayList>(); + final List> suppressedTools = new ArrayList<>(); for (T tool : tools) { try { if (tool instanceof SuppressiveDiffTool) suppressedTools.addAll(((SuppressiveDiffTool)tool).getSuppressedTools()); diff --git a/platform/diff-impl/src/com/intellij/diff/util/TextDiffTypeFactory.java b/platform/diff-impl/src/com/intellij/diff/util/TextDiffTypeFactory.java index 27ed81431e22..047f18b0c063 100644 --- a/platform/diff-impl/src/com/intellij/diff/util/TextDiffTypeFactory.java +++ b/platform/diff-impl/src/com/intellij/diff/util/TextDiffTypeFactory.java @@ -42,7 +42,7 @@ public class TextDiffTypeFactory { new TextDiffTypeImpl(DiffColors.DIFF_CONFLICT, DiffBundle.message("diff.type.conflict.name")); private static final TextDiffTypeFactory ourInstance = new TextDiffTypeFactory(); - private final List myTypes = new ArrayList(); + private final List myTypes = new ArrayList<>(); private TextDiffTypeFactory() { ContainerUtil.addAll(myTypes, INSERTED, DELETED, MODIFIED, CONFLICT); diff --git a/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DTree.java b/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DTree.java index c7094b860025..3325ca54a1ce 100644 --- a/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DTree.java +++ b/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DTree.java @@ -69,7 +69,7 @@ public class DTree { public Collection getChildren() { init(); if (myChildrenList == null) { - myChildrenList = new SortedList(COMPARATOR); + myChildrenList = new SortedList<>(COMPARATOR); myChildrenList.addAll(myChildren.values()); } return myChildrenList; @@ -114,7 +114,7 @@ public class DTree { private void init() { if (myChildren == null) { - myChildren = new HashMap(); + myChildren = new HashMap<>(); } } diff --git a/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffPanel.java b/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffPanel.java index 4098f36425ea..61681ca9be00 100644 --- a/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffPanel.java +++ b/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffPanel.java @@ -539,7 +539,7 @@ public class DirDiffPanel implements Disposable, DataProvider { private OpenFileDescriptor[] getOpenFileDescriptorsArray() { Project project = myModel.getProject(); List elements = myModel.getSelectedElements(); - List descriptors = new ArrayList(); + List descriptors = new ArrayList<>(); for (DirDiffElementImpl element : elements) { DiffElement source = element.getSource(); DiffElement target = element.getTarget(); diff --git a/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffTableModel.java b/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffTableModel.java index d4588e9d2b3e..d64ae486280e 100644 --- a/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffTableModel.java +++ b/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffTableModel.java @@ -73,11 +73,11 @@ public class DirDiffTableModel extends AbstractTableModel implements DirDiffMode private DiffElement mySrc; private DiffElement myTrg; private DTree myTree; - private final List myElements = new ArrayList(); + private final List myElements = new ArrayList<>(); private final AtomicBoolean myUpdating = new AtomicBoolean(false); private JBTable myTable; public String DECORATOR = "DIFF_TABLE_DECORATOR"; - public final AtomicReference text = new AtomicReference(prepareText("")); + public final AtomicReference text = new AtomicReference<>(prepareText("")); private Updater myUpdater; private List myListeners = ContainerUtil.createLockFreeCopyOnWriteList(); private TableSelectionConfig mySelectionConfig; @@ -282,7 +282,7 @@ public class DirDiffTableModel extends AbstractTableModel implements DirDiffMode myTree.setTarget(myTrg); myTree.update(mySettings); - ArrayList elements = new ArrayList(); + ArrayList elements = new ArrayList<>(); fillElements(myTree, elements); myElements.clear(); myElements.addAll(elements); @@ -333,7 +333,7 @@ public class DirDiffTableModel extends AbstractTableModel implements DirDiffMode public void run() { if (myDisposed) return; myTree.updateVisibility(mySettings); - final ArrayList elements = new ArrayList(); + final ArrayList elements = new ArrayList<>(); fillElements(myTree, elements); final Runnable uiThread = new Runnable() { public void run() { @@ -512,7 +512,7 @@ public class DirDiffTableModel extends AbstractTableModel implements DirDiffMode public List getSelectedElements() { final int[] rows = myTable.getSelectedRows(); - final ArrayList elements = new ArrayList(); + final ArrayList elements = new ArrayList<>(); for (int row : rows) { final DirDiffElementImpl element = getElementAt(row); if (element == null || element.isSeparator()) continue; @@ -604,8 +604,8 @@ public class DirDiffTableModel extends AbstractTableModel implements DirDiffMode final String path = element.getParentNode().getPath(); if (source instanceof BackgroundOperatingDiffElement) { - final Ref errorMessage = new Ref(); - final Ref diff = new Ref(); + final Ref errorMessage = new Ref<>(); + final Ref diff = new Ref<>(); Runnable onFinish = new Runnable() { @Override public void run() { @@ -662,8 +662,8 @@ public class DirDiffTableModel extends AbstractTableModel implements DirDiffMode final String path = element.getParentNode().getPath(); if (target instanceof BackgroundOperatingDiffElement) { - final Ref errorMessage = new Ref(); - final Ref diff = new Ref(); + final Ref errorMessage = new Ref<>(); + final Ref diff = new Ref<>(); Runnable onFinish = new Runnable() { @Override public void run() { @@ -744,7 +744,7 @@ public class DirDiffTableModel extends AbstractTableModel implements DirDiffMode final DiffElement target = element.getTarget(); LOG.assertTrue(source == null || target == null); if (source instanceof BackgroundOperatingDiffElement || target instanceof BackgroundOperatingDiffElement) { - final Ref errorMessage = new Ref(); + final Ref errorMessage = new Ref<>(); Runnable onFinish = new Runnable() { @Override public void run() { @@ -805,7 +805,7 @@ public class DirDiffTableModel extends AbstractTableModel implements DirDiffMode } public void synchronizeAll() { - List elements = new ArrayList(myElements); + List elements = new ArrayList<>(myElements); if (!checkCanDelete(elements)) { return; } diff --git a/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/actions/ChangeCompareModeGroup.java b/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/actions/ChangeCompareModeGroup.java index fe97eec6079f..5d27a03b2fb5 100644 --- a/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/actions/ChangeCompareModeGroup.java +++ b/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/actions/ChangeCompareModeGroup.java @@ -38,7 +38,7 @@ public class ChangeCompareModeGroup extends ComboBoxAction implements ShortcutPr public ChangeCompareModeGroup(DirDiffTableModel model) { mySettings = model.getSettings(); getTemplatePresentation().setText(mySettings.compareMode.getPresentableName(mySettings)); - final ArrayList actions = new ArrayList(); + final ArrayList actions = new ArrayList<>(); if (model.getSettings().showCompareModes) { for (DirDiffSettings.CompareMode mode : DirDiffSettings.CompareMode.values()) { actions.add(new ChangeCompareModeAction(model, mode)); diff --git a/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/actions/DirDiffToolbarActions.java b/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/actions/DirDiffToolbarActions.java index e845e939c0d2..f170b83a8e40 100644 --- a/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/actions/DirDiffToolbarActions.java +++ b/platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/actions/DirDiffToolbarActions.java @@ -34,7 +34,7 @@ public class DirDiffToolbarActions extends ActionGroup { public DirDiffToolbarActions(DirDiffTableModel model, JComponent panel) { super("Directory Diff Actions", false); - final List actions = new ArrayList(Arrays.asList( + final List actions = new ArrayList<>(Arrays.asList( new RefreshDirDiffAction(model), Separator.getInstance(), new EnableLeft(model),