From 9cdd4f4791acfcab90e9e2c52cf261b881d153f1 Mon Sep 17 00:00:00 2001
From: sjfink <sjfink@f5eafffb-2e1d-0410-98e4-8ec43c5233c4>
Date: Wed, 2 May 2007 02:22:42 +0000
Subject: [PATCH] minor changes

git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@1035 f5eafffb-2e1d-0410-98e4-8ec43c5233c4
---
 com.ibm.wala.core/src/com/ibm/wala/logic/BasicTheory.java   | 2 +-
 .../src/com/ibm/wala/logic/BasicVocabulary.java             | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/com.ibm.wala.core/src/com/ibm/wala/logic/BasicTheory.java b/com.ibm.wala.core/src/com/ibm/wala/logic/BasicTheory.java
index 9d041a36b..8d262e530 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/logic/BasicTheory.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/logic/BasicTheory.java
@@ -13,7 +13,7 @@ package com.ibm.wala.logic;
 import java.util.Collection;
 
 
-public class BasicTheory implements ITheory {
+public class BasicTheory extends AbstractTheory {
 
   private final IVocabulary vocab;
   private final Collection<? extends IFormula> sentences;
diff --git a/com.ibm.wala.core/src/com/ibm/wala/logic/BasicVocabulary.java b/com.ibm.wala.core/src/com/ibm/wala/logic/BasicVocabulary.java
index adddfe4b7..006a3d096 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/logic/BasicVocabulary.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/logic/BasicVocabulary.java
@@ -24,7 +24,7 @@ import com.ibm.wala.util.intset.OrdinalSetMapping;
  * @author sjfink
  *
  */
-public class BasicVocabulary<T> implements IVocabulary<T> {
+public class BasicVocabulary<T> extends AbstractVocabulary<T> {
 
   private final Collection<? extends IFunction> functions;
   private final Collection<? extends IRelation> relations;
@@ -56,6 +56,10 @@ public class BasicVocabulary<T> implements IVocabulary<T> {
     Collection<IRelation> empty = Collections.emptySet();
     return new BasicVocabulary<T>(f, empty);
   }
+  
+  public static <T> BasicVocabulary make(Collection<IFunction> f, Collection<IRelation> r) {
+    return new BasicVocabulary<T>(f, r);
+  }
 
   public OrdinalSetMapping<T> getConstants() {
     // TODO: implement empty mapping