You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2009/11/23 19:36:22 UTC
svn commit: r883451 -
/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/
Author: elecharny
Date: Mon Nov 23 18:36:14 2009
New Revision: 883451
URL: http://svn.apache.org/viewvc?rev=883451&view=rev
Log:
Removed the containsName() method, as it's a duplicate for contains()
Modified:
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultSchemaObjectRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableAttributeTypeRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableComparatorRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableDITContentRuleRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableDITStructureRuleRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableLdapSyntaxRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableMatchingRuleRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableMatchingRuleUseRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableNameFormRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableNormalizerRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableObjectClassRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableSyntaxCheckerRegistry.java
directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/SchemaObjectRegistry.java
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultSchemaObjectRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultSchemaObjectRegistry.java?rev=883451&r1=883450&r2=883451&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultSchemaObjectRegistry.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/DefaultSchemaObjectRegistry.java Mon Nov 23 18:36:14 2009
@@ -136,7 +136,7 @@
*/
public Iterator<T> iterator()
{
- return (Iterator<T>)oidRegistry.iterator(); //byName.values().iterator();
+ return (Iterator<T>)oidRegistry.iterator();
}
@@ -306,21 +306,6 @@
/**
* {@inheritDoc}
*/
- public boolean containsName( String name )
- {
- if ( ! byName.containsKey( name ) )
- {
- // last resort before giving up check with lower cased version
- return byName.containsKey( name.toLowerCase() );
- }
-
- return true;
- }
-
-
- /**
- * {@inheritDoc}
- */
public SchemaObjectRegistry<T> copy( SchemaObjectRegistry<T> original )
{
// Fill the byName and OidRegistry maps, the type has already be copied
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableAttributeTypeRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableAttributeTypeRegistry.java?rev=883451&r1=883450&r2=883451&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableAttributeTypeRegistry.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableAttributeTypeRegistry.java Mon Nov 23 18:36:14 2009
@@ -194,15 +194,6 @@
/**
* {@inheritDoc}
*/
- public boolean containsName( String name )
- {
- return immutableAttributeTypeRegistry.containsName( name );
- }
-
-
- /**
- * {@inheritDoc}
- */
public String getOidByName( String name ) throws NamingException
{
return immutableAttributeTypeRegistry.getOidByName( name );
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableComparatorRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableComparatorRegistry.java?rev=883451&r1=883450&r2=883451&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableComparatorRegistry.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableComparatorRegistry.java Mon Nov 23 18:36:14 2009
@@ -110,15 +110,6 @@
/**
* {@inheritDoc}
*/
- public boolean containsName( String name )
- {
- return immutableComparatorRegistry.containsName( name );
- }
-
-
- /**
- * {@inheritDoc}
- */
public String getOidByName( String name ) throws NamingException
{
return immutableComparatorRegistry.getOidByName( name );
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableDITContentRuleRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableDITContentRuleRegistry.java?rev=883451&r1=883450&r2=883451&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableDITContentRuleRegistry.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableDITContentRuleRegistry.java Mon Nov 23 18:36:14 2009
@@ -83,15 +83,6 @@
/**
* {@inheritDoc}
*/
- public boolean containsName( String name )
- {
- return immutableDITContentRuleRegistry.containsName( name );
- }
-
-
- /**
- * {@inheritDoc}
- */
public String getOidByName( String name ) throws NamingException
{
return immutableDITContentRuleRegistry.getOidByName( name );
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableDITStructureRuleRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableDITStructureRuleRegistry.java?rev=883451&r1=883450&r2=883451&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableDITStructureRuleRegistry.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableDITStructureRuleRegistry.java Mon Nov 23 18:36:14 2009
@@ -163,15 +163,6 @@
/**
* {@inheritDoc}
*/
- public boolean containsName( String name )
- {
- return immutableDITStructureRuleRegistry.containsName( name );
- }
-
-
- /**
- * {@inheritDoc}
- */
public String getOidByName( String name ) throws NamingException
{
return immutableDITStructureRuleRegistry.getOidByName( name );
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableLdapSyntaxRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableLdapSyntaxRegistry.java?rev=883451&r1=883450&r2=883451&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableLdapSyntaxRegistry.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableLdapSyntaxRegistry.java Mon Nov 23 18:36:14 2009
@@ -82,15 +82,6 @@
/**
* {@inheritDoc}
*/
- public boolean containsName( String name )
- {
- return immutableLdapSyntaxRegistry.containsName( name );
- }
-
-
- /**
- * {@inheritDoc}
- */
public String getOidByName( String name ) throws NamingException
{
return immutableLdapSyntaxRegistry.getOidByName( name );
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableMatchingRuleRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableMatchingRuleRegistry.java?rev=883451&r1=883450&r2=883451&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableMatchingRuleRegistry.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableMatchingRuleRegistry.java Mon Nov 23 18:36:14 2009
@@ -84,15 +84,6 @@
/**
* {@inheritDoc}
*/
- public boolean containsName( String name )
- {
- return immutableMatchingRuleRegistry.containsName( name );
- }
-
-
- /**
- * {@inheritDoc}
- */
public String getOidByName( String name ) throws NamingException
{
return immutableMatchingRuleRegistry.getOidByName( name );
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableMatchingRuleUseRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableMatchingRuleUseRegistry.java?rev=883451&r1=883450&r2=883451&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableMatchingRuleUseRegistry.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableMatchingRuleUseRegistry.java Mon Nov 23 18:36:14 2009
@@ -83,15 +83,6 @@
/**
* {@inheritDoc}
*/
- public boolean containsName( String name )
- {
- return immutableMatchingRuleUseRegistry.containsName( name );
- }
-
-
- /**
- * {@inheritDoc}
- */
public String getOidByName( String name ) throws NamingException
{
return immutableMatchingRuleUseRegistry.getOidByName( name );
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableNameFormRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableNameFormRegistry.java?rev=883451&r1=883450&r2=883451&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableNameFormRegistry.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableNameFormRegistry.java Mon Nov 23 18:36:14 2009
@@ -84,15 +84,6 @@
/**
* {@inheritDoc}
*/
- public boolean containsName( String name )
- {
- return immutableNameFormRegistry.containsName( name );
- }
-
-
- /**
- * {@inheritDoc}
- */
public String getOidByName( String name ) throws NamingException
{
return immutableNameFormRegistry.getOidByName( name );
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableNormalizerRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableNormalizerRegistry.java?rev=883451&r1=883450&r2=883451&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableNormalizerRegistry.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableNormalizerRegistry.java Mon Nov 23 18:36:14 2009
@@ -111,15 +111,6 @@
/**
* {@inheritDoc}
*/
- public boolean containsName( String name )
- {
- return immutableNormalizerRegistry.containsName( name );
- }
-
-
- /**
- * {@inheritDoc}
- */
public String getOidByName( String name ) throws NamingException
{
return immutableNormalizerRegistry.getOidByName( name );
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableObjectClassRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableObjectClassRegistry.java?rev=883451&r1=883450&r2=883451&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableObjectClassRegistry.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableObjectClassRegistry.java Mon Nov 23 18:36:14 2009
@@ -140,15 +140,6 @@
/**
* {@inheritDoc}
*/
- public boolean containsName( String name )
- {
- return immutableObjectClassRegistry.containsName( name );
- }
-
-
- /**
- * {@inheritDoc}
- */
public String getOidByName( String name ) throws NamingException
{
return immutableObjectClassRegistry.getOidByName( name );
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableSyntaxCheckerRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableSyntaxCheckerRegistry.java?rev=883451&r1=883450&r2=883451&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableSyntaxCheckerRegistry.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/ImmutableSyntaxCheckerRegistry.java Mon Nov 23 18:36:14 2009
@@ -110,15 +110,6 @@
/**
* {@inheritDoc}
*/
- public boolean containsName( String name )
- {
- return immutableSyntaxCheckerRegistry.containsName( name );
- }
-
-
- /**
- * {@inheritDoc}
- */
public String getOidByName( String name ) throws NamingException
{
return immutableSyntaxCheckerRegistry.getOidByName( name );
Modified: directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/SchemaObjectRegistry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/SchemaObjectRegistry.java?rev=883451&r1=883450&r2=883451&view=diff
==============================================================================
--- directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/SchemaObjectRegistry.java (original)
+++ directory/shared/branches/shared-schema/ldap/src/main/java/org/apache/directory/shared/ldap/schema/registries/SchemaObjectRegistry.java Mon Nov 23 18:36:14 2009
@@ -146,19 +146,6 @@
/**
- * Checks to see if an alias/name is associated with an OID and it's
- * respective schema object in this registry. Unlike the getOidByName()
- * method this method does not throw an exception when the name is not
- * found.
- *
- * @param name The name we are looking for
- * @return true if the name or it's cannonical form is mapped to a
- * schemaObject in this registry, false otherwise.
- */
- boolean containsName( String name );
-
-
- /**
* Copy a DefaultSchemaObjectRegistry. All the stored SchemaObject will also
* be copied, by the cross references will be lost.
*