diff --git a/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationFeedbackHandler.java b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationFeedbackHandler.java deleted file mode 100644 index 57988ead..00000000 --- a/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationFeedbackHandler.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright 2014-2019 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. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package jetbrains.mps.logic.reactor.evaluation; - -import jetbrains.mps.logic.reactor.program.Rule; - -/** - * @author Fedor Isakov - */ -@Deprecated -public interface EvaluationFeedbackHandler { - - /** - * @deprecated moved elsewhere - */ - @Deprecated - default boolean handleFeedback(Rule rule, EvaluationFeedback feedback){ - throw new UnsupportedOperationException(); - } - -} diff --git a/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationResult.java b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationResult.java index 870fedb3..eece2fd9 100644 --- a/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationResult.java +++ b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationResult.java @@ -24,13 +24,7 @@ import jetbrains.mps.logic.reactor.core.EvaluationFailure; public interface EvaluationResult { public StoreView storeView(); - - /** - * @deprecated use {@link EvaluationResult#feedback()} - */ - @Deprecated - default EvaluationFailure failure() { throw new UnsupportedOperationException(); } - + public EvaluationFeedback feedback(); } diff --git a/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationSession.java b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationSession.java index f6369137..e7ed9572 100644 --- a/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationSession.java +++ b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationSession.java @@ -90,19 +90,8 @@ public abstract class EvaluationSession { public abstract Config withStoreView(StoreView storeView); - @Deprecated - public Config withFeedbackHandler(EvaluationFeedbackHandler handler) { - throw new UnsupportedOperationException(); - } - public abstract EvaluationResult start(Supervisor supervisor); - /** - * @deprecated use {@link Config#start(Supervisor)} - */ - @Deprecated - public EvaluationResult start() { throw new UnsupportedOperationException(); } - } protected static void setBackend(EvaluationSession.Backend backend) { diff --git a/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationTrace.java b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationTrace.java index 095125da..0f3b5b13 100644 --- a/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationTrace.java +++ b/reactor/Core/src/jetbrains/mps/logic/reactor/evaluation/EvaluationTrace.java @@ -50,8 +50,5 @@ public interface EvaluationTrace { default void ask(boolean result, PredicateInvocation invocation) {} - @Deprecated - default void failure(EvaluationFailure failure) {} - default void feedback(EvaluationFeedback feedback) {} } diff --git a/reactor/Core/src/jetbrains/mps/logic/reactor/program/Program.java b/reactor/Core/src/jetbrains/mps/logic/reactor/program/Program.java index 70395324..49ba78e5 100644 --- a/reactor/Core/src/jetbrains/mps/logic/reactor/program/Program.java +++ b/reactor/Core/src/jetbrains/mps/logic/reactor/program/Program.java @@ -34,12 +34,4 @@ public abstract class Program { public abstract Iterable handlers(); - /** - * @deprecated use {@link jetbrains.mps.logic.reactor.evaluation.Supervisor} - */ - @Deprecated - public List instantiateArguments(List arguments, LogicalContext logicalContext, InvocationContext invocationContext) { - throw new UnsupportedOperationException(); - } - }