eliminate null disjoint tags when printing and use proper method for getting the...

diff --git a/Robust/src/Analysis/OwnershipAnalysis/AllocationSite.java b/Robust/src/Analysis/OwnershipAnalysis/AllocationSite.java
index 9ccece7b02bbfda72f8cc7e06405950d6b2fa946..c53c728530c1c0d233ee5380c276443cb608afb4 100644 (file)
--- a/Robust/src/Analysis/OwnershipAnalysis/AllocationSite.java
+++ b/Robust/src/Analysis/OwnershipAnalysis/AllocationSite.java
@@ -184,6 +184,10 @@ public class AllocationSite {
   }
 
   public String toStringForDOT() {
-    return "disjoint "+disjointId+"\\n"+toString()+"\\n"+getType();
+    if( disjointId != null ) {
+      return "disjoint "+disjointId+"\\n"+toString()+"\\n"+getType();
+    } else {
+      return                              toString()+"\\n"+getType();
+    }
   }
 }

diff --git a/Robust/src/Analysis/OwnershipAnalysis/OwnershipAnalysis.java b/Robust/src/Analysis/OwnershipAnalysis/OwnershipAnalysis.java
index 850445b87d43d7cfd09379213c63734d46c90efa..ed7fa2199589170dcd66c451a4bf6053c9fc476e 100644 (file)
--- a/Robust/src/Analysis/OwnershipAnalysis/OwnershipAnalysis.java
+++ b/Robust/src/Analysis/OwnershipAnalysis/OwnershipAnalysis.java
@@ -294,11 +294,10 @@ public class OwnershipAnalysis {
     } else {
       // we are not in task mode, just normal Java, so start with
       // the main method
-      
-      // get all classes, get all methods, look for static main, then stop?
-      
-      // YOU CAN DEFINE MORE THAN ONE MAIN!!!!
+      Descriptor d = tu.getMain();
+      scheduleAllCallees(d);
 
+      /*
       Iterator classItr = state.getClassSymbolTable().getDescriptorsIterator();
       while( classItr.hasNext() ) {
        ClassDescriptor cd = (ClassDescriptor) classItr.next();
@@ -312,7 +311,7 @@ public class OwnershipAnalysis {
          }
        }
       }
-      
+      */
     }