Remove NotImplementedError -- do everything through OpenMMException

openmmapi/include/openmm/Force.h

@@ -81,7 +81,7 @@ public:
     /**
      * Returns whether or not this force makes use of periodic boundary
      * conditions. This method should be overridden for all Force subclasses, or
-     * a OpenMM::NotImplementedError will be thrown
+     * a OpenMM::OpenMMException will be thrown
      *
      * @return true if Force uses periodic boundaries or false if it does not
      */

openmmapi/include/openmm/OpenMMException.h

@@ -54,17 +54,6 @@ private:
     std::string message;
 };
 
-class NotImplementedError : public std::exception {
-public:
-    explicit NotImplementedError(const std::string& message) : message(message) {
-    }
-    ~NotImplementedError() throw() {
-    }
-    const char* what() const throw() {
-        return message.c_str();
-    }
-};
-
 } // namespace OpenMM
 
 #endif /*OPENMM_OPENMMEXCEPTION_H_*/

openmmapi/include/openmm/System.h

@@ -228,7 +228,7 @@ public:
      * Returns whether or not any forces in this System use periodic boundaries.
      *
      * If a force in this System does not implement usesPeriodicBoundaryConditions
-     * a NotImplementedError is thrown
+     * a OpenMM::OpenMMException is thrown
      *
      * @return true of at least one force uses PBC and false otherwise
      */

openmmapi/src/Force.cpp

@@ -50,7 +50,7 @@ void Force::setForceGroup(int group) {
 }
 
 bool Force::usesPeriodicBoundaryConditions() const {
-    throw NotImplementedError("usesPeriodicBoundaryConditions is not implemented");
+    throw OpenMMException("usesPeriodicBoundaryConditions is not implemented");
 }
 
 ForceImpl& Force::getImplInContext(Context& context) {

openmmapi/src/System.cpp

@@ -129,7 +129,7 @@ bool System::usesPeriodicBoundaryConditions() {
         try {
             if ((*it)->usesPeriodicBoundaryConditions())
                 uses_pbc = true;
-        } catch (NotImplementedError &e) {
+        } catch (OpenMMException &e) {
             all_forces_implement = false;
         }
     }