You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2011/03/20 22:22:47 UTC
svn commit: r1083574 [12/12] - in /directory:
apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/changelog/
apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/entry/
apacheds/branches/ak...
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasWizard.java Sun Mar 20 21:22:39 2011
@@ -28,7 +28,7 @@ import java.util.Map;
import java.util.Set;
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.MutableAttributeTypeImpl;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.model.Project;
@@ -138,8 +138,8 @@ public class MergeSchemasWizard extends
{
AttributeTypeFolder atf = ( AttributeTypeFolder ) sourceObject;
Schema targetSchema = getTargetSchema( atf.schema.getProject(), targetProject, targetSchemas );
- List<AttributeType> sourceAttributeTypes = atf.schema.getAttributeTypes();
- for ( AttributeType sourceAttributeType : sourceAttributeTypes )
+ List<MutableAttributeTypeImpl> sourceAttributeTypes = atf.schema.getAttributeTypes();
+ for ( MutableAttributeTypeImpl sourceAttributeType : sourceAttributeTypes )
{
mergeAttributeType( sourceAttributeType, targetProject, targetSchema, processedObjects,
errorMessages, replaceUnknownSyntax, mergeDependencies, pullUpAttributes );
@@ -156,9 +156,9 @@ public class MergeSchemasWizard extends
replaceUnknownSyntax, mergeDependencies, pullUpAttributes );
}
}
- if ( sourceObject instanceof AttributeType )
+ if ( sourceObject instanceof MutableAttributeTypeImpl )
{
- AttributeType at = ( AttributeType ) sourceObject;
+ MutableAttributeTypeImpl at = ( MutableAttributeTypeImpl ) sourceObject;
Schema targetSchema = getTargetSchema(
Activator.getDefault().getSchemaHandler().getSchema( at.getSchemaName() ).getProject(),
targetProject, targetSchemas );
@@ -216,8 +216,8 @@ public class MergeSchemasWizard extends
Set<Object> processedObjects, List<String> errorMessages, boolean replaceUnknownSyntax,
boolean mergeDependencies, boolean pullUpAttributes )
{
- List<AttributeType> sourceAttributeTypes = sourceSchema.getAttributeTypes();
- for ( AttributeType sourceAttributeType : sourceAttributeTypes )
+ List<MutableAttributeTypeImpl> sourceAttributeTypes = sourceSchema.getAttributeTypes();
+ for ( MutableAttributeTypeImpl sourceAttributeType : sourceAttributeTypes )
{
mergeAttributeType( sourceAttributeType, targetProject, targetSchema, processedObjects, errorMessages,
replaceUnknownSyntax, mergeDependencies, pullUpAttributes );
@@ -235,7 +235,7 @@ public class MergeSchemasWizard extends
/**
* Merges the given attribute type to the targetSchema.
*/
- private void mergeAttributeType( AttributeType sourceAttributeType, Project targetProject, Schema targetSchema,
+ private void mergeAttributeType( MutableAttributeTypeImpl sourceAttributeType, Project targetProject, Schema targetSchema,
Set<Object> processedObjects, List<String> errorMessages, boolean replaceUnknownSyntax,
boolean mergeDependencies, boolean pullUpAttributes )
{
@@ -246,7 +246,7 @@ public class MergeSchemasWizard extends
processedObjects.add( sourceAttributeType );
// check if attribute (identified by OID or name) already exists in the project
- AttributeType targetAttributeType = targetProject.getSchemaHandler().getAttributeType(
+ MutableAttributeTypeImpl targetAttributeType = targetProject.getSchemaHandler().getAttributeType(
sourceAttributeType.getOid() );
if ( targetAttributeType == null )
{
@@ -290,14 +290,14 @@ public class MergeSchemasWizard extends
else
{
// remove attribute type if already there from previous merge
- AttributeType at = targetSchema.getAttributeType( sourceAttributeType.getOid() );
+ MutableAttributeTypeImpl at = targetSchema.getAttributeType( sourceAttributeType.getOid() );
if ( at != null )
{
targetSchema.removeAttributeType( at );
}
// clone attribute type
- AttributeType clonedAttributeType = new AttributeType( sourceAttributeType.getOid() );
+ MutableAttributeTypeImpl clonedAttributeType = new MutableAttributeTypeImpl( sourceAttributeType.getOid() );
clonedAttributeType.setNames( sourceAttributeType.getNames() );
clonedAttributeType.setDescription( sourceAttributeType.getDescription() );
clonedAttributeType.setSuperiorOid( sourceAttributeType.getSuperiorOid() );
@@ -340,7 +340,7 @@ public class MergeSchemasWizard extends
String superiorName = clonedAttributeType.getSuperiorOid();
if ( superiorName != null )
{
- AttributeType superiorAttributeType = Activator.getDefault().getSchemaHandler()
+ MutableAttributeTypeImpl superiorAttributeType = Activator.getDefault().getSchemaHandler()
.getAttributeType( superiorName );
if ( superiorAttributeType != null )
{
@@ -482,7 +482,7 @@ public class MergeSchemasWizard extends
{
if ( attributeName != null )
{
- AttributeType attributeType = Activator.getDefault().getSchemaHandler().getAttributeType( attributeName );
+ MutableAttributeTypeImpl attributeType = Activator.getDefault().getSchemaHandler().getAttributeType( attributeName );
if ( attributeType != null )
{
mergeAttributeType( attributeType, targetProject, targetSchema, processedObjects,
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeContentWizardPage.java Sun Mar 20 21:22:39 2011
@@ -25,7 +25,7 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
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.UsageEnum;
@@ -130,7 +130,7 @@ public class NewAttributeTypeContentWiza
AttributeTypeSelectionDialog dialog = new AttributeTypeSelectionDialog();
if ( dialog.open() == Dialog.OK )
{
- AttributeType selectedAT = dialog.getSelectedAttributeType();
+ MutableAttributeTypeImpl selectedAT = dialog.getSelectedAttributeType();
List<String> aliases = selectedAT.getNames();
if ( ( aliases != null ) && ( aliases.size() > 0 ) )
{
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeWizard.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeWizard.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeWizard.java Sun Mar 20 21:22:39 2011
@@ -20,7 +20,7 @@
package org.apache.directory.studio.schemaeditor.view.wizards;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.PluginUtils;
@@ -73,7 +73,7 @@ public class NewAttributeTypeWizard exte
public boolean performFinish()
{
// Creating the new attribute type
- AttributeType newAT = new AttributeType( generalPage.getOidValue() );
+ MutableAttributeTypeImpl newAT = new MutableAttributeTypeImpl( generalPage.getOidValue() );
newAT.setSchemaName( generalPage.getSchemaValue() );
newAT.setNames( generalPage.getAliasesValue() );
newAT.setDescription( generalPage.getDescriptionValue() );
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassMandatoryAttributesPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassMandatoryAttributesPage.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassMandatoryAttributesPage.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassMandatoryAttributesPage.java Sun Mar 20 21:22:39 2011
@@ -25,7 +25,7 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.view.ViewUtils;
@@ -61,7 +61,7 @@ import org.eclipse.swt.widgets.Table;
public class NewObjectClassMandatoryAttributesPage extends WizardPage
{
/** The mandatory attribute types list */
- private List<AttributeType> mandatoryAttributeTypesList;
+ private List<MutableAttributeTypeImpl> mandatoryAttributeTypesList;
// UI Fields
private TableViewer mandatoryAttributeTypesTableViewer;
@@ -79,7 +79,7 @@ public class NewObjectClassMandatoryAttr
setDescription( Messages
.getString( "NewObjectClassMandatoryAttributesPage.SpecifiyMandatoryAttributeTypeForObjectClass" ) ); //$NON-NLS-1$
setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_OBJECT_CLASS_NEW_WIZARD ) );
- mandatoryAttributeTypesList = new ArrayList<AttributeType>();
+ mandatoryAttributeTypesList = new ArrayList<MutableAttributeTypeImpl>();
}
@@ -110,7 +110,7 @@ public class NewObjectClassMandatoryAttr
{
public Image getImage( Object element )
{
- if ( element instanceof AttributeType )
+ if ( element instanceof MutableAttributeTypeImpl )
{
return Activator.getDefault().getImage( PluginConstants.IMG_ATTRIBUTE_TYPE );
}
@@ -122,9 +122,9 @@ public class NewObjectClassMandatoryAttr
public String getText( Object element )
{
- if ( element instanceof AttributeType )
+ if ( element instanceof MutableAttributeTypeImpl )
{
- AttributeType at = ( AttributeType ) element;
+ MutableAttributeTypeImpl at = ( MutableAttributeTypeImpl ) element;
List<String> names = at.getNames();
if ( ( names != null ) && ( names.size() > 0 ) )
@@ -186,7 +186,7 @@ public class NewObjectClassMandatoryAttr
private void addMandatoryAttributeType()
{
AttributeTypeSelectionDialog dialog = new AttributeTypeSelectionDialog();
- List<AttributeType> hiddenAttributes = new ArrayList<AttributeType>();
+ List<MutableAttributeTypeImpl> hiddenAttributes = new ArrayList<MutableAttributeTypeImpl>();
hiddenAttributes.addAll( mandatoryAttributeTypesList );
dialog.setHiddenAttributeTypes( hiddenAttributes );
if ( dialog.open() == Dialog.OK )
@@ -217,9 +217,9 @@ public class NewObjectClassMandatoryAttr
*/
private void updateMandatoryAttributeTypesTableTable()
{
- Collections.sort( mandatoryAttributeTypesList, new Comparator<AttributeType>()
+ Collections.sort( mandatoryAttributeTypesList, new Comparator<MutableAttributeTypeImpl>()
{
- public int compare( AttributeType o1, AttributeType o2 )
+ public int compare( MutableAttributeTypeImpl o1, MutableAttributeTypeImpl o2 )
{
List<String> at1Names = o1.getNames();
List<String> at2Names = o2.getNames();
@@ -244,7 +244,7 @@ public class NewObjectClassMandatoryAttr
* @return
* the mandatory attributes types
*/
- public List<AttributeType> getMandatoryAttributeTypes()
+ public List<MutableAttributeTypeImpl> getMandatoryAttributeTypes()
{
return mandatoryAttributeTypesList;
}
@@ -259,7 +259,7 @@ public class NewObjectClassMandatoryAttr
public List<String> getMandatoryAttributeTypesNames()
{
List<String> names = new ArrayList<String>();
- for ( AttributeType at : mandatoryAttributeTypesList )
+ for ( MutableAttributeTypeImpl at : mandatoryAttributeTypesList )
{
names.add( at.getName() );
}
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassOptionalAttributesPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassOptionalAttributesPage.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassOptionalAttributesPage.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewObjectClassOptionalAttributesPage.java Sun Mar 20 21:22:39 2011
@@ -25,7 +25,7 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.view.ViewUtils;
@@ -61,7 +61,7 @@ import org.eclipse.swt.widgets.Table;
public class NewObjectClassOptionalAttributesPage extends WizardPage
{
/** The optional attribute types list */
- private List<AttributeType> optionalAttributeTypesList;
+ private List<MutableAttributeTypeImpl> optionalAttributeTypesList;
// UI Fields
private TableViewer optionalAttributeTypesTableViewer;
@@ -79,7 +79,7 @@ public class NewObjectClassOptionalAttri
setDescription( Messages
.getString( "NewObjectClassOptionalAttributesPage.SpecifiyOptionalAttributeTypesForObjectClass" ) ); //$NON-NLS-1$
setImageDescriptor( Activator.getDefault().getImageDescriptor( PluginConstants.IMG_OBJECT_CLASS_NEW_WIZARD ) );
- optionalAttributeTypesList = new ArrayList<AttributeType>();
+ optionalAttributeTypesList = new ArrayList<MutableAttributeTypeImpl>();
}
@@ -110,7 +110,7 @@ public class NewObjectClassOptionalAttri
{
public Image getImage( Object element )
{
- if ( element instanceof AttributeType )
+ if ( element instanceof MutableAttributeTypeImpl )
{
return Activator.getDefault().getImage( PluginConstants.IMG_ATTRIBUTE_TYPE );
}
@@ -122,9 +122,9 @@ public class NewObjectClassOptionalAttri
public String getText( Object element )
{
- if ( element instanceof AttributeType )
+ if ( element instanceof MutableAttributeTypeImpl )
{
- AttributeType at = ( AttributeType ) element;
+ MutableAttributeTypeImpl at = ( MutableAttributeTypeImpl ) element;
List<String> names = at.getNames();
if ( ( names != null ) && ( names.size() > 0 ) )
@@ -186,7 +186,7 @@ public class NewObjectClassOptionalAttri
private void addOptionalAttributeType()
{
AttributeTypeSelectionDialog dialog = new AttributeTypeSelectionDialog();
- List<AttributeType> hiddenAttributes = new ArrayList<AttributeType>();
+ List<MutableAttributeTypeImpl> hiddenAttributes = new ArrayList<MutableAttributeTypeImpl>();
hiddenAttributes.addAll( optionalAttributeTypesList );
dialog.setHiddenAttributeTypes( hiddenAttributes );
if ( dialog.open() == Dialog.OK )
@@ -217,9 +217,9 @@ public class NewObjectClassOptionalAttri
*/
private void updateOptionalAttributeTypesTableTable()
{
- Collections.sort( optionalAttributeTypesList, new Comparator<AttributeType>()
+ Collections.sort( optionalAttributeTypesList, new Comparator<MutableAttributeTypeImpl>()
{
- public int compare( AttributeType o1, AttributeType o2 )
+ public int compare( MutableAttributeTypeImpl o1, MutableAttributeTypeImpl o2 )
{
List<String> at1Names = o1.getNames();
List<String> at2Names = o2.getNames();
@@ -244,7 +244,7 @@ public class NewObjectClassOptionalAttri
* @return
* the optional attributes types
*/
- public List<AttributeType> getOptionalAttributeTypes()
+ public List<MutableAttributeTypeImpl> getOptionalAttributeTypes()
{
return optionalAttributeTypesList;
}
@@ -259,7 +259,7 @@ public class NewObjectClassOptionalAttri
public List<String> getOptionalAttributeTypesNames()
{
List<String> names = new ArrayList<String>();
- for ( AttributeType at : optionalAttributeTypesList )
+ for ( MutableAttributeTypeImpl at : optionalAttributeTypesList )
{
names.add( at.getName() );
}
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/AttributeTypeWrapper.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/AttributeTypeWrapper.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/AttributeTypeWrapper.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/AttributeTypeWrapper.java Sun Mar 20 21:22:39 2011
@@ -20,7 +20,7 @@
package org.apache.directory.studio.schemaeditor.view.wrappers;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
import org.eclipse.osgi.util.NLS;
@@ -32,7 +32,7 @@ import org.eclipse.osgi.util.NLS;
public class AttributeTypeWrapper extends AbstractTreeNode
{
/** The wrapped AttributeType */
- private AttributeType attributeType;
+ private MutableAttributeTypeImpl attributeType;
/**
@@ -41,7 +41,7 @@ public class AttributeTypeWrapper extend
* @param at
* the wrapped AttributeType
*/
- public AttributeTypeWrapper( AttributeType at )
+ public AttributeTypeWrapper( MutableAttributeTypeImpl at )
{
super( null );
attributeType = at;
@@ -56,7 +56,7 @@ public class AttributeTypeWrapper extend
* @param parent
* the parent TreeNode
*/
- public AttributeTypeWrapper( AttributeType at, TreeNode parent )
+ public AttributeTypeWrapper( MutableAttributeTypeImpl at, TreeNode parent )
{
super( parent );
attributeType = at;
@@ -69,7 +69,7 @@ public class AttributeTypeWrapper extend
* @return
* the wrapped AttributeType
*/
- public AttributeType getAttributeType()
+ public MutableAttributeTypeImpl getAttributeType()
{
return attributeType;
}
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/FirstNameSorter.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/FirstNameSorter.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/FirstNameSorter.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/FirstNameSorter.java Sun Mar 20 21:22:39 2011
@@ -24,7 +24,7 @@ package org.apache.directory.studio.sche
import java.util.Comparator;
import java.util.List;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
@@ -43,8 +43,8 @@ public class FirstNameSorter implements
if ( ( o1 instanceof AttributeTypeWrapper ) && ( o2 instanceof AttributeTypeWrapper ) )
{
- AttributeType at1 = ( ( AttributeTypeWrapper ) o1 ).getAttributeType();
- AttributeType at2 = ( ( AttributeTypeWrapper ) o2 ).getAttributeType();
+ MutableAttributeTypeImpl at1 = ( ( AttributeTypeWrapper ) o1 ).getAttributeType();
+ MutableAttributeTypeImpl at2 = ( ( AttributeTypeWrapper ) o2 ).getAttributeType();
o1Names = at1.getNames();
o2Names = at2.getNames();
@@ -59,7 +59,7 @@ public class FirstNameSorter implements
}
else if ( ( o1 instanceof AttributeTypeWrapper ) && ( o2 instanceof ObjectClassWrapper ) )
{
- AttributeType at = ( ( AttributeTypeWrapper ) o1 ).getAttributeType();
+ MutableAttributeTypeImpl at = ( ( AttributeTypeWrapper ) o1 ).getAttributeType();
ObjectClass oc = ( ( ObjectClassWrapper ) o2 ).getObjectClass();
o1Names = at.getNames();
@@ -68,7 +68,7 @@ public class FirstNameSorter implements
else if ( ( o1 instanceof ObjectClassWrapper ) && ( o2 instanceof AttributeTypeWrapper ) )
{
ObjectClass oc = ( ( ObjectClassWrapper ) o1 ).getObjectClass();
- AttributeType at = ( ( AttributeTypeWrapper ) o2 ).getAttributeType();
+ MutableAttributeTypeImpl at = ( ( AttributeTypeWrapper ) o2 ).getAttributeType();
o1Names = oc.getNames();
o2Names = at.getNames();
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/OidSorter.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/OidSorter.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/OidSorter.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wrappers/OidSorter.java Sun Mar 20 21:22:39 2011
@@ -23,7 +23,7 @@ package org.apache.directory.studio.sche
import java.util.Comparator;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
@@ -39,8 +39,8 @@ public class OidSorter implements Compar
{
if ( ( o1 instanceof AttributeTypeWrapper ) && ( o2 instanceof AttributeTypeWrapper ) )
{
- AttributeType at1 = ( ( AttributeTypeWrapper ) o1 ).getAttributeType();
- AttributeType at2 = ( ( AttributeTypeWrapper ) o2 ).getAttributeType();
+ MutableAttributeTypeImpl at1 = ( ( AttributeTypeWrapper ) o1 ).getAttributeType();
+ MutableAttributeTypeImpl at2 = ( ( AttributeTypeWrapper ) o2 ).getAttributeType();
return at1.getOid().compareToIgnoreCase( at2.getOid() );
}
@@ -53,7 +53,7 @@ public class OidSorter implements Compar
}
else if ( ( o1 instanceof AttributeTypeWrapper ) && ( o2 instanceof ObjectClassWrapper ) )
{
- AttributeType at = ( ( AttributeTypeWrapper ) o1 ).getAttributeType();
+ MutableAttributeTypeImpl at = ( ( AttributeTypeWrapper ) o1 ).getAttributeType();
ObjectClass oc = ( ( ObjectClassWrapper ) o2 ).getObjectClass();
return at.getOid().compareToIgnoreCase( oc.getOid() );
@@ -61,7 +61,7 @@ public class OidSorter implements Compar
else if ( ( o1 instanceof ObjectClassWrapper ) && ( o2 instanceof AttributeTypeWrapper ) )
{
ObjectClass oc = ( ( ObjectClassWrapper ) o1 ).getObjectClass();
- AttributeType at = ( ( AttributeTypeWrapper ) o2 ).getAttributeType();
+ MutableAttributeTypeImpl at = ( ( AttributeTypeWrapper ) o2 ).getAttributeType();
return oc.getOid().compareToIgnoreCase( at.getOid() );
}
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/test/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngineTest.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/test/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngineTest.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/test/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngineTest.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/test/java/org/apache/directory/studio/schemaeditor/model/difference/DifferenceEngineTest.java Sun Mar 20 21:22:39 2011
@@ -25,7 +25,7 @@ import java.util.List;
import junit.framework.TestCase;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum;
import org.apache.directory.shared.ldap.model.schema.UsageEnum;
@@ -45,8 +45,8 @@ public class DifferenceEngineTest extend
*/
public void testAddAliasDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o1 = new MutableAttributeTypeImpl( "1.2.3.4" );
+ MutableAttributeTypeImpl o2 = new MutableAttributeTypeImpl( "1.2.3.4" );
o2.setNames( new String[]
{ "alias" } );
@@ -72,8 +72,8 @@ public class DifferenceEngineTest extend
*/
public void testAddDescriptionDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o1 = new MutableAttributeTypeImpl( "1.2.3.4" );
+ MutableAttributeTypeImpl o2 = new MutableAttributeTypeImpl( "1.2.3.4" );
o2.setDescription( "Description" );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -99,8 +99,8 @@ public class DifferenceEngineTest extend
*/
public void testAddEqualityDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o1 = new MutableAttributeTypeImpl( "1.2.3.4" );
+ MutableAttributeTypeImpl o2 = new MutableAttributeTypeImpl( "1.2.3.4" );
o2.setEqualityOid( "Equality" );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -180,8 +180,8 @@ public class DifferenceEngineTest extend
*/
public void testAddOrderingDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o1 = new MutableAttributeTypeImpl( "1.2.3.4" );
+ MutableAttributeTypeImpl o2 = new MutableAttributeTypeImpl( "1.2.3.4" );
o2.setOrderingOid( "Ordering" );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -206,8 +206,8 @@ public class DifferenceEngineTest extend
*/
public void testAddSubstringDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o1 = new MutableAttributeTypeImpl( "1.2.3.4" );
+ MutableAttributeTypeImpl o2 = new MutableAttributeTypeImpl( "1.2.3.4" );
o2.setSubstringOid( "Substring" );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -232,8 +232,8 @@ public class DifferenceEngineTest extend
*/
public void testAddSuperiorATDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o1 = new MutableAttributeTypeImpl( "1.2.3.4" );
+ MutableAttributeTypeImpl o2 = new MutableAttributeTypeImpl( "1.2.3.4" );
o2.setSuperiorOid( "superiorAT" );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -285,8 +285,8 @@ public class DifferenceEngineTest extend
*/
public void testAddSyntaxDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o1 = new MutableAttributeTypeImpl( "1.2.3.4" );
+ MutableAttributeTypeImpl o2 = new MutableAttributeTypeImpl( "1.2.3.4" );
o2.setSyntaxOid( "1.2.3.4.5" );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -311,8 +311,8 @@ public class DifferenceEngineTest extend
*/
public void testAddSyntaxLengthDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o1 = new MutableAttributeTypeImpl( "1.2.3.4" );
+ MutableAttributeTypeImpl o2 = new MutableAttributeTypeImpl( "1.2.3.4" );
o2.setSyntaxLength( 1234 );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -367,9 +367,9 @@ public class DifferenceEngineTest extend
*/
public void testModifyCollectiveDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o1 = new MutableAttributeTypeImpl( "1.2.3.4" );
o1.setCollective( true );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o2 = new MutableAttributeTypeImpl( "1.2.3.4" );
o2.setCollective( false );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -396,9 +396,9 @@ public class DifferenceEngineTest extend
*/
public void testModifyDescriptionDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o1 = new MutableAttributeTypeImpl( "1.2.3.4" );
o1.setDescription( "Description" );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o2 = new MutableAttributeTypeImpl( "1.2.3.4" );
o2.setDescription( "New Description" );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -425,9 +425,9 @@ public class DifferenceEngineTest extend
*/
public void testModifyEqualityDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o1 = new MutableAttributeTypeImpl( "1.2.3.4" );
o1.setEqualityOid( "equalityName" );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o2 = new MutableAttributeTypeImpl( "1.2.3.4" );
o2.setEqualityOid( "newEqualityName" );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -454,9 +454,9 @@ public class DifferenceEngineTest extend
*/
public void testModifyNoUserModificationDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o1 = new MutableAttributeTypeImpl( "1.2.3.4" );
o1.setUserModifiable( true );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o2 = new MutableAttributeTypeImpl( "1.2.3.4" );
o2.setUserModifiable( false );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -483,9 +483,9 @@ public class DifferenceEngineTest extend
*/
public void testModifyObsoleteDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o1 = new MutableAttributeTypeImpl( "1.2.3.4" );
o1.setObsolete( true );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o2 = new MutableAttributeTypeImpl( "1.2.3.4" );
o2.setObsolete( false );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -512,9 +512,9 @@ public class DifferenceEngineTest extend
*/
public void testModifyOrderingDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o1 = new MutableAttributeTypeImpl( "1.2.3.4" );
o1.setOrderingOid( "orderingName" );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o2 = new MutableAttributeTypeImpl( "1.2.3.4" );
o2.setOrderingOid( "newOrderingName" );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -541,9 +541,9 @@ public class DifferenceEngineTest extend
*/
public void testModifySingleValueDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o1 = new MutableAttributeTypeImpl( "1.2.3.4" );
o1.setSingleValued( true );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o2 = new MutableAttributeTypeImpl( "1.2.3.4" );
o2.setSingleValued( false );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -570,9 +570,9 @@ public class DifferenceEngineTest extend
*/
public void testModifySubstringDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o1 = new MutableAttributeTypeImpl( "1.2.3.4" );
o1.setSubstringOid( "substrName" );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o2 = new MutableAttributeTypeImpl( "1.2.3.4" );
o2.setSubstringOid( "newSubstrName" );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -599,9 +599,9 @@ public class DifferenceEngineTest extend
*/
public void testModifySuperiorATDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o1 = new MutableAttributeTypeImpl( "1.2.3.4" );
o1.setSuperiorOid( "superiorName" );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o2 = new MutableAttributeTypeImpl( "1.2.3.4" );
o2.setSuperiorOid( "newSuperiorName" );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -628,9 +628,9 @@ public class DifferenceEngineTest extend
*/
public void testModifySyntaxDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o1 = new MutableAttributeTypeImpl( "1.2.3.4" );
o1.setSyntaxOid( "1.2.3.4.5" );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o2 = new MutableAttributeTypeImpl( "1.2.3.4" );
o2.setSyntaxOid( "1.2.3.4.6" );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -656,9 +656,9 @@ public class DifferenceEngineTest extend
*/
public void testModifySyntaxLengthDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o1 = new MutableAttributeTypeImpl( "1.2.3.4" );
o1.setSyntaxLength( 1234 );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o2 = new MutableAttributeTypeImpl( "1.2.3.4" );
o2.setSyntaxLength( 12345 );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -685,9 +685,9 @@ public class DifferenceEngineTest extend
*/
public void testModifyUsageDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o1 = new MutableAttributeTypeImpl( "1.2.3.4" );
o1.setUsage( UsageEnum.DISTRIBUTED_OPERATION );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o2 = new MutableAttributeTypeImpl( "1.2.3.4" );
o2.setUsage( UsageEnum.DIRECTORY_OPERATION );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -713,10 +713,10 @@ public class DifferenceEngineTest extend
*/
public void testRemoveAliasDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o1 = new MutableAttributeTypeImpl( "1.2.3.4" );
o1.setNames( new String[]
{ "name1", "name2" } );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o2 = new MutableAttributeTypeImpl( "1.2.3.4" );
o2.setNames( new String[]
{ "name2" } );
@@ -743,9 +743,9 @@ public class DifferenceEngineTest extend
*/
public void testRemoveDescriptionDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o1 = new MutableAttributeTypeImpl( "1.2.3.4" );
o1.setDescription( "Description" );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o2 = new MutableAttributeTypeImpl( "1.2.3.4" );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -771,9 +771,9 @@ public class DifferenceEngineTest extend
*/
public void testRemoveEqualityDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o1 = new MutableAttributeTypeImpl( "1.2.3.4" );
o1.setEqualityOid( "equalityName" );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o2 = new MutableAttributeTypeImpl( "1.2.3.4" );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -860,9 +860,9 @@ public class DifferenceEngineTest extend
*/
public void testRemoveOrderingDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o1 = new MutableAttributeTypeImpl( "1.2.3.4" );
o1.setOrderingOid( "orderingName" );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o2 = new MutableAttributeTypeImpl( "1.2.3.4" );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -887,9 +887,9 @@ public class DifferenceEngineTest extend
*/
public void testRemoveSubstringDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o1 = new MutableAttributeTypeImpl( "1.2.3.4" );
o1.setSubstringOid( "substrName" );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o2 = new MutableAttributeTypeImpl( "1.2.3.4" );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -915,9 +915,9 @@ public class DifferenceEngineTest extend
*/
public void testRemoveSuperiorATDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o1 = new MutableAttributeTypeImpl( "1.2.3.4" );
o1.setSuperiorOid( "superiorName" );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o2 = new MutableAttributeTypeImpl( "1.2.3.4" );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -974,9 +974,9 @@ public class DifferenceEngineTest extend
*/
public void testRemoveSyntaxDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o1 = new MutableAttributeTypeImpl( "1.2.3.4" );
o1.setSyntaxOid( "1.2.3.4.5" );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o2 = new MutableAttributeTypeImpl( "1.2.3.4" );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );
@@ -1001,9 +1001,9 @@ public class DifferenceEngineTest extend
*/
public void testRemoveSyntaxLengthDifference() throws Exception
{
- AttributeType o1 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o1 = new MutableAttributeTypeImpl( "1.2.3.4" );
o1.setSyntaxLength( 1234 );
- AttributeType o2 = new AttributeType( "1.2.3.4" );
+ MutableAttributeTypeImpl o2 = new MutableAttributeTypeImpl( "1.2.3.4" );
List<PropertyDifference> differences = DifferenceEngine.getDifferences( o1, o2 );