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 [11/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/editors/attributetype/AttributeTypeEditorInput.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java Sun Mar 20 21:22:39 2011
@@ -23,7 +23,7 @@ package org.apache.directory.studio.sche
import java.util.List;
-import org.apache.directory.shared.ldap.model.schema.AttributeType;
+import org.apache.directory.shared.ldap.model.schema.MutableAttributeTypeImpl;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.osgi.util.NLS;
import org.eclipse.ui.IEditorInput;
@@ -36,7 +36,7 @@ import org.eclipse.ui.IPersistableElemen
public class AttributeTypeEditorInput implements IEditorInput
{
/** The input attribute type */
- private AttributeType attributeType;
+ private MutableAttributeTypeImpl attributeType;
/**
@@ -45,7 +45,7 @@ public class AttributeTypeEditorInput im
* @param at
* the input attribute type
*/
- public AttributeTypeEditorInput( AttributeType at )
+ public AttributeTypeEditorInput( MutableAttributeTypeImpl at )
{
attributeType = at;
}
@@ -143,7 +143,7 @@ public class AttributeTypeEditorInput im
* @return
* the input Attribute Type
*/
- public AttributeType getAttributeType()
+ public MutableAttributeTypeImpl getAttributeType()
{
return this.attributeType;
}
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java Sun Mar 20 21:22:39 2011
@@ -25,7 +25,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.directory.shared.asn1.util.OID;
-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.MatchingRule;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
@@ -91,10 +91,10 @@ public class AttributeTypeEditorOverview
public static final String ID = AttributeTypeEditor.ID + ".overviewPage"; //$NON-NLS-1$
/** The original object class */
- private AttributeType originalAttributeType;
+ private MutableAttributeTypeImpl originalAttributeType;
/** The modified object class */
- private AttributeType modifiedAttributeType;
+ private MutableAttributeTypeImpl modifiedAttributeType;
/** The original schema */
private Schema originalSchema;
@@ -108,7 +108,7 @@ public class AttributeTypeEditorOverview
/* (non-Javadoc)
* @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#attributeTypeAdded(org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl)
*/
- public void attributeTypeAdded( AttributeType at )
+ public void attributeTypeAdded( MutableAttributeTypeImpl at )
{
refreshUI();
}
@@ -117,7 +117,7 @@ public class AttributeTypeEditorOverview
/* (non-Javadoc)
* @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#attributeTypeModified(org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl)
*/
- public void attributeTypeModified( AttributeType at )
+ public void attributeTypeModified( MutableAttributeTypeImpl at )
{
refreshUI();
}
@@ -126,7 +126,7 @@ public class AttributeTypeEditorOverview
/* (non-Javadoc)
* @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#attributeTypeRemoved(org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl)
*/
- public void attributeTypeRemoved( AttributeType at )
+ public void attributeTypeRemoved( MutableAttributeTypeImpl at )
{
if ( !at.equals( originalAttributeType ) )
{
@@ -397,11 +397,11 @@ public class AttributeTypeEditorOverview
{
Object selectedItem = ( ( StructuredSelection ) supComboViewer.getSelection() ).getFirstElement();
- if ( selectedItem instanceof AttributeType )
+ if ( selectedItem instanceof MutableAttributeTypeImpl )
{
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
- AttributeTypeEditorInput input = new AttributeTypeEditorInput( ( AttributeType ) selectedItem );
+ AttributeTypeEditorInput input = new AttributeTypeEditorInput( ( MutableAttributeTypeImpl ) selectedItem );
try
{
page.openEditor( input, AttributeTypeEditor.ID );
@@ -421,9 +421,9 @@ public class AttributeTypeEditorOverview
{
Object selectedItem = ( ( StructuredSelection ) supComboViewer.getSelection() ).getFirstElement();
- if ( selectedItem instanceof AttributeType )
+ if ( selectedItem instanceof MutableAttributeTypeImpl )
{
- AttributeType at = ( AttributeType ) selectedItem;
+ MutableAttributeTypeImpl at = ( MutableAttributeTypeImpl ) selectedItem;
List<String> names = at.getNames();
if ( ( names != null ) && ( names.size() > 0 ) )
{
@@ -991,7 +991,7 @@ public class AttributeTypeEditorOverview
}
else
{
- AttributeType supAT = schemaHandler.getAttributeType( supAtName );
+ MutableAttributeTypeImpl supAT = schemaHandler.getAttributeType( supAtName );
if ( supAT != null )
{
supComboViewer.setSelection( new StructuredSelection( supAT ), true );
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorSourceCodePage.java Sun Mar 20 21:22:39 2011
@@ -25,7 +25,7 @@ import java.io.IOException;
import java.text.ParseException;
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.parsers.OpenLdapSchemaParser;
import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.model.io.OpenLdapSchemaFileExporter;
@@ -56,7 +56,7 @@ public class AttributeTypeEditorSourceCo
public static final String ID = AttributeTypeEditor.ID + "sourceCodePage"; //$NON-NLS-1$
/** The modified attribute type */
- private AttributeType modifiedAttributeType;
+ private MutableAttributeTypeImpl modifiedAttributeType;
/** The Schema Source Viewer */
private SchemaSourceViewer schemaSourceViewer;
@@ -82,7 +82,7 @@ public class AttributeTypeEditorSourceCo
}
else
{
- updateAttributeType( ( AttributeType ) attributeTypes.get( 0 ) );
+ updateAttributeType( ( MutableAttributeTypeImpl ) attributeTypes.get( 0 ) );
}
}
catch ( IOException e1 )
@@ -179,7 +179,7 @@ public class AttributeTypeEditorSourceCo
* @param atl
* the Attribute Type Literal
*/
- private void updateAttributeType( AttributeType atl )
+ private void updateAttributeType( MutableAttributeTypeImpl atl )
{
modifiedAttributeType.setCollective( atl.isCollective() );
modifiedAttributeType.setDescription( atl.getDescription() );
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorUsedByPage.java Sun Mar 20 21:22:39 2011
@@ -23,7 +23,7 @@ package org.apache.directory.studio.sche
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;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
@@ -65,10 +65,10 @@ public class AttributeTypeEditorUsedByPa
public static final String ID = AttributeTypeEditor.ID + "usedByPage"; //$NON-NLS-1$
/** The modified attribute type */
- private AttributeType modifiedAttributeType;
+ private MutableAttributeTypeImpl modifiedAttributeType;
/** The original attribute type */
- private AttributeType originalAttributeType;
+ private MutableAttributeTypeImpl originalAttributeType;
/** The Schema Handler */
private SchemaHandler schemaHandler;
@@ -79,7 +79,7 @@ public class AttributeTypeEditorUsedByPa
/* (non-Javadoc)
* @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#attributeTypeAdded(org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl)
*/
- public void attributeTypeAdded( AttributeType at )
+ public void attributeTypeAdded( MutableAttributeTypeImpl at )
{
refreshTableViewers();
}
@@ -88,7 +88,7 @@ public class AttributeTypeEditorUsedByPa
/* (non-Javadoc)
* @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#attributeTypeModified(org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl)
*/
- public void attributeTypeModified( AttributeType at )
+ public void attributeTypeModified( MutableAttributeTypeImpl at )
{
refreshTableViewers();
}
@@ -97,7 +97,7 @@ public class AttributeTypeEditorUsedByPa
/* (non-Javadoc)
* @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#attributeTypeRemoved(org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl)
*/
- public void attributeTypeRemoved( AttributeType at )
+ public void attributeTypeRemoved( MutableAttributeTypeImpl at )
{
refreshTableViewers();
}
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableContentProvider.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableContentProvider.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableContentProvider.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.controller.SchemaHandler;
import org.apache.directory.studio.schemaeditor.view.editors.NonExistingAttributeType;
@@ -65,7 +65,7 @@ public class ObjectClassEditorAttributes
List<String> attributes = ( List<String> ) inputElement;
for ( String attribute : attributes )
{
- AttributeType at = schemaHandler.getAttributeType( attribute );
+ MutableAttributeTypeImpl at = schemaHandler.getAttributeType( attribute );
if ( at != null )
{
results.add( at );
@@ -81,10 +81,10 @@ public class ObjectClassEditorAttributes
{
public int compare( Object o1, Object o2 )
{
- if ( o1 instanceof AttributeType && o2 instanceof AttributeType )
+ if ( o1 instanceof MutableAttributeTypeImpl && o2 instanceof MutableAttributeTypeImpl )
{
- List<String> at1Names = ( ( AttributeType ) o1 ).getNames();
- List<String> at2Names = ( ( AttributeType ) o2 ).getNames();
+ List<String> at1Names = ( ( MutableAttributeTypeImpl ) o1 ).getNames();
+ List<String> at2Names = ( ( MutableAttributeTypeImpl ) o2 ).getNames();
if ( ( at1Names != null ) && ( at2Names != null ) && ( at1Names.size() > 0 )
&& ( at2Names.size() > 0 ) )
@@ -92,9 +92,9 @@ public class ObjectClassEditorAttributes
return at1Names.get( 0 ).compareToIgnoreCase( at2Names.get( 0 ) );
}
}
- else if ( o1 instanceof AttributeType && o2 instanceof NonExistingAttributeType )
+ else if ( o1 instanceof MutableAttributeTypeImpl && o2 instanceof NonExistingAttributeType )
{
- List<String> at1Names = ( ( AttributeType ) o1 ).getNames();
+ List<String> at1Names = ( ( MutableAttributeTypeImpl ) o1 ).getNames();
String at2Name = ( ( NonExistingAttributeType ) o2 ).getName();
if ( ( at1Names != null ) && ( at2Name != null ) && ( at1Names.size() > 0 ) )
@@ -102,10 +102,10 @@ public class ObjectClassEditorAttributes
return at1Names.get( 0 ).compareToIgnoreCase( at2Name );
}
}
- else if ( o1 instanceof NonExistingAttributeType && o2 instanceof AttributeType )
+ else if ( o1 instanceof NonExistingAttributeType && o2 instanceof MutableAttributeTypeImpl )
{
String at1Name = ( ( NonExistingAttributeType ) o1 ).getName();
- List<String> at2Names = ( ( AttributeType ) o2 ).getNames();
+ List<String> at2Names = ( ( MutableAttributeTypeImpl ) o2 ).getNames();
if ( ( at1Name != null ) && ( at2Names != null ) && ( at2Names.size() > 0 ) )
{
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableLabelProvider.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableLabelProvider.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorAttributesTableLabelProvider.java Sun Mar 20 21:22:39 2011
@@ -23,7 +23,7 @@ package org.apache.directory.studio.sche
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;
@@ -46,7 +46,7 @@ public class ObjectClassEditorAttributes
*/
public Image getColumnImage( Object element, int columnIndex )
{
- if ( ( element instanceof AttributeType ) || ( element instanceof NonExistingAttributeType ) )
+ if ( ( element instanceof MutableAttributeTypeImpl ) || ( element instanceof NonExistingAttributeType ) )
{
return Activator.getDefault().getImage( PluginConstants.IMG_ATTRIBUTE_TYPE );
}
@@ -61,9 +61,9 @@ public class ObjectClassEditorAttributes
*/
public String getColumnText( Object element, int columnIndex )
{
- 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 ) )
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java Sun Mar 20 21:22:39 2011
@@ -25,7 +25,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.directory.shared.asn1.util.OID;
-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.MatchingRule;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
@@ -113,7 +113,7 @@ public class ObjectClassEditorOverviewPa
/* (non-Javadoc)
* @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#attributeTypeAdded(org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl)
*/
- public void attributeTypeAdded( AttributeType at )
+ public void attributeTypeAdded( MutableAttributeTypeImpl at )
{
refreshUI();
}
@@ -122,7 +122,7 @@ public class ObjectClassEditorOverviewPa
/* (non-Javadoc)
* @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#attributeTypeModified(org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl)
*/
- public void attributeTypeModified( AttributeType at )
+ public void attributeTypeModified( MutableAttributeTypeImpl at )
{
refreshUI();
}
@@ -131,7 +131,7 @@ public class ObjectClassEditorOverviewPa
/* (non-Javadoc)
* @see org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener#attributeTypeRemoved(org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl)
*/
- public void attributeTypeRemoved( AttributeType at )
+ public void attributeTypeRemoved( MutableAttributeTypeImpl at )
{
refreshUI();
}
@@ -436,12 +436,12 @@ public class ObjectClassEditorOverviewPa
Object selectedElement = selection.getFirstElement();
if ( selectedElement != null )
{
- if ( selectedElement instanceof AttributeType )
+ if ( selectedElement instanceof MutableAttributeTypeImpl )
{
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
try
{
- page.openEditor( new AttributeTypeEditorInput( ( AttributeType ) selectedElement ),
+ page.openEditor( new AttributeTypeEditorInput( ( MutableAttributeTypeImpl ) selectedElement ),
AttributeTypeEditor.ID );
}
catch ( PartInitException exception )
@@ -470,27 +470,27 @@ public class ObjectClassEditorOverviewPa
public void widgetSelected( SelectionEvent e )
{
AttributeTypeSelectionDialog dialog = new AttributeTypeSelectionDialog();
- List<AttributeType> hiddenATs = new ArrayList<AttributeType>();
+ List<MutableAttributeTypeImpl> hiddenATs = new ArrayList<MutableAttributeTypeImpl>();
List<String> mustsHidden = modifiedObjectClass.getMustAttributeTypeOids();
if ( mustsHidden != null )
{
for ( String must : mustsHidden )
{
- AttributeType at = schemaHandler.getAttributeType( must );
+ MutableAttributeTypeImpl at = schemaHandler.getAttributeType( must );
if ( at != null )
{
hiddenATs.add( at );
}
}
}
- dialog.setHiddenAttributeTypes( hiddenATs.toArray( new AttributeType[0] ) );
+ dialog.setHiddenAttributeTypes( hiddenATs.toArray( new MutableAttributeTypeImpl[0] ) );
if ( dialog.open() != Window.OK )
{
return;
}
- AttributeType at = dialog.getSelectedAttributeType();
+ MutableAttributeTypeImpl at = dialog.getSelectedAttributeType();
if ( at == null )
{
return;
@@ -542,9 +542,9 @@ public class ObjectClassEditorOverviewPa
newMusts.add( must );
}
- if ( selectedElement instanceof AttributeType )
+ if ( selectedElement instanceof MutableAttributeTypeImpl )
{
- for ( String name : ( ( AttributeType ) selectedElement ).getNames() )
+ for ( String name : ( ( MutableAttributeTypeImpl ) selectedElement ).getNames() )
{
newMusts.remove( name );
}
@@ -578,12 +578,12 @@ public class ObjectClassEditorOverviewPa
Object selectedElement = selection.getFirstElement();
if ( selectedElement != null )
{
- if ( selectedElement instanceof AttributeType )
+ if ( selectedElement instanceof MutableAttributeTypeImpl )
{
IWorkbenchPage page = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage();
try
{
- page.openEditor( new AttributeTypeEditorInput( ( AttributeType ) selectedElement ),
+ page.openEditor( new AttributeTypeEditorInput( ( MutableAttributeTypeImpl ) selectedElement ),
AttributeTypeEditor.ID );
}
catch ( PartInitException exception )
@@ -607,27 +607,27 @@ public class ObjectClassEditorOverviewPa
public void widgetSelected( SelectionEvent e )
{
AttributeTypeSelectionDialog dialog = new AttributeTypeSelectionDialog();
- List<AttributeType> hiddenATs = new ArrayList<AttributeType>();
+ List<MutableAttributeTypeImpl> hiddenATs = new ArrayList<MutableAttributeTypeImpl>();
List<String> maysHidden = modifiedObjectClass.getMayAttributeTypeOids();
if ( maysHidden != null )
{
for ( String may : maysHidden )
{
- AttributeType at = schemaHandler.getAttributeType( may );
+ MutableAttributeTypeImpl at = schemaHandler.getAttributeType( may );
if ( at != null )
{
hiddenATs.add( at );
}
}
}
- dialog.setHiddenAttributeTypes( hiddenATs.toArray( new AttributeType[0] ) );
+ dialog.setHiddenAttributeTypes( hiddenATs.toArray( new MutableAttributeTypeImpl[0] ) );
if ( dialog.open() != Window.OK )
{
return;
}
- AttributeType at = dialog.getSelectedAttributeType();
+ MutableAttributeTypeImpl at = dialog.getSelectedAttributeType();
if ( at == null )
{
return;
@@ -679,9 +679,9 @@ public class ObjectClassEditorOverviewPa
newMays.add( may );
}
- if ( selectedElement instanceof AttributeType )
+ if ( selectedElement instanceof MutableAttributeTypeImpl )
{
- for ( String name : ( ( AttributeType ) selectedElement ).getNames() )
+ for ( String name : ( ( MutableAttributeTypeImpl ) selectedElement ).getNames() )
{
newMays.remove( name );
}
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorOverviewPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorOverviewPage.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorOverviewPage.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorOverviewPage.java Sun Mar 20 21:22:39 2011
@@ -21,7 +21,7 @@
package org.apache.directory.studio.schemaeditor.view.editors.schema;
-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.PluginConstants;
@@ -75,7 +75,7 @@ public class SchemaEditorOverviewPage ex
/* (non-Javadoc)
* @see org.apache.directory.studio.schemaeditor.controller.SchemaListener#attributeTypeAdded(org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl)
*/
- public void attributeTypeAdded( AttributeType at )
+ public void attributeTypeAdded( MutableAttributeTypeImpl at )
{
fillInUiFields();
}
@@ -84,7 +84,7 @@ public class SchemaEditorOverviewPage ex
/* (non-Javadoc)
* @see org.apache.directory.studio.schemaeditor.controller.SchemaListener#attributeTypeModified(org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl)
*/
- public void attributeTypeModified( AttributeType at )
+ public void attributeTypeModified( MutableAttributeTypeImpl at )
{
fillInUiFields();
}
@@ -93,7 +93,7 @@ public class SchemaEditorOverviewPage ex
/* (non-Javadoc)
* @see org.apache.directory.studio.schemaeditor.controller.SchemaListener#attributeTypeRemoved(org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl)
*/
- public void attributeTypeRemoved( AttributeType at )
+ public void attributeTypeRemoved( MutableAttributeTypeImpl at )
{
fillInUiFields();
}
@@ -143,7 +143,7 @@ public class SchemaEditorOverviewPage ex
if ( !selection.isEmpty() )
{
- AttributeType at = ( AttributeType ) selection.getFirstElement();
+ MutableAttributeTypeImpl at = ( MutableAttributeTypeImpl ) selection.getFirstElement();
try
{
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorSourceCodePage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorSourceCodePage.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorSourceCodePage.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorSourceCodePage.java Sun Mar 20 21:22:39 2011
@@ -21,7 +21,7 @@
package org.apache.directory.studio.schemaeditor.view.editors.schema;
-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.MatchingRule;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
@@ -68,7 +68,7 @@ public class SchemaEditorSourceCodePage
/* (non-Javadoc)
* @see org.apache.directory.studio.schemaeditor.controller.SchemaListener#attributeTypeAdded(org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl)
*/
- public void attributeTypeAdded( AttributeType at )
+ public void attributeTypeAdded( MutableAttributeTypeImpl at )
{
fillInUiFields();
}
@@ -77,7 +77,7 @@ public class SchemaEditorSourceCodePage
/* (non-Javadoc)
* @see org.apache.directory.studio.schemaeditor.controller.SchemaListener#attributeTypeModified(org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl)
*/
- public void attributeTypeModified( AttributeType at )
+ public void attributeTypeModified( MutableAttributeTypeImpl at )
{
fillInUiFields();
}
@@ -86,7 +86,7 @@ public class SchemaEditorSourceCodePage
/* (non-Javadoc)
* @see org.apache.directory.studio.schemaeditor.controller.SchemaListener#attributeTypeRemoved(org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl)
*/
- public void attributeTypeRemoved( AttributeType at )
+ public void attributeTypeRemoved( MutableAttributeTypeImpl at )
{
fillInUiFields();
}
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerContentProvider.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerContentProvider.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerContentProvider.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.ObjectClass;
import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.Viewer;
@@ -58,10 +58,10 @@ public class SchemaEditorTableViewerCont
{
public int compare( Object o1, Object o2 )
{
- if ( o1 instanceof AttributeType && o2 instanceof AttributeType )
+ if ( o1 instanceof MutableAttributeTypeImpl && o2 instanceof MutableAttributeTypeImpl )
{
- List<String> at1Names = ( ( AttributeType ) o1 ).getNames();
- List<String> at2Names = ( ( AttributeType ) o2 ).getNames();
+ List<String> at1Names = ( ( MutableAttributeTypeImpl ) o1 ).getNames();
+ List<String> at2Names = ( ( MutableAttributeTypeImpl ) o2 ).getNames();
if ( ( at1Names != null ) && ( at2Names != null ) && ( at1Names.size() > 0 )
&& ( at2Names.size() > 0 ) )
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerLabelProvider.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerLabelProvider.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorTableViewerLabelProvider.java Sun Mar 20 21:22:39 2011
@@ -23,7 +23,7 @@ package org.apache.directory.studio.sche
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;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
@@ -50,7 +50,7 @@ public class SchemaEditorTableViewerLabe
{
return Activator.getDefault().getImage( PluginConstants.IMG_OBJECT_CLASS );
}
- else if ( element instanceof AttributeType )
+ else if ( element instanceof MutableAttributeTypeImpl )
{
return Activator.getDefault().getImage( PluginConstants.IMG_ATTRIBUTE_TYPE );
}
@@ -80,9 +80,9 @@ public class SchemaEditorTableViewerLabe
Messages.getString( "SchemaEditorTableViewerLabelProvider.None" ), new String[] { oc.getOid() } ); //$NON-NLS-1$
}
}
- else if ( element instanceof AttributeType )
+ else if ( element instanceof MutableAttributeTypeImpl )
{
- AttributeType at = ( AttributeType ) element;
+ MutableAttributeTypeImpl at = ( MutableAttributeTypeImpl ) element;
List<String> names = at.getNames();
if ( ( names != null ) && ( names.size() > 0 ) )
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyView.java Sun Mar 20 21:22:39 2011
@@ -22,7 +22,7 @@ package org.apache.directory.studio.sche
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;
import org.apache.directory.shared.ldap.model.schema.SchemaObject;
import org.apache.directory.studio.schemaeditor.Activator;
@@ -153,9 +153,9 @@ public class HierarchyView extends ViewP
}
else
{
- if ( input instanceof AttributeType )
+ if ( input instanceof MutableAttributeTypeImpl )
{
- setOverviewLabel( ( AttributeType ) input );
+ setOverviewLabel( ( MutableAttributeTypeImpl ) input );
}
else if ( input instanceof ObjectClass )
{
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewContentProvider.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewContentProvider.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewContentProvider.java Sun Mar 20 21:22:39 2011
@@ -24,7 +24,7 @@ package org.apache.directory.studio.sche
import java.util.ArrayList;
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;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
@@ -66,9 +66,9 @@ public class HierarchyViewContentProvide
children = createTypeHierarchyObjectClass( oc );
}
- else if ( parentElement instanceof AttributeType )
+ else if ( parentElement instanceof MutableAttributeTypeImpl )
{
- AttributeType at = ( AttributeType ) parentElement;
+ MutableAttributeTypeImpl at = ( MutableAttributeTypeImpl ) parentElement;
children = createTypeHierarchyAttributeType( at );
}
@@ -211,7 +211,7 @@ public class HierarchyViewContentProvide
* @return
* the Type Hierarchy for an attribute type
*/
- private List<TreeNode> createTypeHierarchyAttributeType( AttributeType at )
+ private List<TreeNode> createTypeHierarchyAttributeType( MutableAttributeTypeImpl at )
{
List<TreeNode> children = new ArrayList<TreeNode>();
HierarchyManager hierarchyManager = new HierarchyManager();
@@ -230,9 +230,9 @@ public class HierarchyViewContentProvide
while ( ( parents != null ) && ( parents.size() == 1 ) )
{
Object parent = parents.get( 0 );
- if ( parent instanceof AttributeType )
+ if ( parent instanceof MutableAttributeTypeImpl )
{
- AttributeType parentAT = ( AttributeType ) parent;
+ MutableAttributeTypeImpl parentAT = ( MutableAttributeTypeImpl ) parent;
AttributeTypeWrapper atw2 = new AttributeTypeWrapper( parentAT );
atw.setParent( atw2 );
@@ -257,9 +257,9 @@ public class HierarchyViewContentProvide
while ( ( parents != null ) && ( parents.size() == 1 ) )
{
Object parent = parents.get( 0 );
- if ( parent instanceof AttributeType )
+ if ( parent instanceof MutableAttributeTypeImpl )
{
- AttributeType parentAT = ( AttributeType ) parent;
+ MutableAttributeTypeImpl parentAT = ( MutableAttributeTypeImpl ) parent;
AttributeTypeWrapper atw2 = new AttributeTypeWrapper( parentAT );
atw.setParent( atw2 );
@@ -304,9 +304,9 @@ public class HierarchyViewContentProvide
for ( Object child : children )
{
TreeNode childNode = null;
- if ( child instanceof AttributeType )
+ if ( child instanceof MutableAttributeTypeImpl )
{
- AttributeType at = ( AttributeType ) child;
+ MutableAttributeTypeImpl at = ( MutableAttributeTypeImpl ) child;
childNode = new AttributeTypeWrapper( at, node );
node.addChild( childNode );
}
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewLabelProvider.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewLabelProvider.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/HierarchyViewLabelProvider.java Sun Mar 20 21:22:39 2011
@@ -23,7 +23,7 @@ package org.apache.directory.studio.sche
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;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
@@ -81,7 +81,7 @@ public class HierarchyViewLabelProvider
if ( obj instanceof AttributeTypeWrapper )
{
- AttributeType at = ( ( AttributeTypeWrapper ) obj ).getAttributeType();
+ MutableAttributeTypeImpl at = ( ( AttributeTypeWrapper ) obj ).getAttributeType();
// Label
if ( labelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_FIRST_NAME )
@@ -192,7 +192,7 @@ public class HierarchyViewLabelProvider
String secondaryLabel = ""; //$NON-NLS-1$
if ( obj instanceof AttributeTypeWrapper )
{
- AttributeType at = ( ( AttributeTypeWrapper ) obj ).getAttributeType();
+ MutableAttributeTypeImpl at = ( ( AttributeTypeWrapper ) obj ).getAttributeType();
if ( secondaryLabelValue == PluginConstants.PREFS_HIERARCHY_VIEW_LABEL_FIRST_NAME )
{
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java Sun Mar 20 21:22:39 2011
@@ -21,7 +21,7 @@ package org.apache.directory.studio.sche
import org.apache.directory.shared.ldap.model.exception.LdapSchemaException;
-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.MatchingRule;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
@@ -231,7 +231,7 @@ public class ProblemsViewLabelProvider e
SchemaObject duplicate = exception.getOtherObject();
String message = null;
- if ( duplicate instanceof AttributeType )
+ if ( duplicate instanceof MutableAttributeTypeImpl )
{
message = Messages.getString( "ProblemsViewLabelProvider.NameAlreadyRegisteredAT" ); //$NON-NLS-1$
}
@@ -250,7 +250,7 @@ public class ProblemsViewLabelProvider e
SchemaObject duplicate = exception.getOtherObject();
String message = null;
- if ( duplicate instanceof AttributeType )
+ if ( duplicate instanceof MutableAttributeTypeImpl )
{
message = Messages.getString( "ProblemsViewLabelProvider.OidAlreadyRegisteredAT" ); //$NON-NLS-1$
}
@@ -488,7 +488,7 @@ public class ProblemsViewLabelProvider e
SchemaHandler schemaHandler = Activator.getDefault().getSchemaHandler();
SchemaObject schemaObject = null;
- if ( so instanceof AttributeType )
+ if ( so instanceof MutableAttributeTypeImpl )
{
schemaObject = schemaHandler.getAttributeType( so.getOid() );
}
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewContentProvider.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewContentProvider.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewContentProvider.java Sun Mar 20 21:22:39 2011
@@ -25,7 +25,7 @@ import java.util.Collections;
import java.util.List;
import org.apache.commons.collections.map.MultiValueMap;
-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.PluginConstants;
@@ -176,9 +176,9 @@ public class SchemaViewContentProvider i
TreeNode childNode = null;
// Creating the wrapper
- if ( rootChild instanceof AttributeType )
+ if ( rootChild instanceof MutableAttributeTypeImpl )
{
- AttributeType at = ( AttributeType ) rootChild;
+ MutableAttributeTypeImpl at = ( MutableAttributeTypeImpl ) rootChild;
childNode = new AttributeTypeWrapper( at, atFolder );
atFolder.addChild( childNode );
}
@@ -310,9 +310,9 @@ public class SchemaViewContentProvider i
for ( Object child : children )
{
TreeNode childNode = null;
- if ( child instanceof AttributeType )
+ if ( child instanceof MutableAttributeTypeImpl )
{
- AttributeType at = ( AttributeType ) child;
+ MutableAttributeTypeImpl at = ( MutableAttributeTypeImpl ) child;
childNode = new AttributeTypeWrapper( at, node );
node.addChild( childNode );
}
@@ -458,7 +458,7 @@ public class SchemaViewContentProvider i
* @param at
* the added attribute type
*/
- public void attributeTypeAdded( AttributeType at )
+ public void attributeTypeAdded( MutableAttributeTypeImpl at )
{
int presentation = store.getInt( PluginConstants.PREFS_SCHEMA_VIEW_SCHEMA_PRESENTATION );
if ( presentation == PluginConstants.PREFS_SCHEMA_VIEW_SCHEMA_PRESENTATION_FLAT )
@@ -479,7 +479,7 @@ public class SchemaViewContentProvider i
* @param at
* the added attribute type
*/
- public void attributeTypeAddedFlatPresentation( AttributeType at )
+ public void attributeTypeAddedFlatPresentation( MutableAttributeTypeImpl at )
{
SchemaWrapper schemaWrapper = ( SchemaWrapper ) getWrapper( Activator.getDefault().getSchemaHandler()
.getSchema( at.getSchemaName() ) );
@@ -516,7 +516,7 @@ public class SchemaViewContentProvider i
* @param at
* the added attribute type
*/
- public void attributeTypeAddedHierarchicalPresentation( AttributeType at )
+ public void attributeTypeAddedHierarchicalPresentation( MutableAttributeTypeImpl at )
{
hierarchyManager.attributeTypeAdded( at );
@@ -575,9 +575,9 @@ public class SchemaViewContentProvider i
for ( TreeNode createdWrapper : createdWrappers )
{
- AttributeTypeWrapper atw = new AttributeTypeWrapper( ( AttributeType ) child, createdWrapper );
+ AttributeTypeWrapper atw = new AttributeTypeWrapper( ( MutableAttributeTypeImpl ) child, createdWrapper );
atw.getParent().addChild( atw );
- elementsToWrappersMap.put( ( AttributeType ) child, atw );
+ elementsToWrappersMap.put( ( MutableAttributeTypeImpl ) child, atw );
}
}
}
@@ -590,7 +590,7 @@ public class SchemaViewContentProvider i
* @param at
* the modified attribute type
*/
- public void attributeTypeModified( AttributeType at )
+ public void attributeTypeModified( MutableAttributeTypeImpl at )
{
int presentation = store.getInt( PluginConstants.PREFS_SCHEMA_VIEW_SCHEMA_PRESENTATION );
if ( presentation == PluginConstants.PREFS_SCHEMA_VIEW_SCHEMA_PRESENTATION_FLAT )
@@ -611,7 +611,7 @@ public class SchemaViewContentProvider i
* @param at
* the modified attribute type
*/
- public void attributeTypeModifiedFlatPresentation( AttributeType at )
+ public void attributeTypeModifiedFlatPresentation( MutableAttributeTypeImpl at )
{
// Nothing to do
}
@@ -624,7 +624,7 @@ public class SchemaViewContentProvider i
* @param at
* the modified attribute type
*/
- public void attributeTypeModifiedHierarchicalPresentation( AttributeType at )
+ public void attributeTypeModifiedHierarchicalPresentation( MutableAttributeTypeImpl at )
{
// Propagating the modification to the hierarchy manager
hierarchyManager.attributeTypeModified( at );
@@ -691,7 +691,7 @@ public class SchemaViewContentProvider i
* @param at
* the removed attribute type
*/
- public void attributeTypeRemoved( AttributeType at )
+ public void attributeTypeRemoved( MutableAttributeTypeImpl at )
{
int presentation = store.getInt( PluginConstants.PREFS_SCHEMA_VIEW_SCHEMA_PRESENTATION );
if ( presentation == PluginConstants.PREFS_SCHEMA_VIEW_SCHEMA_PRESENTATION_FLAT )
@@ -712,7 +712,7 @@ public class SchemaViewContentProvider i
* @param at
* the removed attribute type
*/
- private void attributeTypeRemovedFlatPresentation( AttributeType at )
+ private void attributeTypeRemovedFlatPresentation( MutableAttributeTypeImpl at )
{
AttributeTypeWrapper atw = ( AttributeTypeWrapper ) getWrapper( at );
if ( atw != null )
@@ -730,7 +730,7 @@ public class SchemaViewContentProvider i
* @param at
* the removed attribute type
*/
- private void attributeTypeRemovedHierarchicalPresentation( AttributeType at )
+ private void attributeTypeRemovedHierarchicalPresentation( MutableAttributeTypeImpl at )
{
// Creating children nodes of the AT
// and attaching them to the root
@@ -750,7 +750,7 @@ public class SchemaViewContentProvider i
Folder folder = ( Folder ) rootChild;
if ( folder.getType().equals( FolderType.ATTRIBUTE_TYPE ) )
{
- atw = new AttributeTypeWrapper( ( AttributeType ) child, folder );
+ atw = new AttributeTypeWrapper( ( MutableAttributeTypeImpl ) child, folder );
break;
}
}
@@ -758,11 +758,11 @@ public class SchemaViewContentProvider i
}
else if ( group == PluginConstants.PREFS_SCHEMA_VIEW_GROUPING_MIXED )
{
- atw = new AttributeTypeWrapper( ( AttributeType ) child, root );
+ atw = new AttributeTypeWrapper( ( MutableAttributeTypeImpl ) child, root );
}
atw.getParent().addChild( atw );
- elementsToWrappersMap.put( ( AttributeType ) child, atw );
+ elementsToWrappersMap.put( ( MutableAttributeTypeImpl ) child, atw );
}
}
@@ -1250,7 +1250,7 @@ public class SchemaViewContentProvider i
*/
private void schemaAddedHierarchicalPresentation( Schema schema )
{
- for ( AttributeType at : schema.getAttributeTypes() )
+ for ( MutableAttributeTypeImpl at : schema.getAttributeTypes() )
{
attributeTypeAddedHierarchicalPresentation( at );
}
@@ -1310,7 +1310,7 @@ public class SchemaViewContentProvider i
*/
private void schemaRemovedHierarchicalPresentation( Schema schema )
{
- for ( AttributeType at : schema.getAttributeTypes() )
+ for ( MutableAttributeTypeImpl at : schema.getAttributeTypes() )
{
attributeTypeRemovedHierarchicalPresentation( at );
}
@@ -1339,7 +1339,7 @@ public class SchemaViewContentProvider i
Folder atFolder = new Folder( FolderType.ATTRIBUTE_TYPE, schemaWrapper );
schemaWrapper.addChild( atFolder );
- for ( AttributeType attributeType : schema.getAttributeTypes() )
+ for ( MutableAttributeTypeImpl attributeType : schema.getAttributeTypes() )
{
AttributeTypeWrapper atw = new AttributeTypeWrapper( attributeType, atFolder );
atw.getParent().addChild( atw );
@@ -1358,7 +1358,7 @@ public class SchemaViewContentProvider i
}
else if ( group == PluginConstants.PREFS_SCHEMA_VIEW_GROUPING_MIXED )
{
- for ( AttributeType attributeType : schema.getAttributeTypes() )
+ for ( MutableAttributeTypeImpl attributeType : schema.getAttributeTypes() )
{
AttributeTypeWrapper atw = new AttributeTypeWrapper( attributeType, schemaWrapper );
atw.getParent().addChild( atw );
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewLabelProvider.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewLabelProvider.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SchemaViewLabelProvider.java Sun Mar 20 21:22:39 2011
@@ -22,7 +22,7 @@ package org.apache.directory.studio.sche
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;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
@@ -84,7 +84,7 @@ public class SchemaViewLabelProvider ext
}
else if ( element instanceof AttributeTypeWrapper )
{
- AttributeType at = ( ( AttributeTypeWrapper ) element ).getAttributeType();
+ MutableAttributeTypeImpl at = ( ( AttributeTypeWrapper ) element ).getAttributeType();
// Label
if ( labelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_FIRST_NAME )
@@ -208,7 +208,7 @@ public class SchemaViewLabelProvider ext
String secondaryLabel = ""; //$NON-NLS-1$
if ( element instanceof AttributeTypeWrapper )
{
- AttributeType at = ( ( AttributeTypeWrapper ) element ).getAttributeType();
+ MutableAttributeTypeImpl at = ( ( AttributeTypeWrapper ) element ).getAttributeType();
if ( secondaryLabelValue == PluginConstants.PREFS_SCHEMA_VIEW_LABEL_FIRST_NAME )
{
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchView.java Sun Mar 20 21:22:39 2011
@@ -26,7 +26,7 @@ import java.util.Arrays;
import java.util.List;
import java.util.regex.Pattern;
-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.MutableSchemaObject;
import org.apache.directory.studio.schemaeditor.Activator;
@@ -552,9 +552,9 @@ public class SearchView extends ViewPart
String editorId = null;
// Here is the double clicked item
- if ( item instanceof AttributeType )
+ if ( item instanceof MutableAttributeTypeImpl )
{
- input = new AttributeTypeEditorInput( ( AttributeType ) item );
+ input = new AttributeTypeEditorInput( ( MutableAttributeTypeImpl ) item );
editorId = AttributeTypeEditor.ID;
}
else if ( item instanceof ObjectClass )
@@ -698,8 +698,8 @@ public class SearchView extends ViewPart
|| ( scope == PluginConstants.PREFS_SEARCH_PAGE_SCOPE_AT_ONLY ) )
{
// Looping on attribute types
- List<AttributeType> attributeTypes = schemaHandler.getAttributeTypes();
- for ( AttributeType at : attributeTypes )
+ List<MutableAttributeTypeImpl> attributeTypes = schemaHandler.getAttributeTypes();
+ for ( MutableAttributeTypeImpl at : attributeTypes )
{
// Aliases
if ( searchScope.contains( SearchInEnum.ALIASES ) )
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewContentProvider.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewContentProvider.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewContentProvider.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.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.MutableSchemaObject;
import org.apache.directory.shared.ldap.model.schema.SchemaObject;
@@ -69,10 +69,10 @@ public class SearchViewContentProvider i
List<String> o1Names = null;
List<String> o2Names = null;
- if ( ( o1 instanceof AttributeType ) && ( o2 instanceof AttributeType ) )
+ if ( ( o1 instanceof MutableAttributeTypeImpl ) && ( o2 instanceof MutableAttributeTypeImpl ) )
{
- AttributeType at1 = ( AttributeType ) o1;
- AttributeType at2 = ( AttributeType ) o2;
+ MutableAttributeTypeImpl at1 = ( MutableAttributeTypeImpl ) o1;
+ MutableAttributeTypeImpl at2 = ( MutableAttributeTypeImpl ) o2;
o1Names = at1.getNames();
o2Names = at2.getNames();
@@ -85,18 +85,18 @@ public class SearchViewContentProvider i
o1Names = oc1.getNames();
o2Names = oc2.getNames();
}
- else if ( ( o1 instanceof AttributeType ) && ( o2 instanceof ObjectClass ) )
+ else if ( ( o1 instanceof MutableAttributeTypeImpl ) && ( o2 instanceof ObjectClass ) )
{
- AttributeType at = ( AttributeType ) o1;
+ MutableAttributeTypeImpl at = ( MutableAttributeTypeImpl ) o1;
ObjectClass oc = ( ObjectClass ) o2;
o1Names = at.getNames();
o2Names = oc.getNames();
}
- else if ( ( o1 instanceof ObjectClass ) && ( o2 instanceof AttributeType ) )
+ else if ( ( o1 instanceof ObjectClass ) && ( o2 instanceof MutableAttributeTypeImpl ) )
{
ObjectClass oc = ( ObjectClass ) o1;
- AttributeType at = ( AttributeType ) o2;
+ MutableAttributeTypeImpl at = ( MutableAttributeTypeImpl ) o2;
o1Names = oc.getNames();
o2Names = at.getNames();
@@ -128,10 +128,10 @@ public class SearchViewContentProvider i
{
public int compare( MutableSchemaObject o1, MutableSchemaObject o2 )
{
- if ( ( o1 instanceof AttributeType ) && ( o2 instanceof AttributeType ) )
+ if ( ( o1 instanceof MutableAttributeTypeImpl ) && ( o2 instanceof MutableAttributeTypeImpl ) )
{
- AttributeType at1 = ( AttributeType ) o1;
- AttributeType at2 = ( AttributeType ) o2;
+ MutableAttributeTypeImpl at1 = ( MutableAttributeTypeImpl ) o1;
+ MutableAttributeTypeImpl at2 = ( MutableAttributeTypeImpl ) o2;
return at1.getOid().compareToIgnoreCase( at2.getOid() );
}
@@ -142,17 +142,17 @@ public class SearchViewContentProvider i
return oc1.getOid().compareToIgnoreCase( oc2.getOid() );
}
- else if ( ( o1 instanceof AttributeType ) && ( o2 instanceof ObjectClass ) )
+ else if ( ( o1 instanceof MutableAttributeTypeImpl ) && ( o2 instanceof ObjectClass ) )
{
- AttributeType at = ( AttributeType ) o1;
+ MutableAttributeTypeImpl at = ( MutableAttributeTypeImpl ) o1;
ObjectClass oc = ( ObjectClass ) o2;
return at.getOid().compareToIgnoreCase( oc.getOid() );
}
- else if ( ( o1 instanceof ObjectClass ) && ( o2 instanceof AttributeType ) )
+ else if ( ( o1 instanceof ObjectClass ) && ( o2 instanceof MutableAttributeTypeImpl ) )
{
ObjectClass oc = ( ObjectClass ) o1;
- AttributeType at = ( AttributeType ) o2;
+ MutableAttributeTypeImpl at = ( MutableAttributeTypeImpl ) o2;
return oc.getOid().compareToIgnoreCase( at.getOid() );
}
@@ -209,14 +209,14 @@ public class SearchViewContentProvider i
if ( group == PluginConstants.PREFS_SEARCH_VIEW_GROUPING_ATTRIBUTE_TYPES_FIRST )
{
- List<AttributeType> attributeTypes = new ArrayList<AttributeType>();
+ List<MutableAttributeTypeImpl> attributeTypes = new ArrayList<MutableAttributeTypeImpl>();
List<ObjectClass> objectClasses = new ArrayList<ObjectClass>();
for ( SchemaObject searchResult : searchResults )
{
- if ( searchResult instanceof AttributeType )
+ if ( searchResult instanceof MutableAttributeTypeImpl )
{
- attributeTypes.add( ( AttributeType ) searchResult );
+ attributeTypes.add( ( MutableAttributeTypeImpl ) searchResult );
}
else if ( searchResult instanceof ObjectClass )
{
@@ -248,14 +248,14 @@ public class SearchViewContentProvider i
}
else if ( group == PluginConstants.PREFS_SEARCH_VIEW_GROUPING_OBJECT_CLASSES_FIRST )
{
- List<AttributeType> attributeTypes = new ArrayList<AttributeType>();
+ List<MutableAttributeTypeImpl> attributeTypes = new ArrayList<MutableAttributeTypeImpl>();
List<ObjectClass> objectClasses = new ArrayList<ObjectClass>();
for ( SchemaObject searchResult : searchResults )
{
- if ( searchResult instanceof AttributeType )
+ if ( searchResult instanceof MutableAttributeTypeImpl )
{
- attributeTypes.add( ( AttributeType ) searchResult );
+ attributeTypes.add( ( MutableAttributeTypeImpl ) searchResult );
}
else if ( searchResult instanceof ObjectClass )
{
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewLabelProvider.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewLabelProvider.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/SearchViewLabelProvider.java Sun Mar 20 21:22:39 2011
@@ -22,7 +22,7 @@ package org.apache.directory.studio.sche
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;
import org.apache.directory.shared.ldap.model.schema.SchemaObject;
import org.apache.directory.studio.schemaeditor.Activator;
@@ -71,9 +71,9 @@ public class SearchViewLabelProvider ext
.getInt( PluginConstants.PREFS_SEARCH_VIEW_SECONDARY_LABEL_ABBREVIATE_MAX_LENGTH );
boolean schemaLabelDisplay = store.getBoolean( PluginConstants.PREFS_SEARCH_VIEW_SCHEMA_LABEL_DISPLAY );
- if ( element instanceof AttributeType )
+ if ( element instanceof MutableAttributeTypeImpl )
{
- AttributeType at = ( AttributeType ) element;
+ MutableAttributeTypeImpl at = ( MutableAttributeTypeImpl ) element;
// Label
if ( labelValue == PluginConstants.PREFS_SEARCH_VIEW_LABEL_FIRST_NAME )
@@ -182,9 +182,9 @@ public class SearchViewLabelProvider ext
if ( secondaryLabelDisplay )
{
String secondaryLabel = ""; //$NON-NLS-1$
- if ( element instanceof AttributeType )
+ if ( element instanceof MutableAttributeTypeImpl )
{
- AttributeType at = ( AttributeType ) element;
+ MutableAttributeTypeImpl at = ( MutableAttributeTypeImpl ) element;
if ( secondaryLabelValue == PluginConstants.PREFS_SEARCH_VIEW_LABEL_FIRST_NAME )
{
@@ -277,7 +277,7 @@ public class SearchViewLabelProvider ext
*/
public Image getImage( Object element )
{
- if ( element instanceof AttributeType )
+ if ( element instanceof MutableAttributeTypeImpl )
{
return Activator.getDefault().getImage( PluginConstants.IMG_ATTRIBUTE_TYPE );
}
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetSchemaLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetSchemaLabelProvider.java?rev=1083574&r1=1083573&r2=1083574&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetSchemaLabelProvider.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/widget/DifferencesWidgetSchemaLabelProvider.java Sun Mar 20 21:22:39 2011
@@ -22,7 +22,7 @@ package org.apache.directory.studio.sche
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;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
@@ -93,21 +93,21 @@ public class DifferencesWidgetSchemaLabe
{
AttributeTypeDifference atd = ( AttributeTypeDifference ) element;
- AttributeType at = null;
+ MutableAttributeTypeImpl at = null;
switch ( atd.getType() )
{
case ADDED:
- at = ( ( AttributeType ) atd.getDestination() );
+ at = ( ( MutableAttributeTypeImpl ) atd.getDestination() );
break;
case MODIFIED:
- at = ( ( AttributeType ) atd.getDestination() );
+ at = ( ( MutableAttributeTypeImpl ) atd.getDestination() );
break;
case REMOVED:
- at = ( ( AttributeType ) atd.getSource() );
+ at = ( ( MutableAttributeTypeImpl ) atd.getSource() );
break;
case IDENTICAL:
- at = ( ( AttributeType ) atd.getDestination() );
+ at = ( ( MutableAttributeTypeImpl ) atd.getDestination() );
break;
}
@@ -246,21 +246,21 @@ public class DifferencesWidgetSchemaLabe
{
AttributeTypeDifference atd = ( AttributeTypeDifference ) element;
- AttributeType at = null;
+ MutableAttributeTypeImpl at = null;
switch ( atd.getType() )
{
case ADDED:
- at = ( ( AttributeType ) atd.getDestination() );
+ at = ( ( MutableAttributeTypeImpl ) atd.getDestination() );
break;
case MODIFIED:
- at = ( ( AttributeType ) atd.getDestination() );
+ at = ( ( MutableAttributeTypeImpl ) atd.getDestination() );
break;
case REMOVED:
- at = ( ( AttributeType ) atd.getSource() );
+ at = ( ( MutableAttributeTypeImpl ) atd.getSource() );
break;
case IDENTICAL:
- at = ( ( AttributeType ) atd.getDestination() );
+ at = ( ( MutableAttributeTypeImpl ) atd.getDestination() );
break;
}
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.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/ExportSchemasForADSWizard.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/ExportSchemasForADSWizard.java Sun Mar 20 21:22:39 2011
@@ -37,7 +37,7 @@ import javax.naming.NamingException;
import org.apache.directory.shared.converter.schema.AttributeTypeHolder;
import org.apache.directory.shared.converter.schema.ObjectClassHolder;
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.MutableAttributeTypeImpl;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginUtils;
@@ -258,7 +258,7 @@ public class ExportSchemasForADSWizard e
sb.append( "\n" ); //$NON-NLS-1$
// Generating LDIF for Attributes Types
- for ( AttributeType at : schema.getAttributeTypes() )
+ for ( MutableAttributeTypeImpl at : schema.getAttributeTypes() )
{
AttributeTypeHolder holder = new AttributeTypeHolder( at.getOid() );
holder.setCollective( at.isCollective() );
@@ -466,13 +466,13 @@ public class ExportSchemasForADSWizard e
SchemaHandler schemaHandler = Activator.getDefault().getSchemaHandler();
// Looping on Attribute Types
- for ( AttributeType at : schema.getAttributeTypes() )
+ for ( MutableAttributeTypeImpl at : schema.getAttributeTypes() )
{
// Superior
String supName = at.getSuperiorOid();
if ( supName != null )
{
- AttributeType sup = schemaHandler.getAttributeType( supName );
+ MutableAttributeTypeImpl sup = schemaHandler.getAttributeType( supName );
if ( sup != null )
{
if ( !schema.getSchemaName().toLowerCase().equals( sup.getSchemaName().toLowerCase() ) )
@@ -509,7 +509,7 @@ public class ExportSchemasForADSWizard e
{
for ( String mayName : mayNames )
{
- AttributeType may = schemaHandler.getAttributeType( mayName );
+ MutableAttributeTypeImpl may = schemaHandler.getAttributeType( mayName );
if ( may != null )
{
if ( !schema.getSchemaName().toLowerCase().equals( may.getSchemaName().toLowerCase() ) )
@@ -527,7 +527,7 @@ public class ExportSchemasForADSWizard e
{
for ( String mustName : oc.getMustAttributeTypeOids() )
{
- AttributeType must = schemaHandler.getAttributeType( mustName );
+ MutableAttributeTypeImpl must = schemaHandler.getAttributeType( mustName );
if ( must != null )
{
if ( !schema.getSchemaName().toLowerCase().equals( must.getSchemaName().toLowerCase() ) )
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasSelectionWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasSelectionWizardPage.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/MergeSchemasSelectionWizardPage.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/MergeSchemasSelectionWizardPage.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.ObjectClass;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
@@ -144,7 +144,7 @@ public class MergeSchemasSelectionWizard
if ( parentElement instanceof AttributeTypeFolder )
{
AttributeTypeFolder folder = ( AttributeTypeFolder ) parentElement;
- List<AttributeType> attributeTypes = folder.schema.getAttributeTypes();
+ List<MutableAttributeTypeImpl> attributeTypes = folder.schema.getAttributeTypes();
return attributeTypes.toArray();
}
if ( parentElement instanceof ObjectClassFolder )
@@ -177,9 +177,9 @@ public class MergeSchemasSelectionWizard
{
return Messages.getString( "MergeSchemasSelectionWizardPage.AttributeTypes" ); //$NON-NLS-1$
}
- else if ( element instanceof AttributeType )
+ else if ( element instanceof MutableAttributeTypeImpl )
{
- AttributeType at = ( ( AttributeType ) element );
+ MutableAttributeTypeImpl at = ( ( MutableAttributeTypeImpl ) element );
List<String> names = at.getNames();
if ( ( names != null ) && ( names.size() > 0 ) )
{
@@ -234,7 +234,7 @@ public class MergeSchemasSelectionWizard
{
return Activator.getDefault().getImage( PluginConstants.IMG_FOLDER_AT );
}
- else if ( element instanceof AttributeType )
+ else if ( element instanceof MutableAttributeTypeImpl )
{
return Activator.getDefault().getImage( PluginConstants.IMG_ATTRIBUTE_TYPE );
}