MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-08 15:09:39 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup: remove duplication from the code

Browse Source 
GitOrigin-RevId: 04533bf1e3f1b7cd94ac91a26a60e4c16ee84d8f
This commit is contained in:
Alexey Kudravtsev
2021-09-20 14:32:43 +02:00
committed by intellij-monorepo-bot
parent 9b9dcde990
commit 0806e44ac7
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
platform/platform-api/src/com/intellij/openapi/actionSystem/DefaultActionGroup.java
View File

@@ -35,7 +35,6 @@ public class DefaultActionGroup extends ActionGroup {
private static final Logger LOG = Logger.getInstance(DefaultActionGroup.class);
private static final String CANT_ADD_ITSELF = "Cannot add a group to itself: ";
private static final String CANT_ADD_ACTION_TWICE = "Cannot add an action twice: ";
private final List<AnAction> mySortedChildren = new ArrayList<>();
private final List<Pair<AnAction, Constraints>> myPairs = new ArrayList<>();
@@ -101,20 +100,25 @@ public class DefaultActionGroup extends ActionGroup {
}
private synchronized void addActions(@NotNull List<? extends AnAction> actions) {
Set<Object> actionSet = new HashSet<>();
Set<AnAction> actionSet = new HashSet<>(actions.size());
List<AnAction> uniqueActions = new ArrayList<>(actions.size());
for (AnAction action : actions) {
if (action == this) throw new IllegalArgumentException(CANT_ADD_ITSELF + action);
if (!(action instanceof Separator) && !actionSet.add(action)) {
LOG.error(CANT_ADD_ACTION_TWICE + action);
continue;
if (action instanceof Separator || actionSet.add(action)) {
uniqueActions.add(action);
}
else {
errorDuplicateActionAdded(action);
}
uniqueActions.add(action);
}
mySortedChildren.addAll(uniqueActions);
incrementModificationStamp();
}
private static void errorDuplicateActionAdded(@NotNull AnAction action) {
LOG.error("Cannot add an action twice: " + action + "(" + action.getClass() + ")");
}
/**
* Adds the specified action to the tail.
*
@@ -169,7 +173,7 @@ public class DefaultActionGroup extends ActionGroup {
// check that action isn't already registered
if (!(action instanceof Separator) && containsAction(action)) {
LOG.error(CANT_ADD_ACTION_TWICE + action);
errorDuplicateActionAdded(action);
remove(action, actionManager.getId(action));
}