From e0dc4d12041da4b835380dcdd478289973c2ee41 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Fri, 22 Jan 2016 12:43:39 +0300 Subject: [PATCH] unnecessary method removed --- .../intellij/util/ui/update/MergingUpdateQueue.java | 12 ++++-------- .../idea/maven/project/MavenProjectsManager.java | 4 ++-- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/platform/platform-api/src/com/intellij/util/ui/update/MergingUpdateQueue.java b/platform/platform-api/src/com/intellij/util/ui/update/MergingUpdateQueue.java index 50cd632a1251..137d164d0e9b 100644 --- a/platform/platform-api/src/com/intellij/util/ui/update/MergingUpdateQueue.java +++ b/platform/platform-api/src/com/intellij/util/ui/update/MergingUpdateQueue.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2015 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -241,10 +241,6 @@ public class MergingUpdateQueue implements Runnable, Disposable, Activatable { return; } } - flush(true); - } - - public void flush(boolean invokeLaterIfNotDispatch) { if (myFlushing) { return; } @@ -279,7 +275,7 @@ public class MergingUpdateQueue implements Runnable, Disposable, Activatable { } }; - if (myExecuteInDispatchThread && invokeLaterIfNotDispatch) { + if (myExecuteInDispatchThread) { UIUtil.invokeLaterIfNeeded(toRun); } else { @@ -426,7 +422,7 @@ public class MergingUpdateQueue implements Runnable, Disposable, Activatable { myWaiterForMerge.cancelAllRequests(); } - @SuppressWarnings({"HardCodedStringLiteral"}) + @SuppressWarnings("HardCodedStringLiteral") public String toString() { synchronized (myScheduledUpdates) { return myName + " active=" + myActive + " scheduled=" + getAllScheduledUpdates().size(); @@ -496,7 +492,7 @@ public class MergingUpdateQueue implements Runnable, Disposable, Activatable { } @NotNull - protected UiActivity getActivityId() { + private UiActivity getActivityId() { if (myUiActivity == null) { myUiActivity = new UiActivity.AsyncBgOperation("UpdateQueue:" + myName + hashCode()); } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManager.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManager.java index 56a1b996d26e..b3f10acb9044 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManager.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2015 JetBrains s.r.o. + * Copyright 2000-2016 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -1055,7 +1055,7 @@ public class MavenProjectsManager extends MavenSimpleProjectComponent if (!isInitialized()) return; runWhenFullyOpen(new Runnable() { public void run() { - myImportingQueue.flush(false); + myImportingQueue.flush(); } }); }