- Fixed unreported bug where boolean deafult values where not set correctly

- Fixed AR-314, category rule was not appending additional categories
- Fixed spelling mistake and moved lock messages into properties file while I was there (AWC-350)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@2039 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Roy Wetherall
2005-12-13 17:21:33 +00:00
parent 3f047e8aed
commit 366873440c
8 changed files with 59 additions and 15 deletions

View File

@@ -19,6 +19,7 @@ package org.alfresco.service.cmr.lock;
import java.text.MessageFormat;
import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.i18n.I18NUtil;
import org.alfresco.service.cmr.repository.NodeRef;
/**
@@ -36,10 +37,8 @@ public class NodeLockedException extends AlfrescoRuntimeException
/**
* Error message
*/
private static final String ERROR_MESSAGE = "Can not perform operation since " +
"the node (id:{0}) is locked by another user.";
private static final String ERROR_MESSAGE_2 = "Can not perform operation {0} since " +
"the node (id:{1}) is locked by another user.";
private static final String ERROR_MESSAGE = I18NUtil.getMessage("lock_service.no_op");
private static final String ERROR_MESSAGE_2 = I18NUtil.getMessage("lock_service.no_op2");
/**
* @param message

View File

@@ -18,6 +18,7 @@ package org.alfresco.service.cmr.lock;
import java.text.MessageFormat;
import org.alfresco.i18n.I18NUtil;
import org.alfresco.service.cmr.repository.NodeRef;
/**
@@ -33,8 +34,7 @@ public class UnableToAquireLockException extends RuntimeException
/**
* Error message
*/
private final static String ERROR_MESSAGE = "The node (id: {0})could not be locked since it" +
" is already locked by antoher user.";
private final static String ERROR_MESSAGE = I18NUtil.getMessage("lock_service.node_locked");
/**
* Constructor

View File

@@ -18,6 +18,7 @@ package org.alfresco.service.cmr.lock;
import java.text.MessageFormat;
import org.alfresco.i18n.I18NUtil;
import org.alfresco.service.cmr.repository.NodeRef;
/**
@@ -35,10 +36,7 @@ public class UnableToReleaseLockException extends RuntimeException
/**
* Error message
*/
private static final String ERROR_MESSAGE =
"You have insufficent priveleges to realese the " +
"lock on the node (id: {0}). The node is locked by " +
"another user.";
private static final String ERROR_MESSAGE = I18NUtil.getMessage("lock_service.insufficent_preveleges");
/**
* Constructor