directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1087517 - in /directory/studio/trunk/plugins: apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/ apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/edito...
Date Fri, 01 Apr 2011 00:14:49 GMT
Author: elecharny
Date: Fri Apr  1 00:14:48 2011
New Revision: 1087517

URL: http://svn.apache.org/viewvc?rev=1087517&view=rev
Log:
o Renamed the DefaultEntryAttribute interface to DefaultAttribute

Modified:
    directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java
    directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/PartitionDetailsPage.java
    directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/PartitionDetailsPage.java
    directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/PartitionDetailsPage.java
    directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/PartitionDetailsPage.java
    directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoaderUtils.java

Modified: directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java?rev=1087517&r1=1087516&r2=1087517&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java
(original)
+++ directory/studio/trunk/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/jobs/PartitionsDiffComputer.java
Fri Apr  1 00:14:48 2011
@@ -30,7 +30,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
 import org.apache.directory.server.core.partition.Partition;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
 import org.apache.directory.shared.ldap.model.entry.DefaultModification;
 import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.entry.Attribute;
@@ -327,7 +327,7 @@ public class PartitionsDiffComputer
                     // Creating a modification for the removed AT
                     Modification modification = new DefaultModification();
                     modification.setOperation( ModificationOperation.REMOVE_ATTRIBUTE );
-                    modification.setAttribute( new DefaultEntryAttribute( originalAttribute.getAttributeType()
) );
+                    modification.setAttribute( new DefaultAttribute( originalAttribute.getAttributeType()
) );
 
                     modificationEntry.addModificationItem( modification );
                 }
@@ -355,7 +355,7 @@ public class PartitionsDiffComputer
                     // Creating a modification for the added AT
                     Modification modification = new DefaultModification();
                     modification.setOperation( ModificationOperation.ADD_ATTRIBUTE );
-                    Attribute attribute = new DefaultEntryAttribute( destinationAttributeType
);
+                    Attribute attribute = new DefaultAttribute( destinationAttributeType
);
                     modification.setAttribute( attribute );
                     
                     for ( Value<?> value : destinationAttribute )
@@ -402,7 +402,7 @@ public class PartitionsDiffComputer
                 // Creating a modification for the removed AT value
                 Modification modification = new DefaultModification();
                 modification.setOperation( ModificationOperation.REMOVE_ATTRIBUTE );
-                Attribute attribute = new DefaultEntryAttribute( originalAttribute.getAttributeType()
);
+                Attribute attribute = new DefaultAttribute( originalAttribute.getAttributeType()
);
                 modification.setAttribute( attribute );
                 
                 try
@@ -428,7 +428,7 @@ public class PartitionsDiffComputer
                 // Creating a modification for the added AT value
                 Modification modification = new DefaultModification();
                 modification.setOperation( ModificationOperation.ADD_ATTRIBUTE );
