directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1080977 [2/3] - in /directory: apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/entry/ apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/ apacheds/branches/akarasu...
Date Sat, 12 Mar 2011 19:05:20 GMT
Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaManager.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaManager.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaManager.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaManager.java Sat Mar 12 19:05:17 2011
@@ -470,7 +470,7 @@ public interface SchemaManager
      * @return The found MatchingRule 
      * @throws LdapException if the OID is not found in the MatchingRule registry
      */
-    MatchingRule lookupMatchingRuleRegistry( String oid ) throws LdapException;
+    MutableMatchingRuleImpl lookupMatchingRuleRegistry( String oid ) throws LdapException;
 
 
     /**

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaUtils.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaUtils.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/SchemaUtils.java Sat Mar 12 19:05:17 2011
@@ -756,7 +756,7 @@ public final class SchemaUtils
      * @throws LdapException if there are problems accessing the objects
      * associated with the MatchingRule.
      */
-    public static StringBuffer render( MatchingRule mr ) throws LdapException
+    public static StringBuffer render( MutableMatchingRuleImpl mr ) throws LdapException
     {
         StringBuffer buf = new StringBuffer();
         buf.append( "( " ).append( mr.getOid() );

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/ConcreteNameComponentNormalizer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/ConcreteNameComponentNormalizer.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/ConcreteNameComponentNormalizer.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/normalizers/ConcreteNameComponentNormalizer.java Sat Mar 12 19:05:17 2011
@@ -27,7 +27,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.name.NameComponentNormalizer;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.util.Hex;
@@ -195,7 +195,7 @@ public class ConcreteNameComponentNormal
     private Normalizer lookup( String id ) throws LdapException
     {
         AttributeType type = schemaManager.lookupAttributeTypeRegistry( id );
-        MatchingRule mrule = type.getEquality();
+        MutableMatchingRuleImpl mrule = type.getEquality();
         
         if ( mrule == null )
         {

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/MatchingRuleDescriptionSchemaParser.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/MatchingRuleDescriptionSchemaParser.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/MatchingRuleDescriptionSchemaParser.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/MatchingRuleDescriptionSchemaParser.java Sat Mar 12 19:05:17 2011
@@ -23,7 +23,7 @@ package org.apache.directory.shared.ldap
 import java.text.ParseException;
 
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -70,7 +70,7 @@ public class MatchingRuleDescriptionSche
      * @return the parsed MatchingRuleDescription bean
      * @throws ParseException if there are any recognition errors (bad syntax)
      */
-    public synchronized MatchingRule parseMatchingRuleDescription( String matchingRuleDescription )
+    public synchronized MutableMatchingRuleImpl parseMatchingRuleDescription( String matchingRuleDescription )
         throws ParseException
     {
         LOG.debug( "Parsing a MatchingRule : {}", matchingRuleDescription );
@@ -85,7 +85,7 @@ public class MatchingRuleDescriptionSche
 
         try
         {
-            MatchingRule matchingRule = parser.matchingRuleDescription();
+            MutableMatchingRuleImpl matchingRule = parser.matchingRuleDescription();
 
             // Update the schemaName
             updateSchemaName( matchingRule );
@@ -114,7 +114,7 @@ public class MatchingRuleDescriptionSche
      * @return An instance of MatchingRule
      * @throws ParseException {@inheritDoc}
      */
-    public MatchingRule parse( String schemaDescription ) throws ParseException
+    public MutableMatchingRuleImpl parse( String schemaDescription ) throws ParseException
     {
         return parseMatchingRuleDescription( schemaDescription );
     }

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ParserDescriptionUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ParserDescriptionUtils.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ParserDescriptionUtils.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/parsers/ParserDescriptionUtils.java Sat Mar 12 19:05:17 2011
@@ -25,7 +25,7 @@ import java.util.List;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
 import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.SchemaObject;
 
@@ -190,7 +190,7 @@ public final class ParserDescriptionUtil
      * @param matchingRule1 the second matchingRule to compare
      * @return true if the matchingRules match exactly, false otherwise
      */
-    public static boolean matchingRulesMatch( MatchingRule matchingRule0, MatchingRule matchingRule1 )
+    public static boolean matchingRulesMatch( MutableMatchingRuleImpl matchingRule0, MutableMatchingRuleImpl matchingRule1 )
     {
         // compare all common description parameters
         if ( ! descriptionsMatch( matchingRule0, matchingRule1 ) )

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultAttributeTypeRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultAttributeTypeRegistry.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultAttributeTypeRegistry.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultAttributeTypeRegistry.java Sat Mar 12 19:05:17 2011
@@ -30,7 +30,7 @@ import java.util.Set;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapNoSuchAttributeException;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.SchemaObjectType;
 import org.apache.directory.shared.ldap.model.schema.normalizers.NoOpNormalizer;
 import org.apache.directory.shared.ldap.model.schema.normalizers.OidNormalizer;
@@ -257,7 +257,7 @@ public class DefaultAttributeTypeRegistr
      */
     public void addMappingFor( AttributeType attributeType ) throws LdapException
     {
-        MatchingRule equality = attributeType.getEquality();
+        MutableMatchingRuleImpl equality = attributeType.getEquality();
         OidNormalizer oidNormalizer;
         String oid = attributeType.getOid();
 

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultMatchingRuleRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultMatchingRuleRegistry.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultMatchingRuleRegistry.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/DefaultMatchingRuleRegistry.java Sat Mar 12 19:05:17 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.ldap.model.schema.registries;
 
 
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.SchemaObjectType;
 
 
@@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class DefaultMatchingRuleRegistry extends DefaultSchemaObjectRegistry<MatchingRule>
+public class DefaultMatchingRuleRegistry extends DefaultSchemaObjectRegistry<MutableMatchingRuleImpl>
     implements MatchingRuleRegistry
 {
     /**
@@ -37,7 +37,7 @@ public class DefaultMatchingRuleRegistry
      */
     public DefaultMatchingRuleRegistry()
     {
-        super( SchemaObjectType.MATCHING_RULE, new OidRegistry<MatchingRule>() );
+        super( SchemaObjectType.MATCHING_RULE, new OidRegistry<MutableMatchingRuleImpl>() );
     }
 
 

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableMatchingRuleRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableMatchingRuleRegistry.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableMatchingRuleRegistry.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/ImmutableMatchingRuleRegistry.java Sat Mar 12 19:05:17 2011
@@ -27,6 +27,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.exception.LdapUnwillingToPerformException;
 import org.apache.directory.shared.ldap.model.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.SchemaObjectType;
 
 
@@ -109,7 +110,7 @@ public class ImmutableMatchingRuleRegist
     /**
      * {@inheritDoc}
      */
-    public Iterator<MatchingRule> iterator()
+    public Iterator<MutableMatchingRuleImpl> iterator()
     {
         return immutableMatchingRuleRegistry.iterator();
     }
@@ -118,7 +119,7 @@ public class ImmutableMatchingRuleRegist
     /**
      * {@inheritDoc}
      */
-    public MatchingRule lookup( String oid ) throws LdapException
+    public MutableMatchingRuleImpl lookup( String oid ) throws LdapException
     {
         return immutableMatchingRuleRegistry.lookup( oid );
     }
@@ -136,7 +137,7 @@ public class ImmutableMatchingRuleRegist
     /**
      * {@inheritDoc}
      */
-    public void register( MatchingRule schemaObject ) throws LdapException
+    public void register( MutableMatchingRuleImpl schemaObject ) throws LdapException
     {
         throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04280 ) );
     }
@@ -154,7 +155,7 @@ public class ImmutableMatchingRuleRegist
     /**
      * {@inheritDoc}
      */
-    public MatchingRule unregister( String numericOid ) throws LdapException
+    public MutableMatchingRuleImpl unregister( String numericOid ) throws LdapException
     {
         throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04280 ) );
     }
@@ -190,7 +191,7 @@ public class ImmutableMatchingRuleRegist
     /**
      * {@inheritDoc}
      */
-    public MatchingRule unregister( MatchingRule schemaObject ) throws LdapException
+    public MutableMatchingRuleImpl unregister( MutableMatchingRuleImpl schemaObject ) throws LdapException
     {
         throw new LdapUnwillingToPerformException( ResultCodeEnum.NO_SUCH_OPERATION, I18n.err( I18n.ERR_04280 ) );
     }

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/MatchingRuleRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/MatchingRuleRegistry.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/MatchingRuleRegistry.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/MatchingRuleRegistry.java Sat Mar 12 19:05:17 2011
@@ -20,7 +20,7 @@
 package org.apache.directory.shared.ldap.model.schema.registries;
 
 
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 
 
 /**
@@ -28,8 +28,8 @@ import org.apache.directory.shared.ldap.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public interface MatchingRuleRegistry extends SchemaObjectRegistry<MatchingRule>,
-    Iterable<MatchingRule>
+public interface MatchingRuleRegistry extends SchemaObjectRegistry<MutableMatchingRuleImpl>,
+    Iterable<MutableMatchingRuleImpl>
 {
     /**
      * Copy the MatchingRuleRegistry

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Registries.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Registries.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Registries.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/schema/registries/Registries.java Sat Mar 12 19:05:17 2011
@@ -45,7 +45,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntax;
 import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
 import org.apache.directory.shared.ldap.model.schema.MutableLoadableSchemaObject;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.MatchingRuleUse;
 import org.apache.directory.shared.ldap.model.schema.MutableNormalizer;
 import org.apache.directory.shared.ldap.model.schema.MutableSyntaxChecker;
@@ -343,7 +343,7 @@ public class Registries implements Schem
         // MatchingRule
         try
         {
-            MatchingRule matchingRule = matchingRuleRegistry.lookup( name );
+            MutableMatchingRuleImpl matchingRule = matchingRuleRegistry.lookup( name );
 
             if ( matchingRule != null )
             {
@@ -499,7 +499,7 @@ public class Registries implements Schem
 
         // Step 3 :
         // Check the matchingRules
-        for ( MatchingRule matchingRule : matchingRuleRegistry )
+        for ( MutableMatchingRuleImpl matchingRule : matchingRuleRegistry )
         {
             resolve( matchingRule, errors );
         }
@@ -706,7 +706,7 @@ public class Registries implements Schem
      * MR -> N
      * MR -> S
      */
-    public void delCrossReferences( MatchingRule matchingRule )
+    public void delCrossReferences( MutableMatchingRuleImpl matchingRule )
     {
         if ( matchingRule.getLdapComparator() != null )
         {
@@ -772,7 +772,7 @@ public class Registries implements Schem
      */
     private void buildMatchingRuleReferences( List<Throwable> errors )
     {
-        for ( MatchingRule matchingRule : matchingRuleRegistry )
+        for ( MutableMatchingRuleImpl matchingRule : matchingRuleRegistry )
         {
             buildReference( errors, matchingRule );
         }
@@ -996,7 +996,7 @@ public class Registries implements Schem
      * Check if the Comparator, Normalizer and the syntax are 
      * existing for a matchingRule.
      */
-    private void resolve( MatchingRule matchingRule, List<Throwable> errors )
+    private void resolve( MutableMatchingRuleImpl matchingRule, List<Throwable> errors )
     {
         // Process the Syntax. It can't be null
         String syntaxOid = matchingRule.getSyntaxOid();
@@ -1591,7 +1591,7 @@ public class Registries implements Schem
                     break;
 
                 case MATCHING_RULE:
-                    matchingRuleRegistry.register( ( MatchingRule ) schemaObject );
+                    matchingRuleRegistry.register( ( MutableMatchingRuleImpl ) schemaObject );
                     break;
 
                 case MATCHING_RULE_USE:
@@ -1809,7 +1809,7 @@ public class Registries implements Schem
                 break;
 
             case MATCHING_RULE:
-                unregistered = matchingRuleRegistry.unregister( ( MatchingRule ) schemaObject );
+                unregistered = matchingRuleRegistry.unregister( ( MutableMatchingRuleImpl ) schemaObject );
                 break;
 
             case MATCHING_RULE_USE:
@@ -2276,7 +2276,7 @@ public class Registries implements Schem
         // Check the MatchingRules : check for a Normalizer, a Comparator and a Syntax
         LOG.debug( "Checking MatchingRules..." );
 
-        for ( MatchingRule matchingRule : matchingRuleRegistry )
+        for ( MutableMatchingRuleImpl matchingRule : matchingRuleRegistry )
         {
             // Check that each MatchingRule has a Normalizer
             if ( matchingRule.getNormalizer() == null )
@@ -2563,7 +2563,7 @@ public class Registries implements Schem
             clone.globalOidRegistry.put( ditStructureRule );
         }
 
-        for ( MatchingRule matchingRule : clone.matchingRuleRegistry )
+        for ( MutableMatchingRuleImpl matchingRule : clone.matchingRuleRegistry )
         {
             clone.globalOidRegistry.put( matchingRule );
         }

Modified: directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java Sat Mar 12 19:05:17 2011
@@ -37,7 +37,7 @@ import java.util.Arrays;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.AbstractNormalizer;
 import org.apache.directory.shared.ldap.model.schema.comparators.ByteArrayComparator;
 import org.apache.directory.shared.ldap.model.schema.syntaxCheckers.OctetStringSyntaxChecker;
@@ -69,7 +69,7 @@ public class BinaryValueAttributeTypeTes
 {
     private MutableLdapSyntaxImpl s;
     private AttributeType at;
-    private MatchingRule mr;
+    private MutableMatchingRuleImpl mr;
     
     private static final byte[] BYTES1 = new byte[]{0x01, 0x02, 0x03, 0x04};
     private static final byte[] BYTES2 = new byte[]{(byte)0x81, (byte)0x82, (byte)0x83, (byte)0x84};

Modified: directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/SchemaUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/SchemaUtilsTest.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/SchemaUtilsTest.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/SchemaUtilsTest.java Sat Mar 12 19:05:17 2011
@@ -29,7 +29,7 @@ import com.mycila.junit.concurrent.Concu
 import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.SchemaUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -54,21 +54,21 @@ public class SchemaUtilsTest
     }
 
 
-    public static MatchingRule[] getMatchingRules()
+    public static MutableMatchingRuleImpl[] getMatchingRules()
     {
-        MatchingRule[] mrs = new MatchingRule[3];
+        MutableMatchingRuleImpl[] mrs = new MutableMatchingRuleImpl[3];
         
-        mrs[0] = new MatchingRule( "2.5.13.2" );
+        mrs[0] = new MutableMatchingRuleImpl( "2.5.13.2" );
         mrs[0].setSyntax( getSyntaxes()[1] );
         mrs[0].addName( "caseIgnoreMatch" );
         mrs[0].setDescription( "Ignores case in strings" );
 
-        mrs[1] = new MatchingRule( "2.5.13.4" );
+        mrs[1] = new MutableMatchingRuleImpl( "2.5.13.4" );
         mrs[0].setSyntax( getSyntaxes()[2] );
         mrs[1].addName( "caseIgnoreSubstringsMatch" );
         mrs[1].setDescription( "Ignores case in substrings" );
 
-        mrs[2] = new MatchingRule( "2.5.13.1" );
+        mrs[2] = new MutableMatchingRuleImpl( "2.5.13.1" );
         mrs[0].setSyntax( getSyntaxes()[0] );
         mrs[2].addName( "distinguishedNameMatch" );
         mrs[2].setDescription( "distinguishedNameMatch" );

Modified: directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/MatchingRuleDescriptionSchemaParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/MatchingRuleDescriptionSchemaParserTest.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/MatchingRuleDescriptionSchemaParserTest.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/test/java/org/apache/directory/shared/ldap/model/schema/syntaxes/parser/MatchingRuleDescriptionSchemaParserTest.java Sat Mar 12 19:05:17 2011
@@ -33,7 +33,9 @@ import javax.naming.NamingException;
 
 import com.mycila.junit.concurrent.Concurrency;
 import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.parsers.MatchingRuleDescriptionSchemaParser;
 import org.junit.After;
 import org.junit.Before;
@@ -174,7 +176,7 @@ public class MatchingRuleDescriptionSche
     public void testFull() throws ParseException, NamingException
     {
         String value = null;
-        MatchingRule matchingRule = null;
+        MutableMatchingRuleImpl matchingRule = null;
 
         value = "( 1.2.3.4.5.6.7.8.9.0 NAME ( 'abcdefghijklmnopqrstuvwxyz-ABCDEFGHIJKLMNOPQRSTUVWXYZ-0123456789' 'test' ) DESC 'Descripton \u00E4\u00F6\u00FC\u00DF \u90E8\u9577' OBSOLETE SYNTAX 0.1.2.3.4.5.6.7.8.9 X-TEST-a ('test1-1' 'test1-2') X-TEST-b ('test2-1' 'test2-2') )";
         matchingRule = parser.parseMatchingRuleDescription( value );
@@ -253,7 +255,7 @@ public class MatchingRuleDescriptionSche
     public void testRfc1() throws ParseException, NamingException
     {
         String value = "( 2.5.13.5 NAME 'caseExactMatch' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )";
-        MatchingRule matchingRule = parser.parseMatchingRuleDescription( value );
+        MutableMatchingRuleImpl matchingRule = parser.parseMatchingRuleDescription( value );
 
         assertEquals( "2.5.13.5", matchingRule.getOid() );
         assertEquals( 1, matchingRule.getNames().size() );
@@ -269,7 +271,7 @@ public class MatchingRuleDescriptionSche
     public void testSun1() throws ParseException, NamingException
     {
         String value = "( 2.5.13.5 NAME 'caseExactMatch' DESC 'Case Exact Matching on Directory String [defined in X.520]' SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 )";
-        MatchingRule matchingRule = parser.parseMatchingRuleDescription( value );
+        MutableMatchingRuleImpl matchingRule = parser.parseMatchingRuleDescription( value );
 
         assertEquals( "2.5.13.5", matchingRule.getOid() );
         assertEquals( 1, matchingRule.getNames().size() );
@@ -303,7 +305,7 @@ public class MatchingRuleDescriptionSche
         }
         else
         {
-            MatchingRule matchingRule = parser.parseMatchingRuleDescription( value );
+            MutableMatchingRuleImpl matchingRule = parser.parseMatchingRuleDescription( value );
             assertEquals( "1.3.6.1.4.1.42.2.27.9.4.34.3.6", matchingRule.getOid() );
             assertEquals( 1, matchingRule.getNames().size() );
             assertEquals( "caseExactSubstringMatch-2.16.840.1.113730.3.3.2.11.3", matchingRule.getNames().get( 0 ) );

Modified: directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java (original)
+++ directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemaloader/SchemaEntityFactory.java Sat Mar 12 19:05:17 2011
@@ -43,7 +43,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.AbstractLdapComparator;
 import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
 import org.apache.directory.shared.ldap.model.schema.LoadableSchemaObject;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.AbstractNormalizer;
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
@@ -726,7 +726,7 @@ public class SchemaEntityFactory impleme
      * @throws LdapUnwillingToPerformException 
      * @throws LdapInvalidAttributeValueException 
      */
-    public MatchingRule getMatchingRule( SchemaManager schemaManager, Entry entry, Registries targetRegistries,
+    public MutableMatchingRuleImpl getMatchingRule( SchemaManager schemaManager, Entry entry, Registries targetRegistries,
         String schemaName ) throws LdapUnwillingToPerformException, LdapInvalidAttributeValueException
     {
         checkEntry( entry, SchemaConstants.MATCHING_RULE );
@@ -753,7 +753,7 @@ public class SchemaEntityFactory impleme
             schema = schemaManager.getLoadedSchema( schemaName );
         }
 
-        MatchingRule matchingRule = new MatchingRule( oid );
+        MutableMatchingRuleImpl matchingRule = new MutableMatchingRuleImpl( oid );
 
         // The syntax field
         EntryAttribute mSyntax = entry.get( MetaSchemaConstants.M_SYNTAX_AT );

Modified: directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java (original)
+++ directory/shared/branches/akarasulu/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java Sat Mar 12 19:05:17 2011
@@ -48,7 +48,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
 import org.apache.directory.shared.ldap.model.schema.LoadableSchemaObject;
 import org.apache.directory.shared.ldap.model.schema.MutableLoadableSchemaObject;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.MutableNormalizer;
 import org.apache.directory.shared.ldap.model.schema.AbstractNormalizer;
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
@@ -843,7 +843,7 @@ public class DefaultSchemaManager implem
     {
         for ( Entry entry : schemaLoader.loadMatchingRules( schema ) )
         {
-            MatchingRule matchingRule = factory.getMatchingRule( this, entry, registries, schema.getSchemaName() );
+            MutableMatchingRuleImpl matchingRule = factory.getMatchingRule( this, entry, registries, schema.getSchemaName() );
 
             addSchemaObject( registries, matchingRule, schema );
         }
@@ -1547,7 +1547,7 @@ public class DefaultSchemaManager implem
     /**
      * {@inheritDoc}
      */
-    public MatchingRule lookupMatchingRuleRegistry( String oid ) throws LdapException
+    public MutableMatchingRuleImpl lookupMatchingRuleRegistry( String oid ) throws LdapException
     {
         return registries.getMatchingRuleRegistry().lookup( Strings.toLowerCase( oid ).trim() );
     }

Modified: directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/MatchingRuleTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/MatchingRuleTest.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/MatchingRuleTest.java (original)
+++ directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/MatchingRuleTest.java Sat Mar 12 19:05:17 2011
@@ -32,7 +32,7 @@ import org.apache.commons.io.FileUtils;
 import com.mycila.junit.concurrent.Concurrency;
 import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.model.schema.comparators.*;
 import org.apache.directory.shared.ldap.model.schema.comparators.GeneralizedTimeComparator;
@@ -112,14 +112,14 @@ public class MatchingRuleTest
     public void testTelephoneNumberMatch() throws Exception
     {
         // matching rule: telephoneNumberMatch
-        MatchingRule mr1 = schemaManager.lookupMatchingRuleRegistry( "telephoneNumberMatch" );
+        MutableMatchingRuleImpl mr1 = schemaManager.lookupMatchingRuleRegistry( "telephoneNumberMatch" );
         assertEquals( TelephoneNumberNormalizer.class.getName(), mr1.getNormalizer().getClass().getName() );
         assertEquals( "+1234567890", mr1.getNormalizer().normalize( " +1 234-567 890 " ) );
         assertEquals( TelephoneNumberComparator.class.getName(), mr1.getLdapComparator().getClass().getName() );
         assertEquals( 0, mr1.getLdapComparator().compare( " +1 234-567 890 ", "+1234567890" ) );
 
         // matching rule: telephoneNumberSubstringsMatch
-        MatchingRule mr2 = schemaManager.lookupMatchingRuleRegistry( "telephoneNumberSubstringsMatch" );
+        MutableMatchingRuleImpl mr2 = schemaManager.lookupMatchingRuleRegistry( "telephoneNumberSubstringsMatch" );
         assertEquals( TelephoneNumberNormalizer.class.getName(), mr2.getNormalizer().getClass().getName() );
         assertEquals( "+1234567890", mr2.getNormalizer().normalize( " +1 234-567 890 " ) );
         assertEquals( TelephoneNumberComparator.class.getName(), mr2.getLdapComparator().getClass().getName() );
@@ -143,13 +143,13 @@ public class MatchingRuleTest
     @Test
     public void testIntegerMatch() throws Exception
     {
-        MatchingRule mr1 = schemaManager.lookupMatchingRuleRegistry( "integerMatch" );
+        MutableMatchingRuleImpl mr1 = schemaManager.lookupMatchingRuleRegistry( "integerMatch" );
         assertEquals( NumericNormalizer.class.getName(), mr1.getNormalizer().getClass().getName() );
         assertEquals( "1234567890", mr1.getNormalizer().normalize( " 1 234 567 890 " ) );
         //assertEquals( IntegerComparator.class.getName(), mr1.getLdapComparator().getClass().getName() );
         //assertEquals( 0, mr1.getLdapComparator().compare( " 1 234 567 890 ", "1234567890" ) );
 
-        MatchingRule mr2 = schemaManager.lookupMatchingRuleRegistry( "integerOrderingMatch" );
+        MutableMatchingRuleImpl mr2 = schemaManager.lookupMatchingRuleRegistry( "integerOrderingMatch" );
         assertEquals( NumericNormalizer.class.getName(), mr2.getNormalizer().getClass().getName() );
         assertEquals( "1234567890", mr2.getNormalizer().normalize( " 1 234 567 890 " ) );
         assertEquals( IntegerComparator.class.getName(), mr2.getLdapComparator().getClass().getName() );
@@ -171,19 +171,19 @@ public class MatchingRuleTest
     @Test
     public void testNumericStringMatch() throws Exception
     {
-        MatchingRule mr1 = schemaManager.lookupMatchingRuleRegistry( "numericStringMatch" );
+        MutableMatchingRuleImpl mr1 = schemaManager.lookupMatchingRuleRegistry( "numericStringMatch" );
         assertEquals( NumericNormalizer.class.getName(), mr1.getNormalizer().getClass().getName() );
         assertEquals( "1234567890", mr1.getNormalizer().normalize( " 1 234 567 890 " ) );
         assertEquals( NumericStringComparator.class.getName(), mr1.getLdapComparator().getClass().getName() );
         assertEquals( 0, mr1.getLdapComparator().compare( " 1 234 567 890 ", "1234567890" ) );
 
-        MatchingRule mr2 = schemaManager.lookupMatchingRuleRegistry( "numericStringSubstringsMatch" );
+        MutableMatchingRuleImpl mr2 = schemaManager.lookupMatchingRuleRegistry( "numericStringSubstringsMatch" );
         assertEquals( NumericNormalizer.class.getName(), mr2.getNormalizer().getClass().getName() );
         assertEquals( "1234567890", mr2.getNormalizer().normalize( " 1 234 567 890 " ) );
         assertEquals( NumericStringComparator.class.getName(), mr2.getLdapComparator().getClass().getName() );
         assertEquals( 0, mr2.getLdapComparator().compare( " 1 234 567 890 ", "1234567890" ) );
 
-        MatchingRule mr3 = schemaManager.lookupMatchingRuleRegistry( "numericStringOrderingMatch" );
+        MutableMatchingRuleImpl mr3 = schemaManager.lookupMatchingRuleRegistry( "numericStringOrderingMatch" );
         assertEquals( NumericNormalizer.class.getName(), mr3.getNormalizer().getClass().getName() );
         assertEquals( "1234567890", mr3.getNormalizer().normalize( " 1 234 567 890 " ) );
         assertEquals( NumericStringComparator.class.getName(), mr3.getLdapComparator().getClass().getName() );
@@ -196,7 +196,7 @@ public class MatchingRuleTest
     @Test
     public void testGeneralizedTimeStringMatch() throws Exception
     {
-        MatchingRule mr1 = schemaManager.lookupMatchingRuleRegistry( "generalizedTimeMatch" );
+        MutableMatchingRuleImpl mr1 = schemaManager.lookupMatchingRuleRegistry( "generalizedTimeMatch" );
         assertEquals( GeneralizedTimeNormalizer.class.getName(), mr1.getNormalizer().getClass().getName() );
 
         String normalized = mr1.getNormalizer().normalize( "2010031415Z" );
@@ -211,7 +211,7 @@ public class MatchingRuleTest
         int compare3 = mr1.getLdapComparator().compare( "2010031415Z", "20100314154500.000+0000" );
         assertTrue( ( compare1 == 0 ) || ( compare2 == 0 ) || ( compare3 == 0 ) );
 
-        MatchingRule mr2 = schemaManager.lookupMatchingRuleRegistry( "generalizedTimeOrderingMatch" );
+        MutableMatchingRuleImpl mr2 = schemaManager.lookupMatchingRuleRegistry( "generalizedTimeOrderingMatch" );
         assertEquals( GeneralizedTimeNormalizer.class.getName(), mr2.getNormalizer().getClass().getName() );
         normalized = mr2.getNormalizer().normalize( "2010031415Z" );
         assertTrue( "20100314150000.000Z".equals( normalized ) || "20100314153000.000Z".equals( normalized )

Modified: directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerAddTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerAddTest.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerAddTest.java (original)
+++ directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerAddTest.java Sat Mar 12 19:05:17 2011
@@ -42,7 +42,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
 import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntax;
 import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.MutableNormalizer;
 import org.apache.directory.shared.ldap.model.schema.AbstractNormalizer;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
@@ -153,7 +153,7 @@ public class SchemaManagerAddTest
     {
         try
         {
-            MatchingRule matchingRule = schemaManager.lookupMatchingRuleRegistry( oid );
+            MutableMatchingRuleImpl matchingRule = schemaManager.lookupMatchingRuleRegistry( oid );
 
             return matchingRule != null;
         }
@@ -949,7 +949,7 @@ public class SchemaManagerAddTest
         int mrrSize = schemaManager.getMatchingRuleRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        MatchingRule matchingRule = new MatchingRule( "1.1.0" );
+        MutableMatchingRuleImpl matchingRule = new MutableMatchingRuleImpl( "1.1.0" );
         matchingRule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.26" );
 
         // It should not fail
@@ -958,7 +958,7 @@ public class SchemaManagerAddTest
         assertTrue( isMRPresent( schemaManager, "1.1.0" ) );
 
         // The C and N must have default values
-        MatchingRule added = schemaManager.lookupMatchingRuleRegistry( "1.1.0" );
+        MutableMatchingRuleImpl added = schemaManager.lookupMatchingRuleRegistry( "1.1.0" );
 
         assertEquals( NoOpNormalizer.class.getName(), added.getNormalizer().getClass().getName() );
         assertEquals( ComparableComparator.class.getName(), added.getLdapComparator().getClass().getName() );
@@ -978,7 +978,7 @@ public class SchemaManagerAddTest
         int mrrSize = schemaManager.getMatchingRuleRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        MatchingRule matchingRule = new MatchingRule( "1.1.0" );
+        MutableMatchingRuleImpl matchingRule = new MutableMatchingRuleImpl( "1.1.0" );
 
         // It should fail (no syntax)
         assertFalse( schemaManager.add( matchingRule ) );
@@ -1006,7 +1006,7 @@ public class SchemaManagerAddTest
         int mrrSize = schemaManager.getMatchingRuleRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        MatchingRule matchingRule = new MatchingRule( "2.5.13.0" );
+        MutableMatchingRuleImpl matchingRule = new MutableMatchingRuleImpl( "2.5.13.0" );
         matchingRule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.26" );
 
         // It should fail (oid already registered)
@@ -1020,7 +1020,7 @@ public class SchemaManagerAddTest
 
         // Check that the existing MR has not been replaced
         assertTrue( isMRPresent( schemaManager, "2.5.13.0" ) );
-        MatchingRule existing = schemaManager.lookupMatchingRuleRegistry( "2.5.13.0" );
+        MutableMatchingRuleImpl existing = schemaManager.lookupMatchingRuleRegistry( "2.5.13.0" );
 
         assertEquals( "objectIdentifierMatch", existing.getName() );
 
@@ -1039,7 +1039,7 @@ public class SchemaManagerAddTest
         int mrrSize = schemaManager.getMatchingRuleRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        MatchingRule matchingRule = new MatchingRule( "1.1.0" );
+        MutableMatchingRuleImpl matchingRule = new MutableMatchingRuleImpl( "1.1.0" );
         matchingRule.setNames( "Test", "objectIdentifierMatch" );
         matchingRule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.26" );
 
@@ -1067,7 +1067,7 @@ public class SchemaManagerAddTest
         int mrrSize = schemaManager.getMatchingRuleRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        MatchingRule matchingRule = new MatchingRule( "1.1.0" );
+        MutableMatchingRuleImpl matchingRule = new MutableMatchingRuleImpl( "1.1.0" );
         matchingRule.setNames( "Test", "cn" );
         matchingRule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.26" );
 
@@ -1080,7 +1080,7 @@ public class SchemaManagerAddTest
 
         // Check that the new MR has been injected
         assertTrue( isMRPresent( schemaManager, "1.1.0" ) );
-        MatchingRule added = schemaManager.lookupMatchingRuleRegistry( "1.1.0" );
+        MutableMatchingRuleImpl added = schemaManager.lookupMatchingRuleRegistry( "1.1.0" );
 
         assertTrue( added.getNames().contains( "cn" ) );
         assertTrue( added.getNames().contains( "Test" ) );
@@ -1100,7 +1100,7 @@ public class SchemaManagerAddTest
         int mrrSize = schemaManager.getMatchingRuleRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        MatchingRule matchingRule = new MatchingRule( "1.1.0" );
+        MutableMatchingRuleImpl matchingRule = new MutableMatchingRuleImpl( "1.1.0" );
         matchingRule.setNames( "Test" );
         matchingRule.setSyntaxOid( "1.1.1" );
 
@@ -1129,7 +1129,7 @@ public class SchemaManagerAddTest
         int mrrSize = schemaManager.getMatchingRuleRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
-        MatchingRule matchingRule = new MatchingRule( "1.1.0" );
+        MutableMatchingRuleImpl matchingRule = new MutableMatchingRuleImpl( "1.1.0" );
         matchingRule.setNames( "Test" );
         matchingRule.setSyntaxOid( "1.3.6.1.4.1.1466.115.121.1.26" );
         matchingRule.setSchemaName( "bad" );

Modified: directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerDelTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerDelTest.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerDelTest.java (original)
+++ directory/shared/branches/akarasulu/ldap/schema/data/src/test/java/org/apache/directory/shared/ldap/schemaloader/SchemaManagerDelTest.java Sat Mar 12 19:05:17 2011
@@ -40,7 +40,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
 import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntax;
 import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.MutableNormalizer;
 import org.apache.directory.shared.ldap.model.schema.AbstractNormalizer;
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
@@ -169,7 +169,7 @@ public class SchemaManagerDelTest
     {
         try
         {
-            MatchingRule matchingRule = schemaManager.lookupMatchingRuleRegistry( oid );
+            MutableMatchingRuleImpl matchingRule = schemaManager.lookupMatchingRuleRegistry( oid );
 
             return matchingRule != null;
         }
@@ -446,7 +446,7 @@ public class SchemaManagerDelTest
         assertTrue( errors.get( 0 ) instanceof LdapProtocolErrorException );
 
         // Now delete the using MR : it should be OK
-        MatchingRule mr = new MatchingRule( OID );
+        MutableMatchingRuleImpl mr = new MutableMatchingRuleImpl( OID );
         assertTrue( schemaManager.delete( mr ) );
 
         assertEquals( mrrSize - 1, schemaManager.getMatchingRuleRegistry().size() );
@@ -484,7 +484,7 @@ public class SchemaManagerDelTest
         int mrSize = schemaManager.getMatchingRuleRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
         
-        MatchingRule mr = new MatchingRule( "2.5.13.33" );
+        MutableMatchingRuleImpl mr = new MutableMatchingRuleImpl( "2.5.13.33" );
         assertTrue( schemaManager.delete( mr ) );
         
         assertEquals( mrSize - 1, schemaManager.getMatchingRuleRegistry().size() );
@@ -499,7 +499,7 @@ public class SchemaManagerDelTest
         int mrSize = schemaManager.getMatchingRuleRegistry().size();
         int goidSize = schemaManager.getGlobalOidRegistry().size();
         
-        MatchingRule mr = new MatchingRule( "0.1.1" );
+        MutableMatchingRuleImpl mr = new MutableMatchingRuleImpl( "0.1.1" );
         assertFalse( schemaManager.delete( mr ) );
         
         assertEquals( mrSize, schemaManager.getMatchingRuleRegistry().size() );
@@ -515,7 +515,7 @@ public class SchemaManagerDelTest
         int goidSize = schemaManager.getGlobalOidRegistry().size();
 
         // AT with OID 2.5.18.4 has syntax 1.3.6.1.4.1.1466.115.121.1.12 which is used by MR 2.5.13.1
-        MatchingRule mr = new MatchingRule( "2.5.13.1" );
+        MutableMatchingRuleImpl mr = new MutableMatchingRuleImpl( "2.5.13.1" );
         assertFalse( schemaManager.delete( mr ) );
         
         assertEquals( mrSize, schemaManager.getMatchingRuleRegistry().size() );
@@ -543,7 +543,7 @@ public class SchemaManagerDelTest
         assertTrue( isMatchingRulePresent( schemaManager, MR_OID ) );
 
         // Now try to remove the MR
-        MatchingRule matchingRule = schemaManager.lookupMatchingRuleRegistry( MR_OID );
+        MutableMatchingRuleImpl matchingRule = schemaManager.lookupMatchingRuleRegistry( MR_OID );
         
         // shouldn't be deleted cause there is a AT associated with it
         assertFalse( schemaManager.delete( matchingRule ) );
@@ -687,7 +687,7 @@ public class SchemaManagerDelTest
         assertTrue( errors.get( 0 ) instanceof LdapProtocolErrorException );
 
         // Now delete the using MR : it should be OK
-        MatchingRule mr = new MatchingRule( OID );
+        MutableMatchingRuleImpl mr = new MutableMatchingRuleImpl( OID );
         assertTrue( schemaManager.delete( mr ) );
 
         assertEquals( mrrSize - 1, schemaManager.getMatchingRuleRegistry().size() );
@@ -900,7 +900,7 @@ public class SchemaManagerDelTest
         assertTrue( errors.get( 0 ) instanceof LdapProtocolErrorException );
 
         // Now delete the using MR : it should be OK
-        MatchingRule mr = new MatchingRule( MR_OID );
+        MutableMatchingRuleImpl mr = new MutableMatchingRuleImpl( MR_OID );
         assertTrue( schemaManager.delete( mr ) );
 
         assertEquals( mrrSize - 1, schemaManager.getMatchingRuleRegistry().size() );

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterContentAssistProcessor.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterContentAssistProcessor.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterContentAssistProcessor.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterContentAssistProcessor.java Sat Mar 12 19:05:17 2011
@@ -32,7 +32,7 @@ import java.util.TreeMap;
 
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.studio.ldapbrowser.common.BrowserCommonActivator;
 import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants;
@@ -110,7 +110,7 @@ public class FilterContentAssistProcesso
     private Map<String, ObjectClass> possibleObjectClasses;
 
     /** The possible matching rules. */
-    private Map<String, MatchingRule> possibleMatchingRules;
+    private Map<String, MutableMatchingRuleImpl> possibleMatchingRules;
 
 
     /**
@@ -171,7 +171,7 @@ public class FilterContentAssistProcesso
         possibleAttributeTypes = new TreeMap<String, AttributeType>( nameAndOidComparator );
         possibleFilterTypes = new LinkedHashMap<String, String>();
         possibleObjectClasses = new TreeMap<String, ObjectClass>( nameAndOidComparator );
-        possibleMatchingRules = new TreeMap<String, MatchingRule>( nameAndOidComparator );
+        possibleMatchingRules = new TreeMap<String, MutableMatchingRuleImpl>( nameAndOidComparator );
 
         if ( schema != null )
         {
@@ -201,8 +201,8 @@ public class FilterContentAssistProcesso
                 }
             }
 
-            Collection<MatchingRule> matchingRuleDescriptions = schema.getMatchingRuleDescriptions();
-            for ( MatchingRule description : matchingRuleDescriptions )
+            Collection<MutableMatchingRuleImpl> matchingRuleDescriptions = schema.getMatchingRuleDescriptions();
+            for ( MutableMatchingRuleImpl description : matchingRuleDescriptions )
             {
                 possibleMatchingRules.put( description.getOid(), description );
                 for ( String name : description.getNames() )
@@ -545,7 +545,7 @@ public class FilterContentAssistProcesso
             {
                 if ( possibleMatchingRule.toUpperCase().startsWith( matchingRule.toUpperCase() ) )
                 {
-                    MatchingRule description = schema.getMatchingRuleDescription( possibleMatchingRule );
+                    MutableMatchingRuleImpl description = schema.getMatchingRuleDescription( possibleMatchingRule );
                     String replacementString = possibleMatchingRule;
                     if ( equalsColonToken == null )
                     {

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterTextHover.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterTextHover.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterTextHover.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.common/src/main/java/org/apache/directory/studio/ldapbrowser/common/filtereditor/FilterTextHover.java Sat Mar 12 19:05:17 2011
@@ -23,7 +23,7 @@ package org.apache.directory.studio.ldap
 
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.studio.ldapbrowser.core.model.filter.LdapFilter;
 import org.apache.directory.studio.ldapbrowser.core.model.filter.LdapFilterExtensibleComponent;
@@ -130,7 +130,7 @@ public class FilterTextHover implements 
                         + fc.getMatchingRuleToken().getLength() )
                 {
                     String matchingRule = fc.getMatchingRuleToken().getValue();
-                    MatchingRule matchingRuleDescription = schema.getMatchingRuleDescription( matchingRule );
+                    MutableMatchingRuleImpl matchingRuleDescription = schema.getMatchingRuleDescription( matchingRule );
                     String info = SchemaUtils.getLdifLine( matchingRuleDescription );
                     return info;
                 }

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/Schema.java Sat Mar 12 19:05:17 2011
@@ -39,7 +39,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.MatchingRuleUse;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.UsageEnum;
@@ -132,7 +132,7 @@ public class Schema
 
     private Map<String, MutableLdapSyntaxImpl> lsdMapByNumericOid;
 
-    private Map<String, MatchingRule> mrdMapByNameOrNumericOid;
+    private Map<String, MutableMatchingRuleImpl> mrdMapByNameOrNumericOid;
 
     private Map<String, MatchingRuleUse> mrudMapByNameOrNumericOid;
 
@@ -149,7 +149,7 @@ public class Schema
         this.ocdMapByNameOrNumericOid = new HashMap<String, ObjectClass>();
         this.atdMapByNameOrNumericOid = new HashMap<String, AttributeType>();
         this.lsdMapByNumericOid = new HashMap<String, MutableLdapSyntaxImpl>();
-        this.mrdMapByNameOrNumericOid = new HashMap<String, MatchingRule>();
+        this.mrdMapByNameOrNumericOid = new HashMap<String, MutableMatchingRuleImpl>();
         this.mrudMapByNameOrNumericOid = new HashMap<String, MatchingRuleUse>();
     }
 
@@ -281,7 +281,7 @@ public class Schema
                 }
                 else if ( attributeName.equalsIgnoreCase( SchemaConstants.MATCHING_RULES_AT ) )
                 {
-                    MatchingRule mrd = mrdParser.parseMatchingRuleDescription( value );
+                    MutableMatchingRuleImpl mrd = mrdParser.parseMatchingRuleDescription( value );
                     mrd.addExtension( RAW_SCHEMA_DEFINITION_LDIF_VALUE, ldifValues );
                     addMatchingRule( mrd );
                 }
@@ -342,7 +342,7 @@ public class Schema
         {
             if ( matchingRule != null && !hasMatchingRuleDescription( matchingRule ) )
             {
-                MatchingRule mrd = new MatchingRule( matchingRule );
+                MutableMatchingRuleImpl mrd = new MutableMatchingRuleImpl( matchingRule );
                 mrd.addName( matchingRule );
                 addMatchingRule( mrd );
             }
@@ -701,7 +701,7 @@ public class Schema
      * 
      * @param mrud the matching rule description
      */
-    private void addMatchingRule( MatchingRule mrd )
+    private void addMatchingRule( MutableMatchingRuleImpl mrd )
     {
         if ( mrd.getOid() != null )
         {
@@ -722,9 +722,9 @@ public class Schema
      * 
      * @return the matching rule descriptions
      */
-    public Collection<MatchingRule> getMatchingRuleDescriptions()
+    public Collection<MutableMatchingRuleImpl> getMatchingRuleDescriptions()
     {
-        Set<MatchingRule> set = new HashSet<MatchingRule>( mrdMapByNameOrNumericOid.values() );
+        Set<MutableMatchingRuleImpl> set = new HashSet<MutableMatchingRuleImpl>( mrdMapByNameOrNumericOid.values() );
         return set;
     }
 
@@ -757,7 +757,7 @@ public class Schema
      * 
      * @return the matching rule description or the default or a dummy
      */
-    public MatchingRule getMatchingRuleDescription( String nameOrOid )
+    public MutableMatchingRuleImpl getMatchingRuleDescription( String nameOrOid )
     {
         if ( mrdMapByNameOrNumericOid.containsKey( nameOrOid.toLowerCase() ) )
         {
@@ -770,7 +770,7 @@ public class Schema
         else
         {
             // DUMMY
-            MatchingRule mrd = new MatchingRule( nameOrOid );
+            MutableMatchingRuleImpl mrd = new MutableMatchingRuleImpl( nameOrOid );
             mrd.setExtensions( DUMMY_EXTENSIONS );
             return mrd;
         }

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaUtils.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaUtils.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/model/schema/SchemaUtils.java Sat Mar 12 19:05:17 2011
@@ -36,7 +36,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
 import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.MatchingRuleUse;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum;
@@ -540,7 +540,7 @@ public class SchemaUtils
      * equality, substring or ordering matching
      */
     public static Collection<AttributeType> getUsedFromAttributeTypeDescriptions(
-        MatchingRule mrd, Schema schema )
+        MutableMatchingRuleImpl mrd, Schema schema )
     {
         Set<AttributeType> usedFromSet = new TreeSet<AttributeType>( schemaElementNameComparator );
         for ( AttributeType atd : schema.getAttributeTypeDescriptions() )

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/OpenSchemaBrowserAction.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/OpenSchemaBrowserAction.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/OpenSchemaBrowserAction.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/actions/OpenSchemaBrowserAction.java Sat Mar 12 19:05:17 2011
@@ -23,7 +23,7 @@ package org.apache.directory.studio.ldap
 
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.studio.connection.core.Connection;
 import org.apache.directory.studio.ldapbrowser.common.actions.BrowserAction;
@@ -414,7 +414,7 @@ public class OpenSchemaBrowserAction ext
      * @return
      *      the Equality Matching Rule Description
      */
-    private MatchingRule getEmrd()
+    private MutableMatchingRuleImpl getEmrd()
     {
         if ( getConnection() != null )
         {
@@ -439,7 +439,7 @@ public class OpenSchemaBrowserAction ext
      * @return
      *      the Substring Matching Rule Description
      */
-    private MatchingRule getSmrd()
+    private MutableMatchingRuleImpl getSmrd()
     {
         if ( getConnection() != null )
         {
@@ -464,7 +464,7 @@ public class OpenSchemaBrowserAction ext
      * @return
      *      the Ordering Matching Rule Description
      */
-    private MatchingRule getOmrd()
+    private MutableMatchingRuleImpl getOmrd()
     {
         if ( getConnection() != null )
         {

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/AttributeTypeDescriptionDetailsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/AttributeTypeDescriptionDetailsPage.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/AttributeTypeDescriptionDetailsPage.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/AttributeTypeDescriptionDetailsPage.java Sat Mar 12 19:05:17 2011
@@ -25,7 +25,7 @@ import java.util.Collection;
 
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.UsageEnum;
 import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils;
@@ -383,7 +383,7 @@ public class AttributeTypeDescriptionDet
 
         // set matching rules content
         String emrOid = null;
-        MatchingRule emr = null;
+        MutableMatchingRuleImpl emr = null;
         if ( atd != null )
         {
             emrOid = SchemaUtils.getEqualityMatchingRuleNameOrNumericOidTransitive( atd, getSchema() );
@@ -398,7 +398,7 @@ public class AttributeTypeDescriptionDet
         equalityLink.setEnabled( emr != null );
 
         String smrOid = null;
-        MatchingRule smr = null;
+        MutableMatchingRuleImpl smr = null;
         if ( atd != null )
         {
             smrOid = SchemaUtils.getSubstringMatchingRuleNameOrNumericOidTransitive( atd, getSchema() );
@@ -413,7 +413,7 @@ public class AttributeTypeDescriptionDet
         substringLink.setEnabled( smr != null );
 
         String omrOid = null;
-        MatchingRule omr = null;
+        MutableMatchingRuleImpl omr = null;
         if ( atd != null )
         {
             omrOid = SchemaUtils.getOrderingMatchingRuleNameOrNumericOidTransitive( atd, getSchema() );
@@ -532,7 +532,7 @@ public class AttributeTypeDescriptionDet
                 {
                     if ( getSchema().hasMatchingRuleDescription( mrdName ) )
                     {
-                        MatchingRule mrd = getSchema().getMatchingRuleDescription( mrdName );
+                        MutableMatchingRuleImpl mrd = getSchema().getMatchingRuleDescription( mrdName );
                         Hyperlink otherMatchLink = toolkit.createHyperlink( otherMatchClient, SchemaUtils
                             .toString( mrd ), SWT.WRAP );
                         otherMatchLink.setHref( mrd );

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleDescriptionDetailsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleDescriptionDetailsPage.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleDescriptionDetailsPage.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleDescriptionDetailsPage.java Sat Mar 12 19:05:17 2011
@@ -24,8 +24,9 @@ package org.apache.directory.studio.ldap
 import java.util.Collection;
 
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema;
 import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils;
 import org.eclipse.osgi.util.NLS;
@@ -187,10 +188,10 @@ public class MatchingRuleDescriptionDeta
      */
     public void setInput( Object input )
     {
-        MatchingRule mrd = null;
+        MutableMatchingRuleImpl mrd = null;
         if ( input instanceof MatchingRule )
         {
-            mrd = ( MatchingRule ) input;
+            mrd = ( MutableMatchingRuleImpl ) input;
         }
 
         // create main content
@@ -233,7 +234,7 @@ public class MatchingRuleDescriptionDeta
      *
      * @param mrd the matching rule description
      */
-    private void createMainContent( MatchingRule mrd )
+    private void createMainContent( MutableMatchingRuleImpl mrd )
     {
         // dispose old content
         if ( mainSection.getClient() != null )
@@ -282,7 +283,7 @@ public class MatchingRuleDescriptionDeta
      *
      * @param mrd the matching rule description
      */
-    private void createUsedFromContents( MatchingRule mrd )
+    private void createUsedFromContents( MutableMatchingRuleImpl mrd )
     {
         // dispose old content
         if ( usedFromSection.getClient() != null )

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleDescriptionPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleDescriptionPage.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleDescriptionPage.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleDescriptionPage.java Sat Mar 12 19:05:17 2011
@@ -21,7 +21,7 @@
 package org.apache.directory.studio.ldapbrowser.ui.editors.schemabrowser;
 
 
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema;
 import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils;
 import org.eclipse.jface.viewers.IStructuredContentProvider;
@@ -167,9 +167,9 @@ public class MatchingRuleDescriptionPage
          */
         public String getColumnText( Object obj, int index )
         {
-            if ( obj instanceof MatchingRule )
+            if ( obj instanceof MutableMatchingRuleImpl )
             {
-                return SchemaUtils.toString( ( MatchingRule ) obj );
+                return SchemaUtils.toString( ( MutableMatchingRuleImpl ) obj );
             }
             return obj.toString();
         }
@@ -196,13 +196,13 @@ public class MatchingRuleDescriptionPage
          */
         public int compare( Viewer viewer, Object e1, Object e2 )
         {
-            if ( e1 instanceof MatchingRule )
+            if ( e1 instanceof MutableMatchingRuleImpl )
             {
-                e1 = SchemaUtils.toString( ( MatchingRule ) e1 );
+                e1 = SchemaUtils.toString( ( MutableMatchingRuleImpl ) e1 );
             }
-            if ( e2 instanceof MatchingRule )
+            if ( e2 instanceof MutableMatchingRuleImpl )
             {
-                e2 = SchemaUtils.toString( ( MatchingRule ) e2 );
+                e2 = SchemaUtils.toString( ( MutableMatchingRuleImpl ) e2 );
             }
             return e1.toString().compareTo( e2.toString() );
         }
@@ -220,9 +220,9 @@ public class MatchingRuleDescriptionPage
          */
         public boolean select( Viewer viewer, Object parentElement, Object element )
         {
-            if ( element instanceof MatchingRule )
+            if ( element instanceof MutableMatchingRuleImpl )
             {
-                MatchingRule mrd = ( MatchingRule ) element;
+                MutableMatchingRuleImpl mrd = ( MutableMatchingRuleImpl ) element;
                 boolean matched = SchemaUtils.toString( mrd ).toLowerCase()
                     .indexOf( filterText.getText().toLowerCase() ) != -1
                     || mrd.getOid().toLowerCase().indexOf( filterText.getText().toLowerCase() ) != -1;

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleUseDescriptionDetailsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleUseDescriptionDetailsPage.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleUseDescriptionDetailsPage.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleUseDescriptionDetailsPage.java Sat Mar 12 19:05:17 2011
@@ -24,7 +24,7 @@ package org.apache.directory.studio.ldap
 import java.util.List;
 
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.MatchingRuleUse;
 import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema;
 import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils;
@@ -201,7 +201,7 @@ public class MatchingRuleUseDescriptionD
             nameLink.addHyperlinkListener( this );
 
             Schema schema = getSchema();
-            MatchingRule mrd = schema.hasMatchingRuleDescription( mrud.getOid() ) ? schema
+            MutableMatchingRuleImpl mrd = schema.hasMatchingRuleDescription( mrud.getOid() ) ? schema
                 .getMatchingRuleDescription( mrud.getOid() ) : null;
             nameLink
                 .setText( getNonNullString( mrd != null ? SchemaUtils.toString( mrd ) : SchemaUtils.toString( mrud ) ) );

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowser.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowser.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowser.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowser.java Sat Mar 12 19:05:17 2011
@@ -24,7 +24,7 @@ package org.apache.directory.studio.ldap
 import org.apache.directory.shared.ldap.model.schema.AbstractSchemaObject;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.MatchingRuleUse;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
@@ -214,7 +214,7 @@ public class SchemaBrowser extends Edito
                 atdPage.select( schemaElement );
                 tabFolder.setSelection( atdTab );
             }
-            else if ( schemaElement instanceof MatchingRule )
+            else if ( schemaElement instanceof MutableMatchingRuleImpl )
             {
                 mrdPage.select( schemaElement );
                 tabFolder.setSelection( mrdTab );

Modified: directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserNavigationLocation.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserNavigationLocation.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserNavigationLocation.java (original)
+++ directory/studio/branches/akarasulu/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserNavigationLocation.java Sat Mar 12 19:05:17 2011
@@ -24,8 +24,9 @@ package org.apache.directory.studio.ldap
 import org.apache.directory.shared.ldap.model.schema.AbstractSchemaObject;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
-import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.MatchingRuleUse;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
@@ -132,7 +133,7 @@ public class SchemaBrowserNavigationLoca
         {
             schemaElement = connection.getSchema().getLdapSyntaxDescription( schemaElementOid );
         }
-        else if ( MatchingRule.class.getName().equals( schemaElementType ) )
+        else if ( MutableMatchingRuleImpl.class.getName().equals( schemaElementType ) )
         {
             schemaElement = connection.getSchema().getMatchingRuleDescription( schemaElementOid );
         }

Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaAdapter.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaAdapter.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaAdapter.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaAdapter.java Sat Mar 12 19:05:17 2011
@@ -22,7 +22,7 @@ package org.apache.directory.studio.sche
 
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
 import org.apache.directory.shared.ldap.model.schema.ObjectClass;
 
 
@@ -64,7 +64,7 @@ public abstract class SchemaAdapter impl
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.model.SchemaListener#matchingRuleAdded(org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl)
      */
-    public void matchingRuleAdded( MatchingRule mr )
+    public void matchingRuleAdded( MutableMatchingRuleImpl mr )
     {
     }
 
@@ -72,7 +72,7 @@ public abstract class SchemaAdapter impl
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.model.SchemaListener#matchingRuleModified(org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl)
      */
-    public void matchingRuleModified( MatchingRule mr )
+    public void matchingRuleModified( MutableMatchingRuleImpl mr )
     {
     }
 
@@ -80,7 +80,7 @@ public abstract class SchemaAdapter impl
     /* (non-Javadoc)
      * @see org.apache.directory.studio.schemaeditor.model.SchemaListener#matchingRuleRemoved(org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl)
      */
-    public void matchingRuleRemoved( MatchingRule mr )
+    public void matchingRuleRemoved( MutableMatchingRuleImpl mr )
     {
     }
 



Mime
View raw message