From 030d474727a77d5b1c65097a3c92d78bfcf1a5ea Mon Sep 17 00:00:00 2001
From: Fedor Isakov <fisakov@gmail.com>
Date: Mon, 29 Aug 2016 11:21:23 +0200
Subject: [PATCH] Itegrating the reactor API changes from the typechecker
 project.

---
 .../mps/logic/reactor/evaluation/EvaluationSession.java   | 2 +-
 .../src/jetbrains/mps/logic/reactor/evaluation/trace.info | 4 ++--
 .../mps/logic/reactor/logical/SolverLogical.java          | 2 +-
 .../src/jetbrains/mps/logic/reactor/logical/trace.info    | 4 ++--
 .../API/src/jetbrains/mps/logic/reactor/program/Rule.java | 5 ++---
 .../src/jetbrains/mps/logic/reactor/program/trace.info    | 8 ++++----
 6 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/EvaluationSession.java b/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/EvaluationSession.java
index 16419de2..621aa07a 100644
--- a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/EvaluationSession.java
+++ b/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/EvaluationSession.java
@@ -58,7 +58,7 @@ public abstract class EvaluationSession {
     ourBackend = null;
   }
 
-  protected static interface Backend {
+  protected interface Backend {
 
     EvaluationSession current();
 
diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/trace.info b/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/trace.info
index 1ab42c97..a80ab951 100644
--- a/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/trace.info
+++ b/reactor/API/src/jetbrains/mps/logic/reactor/evaluation/trace.info
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<debug-info-v2>
+<debug-info version="2">
   <concept fqn="c:f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123140:jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" />
   <concept fqn="c:f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123155:jetbrains.mps.baseLanguage.structure.ExpressionStatement" />
   <concept fqn="c:f3061a53-9226-4cc5-a443-f952ceaf5816/1068390468200:jetbrains.mps.baseLanguage.structure.FieldDeclaration" />
@@ -437,5 +437,5 @@
       <unit id="8638394859472384258" at="6,0,17,0" name="jetbrains.mps.logic.reactor.evaluation.EvaluationFailureException" />
     </file>
   </root>
-</debug-info-v2>
+</debug-info>
 
diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/logical/SolverLogical.java b/reactor/API/src/jetbrains/mps/logic/reactor/logical/SolverLogical.java
index 0ca7da93..7f93f070 100644
--- a/reactor/API/src/jetbrains/mps/logic/reactor/logical/SolverLogical.java
+++ b/reactor/API/src/jetbrains/mps/logic/reactor/logical/SolverLogical.java
@@ -28,7 +28,7 @@ public interface SolverLogical<T> extends Logical<T> {
    */
   void setValue(T newValue);
 
-  static interface ValueReconciler<T> {
+  interface ValueReconciler<T> {
 
     void reconcile(T valueA, T valueB);
 
diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/logical/trace.info b/reactor/API/src/jetbrains/mps/logic/reactor/logical/trace.info
index 4ed934dc..8d13180e 100644
--- a/reactor/API/src/jetbrains/mps/logic/reactor/logical/trace.info
+++ b/reactor/API/src/jetbrains/mps/logic/reactor/logical/trace.info
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<debug-info-v2>
+<debug-info version="2">
   <concept fqn="c:f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123140:jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" />
   <concept fqn="c:f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123155:jetbrains.mps.baseLanguage.structure.ExpressionStatement" />
   <concept fqn="c:f3061a53-9226-4cc5-a443-f952ceaf5816/1068390468200:jetbrains.mps.baseLanguage.structure.FieldDeclaration" />
@@ -169,5 +169,5 @@
       <unit id="8907901911298493091" at="6,0,11,0" name="jetbrains.mps.logic.reactor.logical.LogicalContext" />
     </file>
   </root>
-</debug-info-v2>
+</debug-info>
 
diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/program/Rule.java b/reactor/API/src/jetbrains/mps/logic/reactor/program/Rule.java
index 4e2ff308..6ac9ccbc 100644
--- a/reactor/API/src/jetbrains/mps/logic/reactor/program/Rule.java
+++ b/reactor/API/src/jetbrains/mps/logic/reactor/program/Rule.java
@@ -22,11 +22,10 @@ public abstract class Rule {
 
   public abstract Iterable<AndItem> all();
 
-  public static   enum Kind {
+  public enum Kind {
     SIMPLIFICATION(),
     PROPAGATION(),
-    SIMPAGATION();
-
+    SIMPAGATION()
   }
 
 }
diff --git a/reactor/API/src/jetbrains/mps/logic/reactor/program/trace.info b/reactor/API/src/jetbrains/mps/logic/reactor/program/trace.info
index 1d0016b0..a8cac5f8 100644
--- a/reactor/API/src/jetbrains/mps/logic/reactor/program/trace.info
+++ b/reactor/API/src/jetbrains/mps/logic/reactor/program/trace.info
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<debug-info-v2>
+<debug-info version="2">
   <concept fqn="c:f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123140:jetbrains.mps.baseLanguage.structure.ConstructorDeclaration" />
   <concept fqn="c:f3061a53-9226-4cc5-a443-f952ceaf5816/1068580123155:jetbrains.mps.baseLanguage.structure.ExpressionStatement" />
   <concept fqn="c:f3061a53-9226-4cc5-a443-f952ceaf5816/1068390468200:jetbrains.mps.baseLanguage.structure.FieldDeclaration" />
@@ -210,8 +210,8 @@
       <scope id="1044388088885792501" at="21,0,22,0" />
       <scope id="8335224865065122390" at="23,0,24,0" />
       <scope id="8335224865064895099" at="18,0,20,0" />
-      <unit id="8335224865064895106" at="25,0,31,0" name="jetbrains.mps.logic.reactor.program.Rule$Kind" />
-      <unit id="8335224865064895074" at="6,0,33,0" name="jetbrains.mps.logic.reactor.program.Rule" />
+      <unit id="8335224865064895106" at="25,0,30,0" name="jetbrains.mps.logic.reactor.program.Rule$Kind" />
+      <unit id="8335224865064895074" at="6,0,32,0" name="jetbrains.mps.logic.reactor.program.Rule" />
     </file>
   </root>
   <root nodeRef="r:f43ee4a0-488a-425a-87a0-594ab3b0d15f(jetbrains.mps.logic.reactor.program)/9010599623174261813">
@@ -250,5 +250,5 @@
       <unit id="9010599623176680927" at="6,0,17,0" name="jetbrains.mps.logic.reactor.program.InvalidConstraintException" />
     </file>
   </root>
-</debug-info-v2>
+</debug-info>