Add DisplayNode class with default IDisplayNode implementation. Add IDisplayNode.State.

1 files changed, 44 insertions, 12 deletions

diff --git a/Source/ModelViewer/DataModel.cs b/Source/ModelViewer/DataModel.cs
index 6f8811e9..bda154ca 100644
--- a/Source/ModelViewer/DataModel.cs
+++ b/Source/ModelViewer/DataModel.cs
@@ -5,6 +5,13 @@ using System.Text;
 

 namespace Microsoft.Boogie.ModelViewer

 {

+  [Flags]

+  public enum NodeState

+  {

+    Normal = 0,

+    Changed = 1

+  }

+

   public interface IDisplayNode

   {

     string Name { get; }

@@ -12,6 +19,7 @@ namespace Microsoft.Boogie.ModelViewer
     bool Expandable { get; }

     IEnumerable<IDisplayNode> Expand();

     object ViewSync { get; set; }

+    NodeState State { get; }

   }

 

   public interface ILanguageProvider

@@ -20,18 +28,11 @@ namespace Microsoft.Boogie.ModelViewer
     IEnumerable<IDisplayNode> GetStates(Model m);

   }

 

-  public class ContainerNode<T> : IDisplayNode

+  public abstract class DisplayNode : IDisplayNode

   {

     protected string name;

-    protected Func<T, IDisplayNode> convert;

-    protected IEnumerable<T> data;

 

-    public ContainerNode(string name, Func<T, IDisplayNode> convert, IEnumerable<T> data)

-    {

-      this.name = name;

-      this.convert = convert;

-      this.data = data;

-    }

+    public DisplayNode(string n) { name = n; }

 

     public virtual string Name

     {

@@ -43,18 +44,49 @@ namespace Microsoft.Boogie.ModelViewer
       get { yield break; }

     }

 

-    public virtual bool Expandable { get { return true; } }

+    public virtual bool Expandable

+    {

+      get { return false; }

+    }

 

     public virtual IEnumerable<IDisplayNode> Expand()

     {

+      yield break;

+    }

+

+    public virtual NodeState State { get { return NodeState.Normal; } }

+

+    public object ViewSync { get; set; }

+  }

+

+  public static class SeqExtensions

+  {

+    public static IEnumerable<T> Map<S, T>(this IEnumerable<S> inp, Func<S, T> conv)

+    {

+      foreach (var s in inp) yield return conv(s);

+    }

+  }

+

+  public class ContainerNode<T> : DisplayNode

+  {

+    protected Func<T, IDisplayNode> convert;

+    protected IEnumerable<T> data;

+

+    public ContainerNode(string name, Func<T, IDisplayNode> convert, IEnumerable<T> data) : base(name)

+    {

+      this.convert = convert;

+      this.data = data;

+    }

+

+    public override bool Expandable { get { return true; } }

+    public override IEnumerable<IDisplayNode> Expand()

+    {

       foreach (var f in data) {

         var res = convert(f);

         if (res != null)

           yield return res;

       }

     }

-

-    public object ViewSync { get; set; }

   }