antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

Remove *** prefix from DbMapping error messages and warnings.

Browse source
This commit is contained in:
hns 2009-05-27 11:42:57 +00:00
parent 44233c5446
commit 3b25f65602
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/helma/objectmodel/db/DbMapping.java
View file

@ -187,13 +187,13 @@ public final class DbMapping {
dbSource = app.getDbSource(dbSourceName); dbSource = app.getDbSource(dbSourceName);
if (dbSource == null) { if (dbSource == null) {
app.logError("*** Data Source for prototype " + typename + app.logError("Data Source for prototype " + typename +
" does not exist: " + dbSourceName); " does not exist: " + dbSourceName);
app.logError("*** accessing or storing a " + typename + app.logError("Accessing or storing a " + typename +
" object will cause an error."); " object will cause an error.");
} else if (tableName == null) { } else if (tableName == null) {
app.logError("*** No table name specified for prototype " + typename); app.logError("No table name specified for prototype " + typename);
app.logError("*** accessing or storing a " + typename + app.logError("Accessing or storing a " + typename +
" object will cause an error."); " object will cause an error.");
// mark mapping as invalid by nulling the dbSource field // mark mapping as invalid by nulling the dbSource field
@ -245,7 +245,7 @@ public final class DbMapping {
if (extendsProto != null) { if (extendsProto != null) {
parentMapping = app.getDbMapping(extendsProto); parentMapping = app.getDbMapping(extendsProto);
if (parentMapping == null) { if (parentMapping == null) {
app.logError("*** Parent mapping for prototype " + typename + app.logError("Parent mapping for prototype " + typename +
" does not exist: " + extendsProto); " does not exist: " + extendsProto);
} else { } else {
if (parentMapping.needsUpdate()) { if (parentMapping.needsUpdate()) {
@ -268,8 +268,8 @@ public final class DbMapping {
} }
if (inheritsStorage() && getPrototypeField() == null) { if (inheritsStorage() && getPrototypeField() == null) {
app.logError("*** Prototype not stored for extended relational type " + typename); app.logError("No _prototype mapping in extended prototype " + typename);
app.logError("*** objects fetched from db will have base prototype!"); app.logError("Objects fetched from db will have base prototype " + extendsProto);
} }
// check if there is an extension-id specified inside the type.properties // check if there is an extension-id specified inside the type.properties
@ -328,7 +328,7 @@ public final class DbMapping {
// if so, primitive relations get precendence to references // if so, primitive relations get precendence to references
if (old != null) { if (old != null) {
if (rel.isPrimitive() && old.isPrimitive()) { if (rel.isPrimitive() && old.isPrimitive()) {
app.logEvent("*** Duplicate mapping for " + typename + "." + rel.columnName); app.logEvent("Duplicate mapping for " + typename + "." + rel.columnName);
} else if (rel.isReference() && old.isPrimitive()) { } else if (rel.isReference() && old.isPrimitive()) {
// if a column is used both in a primitive and a reference mapping, // if a column is used both in a primitive and a reference mapping,
// use primitive mapping as primary one and mark reference as // use primitive mapping as primary one and mark reference as