Index: kernel/api/src/main/java/org/sakaiproject/exception/InconsistentException.java =================================================================== --- kernel/api/src/main/java/org/sakaiproject/exception/InconsistentException.java (revision 106592) +++ kernel/api/src/main/java/org/sakaiproject/exception/InconsistentException.java (working copy) @@ -26,17 +26,10 @@ * InconsistentException is thrown whenever an operation fails due to inconsistency or potential inconsistency. *

*/ -public class InconsistentException extends Exception +public class InconsistentException extends SakaiException { - private String m_id = null; - public InconsistentException(String id) { - m_id = id; + super(id); } - - public String toString() - { - return super.toString() + " id=" + m_id; - } } Index: kernel/api/src/main/java/org/sakaiproject/exception/IdUnusedException.java =================================================================== --- kernel/api/src/main/java/org/sakaiproject/exception/IdUnusedException.java (revision 106592) +++ kernel/api/src/main/java/org/sakaiproject/exception/IdUnusedException.java (working copy) @@ -26,23 +26,10 @@ * IdUnusedException is thrown whenever no resource is associated with an id. *

*/ -public class IdUnusedException extends Exception +public class IdUnusedException extends SakaiException { - private String m_id = null; - public IdUnusedException(String id) { - m_id = id; - + super(id); } - - public String getId() - { - return m_id; - } - - public String toString() - { - return super.toString() + " id=" + m_id; - } } Index: kernel/api/src/main/java/org/sakaiproject/exception/TypeException.java =================================================================== --- kernel/api/src/main/java/org/sakaiproject/exception/TypeException.java (revision 106592) +++ kernel/api/src/main/java/org/sakaiproject/exception/TypeException.java (working copy) @@ -26,17 +26,10 @@ * TypeException is thrown whenever type mismatch occurs. *

*/ -public class TypeException extends Exception +public class TypeException extends SakaiException { - private String m_id = null; - public TypeException(String id) { - m_id = id; + super(id); } - - public String toString() - { - return super.toString() + " id=" + m_id; - } } Index: kernel/api/src/main/java/org/sakaiproject/exception/InUseException.java =================================================================== --- kernel/api/src/main/java/org/sakaiproject/exception/InUseException.java (revision 106592) +++ kernel/api/src/main/java/org/sakaiproject/exception/InUseException.java (working copy) @@ -29,22 +29,10 @@ * The id is available as part of the exception. *

*/ -public class InUseException extends Exception +public class InUseException extends SakaiException { - private String m_id = null; - public InUseException(String id) { - m_id = id; + super(id); } - - public String getId() - { - return m_id; - } - - public String toString() - { - return super.toString() + " id=" + m_id; - } } Index: kernel/api/src/main/java/org/sakaiproject/exception/OverQuotaException.java =================================================================== --- kernel/api/src/main/java/org/sakaiproject/exception/OverQuotaException.java (revision 106592) +++ kernel/api/src/main/java/org/sakaiproject/exception/OverQuotaException.java (working copy) @@ -29,17 +29,15 @@ * The id of the Resource is available as part of the exception. *

*/ -public class OverQuotaException extends Exception +public class OverQuotaException extends SakaiException { - private String m_ref = null; - public OverQuotaException(String ref) { - m_ref = ref; + super(ref); } public String toString() { - return super.toString() + " ref: " + m_ref; + return super.toString() + " ref: " + m_id; } } Index: kernel/api/src/main/java/org/sakaiproject/exception/VersionException.java =================================================================== --- kernel/api/src/main/java/org/sakaiproject/exception/VersionException.java (revision 106592) +++ kernel/api/src/main/java/org/sakaiproject/exception/VersionException.java (working copy) @@ -27,22 +27,10 @@ *

