Rename Java package to edu.stanford.CVC4 (#3752)

7 files changed, 19 insertions, 19 deletions

diff --git a/src/bindings/java/CMakeLists.txt b/src/bindings/java/CMakeLists.txt
index 3ab2ed446..508a74532 100644
--- a/src/bindings/java/CMakeLists.txt
+++ b/src/bindings/java/CMakeLists.txt
@@ -6,7 +6,7 @@ include_directories(${JNI_INCLUDE_DIRS})
 
 set(SWIG_MODULE_cvc4jni_EXTRA_DEPS cvc4 cvc4parser)
 set_property(SOURCE ${CVC4_SWIG_INTERFACE} PROPERTY CPLUSPLUS ON)
-set(CMAKE_SWIG_FLAGS -package edu.nyu.acsys.CVC4)
+set(CMAKE_SWIG_FLAGS -package edu.stanford.CVC4)
 
 if(${CMAKE_VERSION} VERSION_LESS "3.8.0")
   swig_add_module(cvc4jni Java ${CVC4_SWIG_INTERFACE})
diff --git a/src/cvc4.i b/src/cvc4.i
index 69041b277..9e69212ae 100644
--- a/src/cvc4.i
+++ b/src/cvc4.i
@@ -113,7 +113,7 @@ std::set<JavaInputStreamAdapter*> CVC4::JavaInputStreamAdapter::s_adapters;
 // Create a mapping from C++ Exceptions to Java Exceptions.
 // This is in a couple of throws typemaps, simply because it's sensitive to SWIG's concept of which namespace we're in.
 %typemap(throws) Exception %{
-  std::string name = "edu/nyu/acsys/CVC4/$1_type";
+  std::string name = "edu/stanford/CVC4/$1_type";
   /*
   size_t i = name.find("::");
   if(i != std::string::npos) {
@@ -132,7 +132,7 @@ std::set<JavaInputStreamAdapter*> CVC4::JavaInputStreamAdapter::s_adapters;
   assert(status == 0);
 %}
 %typemap(throws) CVC4::Exception %{
-  std::string name = "edu/nyu/acsys/$1_type";
+  std::string name = "edu/stanford/$1_type";
   size_t i = name.find("::");
   if(i != std::string::npos) {
     size_t j = name.rfind("::");
@@ -186,17 +186,17 @@ std::set<JavaInputStreamAdapter*> CVC4::JavaInputStreamAdapter::s_adapters;
 %typemap(jtype) std::ostream& "long"
 %typemap(jstype) std::ostream& "java.io.OutputStream"
 %typemap(javain,
-         pre="    edu.nyu.acsys.CVC4.JavaOutputStreamAdapter temp$javainput = new edu.nyu.acsys.CVC4.JavaOutputStreamAdapter();", pgcppname="temp$javainput",
+         pre="    edu.stanford.CVC4.JavaOutputStreamAdapter temp$javainput = new edu.stanford.CVC4.JavaOutputStreamAdapter();", pgcppname="temp$javainput",
          post="    new java.io.PrintStream($javainput).print(temp$javainput.toString());")
-         std::ostream& "edu.nyu.acsys.CVC4.JavaOutputStreamAdapter.getCPtr(temp$javainput)"
+         std::ostream& "edu.stanford.CVC4.JavaOutputStreamAdapter.getCPtr(temp$javainput)"
 
 %typemap(jni) std::istream& "jlong"
 %typemap(jtype) std::istream& "long"
 %typemap(jstype) std::istream& "java.io.InputStream"
 %typemap(javain,
-         pre="    edu.nyu.acsys.CVC4.JavaInputStreamAdapter temp$javainput = edu.nyu.acsys.CVC4.JavaInputStreamAdapter.get($javainput);", pgcppname="temp$javainput",
+         pre="    edu.stanford.CVC4.JavaInputStreamAdapter temp$javainput = edu.stanford.CVC4.JavaInputStreamAdapter.get($javainput);", pgcppname="temp$javainput",
          post="")
-         std::istream& "edu.nyu.acsys.CVC4.JavaInputStreamAdapter.getCPtr(temp$javainput)"
+         std::istream& "edu.stanford.CVC4.JavaInputStreamAdapter.getCPtr(temp$javainput)"
 %typemap(in) jobject inputStream %{
   $1 = jenv->NewGlobalRef($input);
 %}
diff --git a/src/expr/expr.i b/src/expr/expr.i
index fba1e8858..14ccf213c 100644
--- a/src/expr/expr.i
+++ b/src/expr/expr.i
@@ -99,18 +99,18 @@ namespace CVC4 {
 }
 
 // Expr is "iterable" on the Java side
-%typemap(javainterfaces) CVC4::Expr "java.lang.Iterable<edu.nyu.acsys.CVC4.Expr>";
+%typemap(javainterfaces) CVC4::Expr "java.lang.Iterable<edu.stanford.CVC4.Expr>";
 
 // the JavaIteratorAdapter should not be public, and implements Iterator
 %typemap(javaclassmodifiers) CVC4::JavaIteratorAdapter<CVC4::Expr, CVC4::Expr> "class";
-%typemap(javainterfaces) CVC4::JavaIteratorAdapter<CVC4::Expr, CVC4::Expr> "java.util.Iterator<edu.nyu.acsys.CVC4.Expr>";
+%typemap(javainterfaces) CVC4::JavaIteratorAdapter<CVC4::Expr, CVC4::Expr> "java.util.Iterator<edu.stanford.CVC4.Expr>";
 // add some functions to the Java side (do it here because there's no way to do these in C++)
 %typemap(javacode) CVC4::JavaIteratorAdapter<CVC4::Expr, CVC4::Expr> "
   public void remove() {
     throw new java.lang.UnsupportedOperationException();
   }
 
-  public edu.nyu.acsys.CVC4.Expr next() {
+  public edu.stanford.CVC4.Expr next() {
     if(hasNext()) {
       return getNext();
     } else {
diff --git a/src/expr/record.i b/src/expr/record.i
index 6133114cd..dce785ea3 100644
--- a/src/expr/record.i
+++ b/src/expr/record.i
@@ -35,7 +35,7 @@
 %typemap(out) std::pair<std::string, CVC4::Type> {
       $result = jenv->NewObjectArray(2, jenv->FindClass("java/lang/Object"), $null);
       jenv->SetObjectArrayElement($result, 0, jenv->NewStringUTF($1.first.c_str()));
-      jclass clazz = jenv->FindClass("edu/nyu/acsys/CVC4/Type");
+      jclass clazz = jenv->FindClass("edu/stanford/CVC4/Type");
       jmethodID methodid = jenv->GetMethodID(clazz, "<init>", "(JZ)V");
       jenv->SetObjectArrayElement($result, 1, jenv->NewObject(clazz, methodid, reinterpret_cast<uintptr_t>(new CVC4::Type($1.second)), true));
     };
diff --git a/src/proof/unsat_core.i b/src/proof/unsat_core.i
index d3fd615ce..c37c8551d 100644
--- a/src/proof/unsat_core.i
+++ b/src/proof/unsat_core.i
@@ -35,18 +35,18 @@
 }
 
 // UnsatCore is "iterable" on the Java side
-%typemap(javainterfaces) CVC4::UnsatCore "java.lang.Iterable<edu.nyu.acsys.CVC4.Expr>";
+%typemap(javainterfaces) CVC4::UnsatCore "java.lang.Iterable<edu.stanford.CVC4.Expr>";
 
 // the JavaIteratorAdapter should not be public, and implements Iterator
 %typemap(javaclassmodifiers) CVC4::JavaIteratorAdapter<CVC4::UnsatCore, CVC4::Expr> "class";
-%typemap(javainterfaces) CVC4::JavaIteratorAdapter<CVC4::UnsatCore, CVC4::Expr> "java.util.Iterator<edu.nyu.acsys.CVC4.Expr>";
+%typemap(javainterfaces) CVC4::JavaIteratorAdapter<CVC4::UnsatCore, CVC4::Expr> "java.util.Iterator<edu.stanford.CVC4.Expr>";
 // add some functions to the Java side (do it here because there's no way to do these in C++)
 %typemap(javacode) CVC4::JavaIteratorAdapter<CVC4::UnsatCore, CVC4::Expr> "
   public void remove() {
     throw new java.lang.UnsupportedOperationException();
   }
 
-  public edu.nyu.acsys.CVC4.Expr next() {
+  public edu.stanford.CVC4.Expr next() {
     if(hasNext()) {
       return getNext();
     } else {
diff --git a/src/smt/command.i b/src/smt/command.i
index ff8094165..bd28fa8e5 100644
--- a/src/smt/command.i
+++ b/src/smt/command.i
@@ -36,18 +36,18 @@
 }
 
 // CommandSequence is "iterable" on the Java side
-%typemap(javainterfaces) CVC4::CommandSequence "java.lang.Iterable<edu.nyu.acsys.CVC4.Command>";
+%typemap(javainterfaces) CVC4::CommandSequence "java.lang.Iterable<edu.stanford.CVC4.Command>";
 
 // the JavaIteratorAdapter should not be public, and implements Iterator
 %typemap(javaclassmodifiers) CVC4::JavaIteratorAdapter<CVC4::CommandSequence, CVC4::Command*> "class";
-%typemap(javainterfaces) CVC4::JavaIteratorAdapter<CVC4::CommandSequence, CVC4::Command*> "java.util.Iterator<edu.nyu.acsys.CVC4.Command>";
+%typemap(javainterfaces) CVC4::JavaIteratorAdapter<CVC4::CommandSequence, CVC4::Command*> "java.util.Iterator<edu.stanford.CVC4.Command>";
 // add some functions to the Java side (do it here because there's no way to do these in C++)
 %typemap(javacode) CVC4::JavaIteratorAdapter<CVC4::CommandSequence, CVC4::Command*> "
   public void remove() {
     throw new java.lang.UnsupportedOperationException();
   }
 
-  public edu.nyu.acsys.CVC4.Command next() {
+  public edu.stanford.CVC4.Command next() {
     if(hasNext()) {
       return getNext();
     } else {
diff --git a/src/smt/smt_engine.i b/src/smt/smt_engine.i
index 4018cc3dc..635e593bb 100644
--- a/src/smt/smt_engine.i
+++ b/src/smt/smt_engine.i
@@ -14,13 +14,13 @@
 %native (dlRef) void SmtEngine::dlRef(jobject);
 %{
 extern "C" {
-SWIGEXPORT jobject JNICALL Java_edu_nyu_acsys_CVC4_SmtEngine_mkRef(JNIEnv* jenv, jclass jcls, jobject o) {
+SWIGEXPORT jobject JNICALL Java_edu_stanford_CVC4_SmtEngine_mkRef(JNIEnv* jenv, jclass jcls, jobject o) {
   if(o == NULL) {
     return NULL;
   }
   return jenv->NewGlobalRef(o);
 }
-SWIGEXPORT void JNICALL Java_edu_nyu_acsys_CVC4_SmtEngine_dlRef(JNIEnv* jenv, jclass jcls, jobject o) {
+SWIGEXPORT void JNICALL Java_edu_stanford_CVC4_SmtEngine_dlRef(JNIEnv* jenv, jclass jcls, jobject o) {
   if(o != NULL) {
     jenv->DeleteGlobalRef(o);
   }