MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

hide equivalent conflict messages from user (IDEADEV-40456)

Browse Source
This commit is contained in:
anna
2009-10-30 21:23:18 +03:00
parent bff6a8afb3
commit dbfca0a56d
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/refactoring/ui/ConflictsDialog.java
+5 -5
View File
@@ -40,9 +40,8 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.LinkedHashSet;
import java.util.regex.Pattern;
public class ConflictsDialog extends DialogWrapper{
@@ -55,7 +54,7 @@ public class ConflictsDialog extends DialogWrapper{
public ConflictsDialog(Project project, MultiMap<PsiElement, String> conflictDescriptions) {
super(project, true);
myProject = project;
List<String> conflicts = new ArrayList<String>();
final LinkedHashSet<String> conflicts = new LinkedHashSet<String>();
for (String conflict : conflictDescriptions.values()) {
conflicts.add(conflict);
@@ -182,7 +181,8 @@ public class ConflictsDialog extends DialogWrapper{
}
private UsagePresentation getPresentation(final UsagePresentation usagePresentation, PsiElement element) {
final String conflictDescription = " (" + Pattern.compile("<[^<>]*>").matcher(StringUtil.join(myElementConflictDescription.get(element), "\n")).replaceAll("") + ")";
final Collection<String> elementConflicts = new LinkedHashSet<String>(myElementConflictDescription.get(element));
final String conflictDescription = " (" + Pattern.compile("<[^<>]*>").matcher(StringUtil.join(elementConflicts, "\n")).replaceAll("") + ")";
return new UsagePresentation() {
@NotNull
public TextChunk[] getText() {
@@ -207,7 +207,7 @@ public class ConflictsDialog extends DialogWrapper{
}
private class DescriptionOnlyUsage implements Usage {
private final String myConflictDescription = Pattern.compile("<[^<>]*>").matcher(StringUtil.join(myElementConflictDescription.get(null), "\n")).replaceAll("");
private final String myConflictDescription = Pattern.compile("<[^<>]*>").matcher(StringUtil.join(new LinkedHashSet<String>(myElementConflictDescription.get(null)), "\n")).replaceAll("");
@NotNull
public UsagePresentation getPresentation() {