*/ -public class VersionException extends Exception +public class VersionException extends SakaiException { - private String m_id = null; - public VersionException(String id) { - m_id = id; + super(id); } - - public String getId() - { - return m_id; - } - - public String toString() - { - return super.toString() + " id=" + m_id; - } } Index: kernel/api/src/main/java/org/sakaiproject/exception/SakaiException.java =================================================================== --- kernel/api/src/main/java/org/sakaiproject/exception/SakaiException.java (revision 0) +++ kernel/api/src/main/java/org/sakaiproject/exception/SakaiException.java (revision 0) @@ -0,0 +1,74 @@ +/********************************************************************************** + * $URL: https://source.sakaiproject.org/svn/kernel/trunk/api/src/main/java/org/sakaiproject/exception/SakaiException.java $ + * $Id: OverQuotaException.java 105077 2012-02-24 22:54:29Z ottenhoff@longsight.com $ + *********************************************************************************** + * + * Copyright (c) 2012 Sakai Foundation + * + * Licensed under the Educational Community License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.opensource.org/licenses/ECL-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + **********************************************************************************/ + +package org.sakaiproject.exception; + +/** + *

+ * SakaiException is a baseclass for Sakai Exceptions *

+ *

+ * The id of the Resource is available as part of the exception. + *

+ */ +public class SakaiException extends Exception +{ + protected String m_id = null; + + public SakaiException () {} + public SakaiException(String id) + { + m_id = id; + } + + /** + * @param cause + */ + public SakaiException(Throwable cause) + { + super(cause); + } + + /** + * @param message + * @param cause + */ + public SakaiException(String message, Throwable cause) + { + super(message, cause); + } + + + public String getId() + { + return m_id; + } + + public String getReference() + { + return m_id; + } + + public String toString() + { + return super.toString() + " id: " + m_id; + } + +} Index: kernel/api/src/main/java/org/sakaiproject/exception/UnsupportedFileTypeException.java =================================================================== --- kernel/api/src/main/java/org/sakaiproject/exception/UnsupportedFileTypeException.java (revision 106592) +++ kernel/api/src/main/java/org/sakaiproject/exception/UnsupportedFileTypeException.java (working copy) @@ -24,7 +24,7 @@ /** * This is thrown when a file is needed but the selected file doesn't have the correct type */ -public class UnsupportedFileTypeException extends Exception +public class UnsupportedFileTypeException extends SakaiException { /** * Index: kernel/api/src/main/java/org/sakaiproject/exception/IdLengthException.java =================================================================== --- kernel/api/src/main/java/org/sakaiproject/exception/IdLengthException.java (revision 106592) +++ kernel/api/src/main/java/org/sakaiproject/exception/IdLengthException.java (working copy) @@ -26,22 +26,11 @@ * IdLengthException is thrown whenever a resource id is too long to be used as a resource id. *

*/ -public class IdLengthException extends Exception +public class IdLengthException extends SakaiException { - private String m_id = null; public IdLengthException(String id) { - m_id = id; + super(id); } - - public String toString() - { - return super.toString() + " id=" + m_id; - } - - public String getMessage() - { - return m_id; - } } Index: kernel/api/src/main/java/org/sakaiproject/exception/EmptyException.java =================================================================== --- kernel/api/src/main/java/org/sakaiproject/exception/EmptyException.java (revision 106592) +++ kernel/api/src/main/java/org/sakaiproject/exception/EmptyException.java (working copy) @@ -26,6 +26,6 @@ * EmptyException indicates that an access operation was attempted on an empty resource. *

*/ -public class EmptyException extends Exception +public class EmptyException extends SakaiException { } Index: kernel/api/src/main/java/org/sakaiproject/exception/ServerOverloadException.java =================================================================== --- kernel/api/src/main/java/org/sakaiproject/exception/ServerOverloadException.java (revision 106592) +++ kernel/api/src/main/java/org/sakaiproject/exception/ServerOverloadException.java (working copy) @@ -26,22 +26,11 @@ * ServerOverloadException is thrown whenever a request cannot be completed at this time due to some critical resource of the server being in too short supply. *

*/ -public class ServerOverloadException extends Exception +public class ServerOverloadException extends SakaiException { - private String m_id = null; public ServerOverloadException(String id) { - m_id = id; + super(id); } - - public String getId() - { - return m_id; - } - - public String toString() - { - return super.toString() + " id=" + m_id; - } } Index: kernel/api/src/main/java/org/sakaiproject/exception/IdInvalidException.java =================================================================== --- kernel/api/src/main/java/org/sakaiproject/exception/IdInvalidException.java (revision 106592) +++ kernel/api/src/main/java/org/sakaiproject/exception/IdInvalidException.java (working copy) @@ -29,22 +29,10 @@ * The invalid id is available as part of the exception. *

*/ -public class IdInvalidException extends Exception +public class IdInvalidException extends SakaiException { - private String m_id = null; - public IdInvalidException(String id) { - m_id = id; + super(id); } - - public String toString() - { - return super.toString() + " id=" + m_id; - } - - public String getMessage() - { - return m_id; - } } Index: kernel/api/src/main/java/org/sakaiproject/exception/CopyrightException.java =================================================================== --- kernel/api/src/main/java/org/sakaiproject/exception/CopyrightException.java (revision 106592) +++ kernel/api/src/main/java/org/sakaiproject/exception/CopyrightException.java (working copy) @@ -26,24 +26,20 @@ * CopyrightException is thrown when a resource is accessed that requires a copyright agreement from the end user. *

*/ -public class CopyrightException extends Exception +public class CopyrightException extends SakaiException { private String m_ref = null; public CopyrightException() { + super(); } public CopyrightException(String ref) { - m_ref = ref; + super(ref); } - public String getReference() - { - return m_ref; - } - public String toString() { return super.toString() + ((m_ref != null) ? (" : " + m_ref) : ""); Index: kernel/api/src/main/java/org/sakaiproject/exception/ImportException.java =================================================================== --- kernel/api/src/main/java/org/sakaiproject/exception/ImportException.java (revision 106592) +++ kernel/api/src/main/java/org/sakaiproject/exception/ImportException.java (working copy) @@ -26,7 +26,7 @@ * ImportException is thrown whenever there is in error while importing schedule items. *

*/ -public class ImportException extends Exception +public class ImportException extends SakaiException { /** * Default constructor Index: kernel/api/src/main/java/org/sakaiproject/exception/IdUniquenessException.java =================================================================== --- kernel/api/src/main/java/org/sakaiproject/exception/IdUniquenessException.java (revision 106592) +++ kernel/api/src/main/java/org/sakaiproject/exception/IdUniquenessException.java (working copy) @@ -29,23 +29,10 @@ * A string indicating the final attempt to find a unique id is available as part of the exception. *

*/ -public class IdUniquenessException extends Exception +public class IdUniquenessException extends SakaiException { - private String m_id = null; - public IdUniquenessException(String id) { - m_id = id; + super(id); } - - public String toString() - { - return super.toString() + " id=" + m_id; - } - - public String getMessage() - { - return m_id; - } - } Index: kernel/api/src/main/java/org/sakaiproject/exception/IdUsedException.java =================================================================== --- kernel/api/src/main/java/org/sakaiproject/exception/IdUsedException.java (revision 106592) +++ kernel/api/src/main/java/org/sakaiproject/exception/IdUsedException.java (working copy) @@ -26,17 +26,10 @@ * IdUsedException is thrown whenever a resource id is already in use. *

*/ -public class IdUsedException extends Exception +public class IdUsedException extends SakaiException { - private String m_id = null; - public IdUsedException(String id) { - m_id = id; + super(id); } - - public String toString() - { - return super.toString() + " id=" + m_id; - } }