Re-structured XNAT exception hierarchy.

Libs/XNAT/Core/Testing/ctkXnatSessionTest.cpp

@@ -185,7 +185,7 @@ void ctkXnatSessionTestCase::testSession()
     d->Session->dataModel();
     QFAIL("Exception for closed session expected");
   }
-  catch(const ctkXnatSessionException&)
+  catch(const ctkXnatInvalidSessionException&)
   {}
 }
 

Libs/XNAT/Core/ctkXnatException.cpp

@@ -21,7 +21,8 @@
 
 #include "ctkXnatException.h"
 
-CTK_IMPLEMENT_EXCEPTION(ctkXnatTimeoutException, ctkRuntimeException, "ctkXnatTimeoutException")
-CTK_IMPLEMENT_EXCEPTION(ctkXnatSessionException, ctkRuntimeException, "ctkXnatSessionException")
-CTK_IMPLEMENT_EXCEPTION(ctkXnatAuthenticationException, ctkXnatSessionException, "ctkXnatAuthenticationException")
-CTK_IMPLEMENT_EXCEPTION(ctkXnatProtocolFailureException, ctkRuntimeException, "ctkXnatProtocolFailureException")
+CTK_IMPLEMENT_EXCEPTION(ctkXnatException, ctkRuntimeException, "ctkXnatException")
+CTK_IMPLEMENT_EXCEPTION(ctkXnatTimeoutException, ctkXnatException, "ctkXnatTimeoutException")
+CTK_IMPLEMENT_EXCEPTION(ctkXnatInvalidSessionException, ctkXnatException, "ctkXnatInvalidSessionException")
+CTK_IMPLEMENT_EXCEPTION(ctkXnatAuthenticationException, ctkXnatException, "ctkXnatAuthenticationException")
+CTK_IMPLEMENT_EXCEPTION(ctkXnatProtocolFailureException, ctkXnatException, "ctkXnatProtocolFailureException")

Libs/XNAT/Core/ctkXnatException.h

@@ -26,9 +26,10 @@
 
 #include "ctkException.h"
 
-CTK_DECLARE_EXCEPTION(CTK_XNAT_CORE_EXPORT, ctkXnatTimeoutException, ctkRuntimeException)
-CTK_DECLARE_EXCEPTION(CTK_XNAT_CORE_EXPORT, ctkXnatSessionException, ctkRuntimeException)
-CTK_DECLARE_EXCEPTION(CTK_XNAT_CORE_EXPORT, ctkXnatAuthenticationException, ctkXnatSessionException)
-CTK_DECLARE_EXCEPTION(CTK_XNAT_CORE_EXPORT, ctkXnatProtocolFailureException, ctkRuntimeException)
+CTK_DECLARE_EXCEPTION(CTK_XNAT_CORE_EXPORT, ctkXnatException, ctkRuntimeException)
+CTK_DECLARE_EXCEPTION(CTK_XNAT_CORE_EXPORT, ctkXnatTimeoutException, ctkXnatException)
+CTK_DECLARE_EXCEPTION(CTK_XNAT_CORE_EXPORT, ctkXnatInvalidSessionException, ctkXnatException)
+CTK_DECLARE_EXCEPTION(CTK_XNAT_CORE_EXPORT, ctkXnatAuthenticationException, ctkXnatException)
+CTK_DECLARE_EXCEPTION(CTK_XNAT_CORE_EXPORT, ctkXnatProtocolFailureException, ctkXnatException)
 
 #endif

Libs/XNAT/Core/ctkXnatSession.cpp

@@ -152,7 +152,7 @@ void ctkXnatSessionPrivate::checkSession() const
 {
   if (sessionId.isEmpty())
   {
-    throw ctkXnatSessionException("Session closed.");
+    throw ctkXnatInvalidSessionException("Session closed.");
   }
 }