svn commit: r476876 - in /directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core: operational/OperationalAttributeService.java partition/DefaultPartitionNexus.java partition/impl/btree/BTreeSearchResultEnumeration.java

Author: elecharny
Date: Sun Nov 19 10:38:19 2006
New Revision: 476876

URL: http://svn.apache.org/viewvc?view=rev&rev=476876
Log:
Changed the UsageTypeEnum to become an enum instead of an subclass
of ValuedEnum (Java 5 migration)

Modified:
    
directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java
    
directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
    
directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java

Modified: 
directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java
URL: 
http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java?view=diff&rev=476876&r1=476875&r2=476876
==============================================================================
--- 
directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java
 (original)
+++ 
directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/operational/OperationalAttributeService.java
 Sun Nov 19 10:38:19 2006
@@ -321,7 +321,7 @@
                 type = registry.lookup( attrId );
             }
 
-            if ( type != null && type.getUsage() != UsageEnum.USERAPPLICATIONS 
)
+            if ( type != null && type.getUsage() != 
UsageEnum.USER_APPLICATIONS )
             {
                 attributes.remove( attrId );
             }

Modified: 
directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
URL: 
http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java?view=diff&rev=476876&r1=476875&r2=476876
==============================================================================
--- 
directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
 (original)
+++ 
directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/DefaultPartitionNexus.java
 Sun Nov 19 10:38:19 2006
@@ -809,7 +809,7 @@
                         // add all user attribute
                         Attribute attr = ( Attribute ) ii.next();
                         AttributeType type = attrRegistry.lookup( attr.getID() 
);
-                        if ( type.getUsage() == UsageEnum.USERAPPLICATIONS )
+                        if ( type.getUsage() == UsageEnum.USER_APPLICATIONS )
                         {
                             attrs.put( attr );
                         }
@@ -827,7 +827,7 @@
                         // add all operational attributes
                         Attribute attr = ( Attribute ) ii.next();
                         AttributeType type = attrRegistry.lookup( attr.getID() 
);
-                        if ( type.getUsage() != UsageEnum.USERAPPLICATIONS )
+                        if ( type.getUsage() != UsageEnum.USER_APPLICATIONS )
                         {
                             attrs.put( attr );
                         }

Modified: 
directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java
URL: 
http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java?view=diff&rev=476876&r1=476875&r2=476876
==============================================================================
--- 
directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java
 (original)
+++ 
directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreeSearchResultEnumeration.java
 Sun Nov 19 10:38:19 2006
@@ -144,7 +144,7 @@
             {
                 String attrId = ( String ) list.next();
                 AttributeType attrType = registry.lookup( attrId );
-                if ( attrType.getUsage() == UsageEnum.USERAPPLICATIONS )
+                if ( attrType.getUsage() == UsageEnum.USER_APPLICATIONS )
                 {
                     continue;
                 }
@@ -181,7 +181,7 @@
             {
                 String attrId = ( String ) list.next();
                 AttributeType attrType = registry.lookup( attrId );
-                if ( attrType.getUsage() == UsageEnum.USERAPPLICATIONS )
+                if ( attrType.getUsage() == UsageEnum.USER_APPLICATIONS )
                 {
                     Attribute attr = ( Attribute ) rec.getAttributes().get( 
attrId ).clone();
                     entry.put( attr );