OwnershipGraph and Node classes are working and tested.

[IRC.git] / Robust / src / Analysis / OwnershipAnalysis / OwnershipHeapRegionNode.java

diff --git a/Robust/src/Analysis/OwnershipAnalysis/OwnershipHeapRegionNode.java b/Robust/src/Analysis/OwnershipAnalysis/OwnershipHeapRegionNode.java
index ef8bb7ddf46e872ec932d362e37c949069200242..54cd1996e3d9c730d229cc06d60ee910bc65284f 100644 (file)
--- a/Robust/src/Analysis/OwnershipAnalysis/OwnershipHeapRegionNode.java
+++ b/Robust/src/Analysis/OwnershipAnalysis/OwnershipHeapRegionNode.java
@@ -4,40 +4,15 @@ import IR.*;
 import IR.Flat.*;
 import java.util.*;
 
-public class OwnershipHeapRegionNode {
+public class OwnershipHeapRegionNode extends OwnershipNode {
     
-    protected int id;
-    protected Hashtable<FieldDescriptor, OwnershipHeapRegionNode> fields;
     protected Vector<TempDescriptor> analysisRegionAliases;
 
-    public OwnershipHeapRegionNode( int id ) {
-       this.id = id;
-       fields = new Hashtable<FieldDescriptor, OwnershipHeapRegionNode>();
+    public OwnershipHeapRegionNode( Integer id ) {
+       super( id );
        analysisRegionAliases = new Vector<TempDescriptor>();
     }
 
-    public void setField( FieldDescriptor fd,
-                         OwnershipHeapRegionNode ohrn ) {
-       fields.put( fd, ohrn );
-    }
-
-    public OwnershipHeapRegionNode getField( FieldDescriptor fd ) {
-       return fields.get( fd );
-    }
-
-    public Iterator getFieldIterator() {
-       Set s = fields.entrySet();
-       return s.iterator();
-    }
-
-    public String getIDString() {
-       return (new Integer( id )).toString();
-    }
-
-    public String toString() {
-       return "OHRN"+getIDString();
-    }
-
     public void addAnalysisRegionAlias( TempDescriptor td ) {
        analysisRegionAliases.add( td );
     }
@@ -45,4 +20,8 @@ public class OwnershipHeapRegionNode {
     public Vector<TempDescriptor> getAnalysisRegionAliases() {
        return analysisRegionAliases;
     }
+
+    public String toString() {
+       return "OHRN"+getIDString();
+    }
 }