This commit is a step toward getting OpenDS internationalized. There are st...

kenneth_suter

15.34.2007 80c58327faaa4873369f6bb949e62792c2f708e0

 opends/src/server/org/opends/server/authorization/dseecompat/TargetAttr.java

@@ -26,10 +26,10 @@
 */

package org.opends.server.authorization.dseecompat;
import org.opends.messages.Message;

import static org.opends.server.messages.AciMessages.*;
import static org.opends.messages.AccessControlMessages.*;
import static org.opends.server.authorization.dseecompat.Aci.*;
import static org.opends.server.messages.MessageHandler.getMessage;
import java.util.HashSet;
import java.util.regex.Pattern;
import org.opends.server.core.DirectoryServer;
@@ -107,10 +107,10 @@
                        //after conversion to AttributeType.
                        arrayToAttributeTypes(attributeArray, attrString);
                    } else {
                      int msgID =
                         MSGID_ACI_SYNTAX_INVALID_TARGETATTRKEYWORD_EXPRESSION;
                      String message = getMessage(msgID, attrString);
                      throw new AciException(msgID, message);
                      Message message =
                          WARN_ACI_SYNTAX_INVALID_TARGETATTRKEYWORD_EXPRESSION.
                            get(attrString);
                      throw new AciException(message);
                    }
                }
            }
@@ -137,17 +137,17 @@
                if(!allUserAttributes)
                    allUserAttributes=true;
                else {
                    int msgID = MSGID_ACI_TARGETATTR_INVALID_ATTR_TOKEN;
                    String message = getMessage(msgID, attrStr);
                    throw new AciException(msgID, message);
                    Message message =
                        WARN_ACI_TARGETATTR_INVALID_ATTR_TOKEN.get(attrStr);
                    throw new AciException(message);
                }
            } else if(attribute.equals("+")) {
                if(!allOpAttributes)
                    allOpAttributes=true;
                else {
                    int msgID = MSGID_ACI_TARGETATTR_INVALID_ATTR_TOKEN;
                    String message = getMessage(msgID, attrStr);
                    throw new AciException(msgID, message);
                    Message message =
                        WARN_ACI_TARGETATTR_INVALID_ATTR_TOKEN.get(attrStr);
                    throw new AciException(message);
                }
            } else {
                AttributeType attributeType;