vgritsenko 2003/12/11 03:46:50
Modified: java/src/org/apache/xindice/core FaultCodes.java
Log:
Do not use 'l' in constants declaration - it looks same as '1' in some fonts.
Remove TODO about nested exceptions - XMLDBException has cause field.
Append message from the original exception.
Revision Changes Path
1.18 +69 -71
xml-xindice/java/src/org/apache/xindice/core/FaultCodes.java
Index: FaultCodes.java
===================================================================
RCS file:
/home/cvs/xml-xindice/java/src/org/apache/xindice/core/FaultCodes.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- FaultCodes.java 15 Aug 2003 04:34:54 -0000 1.17
+++ FaultCodes.java 11 Dec 2003 11:46:50 -0000 1.18
@@ -75,72 +75,72 @@
private static final Map faultMessages = new HashMap();
- public static final int GEN = (int) (0l);
- public static final int OBJ = (int) (100l);
- public static final int COL = (int) (200l);
- public static final int IDX = (int) (300l);
- public static final int TRX = (int) (400l);
- public static final int DBE = (int) (500l);
- public static final int QRY = (int) (600l);
- public static final int SEC = (int) (700l);
- public static final int URI = (int) (800l);
- public static final int JAVA = (int) (2000l);
-
- public static final int GEN_UNKNOWN = (int) (0l);
- public static final int GEN_GENERAL_ERROR = (int) (40l);
- public static final int GEN_CRITICAL_ERROR = (int) (70l);
- public static final int GEN_FATAL_ERROR = (int) (90l);
-
- public static final int COL_COLLECTION_NOT_FOUND = (int) (200l);
- public static final int COL_DOCUMENT_NOT_FOUND = (int) (201l);
- public static final int COL_DUPLICATE_COLLECTION = (int) (240l);
- public static final int COL_NULL_RESULT = (int) (241l);
- public static final int COL_NO_FILER = (int) (242l);
- public static final int COL_NO_INDEXMANAGER = (int) (242l);
- public static final int COL_DOCUMENT_MALFORMED = (int) (243l);
- public static final int COL_CANNOT_STORE = (int) (244l);
- public static final int COL_CANNOT_RETRIEVE = (int) (245l);
- public static final int COL_COLLECTION_READ_ONLY = (int) (246l);
- public static final int COL_COLLECTION_CLOSED = (int) (247l);
- public static final int COL_CANNOT_CREATE = (int) (270l);
- public static final int COL_CANNOT_DROP = (int) (271l);
- public static final int COL_INVALID_RESULT = (int) (277l);
-
- public static final int IDX_VALUE_NOT_FOUND = (int) (300l);
- public static final int IDX_INDEX_NOT_FOUND = (int) (301l);
- public static final int IDX_MATCHES_NOT_FOUND = (int) (340l);
- public static final int IDX_DUPLICATE_INDEX = (int) (341l);
- public static final int IDX_NOT_SUPPORTED = (int) (370l);
- public static final int IDX_STYLE_NOT_FOUND = (int) (371l);
- public static final int IDX_CORRUPTED = (int) (372l);
- public static final int IDX_CANNOT_CREATE = (int) (373l);
-
- public static final int TRX_DOC_LOCKED = (int) (400l);
- public static final int TRX_NO_CONTEXT = (int) (440l);
- public static final int TRX_NOT_ACTIVE = (int) (441l);
- public static final int TRX_NOT_SUPPORTED = (int) (470l);
-
- public static final int DBE_NO_PARENT = (int) (500l);
- public static final int DBE_CANNOT_DROP = (int) (570l);
- public static final int DBE_CANNOT_CREATE = (int) (571l);
- public static final int DBE_CANNOT_READ = (int) (572l);
-
- public static final int QRY_NULL_RESULT = (int) (600l);
- public static final int QRY_COMPILATION_ERROR = (int) (640l);
- public static final int QRY_PROCESSING_ERROR = (int) (641l);
- public static final int QRY_NOT_SUPPORTED = (int) (670l);
- public static final int QRY_STYLE_NOT_FOUND = (int) (671l);
-
- public static final int SEC_INVALID_USER = (int) (770l);
- public static final int SEC_INVALID_GROUP = (int) (771l);
- public static final int SEC_INVALID_ACCESS = (int) (772l);
- public static final int SEC_INVALID_CREDENTIALS = (int) (773l);
-
- public static final int URI_EMPTY = (int) (800l);
- public static final int URI_NULL = (int) (801l);
- public static final int URI_PARSE_ERROR = (int) (820l);
+ public static final int GEN = 0;
+ public static final int OBJ = 100;
+ public static final int COL = 200;
+ public static final int IDX = 300;
+ public static final int TRX = 400;
+ public static final int DBE = 500;
+ public static final int QRY = 600;
+ public static final int SEC = 700;
+ public static final int URI = 800;
+ public static final int JAVA = 2000;
+
+ public static final int GEN_UNKNOWN = 0;
+ public static final int GEN_GENERAL_ERROR = 40;
+ public static final int GEN_CRITICAL_ERROR = 70;
+ public static final int GEN_FATAL_ERROR = 90;
+
+ public static final int COL_COLLECTION_NOT_FOUND = 200;
+ public static final int COL_DOCUMENT_NOT_FOUND = 201;
+ public static final int COL_DUPLICATE_COLLECTION = 240;
+ public static final int COL_NULL_RESULT = 241;
+ public static final int COL_NO_FILER = 242;
+ public static final int COL_NO_INDEXMANAGER = 242;
+ public static final int COL_DOCUMENT_MALFORMED = 243;
+ public static final int COL_CANNOT_STORE = 244;
+ public static final int COL_CANNOT_RETRIEVE = 245;
+ public static final int COL_COLLECTION_READ_ONLY = 246;
+ public static final int COL_COLLECTION_CLOSED = 247;
+ public static final int COL_CANNOT_CREATE = 270;
+ public static final int COL_CANNOT_DROP = 271;
+ public static final int COL_INVALID_RESULT = 277;
+
+ public static final int IDX_VALUE_NOT_FOUND = 300;
+ public static final int IDX_INDEX_NOT_FOUND = 301;
+ public static final int IDX_MATCHES_NOT_FOUND = 340;
+ public static final int IDX_DUPLICATE_INDEX = 341;
+ public static final int IDX_NOT_SUPPORTED = 370;
+ public static final int IDX_STYLE_NOT_FOUND = 371;
+ public static final int IDX_CORRUPTED = 372;
+ public static final int IDX_CANNOT_CREATE = 373;
+
+ public static final int TRX_DOC_LOCKED = 400;
+ public static final int TRX_NO_CONTEXT = 440;
+ public static final int TRX_NOT_ACTIVE = 441;
+ public static final int TRX_NOT_SUPPORTED = 470;
+
+ public static final int DBE_NO_PARENT = 500;
+ public static final int DBE_CANNOT_DROP = 570;
+ public static final int DBE_CANNOT_CREATE = 571;
+ public static final int DBE_CANNOT_READ = 572;
+
+ public static final int QRY_NULL_RESULT = 600;
+ public static final int QRY_COMPILATION_ERROR = 640;
+ public static final int QRY_PROCESSING_ERROR = 641;
+ public static final int QRY_NOT_SUPPORTED = 670;
+ public static final int QRY_STYLE_NOT_FOUND = 671;
+
+ public static final int SEC_INVALID_USER = 770;
+ public static final int SEC_INVALID_GROUP = 771;
+ public static final int SEC_INVALID_ACCESS = 772;
+ public static final int SEC_INVALID_CREDENTIALS = 773;
+
+ public static final int URI_EMPTY = 800;
+ public static final int URI_NULL = 801;
+ public static final int URI_PARSE_ERROR = 820;
- public static final int JAVA_RUNTIME_ERROR = (int) (2070l);
+ public static final int JAVA_RUNTIME_ERROR = 2070;
private FaultCodes() {
@@ -272,10 +272,6 @@
* the chain will be followed incorporating the class name and message
* at each level.
*
- * TODO: This should only be considered a temporary fix
- * TODO: until such time as the xmldb API can be refined to allow for
wrapped
- * TODO: throwables in XMLDBException.
- *
* @param faultCode the fault code for the created exception
* @param e The Exception to use
* @return An XMLDBException instance
@@ -291,6 +287,8 @@
if (message == null) {
message = e.getMessage();
+ } else {
+ message += ": " + e.getMessage();
}
// TODO: Mapping FaultCodes.COL_DOCUMENT_NOT_FOUND ->
ErrorCodes.NO_SUCH_RESOURCE etc
