mirror of https://github.com/OpenIdentityPlatform/OpenDJ.git

Nicolas Capponi
12.45.2014 05fc91b048752514f09c1ed8d6d3ab4af3c42e4b
Checkpoint commit for OPENDJ-1308 Migrate schema support

Rename AttributeSyntax#getSyntaxName() to getName()

66 files modified
152 ■■■■ changed files
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/AttributeSyntaxPanel.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java 4 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java 6 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/api/AttributeSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/AttributeSyntaxConfigManager.java 4 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyFactory.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyState.java 4 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/core/SubentryPasswordPolicy.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/AciSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/AttributeTypeSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/BinarySyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/BitStringSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/BooleanSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactAssertionSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/CertificateListSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/CertificatePairSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/CertificateSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/CountryStringSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/DITContentRuleSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/DITStructureRuleSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/DeliveryMethodSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/EnhancedGuideSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/FaxNumberSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/FaxSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/GuideSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/IA5StringSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/IntegerSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/JPEGSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java 8 ●●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/NameFormSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/OIDSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/ObjectClassSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/OtherMailboxSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/PostalAddressSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/PrintableStringSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/SubstringAssertionSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/SubtreeSpecificationSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/TelexNumberSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/UTCTimeSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/UUIDSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordSyntax.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/server/org/opends/server/types/Schema.java 4 ●●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeSyntaxTest.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/BinaryAttributeSyntaxTest.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/BitStringSyntaxTest.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java 2 ●●● patch | view | raw | blame | history
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/GenericSchemaTestCase.java 4 ●●● patch | view | raw | blame | history
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/AttributeSyntaxPanel.java
@@ -197,7 +197,7 @@
   */
  public void update(AttributeSyntax<?> syntax, Schema schema)
  {
    String n = syntax.getSyntaxName();
    String n = syntax.getName();
    if (n == null)
    {
      n = NOT_APPLICABLE.toString();
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java
@@ -842,7 +842,7 @@
    {
      if (mustAdd(syntax))
      {
        String name = syntax.getSyntaxName();
        String name = syntax.getName();
        if (name == null)
        {
          name = syntax.getOID();
@@ -1619,7 +1619,7 @@
        String oid = syntax.getOID();
        values.add(oid);
        String name = syntax.getSyntaxName();
        String name = syntax.getName();
        if (name != null)
        {
          values.add(name);
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
@@ -711,7 +711,7 @@
      for (String key : schema.getSyntaxes().keySet())
      {
        AttributeSyntax<?> syntax = schema.getSyntax(key);
        String name = syntax.getSyntaxName();
        String name = syntax.getName();
        if (name == null)
        {
          name = syntax.getOID();
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/NewAttributePanel.java
@@ -202,7 +202,7 @@
      for (String key : schema.getSyntaxes().keySet())
      {
        AttributeSyntax<?> syntax = schema.getSyntax(key);
        String name = syntax.getSyntaxName();
        String name = syntax.getName();
        if (name == null)
        {
          name = syntax.getOID();
@@ -323,7 +323,7 @@
          {
            AttributeSyntax<?> syn =
              (AttributeSyntax<?>)syntax.getModel().getElementAt(i);
            if ("DirectoryString".equals(syn.getSyntaxName()))
            if ("DirectoryString".equals(syn.getName()))
            {
              syntax.setSelectedIndex(i);
              break;
@@ -519,7 +519,7 @@
    for (AttributeSyntax<?> attr : schema.getSyntaxes().values())
    {
      String n = attr.getSyntaxName();
      String n = attr.getName();
      if (n != null)
      {
        if (n.equalsIgnoreCase(name))
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/SimplifiedViewEntryPanel.java
@@ -1550,7 +1550,7 @@
        if (attr != null)
        {
          // There is no name for a regex syntax.
          String syntaxName = attr.getSyntax().getSyntaxName();
          String syntaxName = attr.getSyntax().getName();
          if (syntaxName!=null) {
              mustAddBrowseButton=syntaxName.equalsIgnoreCase(
                SchemaConstants.SYNTAX_DN_NAME);
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/renderer/SchemaElementComboBoxCellRenderer.java
@@ -70,7 +70,7 @@
  {
    if (value instanceof AttributeSyntax<?>)
    {
      String syntaxName = ((AttributeSyntax<?>)value).getSyntaxName();
      String syntaxName = ((AttributeSyntax<?>)value).getName();
      if (syntaxName == null)
      {
        value = ((AttributeSyntax<?>)value).getOID();
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/util/Utilities.java
@@ -2196,7 +2196,7 @@
  public static String getSyntaxText(AttributeSyntax<?> syntax)
  {
    String returnValue;
    String syntaxName = syntax.getSyntaxName();
    String syntaxName = syntax.getName();
    String syntaxOID = syntax.getOID();
    if (syntaxName == null)
    {
opendj3-server-dev/src/server/org/opends/server/api/AttributeSyntax.java
@@ -123,7 +123,7 @@
   *
   * @return  The common name for this attribute syntax.
   */
  public abstract String getSyntaxName();
  public abstract String getName();
opendj3-server-dev/src/server/org/opends/server/core/AttributeSyntaxConfigManager.java
@@ -259,7 +259,7 @@
        if (oid.equals(at.getSyntax().getOID()))
        {
          LocalizableMessage message = WARN_CONFIG_SCHEMA_CANNOT_DELETE_SYNTAX_IN_USE.get(
                  syntax.getSyntaxName(), at.getNameOrOID());
                  syntax.getName(), at.getNameOrOID());
          unacceptableReasons.add(message);
          configAcceptable = false;
@@ -330,7 +330,7 @@
          {
            LocalizableMessage message =
                    WARN_CONFIG_SCHEMA_CANNOT_DISABLE_SYNTAX_IN_USE.get(
                            syntax.getSyntaxName(),
                            syntax.getName(),
                            at.getNameOrOID());
            unacceptableReasons.add(message);
            return false;
opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyFactory.java
@@ -236,7 +236,7 @@
      }
      else
      {
        String syntax = passwordAttribute.getSyntax().getSyntaxName();
        String syntax = passwordAttribute.getSyntax().getName();
        if ((syntax == null) || (syntax.length() == 0))
        {
          syntax = syntaxOID;
opendj3-server-dev/src/server/org/opends/server/core/PasswordPolicyState.java
@@ -1203,7 +1203,7 @@
    }
    boolean isGeneralizedTime =
        type.getSyntax().getSyntaxName().equals(SYNTAX_GENERALIZED_TIME_NAME);
        type.getSyntax().getName().equals(SYNTAX_GENERALIZED_TIME_NAME);
    lastLoginTime = -1;
    List<Attribute> attrList = userEntry.getAttribute(type);
@@ -1322,7 +1322,7 @@
    {
      SimpleDateFormat dateFormat = new SimpleDateFormat(format);
      // If the attribute has a Generalized Time syntax, make it UTC time.
      if (type.getSyntax().getSyntaxName()
      if (type.getSyntax().getName()
          .equals(SYNTAX_GENERALIZED_TIME_NAME))
      {
        dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
opendj3-server-dev/src/server/org/opends/server/core/SubentryPasswordPolicy.java
@@ -194,7 +194,7 @@
      }
      else
      {
        String syntax = pPasswordAttribute.getSyntax().getSyntaxName();
        String syntax = pPasswordAttribute.getSyntax().getName();
        if (syntax == null || syntax.length() == 0)
        {
          syntax = syntaxOID;
opendj3-server-dev/src/server/org/opends/server/plugins/ReferentialIntegrityPlugin.java
@@ -327,7 +327,7 @@
        unacceptableReasons.add(
                       ERR_PLUGIN_REFERENT_INVALID_ATTRIBUTE_SYNTAX.get(
                            type.getNameOrOID(),
                             type.getSyntax().getSyntaxName()));
                             type.getSyntax().getName()));
      }
      for (DN baseDN : cfgBaseDNs)
opendj3-server-dev/src/server/org/opends/server/schema/AciSyntax.java
@@ -106,7 +106,7 @@
   *
   * @return  The common name for this attribute syntax.
   */
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_ACI_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/AttributeTypeSyntax.java
@@ -155,7 +155,7 @@
   * {@inheritDoc}
   */
  @Override
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_ATTRIBUTE_TYPE_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/AuthPasswordSyntax.java
@@ -102,7 +102,7 @@
   * @return  The common name for this attribute syntax.
   */
  @Override
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_AUTH_PASSWORD_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/BinarySyntax.java
@@ -131,7 +131,7 @@
   * @return  The common name for this attribute syntax.
   */
  @Override
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_BINARY_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/BitStringSyntax.java
@@ -95,7 +95,7 @@
   *
   * @return  The common name for this attribute syntax.
   */
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_BIT_STRING_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/BooleanSyntax.java
@@ -130,7 +130,7 @@
   *
   * @return  The common name for this attribute syntax.
   */
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_BOOLEAN_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/CertificateExactAssertionSyntax.java
@@ -116,7 +116,7 @@
  /**
   * {@inheritDoc}
   */
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_CERTIFICATE_EXACT_ASSERTION_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/CertificateListSyntax.java
@@ -116,7 +116,7 @@
   *
   * @return  The common name for this attribute syntax.
   */
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_CERTLIST_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/CertificatePairSyntax.java
@@ -116,7 +116,7 @@
   *
   * @return  The common name for this attribute syntax.
   */
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_CERTPAIR_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/CertificateSyntax.java
@@ -161,7 +161,7 @@
   *
   * @return  The common name for this attribute syntax.
   */
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_CERTIFICATE_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/CountryStringSyntax.java
@@ -172,7 +172,7 @@
   *
   * @return  The common name for this attribute syntax.
   */
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_COUNTRY_STRING_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/DITContentRuleSyntax.java
@@ -129,7 +129,7 @@
   * {@inheritDoc}
   */
  @Override
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_DIT_CONTENT_RULE_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/DITStructureRuleSyntax.java
@@ -130,7 +130,7 @@
  /**
   * {@inheritDoc}
   */
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_DIT_STRUCTURE_RULE_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/DeliveryMethodSyntax.java
@@ -176,7 +176,7 @@
   *
   * @return  The common name for this attribute syntax.
   */
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_DELIVERY_METHOD_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/DirectoryStringSyntax.java
@@ -188,7 +188,7 @@
   *
   * @return  The common name for this attribute syntax.
   */
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_DIRECTORY_STRING_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/DistinguishedNameSyntax.java
@@ -124,7 +124,7 @@
   *
   * @return  The common name for this attribute syntax.
   */
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_DN_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/EnhancedGuideSyntax.java
@@ -119,7 +119,7 @@
   *
   * @return  The common name for this attribute syntax.
   */
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_ENHANCED_GUIDE_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/FaxNumberSyntax.java
@@ -149,7 +149,7 @@
   *
   * @return  The common name for this attribute syntax.
   */
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_FAXNUMBER_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/FaxSyntax.java
@@ -115,7 +115,7 @@
   *
   * @return  The common name for this attribute syntax.
   */
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_FAX_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/GeneralizedTimeSyntax.java
@@ -137,7 +137,7 @@
   * @return  The common name for this attribute syntax.
   */
  @Override
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_GENERALIZED_TIME_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/GuideSyntax.java
@@ -116,7 +116,7 @@
   *
   * @return  The common name for this attribute syntax.
   */
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_GUIDE_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/IA5StringSyntax.java
@@ -127,7 +127,7 @@
   *
   * @return  The common name for this attribute syntax.
   */
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_IA5_STRING_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/IntegerSyntax.java
@@ -146,7 +146,7 @@
   * @return  The common name for this attribute syntax.
   */
  @Override
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_INTEGER_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/JPEGSyntax.java
@@ -131,7 +131,7 @@
   *
   * @return  The common name for this attribute syntax.
   */
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_JPEG_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/LDAPSyntaxDescriptionSyntax.java
@@ -128,7 +128,7 @@
   * @return  The common name for this attribute syntax.
   */
  @Override
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_LDAP_SYNTAX_NAME;
  }
@@ -962,7 +962,7 @@
     * {@inheritDoc}
     */
     @Override
    public String getSyntaxName()
    public String getName()
    {
      // There is no name for a substitution syntax.
      return null;
@@ -1132,7 +1132,7 @@
     * {@inheritDoc}
     */
     @Override
    public String getSyntaxName()
    public String getName()
    {
      // There is no name for a regex syntax.
      return null;
@@ -1331,7 +1331,7 @@
     * {@inheritDoc}
     */
     @Override
    public String getSyntaxName()
    public String getName()
    {
      // There is no name for a enum syntax.
      return null;
opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleSyntax.java
@@ -126,7 +126,7 @@
   * @return  The common name for this attribute syntax.
   */
  @Override
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_MATCHING_RULE_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/MatchingRuleUseSyntax.java
@@ -131,7 +131,7 @@
  /**
   * {@inheritDoc}
   */
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_MATCHING_RULE_USE_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/NameAndOptionalUIDSyntax.java
@@ -111,7 +111,7 @@
   *
   * @return  The common name for this attribute syntax.
   */
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_NAME_AND_OPTIONAL_UID_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/NameFormSyntax.java
@@ -128,7 +128,7 @@
   * {@inheritDoc}
   */
  @Override
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_NAME_FORM_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/NumericStringSyntax.java
@@ -119,7 +119,7 @@
   *
   * @return  The common name for this attribute syntax.
   */
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_NUMERIC_STRING_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/OIDSyntax.java
@@ -105,7 +105,7 @@
   *
   * @return  The common name for this attribute syntax.
   */
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_OID_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/ObjectClassSyntax.java
@@ -132,7 +132,7 @@
   * {@inheritDoc}
   */
  @Override
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_OBJECTCLASS_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/OctetStringSyntax.java
@@ -115,7 +115,7 @@
   *
   * @return  The common name for this attribute syntax.
   */
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_OCTET_STRING_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/OtherMailboxSyntax.java
@@ -108,7 +108,7 @@
   *
   * @return  The common name for this attribute syntax.
   */
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_OTHER_MAILBOX_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/PostalAddressSyntax.java
@@ -109,7 +109,7 @@
   *
   * @return  The common name for this attribute syntax.
   */
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_POSTAL_ADDRESS_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/PresentationAddressSyntax.java
@@ -129,7 +129,7 @@
   *
   * @return  The common name for this attribute syntax.
   */
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_PRESENTATION_ADDRESS_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/PrintableStringSyntax.java
@@ -131,7 +131,7 @@
   *
   * @return  The common name for this attribute syntax.
   */
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_PRINTABLE_STRING_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/ProtocolInformationSyntax.java
@@ -129,7 +129,7 @@
   *
   * @return  The common name for this attribute syntax.
   */
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_PROTOCOL_INFORMATION_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/SubstringAssertionSyntax.java
@@ -119,7 +119,7 @@
   *
   * @return  The common name for this attribute syntax.
   */
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_SUBSTRING_ASSERTION_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/SubtreeSpecificationSyntax.java
@@ -147,7 +147,7 @@
   *
   * @return The common name for this attribute syntax.
   */
  public String getSyntaxName() {
  public String getName() {
    return SYNTAX_SUBTREE_SPECIFICATION_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/SupportedAlgorithmSyntax.java
@@ -119,7 +119,7 @@
   *
   * @return  The common name for this attribute syntax.
   */
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_SUPPORTED_ALGORITHM_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/TelephoneNumberSyntax.java
@@ -147,7 +147,7 @@
   *
   * @return  The common name for this attribute syntax.
   */
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_TELEPHONE_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/TeletexTerminalIdentifierSyntax.java
@@ -150,7 +150,7 @@
   *
   * @return  The common name for this attribute syntax.
   */
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_TELETEX_TERM_ID_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/TelexNumberSyntax.java
@@ -115,7 +115,7 @@
   *
   * @return  The common name for this attribute syntax.
   */
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_TELEX_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/UTCTimeSyntax.java
@@ -173,7 +173,7 @@
   *
   * @return  The common name for this attribute syntax.
   */
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_UTC_TIME_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/UUIDSyntax.java
@@ -104,7 +104,7 @@
   *
   * @return  The common name for this attribute syntax.
   */
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_UUID_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/schema/UserPasswordSyntax.java
@@ -109,7 +109,7 @@
   *
   * @return  The common name for this attribute syntax.
   */
  public String getSyntaxName()
  public String getName()
  {
    return SYNTAX_USER_PASSWORD_NAME;
  }
opendj3-server-dev/src/server/org/opends/server/types/Schema.java
@@ -928,8 +928,8 @@
          AttributeSyntax<?> conflictingSyntax = syntaxes.get(oid);
          LocalizableMessage message = ERR_SCHEMA_CONFLICTING_SYNTAX_OID.
              get(syntax.getSyntaxName(), oid,
                  conflictingSyntax.getSyntaxName());
              get(syntax.getName(), oid,
                  conflictingSyntax.getName());
          throw new DirectoryException(
                         ResultCode.CONSTRAINT_VIOLATION, message);
        }
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/AttributeSyntaxTest.java
@@ -80,7 +80,7 @@
    syntax.getOID();
    syntax.getOrderingMatchingRule();
    syntax.getSubstringMatchingRule();
    syntax.getSyntaxName();
    syntax.getName();
    syntax.toString();
  }
}
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/BinaryAttributeSyntaxTest.java
@@ -80,7 +80,7 @@
    syntax.getOID();
    syntax.getOrderingMatchingRule();
    syntax.getSubstringMatchingRule();
    syntax.getSyntaxName();
    syntax.getName();
    syntax.toString();
  }
}
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/BitStringSyntaxTest.java
@@ -93,7 +93,7 @@
    syntax.getOID();
    syntax.getOrderingMatchingRule();
    syntax.getSubstringMatchingRule();
    syntax.getSyntaxName();
    syntax.getName();
    syntax.toString();
  }
}
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/ConfigurableAttributeSyntaxTest.java
@@ -137,7 +137,7 @@
    syntax.getOID();
    syntax.getOrderingMatchingRule();
    syntax.getSubstringMatchingRule();
    syntax.getSyntaxName();
    syntax.getName();
    syntax.toString();
  }
}
opendj3-server-dev/tests/unit-tests-testng/src/server/org/opends/server/schema/GenericSchemaTestCase.java
@@ -22,6 +22,8 @@
 *
 *
 *      Copyright 2008 Sun Microsystems, Inc.
 *      Portions Copyright 2014 ForgeRock AS.
 *
 */
package org.opends.server.schema;
@@ -90,7 +92,7 @@
    {
      if (! isNumericOID(as.getOID()))
      {
        invalidOIDs.add(as.getSyntaxName());
        invalidOIDs.add(as.getName());
      }
    }