-                Attribute attribute = new DefaultEntryAttribute( originalAttribute.getAttributeType()
);
+                Attribute attribute = new DefaultAttribute( originalAttribute.getAttributeType()
);
                 modification.setAttribute( attribute );
                 
                 try

Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/PartitionDetailsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/PartitionDetailsPage.java?rev=1087517&r1=1087516&r2=1087517&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/PartitionDetailsPage.java
(original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v150/PartitionDetailsPage.java
Fri Apr  1 00:14:48 2011
@@ -24,7 +24,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
 import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.entry.Value;
@@ -183,7 +183,7 @@ public class PartitionDetailsPage implem
                 {
                     try
                     {
-                        contextEntry.put( new DefaultEntryAttribute( newAttributeValueObject.getAttribute(),
+                        contextEntry.put( new DefaultAttribute( newAttributeValueObject.getAttribute(),
                             newAttributeValueObject.getValue() ) );
                     }
                     catch ( LdapException e1 )
@@ -810,7 +810,7 @@ public class PartitionDetailsPage implem
                 {
                     try
                     {
-                        contextEntry.put( new DefaultEntryAttribute( newAttributeValueObject.getAttribute(),
+                        contextEntry.put( new DefaultAttribute( newAttributeValueObject.getAttribute(),
                             newAttributeValueObject.getValue() ) );
                     }
                     catch ( LdapException e )

Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/PartitionDetailsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/PartitionDetailsPage.java?rev=1087517&r1=1087516&r2=1087517&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/PartitionDetailsPage.java
(original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v151/PartitionDetailsPage.java
Fri Apr  1 00:14:48 2011
@@ -24,7 +24,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
 import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.entry.Value;
@@ -183,7 +183,7 @@ public class PartitionDetailsPage implem
                 {
                     try
                     {
-                        contextEntry.put( new DefaultEntryAttribute( newAttributeValueObject.getAttribute(),
+                        contextEntry.put( new DefaultAttribute( newAttributeValueObject.getAttribute(),
                             newAttributeValueObject.getValue() ) );
                     }
                     catch ( LdapException e1 )
@@ -810,7 +810,7 @@ public class PartitionDetailsPage implem
                 {
                     try
                     {
-                        contextEntry.put( new DefaultEntryAttribute( newAttributeValueObject.getAttribute(),
+                        contextEntry.put( new DefaultAttribute( newAttributeValueObject.getAttribute(),
                             newAttributeValueObject.getValue() ) );
                     }
                     catch ( LdapException e )

Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/PartitionDetailsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/PartitionDetailsPage.java?rev=1087517&r1=1087516&r2=1087517&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/PartitionDetailsPage.java
(original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v152/PartitionDetailsPage.java
Fri Apr  1 00:14:48 2011
@@ -24,7 +24,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
 import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.entry.Value;
@@ -183,7 +183,7 @@ public class PartitionDetailsPage implem
                 {
                     try
                     {
-                        contextEntry.put( new DefaultEntryAttribute( newAttributeValueObject.getAttribute(),
+                        contextEntry.put( new DefaultAttribute( newAttributeValueObject.getAttribute(),
                             newAttributeValueObject.getValue() ) );
                     }
                     catch ( LdapException e1 )
@@ -810,7 +810,7 @@ public class PartitionDetailsPage implem
                 {
                     try
                     {
-                        contextEntry.put( new DefaultEntryAttribute( newAttributeValueObject.getAttribute(),
+                        contextEntry.put( new DefaultAttribute( newAttributeValueObject.getAttribute(),
                             newAttributeValueObject.getValue() ) );
                     }
                     catch ( LdapException e )

Modified: directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/PartitionDetailsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/PartitionDetailsPage.java?rev=1087517&r1=1087516&r2=1087517&view=diff
==============================================================================
--- directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/PartitionDetailsPage.java
(original)
+++ directory/studio/trunk/plugins/apacheds.configuration/src/main/java/org/apache/directory/studio/apacheds/configuration/editor/v153/PartitionDetailsPage.java
Fri Apr  1 00:14:48 2011
@@ -24,7 +24,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
 import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.entry.Value;
@@ -183,7 +183,7 @@ public class PartitionDetailsPage implem
                 {
                     try
                     {
-                        contextEntry.put( new DefaultEntryAttribute( newAttributeValueObject.getAttribute(),
+                        contextEntry.put( new DefaultAttribute( newAttributeValueObject.getAttribute(),
                             newAttributeValueObject.getValue() ) );
                     }
                     catch ( LdapException e1 )
@@ -808,7 +808,7 @@ public class PartitionDetailsPage implem
                 {
                     try
                     {
-                        contextEntry.put( new DefaultEntryAttribute( newAttributeValueObject.getAttribute(),
+                        contextEntry.put( new DefaultAttribute( newAttributeValueObject.getAttribute(),
                             newAttributeValueObject.getValue() ) );
                     }
                     catch ( LdapException e )

Modified: directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoaderUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoaderUtils.java?rev=1087517&r1=1087516&r2=1087517&view=diff
==============================================================================
--- directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoaderUtils.java
(original)
+++ directory/studio/trunk/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoaderUtils.java
Fri Apr  1 00:14:48 2011
@@ -24,7 +24,7 @@ import java.util.List;
 
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
-import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
+import org.apache.directory.shared.ldap.model.entry.DefaultAttribute;
 import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.entry.Attribute;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
@@ -143,7 +143,7 @@ public class SchemaEditorSchemaLoaderUti
         String syntax = matchingRule.getSyntaxOid();
         if ( !Strings.isEmpty( syntax ) )
         {
-            Attribute attribute = new DefaultEntryAttribute( M_SYNTAX, syntax );
+            Attribute attribute = new DefaultAttribute( M_SYNTAX, syntax );
             entry.add( attribute );
         }
 
@@ -277,7 +277,7 @@ public class SchemaEditorSchemaLoaderUti
     private static void addObjectClassValue( SchemaObject schemaObject, String objectClassValue,
Entry entry )
         throws LdapException
     {
-        Attribute objectClassAttribute = new DefaultEntryAttribute( SchemaConstants.OBJECT_CLASS_AT
);
+        Attribute objectClassAttribute = new DefaultAttribute( SchemaConstants.OBJECT_CLASS_AT
);
         entry.add( objectClassAttribute );
         objectClassAttribute.add( SchemaConstants.TOP_OC );
         objectClassAttribute.add( SchemaConstants.META_TOP_OC );
@@ -299,7 +299,7 @@ public class SchemaEditorSchemaLoaderUti
         String oid = schemaObject.getOid();
         if ( !Strings.isEmpty( oid ) )
         {
-            Attribute attribute = new DefaultEntryAttribute( M_OID, oid );
+            Attribute attribute = new DefaultAttribute( M_OID, oid );
             entry.add( attribute );
         }
     }
@@ -319,7 +319,7 @@ public class SchemaEditorSchemaLoaderUti
         List<String> names = schemaObject.getNames();
         if ( ( names != null ) && ( names.size() > 0 ) )
         {
-            Attribute attribute = new DefaultEntryAttribute( M_NAME );
+            Attribute attribute = new DefaultAttribute( M_NAME );
             entry.add( attribute );
 
             for ( String name : names )
@@ -344,7 +344,7 @@ public class SchemaEditorSchemaLoaderUti
         String description = schemaObject.getDescription();
         if ( !Strings.isEmpty( description ) )
         {
-            Attribute attribute = new DefaultEntryAttribute( M_DESCRIPTION, description );
+            Attribute attribute = new DefaultAttribute( M_DESCRIPTION, description );
             entry.add( attribute );
         }
     }
@@ -363,7 +363,7 @@ public class SchemaEditorSchemaLoaderUti
     {
         if ( schemaObject.isObsolete() )
         {
-            Attribute attribute = new DefaultEntryAttribute( M_OBSOLETE, TRUE );
+            Attribute attribute = new DefaultAttribute( M_OBSOLETE, TRUE );
             entry.add( attribute );
         }
     }
@@ -383,7 +383,7 @@ public class SchemaEditorSchemaLoaderUti
         String superior = attributeType.getSuperiorName();
         if ( !Strings.isEmpty( superior ) )
         {
-            Attribute attribute = new DefaultEntryAttribute( M_SUP_ATTRIBUTE_TYPE, superior
);
+            Attribute attribute = new DefaultAttribute( M_SUP_ATTRIBUTE_TYPE, superior );
             entry.add( attribute );
         }
     }
@@ -403,7 +403,7 @@ public class SchemaEditorSchemaLoaderUti
         String equality = attributeType.getEqualityName();
         if ( !Strings.isEmpty( equality ) )
         {
-            Attribute attribute = new DefaultEntryAttribute( M_EQUALITY, equality );
+            Attribute attribute = new DefaultAttribute( M_EQUALITY, equality );
             entry.add( attribute );
         }
     }
@@ -423,7 +423,7 @@ public class SchemaEditorSchemaLoaderUti
         String ordering = attributeType.getOrderingName();
         if ( !Strings.isEmpty( ordering ) )
         {
-            Attribute attribute = new DefaultEntryAttribute( M_ORDERING, ordering );
+            Attribute attribute = new DefaultAttribute( M_ORDERING, ordering );
             entry.add( attribute );
         }
     }
@@ -443,7 +443,7 @@ public class SchemaEditorSchemaLoaderUti
         String substr = attributeType.getSubstringName();
         if ( !Strings.isEmpty( substr ) )
         {
-            Attribute attribute = new DefaultEntryAttribute( M_SUBSTR, substr );
+            Attribute attribute = new DefaultAttribute( M_SUBSTR, substr );
             entry.add( attribute );
         }
     }
@@ -463,13 +463,13 @@ public class SchemaEditorSchemaLoaderUti
         String syntax = attributeType.getSyntaxName();
         if ( !Strings.isEmpty( syntax ) )
         {
-            Attribute attribute = new DefaultEntryAttribute( M_SYNTAX, syntax );
+            Attribute attribute = new DefaultAttribute( M_SYNTAX, syntax );
             entry.add( attribute );
 
             long syntaxLength = attributeType.getSyntaxLength();
             if ( syntaxLength != -1 )
             {
-                attribute = new DefaultEntryAttribute( M_LENGTH, "" + syntaxLength );
+                attribute = new DefaultAttribute( M_LENGTH, "" + syntaxLength );
                 entry.add( attribute );
             }
         }
@@ -489,7 +489,7 @@ public class SchemaEditorSchemaLoaderUti
     {
         if ( attributeType.isSingleValued() )
         {
-            Attribute attribute = new DefaultEntryAttribute( M_SINGLE_VALUE, TRUE );
+            Attribute attribute = new DefaultAttribute( M_SINGLE_VALUE, TRUE );
             entry.add( attribute );
         }
     }
@@ -508,7 +508,7 @@ public class SchemaEditorSchemaLoaderUti
     {
         if ( attributeType.isCollective() )
         {
-            Attribute attribute = new DefaultEntryAttribute( M_COLLECTIVE, TRUE );
+            Attribute attribute = new DefaultAttribute( M_COLLECTIVE, TRUE );
             entry.add( attribute );
         }
     }
@@ -527,7 +527,7 @@ public class SchemaEditorSchemaLoaderUti
     {
         if ( !attributeType.isUserModifiable() )
         {
-            Attribute attribute = new DefaultEntryAttribute( M_NO_USER_MODIFICATION, TRUE
);
+            Attribute attribute = new DefaultAttribute( M_NO_USER_MODIFICATION, TRUE );
             entry.add( attribute );
         }
     }
@@ -547,7 +547,7 @@ public class SchemaEditorSchemaLoaderUti
         UsageEnum usage = attributeType.getUsage();
         if ( usage != UsageEnum.USER_APPLICATIONS )
         {
-            Attribute attribute = new DefaultEntryAttribute( M_USAGE, usage.render() );
+            Attribute attribute = new DefaultAttribute( M_USAGE, usage.render() );
             entry.add( attribute );
         }
     }
@@ -567,7 +567,7 @@ public class SchemaEditorSchemaLoaderUti
         List<String> superiors = objectClass.getSuperiorOids();
         if ( ( superiors != null ) && ( superiors.size() > 0 ) )
         {
-            Attribute attribute = new DefaultEntryAttribute( M_SUP_OBJECT_CLASS );
+            Attribute attribute = new DefaultAttribute( M_SUP_OBJECT_CLASS );
             entry.add( attribute );
 
             for ( String superior : superiors )
@@ -592,7 +592,7 @@ public class SchemaEditorSchemaLoaderUti
         ObjectClassTypeEnum classType = objectClass.getType();
         if ( classType != ObjectClassTypeEnum.STRUCTURAL )
         {
-            Attribute attribute = new DefaultEntryAttribute( M_TYPE_OBJECT_CLASS, classType.toString()
);
+            Attribute attribute = new DefaultAttribute( M_TYPE_OBJECT_CLASS, classType.toString()
);
             entry.add( attribute );
         }
     }
@@ -612,7 +612,7 @@ public class SchemaEditorSchemaLoaderUti
         List<String> musts = objectClass.getMustAttributeTypeOids();
         if ( ( musts != null ) && ( musts.size() > 0 ) )
         {
-            Attribute attribute = new DefaultEntryAttribute( M_MUST );
+            Attribute attribute = new DefaultAttribute( M_MUST );
             entry.add( attribute );
 
             for ( String must : musts )
@@ -637,7 +637,7 @@ public class SchemaEditorSchemaLoaderUti
         List<String> mays = objectClass.getMayAttributeTypeOids();
         if ( ( mays != null ) && ( mays.size() > 0 ) )
         {
-            Attribute attribute = new DefaultEntryAttribute( M_MAY );
+            Attribute attribute = new DefaultAttribute( M_MAY );
             entry.add( attribute );
 
             for ( String may : mays )



Mime
View raw message