diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/HotSwapProgressImpl.java b/java/debugger/impl/src/com/intellij/debugger/ui/HotSwapProgressImpl.java index e68f1d2d755f..ce10b0d03c1d 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/HotSwapProgressImpl.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/HotSwapProgressImpl.java @@ -63,13 +63,10 @@ public class HotSwapProgressImpl extends HotSwapProgress{ public HotSwapProgressImpl(Project project) { super(project); myProgressWindow = new BackgroundableProcessIndicator(getProject(), myTitle, new PerformInBackgroundOption() { + @Override public boolean shouldStartInBackground() { return DebuggerSettings.getInstance().HOTSWAP_IN_BACKGROUND; } - - public void processSentToBackground() { - } - }, null, null, true); myProgressWindow.addStateDelegate(new AbstractProgressIndicatorExBase(){ @Override @@ -81,6 +78,7 @@ public class HotSwapProgressImpl extends HotSwapProgress{ myUpdateQueue = new MergingUpdateQueue("HotSwapProgress update queue", 100, true, null, myProgressWindow); } + @Override public void finished() { super.finished(); @@ -160,6 +158,7 @@ public class HotSwapProgressImpl extends HotSwapProgress{ return res.toString(); } + @Override public void addMessage(DebuggerSession session, final int type, final String text) { List messages = myMessages.get(type); if (messages == null) { @@ -169,6 +168,7 @@ public class HotSwapProgressImpl extends HotSwapProgress{ messages.add(session.getSessionName() + ": " + text + ";"); } + @Override public void setText(final String text) { myUpdateQueue.queue(new Update("Text") { @Override @@ -182,6 +182,7 @@ public class HotSwapProgressImpl extends HotSwapProgress{ }); } + @Override public void setTitle(final String text) { DebuggerInvocationUtil.invokeLater(getProject(), () -> { if (!myProgressWindow.isCanceled() && myProgressWindow.isRunning()) { @@ -191,6 +192,7 @@ public class HotSwapProgressImpl extends HotSwapProgress{ } + @Override public void setFraction(final double v) { DebuggerInvocationUtil.invokeLater(getProject(), () -> { if (!myProgressWindow.isCanceled() && myProgressWindow.isRunning()) { @@ -199,6 +201,7 @@ public class HotSwapProgressImpl extends HotSwapProgress{ }, myProgressWindow.getModalityState()); } + @Override public boolean isCancelled() { return myProgressWindow.isCanceled(); } @@ -207,6 +210,7 @@ public class HotSwapProgressImpl extends HotSwapProgress{ return myProgressWindow; } + @Override public void setDebuggerSession(DebuggerSession session) { myTitle = DebuggerBundle.message("progress.hot.swap.title") + " : " + session.getSessionName(); myProgressWindow.setTitle(myTitle); diff --git a/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextBase.java b/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextBase.java index 5e63e733a153..2041a71aff9a 100644 --- a/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextBase.java +++ b/platform/analysis-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextBase.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2016 JetBrains s.r.o. + * Copyright 2000-2017 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. @@ -255,11 +255,6 @@ public class GlobalInspectionContextBase extends UserDataHolderBase implements G public boolean shouldStartInBackground() { return true; } - - @Override - public void processSentToBackground() { - - } }; } diff --git a/platform/core-api/src/com/intellij/openapi/progress/PerformInBackgroundOption.java b/platform/core-api/src/com/intellij/openapi/progress/PerformInBackgroundOption.java index f9f67e314d47..f205bdc86da5 100644 --- a/platform/core-api/src/com/intellij/openapi/progress/PerformInBackgroundOption.java +++ b/platform/core-api/src/com/intellij/openapi/progress/PerformInBackgroundOption.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2017 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. @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package com.intellij.openapi.progress; /** @@ -23,17 +22,15 @@ public interface PerformInBackgroundOption { PerformInBackgroundOption DEAF = new PerformInBackgroundOption() { @Override public boolean shouldStartInBackground() { return false; } - @Override - public void processSentToBackground() {} }; PerformInBackgroundOption ALWAYS_BACKGROUND = new PerformInBackgroundOption() { @Override public boolean shouldStartInBackground() { return true; } - @Override - public void processSentToBackground() {} }; boolean shouldStartInBackground(); - void processSentToBackground(); + + default void processSentToBackground() { + } } diff --git a/platform/testRunner/src/com/intellij/execution/testframework/export/ExportTestResultsAction.java b/platform/testRunner/src/com/intellij/execution/testframework/export/ExportTestResultsAction.java index 3bd78524e06f..ab95222ac240 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/export/ExportTestResultsAction.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/export/ExportTestResultsAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2016 JetBrains s.r.o. + * Copyright 2000-2017 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. @@ -131,10 +131,6 @@ public class ExportTestResultsAction extends DumbAwareAction { public boolean shouldStartInBackground() { return true; } - - @Override - public void processSentToBackground() { - } }) { @Override public void run(@NotNull ProgressIndicator indicator) { diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java index 6190404082a7..e627bfcf6bc4 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2016 JetBrains s.r.o. + * Copyright 2000-2017 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. @@ -218,9 +218,6 @@ public final class VcsConfiguration implements PersistentStateComponent