You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pa...@apache.org on 2010/10/08 18:58:56 UTC
svn commit: r1005899 [2/2] - in
/directory/studio/trunk/plugins/ldapbrowser.ui: ./
src/main/java/org/apache/directory/studio/entryeditors/
src/main/java/org/apache/directory/studio/ldapbrowser/ui/
src/main/java/org/apache/directory/studio/ldapbrowser/u...
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleUseDescriptionPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleUseDescriptionPage.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleUseDescriptionPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/MatchingRuleUseDescriptionPage.java Fri Oct 8 16:58:54 2010
@@ -21,7 +21,7 @@
package org.apache.directory.studio.ldapbrowser.ui.editors.schemabrowser;
-import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleUseDescription;
+import org.apache.directory.shared.ldap.schema.MatchingRuleUse;
import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema;
import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils;
import org.eclipse.jface.viewers.IStructuredContentProvider;
@@ -168,9 +168,9 @@ public class MatchingRuleUseDescriptionP
*/
public String getColumnText( Object obj, int index )
{
- if ( obj instanceof MatchingRuleUseDescription )
+ if ( obj instanceof MatchingRuleUse )
{
- return SchemaUtils.toString( ( MatchingRuleUseDescription ) obj );
+ return SchemaUtils.toString( ( MatchingRuleUse ) obj );
}
return obj.toString();
}
@@ -197,13 +197,13 @@ public class MatchingRuleUseDescriptionP
*/
public int compare( Viewer viewer, Object e1, Object e2 )
{
- if ( e1 instanceof MatchingRuleUseDescription )
+ if ( e1 instanceof MatchingRuleUse )
{
- e1 = SchemaUtils.toString( ( MatchingRuleUseDescription ) e1 );
+ e1 = SchemaUtils.toString( ( MatchingRuleUse ) e1 );
}
- if ( e2 instanceof MatchingRuleUseDescription )
+ if ( e2 instanceof MatchingRuleUse )
{
- e2 = SchemaUtils.toString( ( MatchingRuleUseDescription ) e2 );
+ e2 = SchemaUtils.toString( ( MatchingRuleUse ) e2 );
}
return e1.toString().compareTo( e2.toString() );
}
@@ -221,12 +221,12 @@ public class MatchingRuleUseDescriptionP
*/
public boolean select( Viewer viewer, Object parentElement, Object element )
{
- if ( element instanceof MatchingRuleUseDescription )
+ if ( element instanceof MatchingRuleUse )
{
- MatchingRuleUseDescription mrud = ( MatchingRuleUseDescription ) element;
+ MatchingRuleUse mrud = ( MatchingRuleUse ) element;
boolean matched = SchemaUtils.toString( mrud ).toLowerCase().indexOf(
filterText.getText().toLowerCase() ) != -1
- || mrud.getNumericOid().toLowerCase().indexOf( filterText.getText().toLowerCase() ) != -1;
+ || mrud.getOid().toLowerCase().indexOf( filterText.getText().toLowerCase() ) != -1;
return matched;
}
return false;
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/ObjectClassDescriptionDetailsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/ObjectClassDescriptionDetailsPage.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/ObjectClassDescriptionDetailsPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/ObjectClassDescriptionDetailsPage.java Fri Oct 8 16:58:54 2010
@@ -24,8 +24,8 @@ package org.apache.directory.studio.ldap
import java.util.Collection;
import java.util.List;
-import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescription;
-import org.apache.directory.shared.ldap.schema.parsers.ObjectClassDescription;
+import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.schema.ObjectClass;
import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
@@ -176,10 +176,10 @@ public class ObjectClassDescriptionDetai
*/
public void setInput( Object input )
{
- ObjectClassDescription ocd = null;
- if ( input instanceof ObjectClassDescription )
+ ObjectClass ocd = null;
+ if ( input instanceof ObjectClass )
{
- ocd = ( ObjectClassDescription ) input;
+ ocd = ( ObjectClass ) input;
}
// create main content
@@ -203,7 +203,7 @@ public class ObjectClassDescriptionDetai
*
* @param ocd the object class description
*/
- private void createMainContent( ObjectClassDescription ocd )
+ private void createMainContent( ObjectClass ocd )
{
// dispose old content
if ( mainSection.getClient() != null )
@@ -222,7 +222,7 @@ public class ObjectClassDescriptionDetai
{
toolkit.createLabel( mainClient,
Messages.getString( "ObjectClassDescriptionDetailsPage.NumericOID" ), SWT.NONE ); //$NON-NLS-1$
- numericOidText = toolkit.createText( mainClient, getNonNullString( ocd.getNumericOid() ), SWT.NONE );
+ numericOidText = toolkit.createText( mainClient, getNonNullString( ocd.getOid() ), SWT.NONE );
numericOidText.setLayoutData( new GridData( GridData.FILL_HORIZONTAL ) );
numericOidText.setEditable( false );
@@ -241,7 +241,7 @@ public class ObjectClassDescriptionDetai
descText.setEditable( false );
String kind = ""; //$NON-NLS-1$
- switch ( ocd.getKind() )
+ switch ( ocd.getType() )
{
case STRUCTURAL:
kind = Messages.getString( "ObjectClassDescriptionDetailsPage.Structural" ); //$NON-NLS-1$
@@ -275,7 +275,7 @@ public class ObjectClassDescriptionDetai
*
* @param ocd the object class description
*/
- private void createMustContents( ObjectClassDescription ocd )
+ private void createMustContents( ObjectClass ocd )
{
// dispose old content
if ( mustSection.getClient() != null )
@@ -302,7 +302,7 @@ public class ObjectClassDescriptionDetai
{
if ( getSchema().hasAttributeTypeDescription( name ) )
{
- AttributeTypeDescription mustAtd = getSchema().getAttributeTypeDescription( name );
+ AttributeType mustAtd = getSchema().getAttributeTypeDescription( name );
Hyperlink mustLink = toolkit.createHyperlink( mustClient, SchemaUtils.toString( mustAtd ),
SWT.WRAP );
mustLink.setHref( mustAtd );
@@ -345,7 +345,7 @@ public class ObjectClassDescriptionDetai
*
* @param ocd the object class description
*/
- private void createMayContents( ObjectClassDescription ocd )
+ private void createMayContents( ObjectClass ocd )
{
// dispose old content
if ( maySection.getClient() != null )
@@ -372,7 +372,7 @@ public class ObjectClassDescriptionDetai
{
if ( getSchema().hasAttributeTypeDescription( name ) )
{
- AttributeTypeDescription mayAtd = getSchema().getAttributeTypeDescription( name );
+ AttributeType mayAtd = getSchema().getAttributeTypeDescription( name );
Hyperlink mayLink = toolkit.createHyperlink( mayClient, SchemaUtils.toString( mayAtd ),
SWT.WRAP );
mayLink.setHref( mayAtd );
@@ -414,7 +414,7 @@ public class ObjectClassDescriptionDetai
*
* @param ocd the object class description
*/
- private void createSubclassContents( ObjectClassDescription ocd )
+ private void createSubclassContents( ObjectClass ocd )
{
// dispose old content
if ( subclassesSection.getClient() != null )
@@ -430,14 +430,14 @@ public class ObjectClassDescriptionDetai
// create new content
if ( ocd != null )
{
- List<ObjectClassDescription> subOcds = SchemaUtils.getSubObjectClassDescriptions( ocd, getSchema() );
+ List<ObjectClass> subOcds = SchemaUtils.getSubObjectClassDescriptions( ocd, getSchema() );
if ( subOcds != null && subOcds.size() > 0 )
{
subclassesSection
.setText( NLS
.bind(
Messages.getString( "ObjectClassDescriptionDetailsPage.SubclassesCount" ), new Object[] { subOcds.size() } ) ); //$NON-NLS-1$
- for ( ObjectClassDescription subOcd : subOcds )
+ for ( ObjectClass subOcd : subOcds )
{
Hyperlink subLink = toolkit.createHyperlink( subClient, SchemaUtils.toString( subOcd ), SWT.WRAP );
subLink.setHref( subOcd );
@@ -472,7 +472,7 @@ public class ObjectClassDescriptionDetai
*
* @param ocd the object class description
*/
- private void createSuperclassContents( ObjectClassDescription ocd )
+ private void createSuperclassContents( ObjectClass ocd )
{
// dispose old content
if ( superclassesSection.getClient() != null )
@@ -488,7 +488,7 @@ public class ObjectClassDescriptionDetai
// create new content
if ( ocd != null )
{
- List<String> names = ocd.getSuperiorObjectClasses();
+ List<String> names = ocd.getSuperiorOids();
if ( names != null && names.size() > 0 )
{
superclassesSection
@@ -504,7 +504,7 @@ public class ObjectClassDescriptionDetai
{
if ( getSchema().hasObjectClassDescription( name ) )
{
- ObjectClassDescription supOcd = getSchema().getObjectClassDescription( name );
+ ObjectClass supOcd = getSchema().getObjectClassDescription( name );
Hyperlink superLink = toolkit.createHyperlink( supClient, SchemaUtils.toString( supOcd ),
SWT.WRAP );
superLink.setHref( supOcd );
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/ObjectClassDescriptionPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/ObjectClassDescriptionPage.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/ObjectClassDescriptionPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/ObjectClassDescriptionPage.java Fri Oct 8 16:58:54 2010
@@ -21,7 +21,7 @@
package org.apache.directory.studio.ldapbrowser.ui.editors.schemabrowser;
-import org.apache.directory.shared.ldap.schema.parsers.ObjectClassDescription;
+import org.apache.directory.shared.ldap.schema.ObjectClass;
import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema;
import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils;
import org.eclipse.jface.viewers.IStructuredContentProvider;
@@ -167,9 +167,9 @@ public class ObjectClassDescriptionPage
*/
public String getColumnText( Object obj, int index )
{
- if ( obj instanceof ObjectClassDescription )
+ if ( obj instanceof ObjectClass )
{
- return SchemaUtils.toString( ( ObjectClassDescription ) obj );
+ return SchemaUtils.toString( ( ObjectClass ) obj );
}
return obj.toString();
}
@@ -196,13 +196,13 @@ public class ObjectClassDescriptionPage
*/
public int compare( Viewer viewer, Object e1, Object e2 )
{
- if ( e1 instanceof ObjectClassDescription )
+ if ( e1 instanceof ObjectClass )
{
- e1 = SchemaUtils.toString( ( ObjectClassDescription ) e1 );
+ e1 = SchemaUtils.toString( ( ObjectClass ) e1 );
}
- if ( e2 instanceof ObjectClassDescription )
+ if ( e2 instanceof ObjectClass )
{
- e2 = SchemaUtils.toString( ( ObjectClassDescription ) e2 );
+ e2 = SchemaUtils.toString( ( ObjectClass ) e2 );
}
return e1.toString().compareTo( e2.toString() );
}
@@ -220,12 +220,12 @@ public class ObjectClassDescriptionPage
*/
public boolean select( Viewer viewer, Object parentElement, Object element )
{
- if ( element instanceof ObjectClassDescription )
+ if ( element instanceof ObjectClass )
{
- ObjectClassDescription ocd = ( ObjectClassDescription ) element;
+ ObjectClass ocd = ( ObjectClass ) element;
boolean matched = SchemaUtils.toString( ocd ).toLowerCase()
.indexOf( filterText.getText().toLowerCase() ) != -1
- || ocd.getNumericOid().toLowerCase().indexOf( filterText.getText().toLowerCase() ) != -1;
+ || ocd.getOid().toLowerCase().indexOf( filterText.getText().toLowerCase() ) != -1;
return matched;
}
return false;
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowser.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowser.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowser.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowser.java Fri Oct 8 16:58:54 2010
@@ -21,12 +21,12 @@
package org.apache.directory.studio.ldapbrowser.ui.editors.schemabrowser;
-import org.apache.directory.shared.ldap.schema.parsers.AbstractSchemaDescription;
-import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescription;
-import org.apache.directory.shared.ldap.schema.parsers.LdapSyntaxDescription;
-import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleDescription;
-import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleUseDescription;
-import org.apache.directory.shared.ldap.schema.parsers.ObjectClassDescription;
+import org.apache.directory.shared.ldap.schema.AbstractSchemaObject;
+import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.schema.LdapSyntax;
+import org.apache.directory.shared.ldap.schema.MatchingRule;
+import org.apache.directory.shared.ldap.schema.MatchingRuleUse;
+import org.apache.directory.shared.ldap.schema.ObjectClass;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants;
import org.apache.directory.studio.ldapbrowser.ui.BrowserUIPlugin;
@@ -203,28 +203,28 @@ public class SchemaBrowser extends Edito
setConnection( connection );
// set schema element and activate tab
- AbstractSchemaDescription schemaElement = sbi.getSchemaElement();
- if ( schemaElement instanceof ObjectClassDescription )
+ AbstractSchemaObject schemaElement = sbi.getSchemaElement();
+ if ( schemaElement instanceof ObjectClass )
{
ocdPage.select( schemaElement );
tabFolder.setSelection( ocdTab );
}
- else if ( schemaElement instanceof AttributeTypeDescription )
+ else if ( schemaElement instanceof AttributeType )
{
atdPage.select( schemaElement );
tabFolder.setSelection( atdTab );
}
- else if ( schemaElement instanceof MatchingRuleDescription )
+ else if ( schemaElement instanceof MatchingRule )
{
mrdPage.select( schemaElement );
tabFolder.setSelection( mrdTab );
}
- else if ( schemaElement instanceof MatchingRuleUseDescription )
+ else if ( schemaElement instanceof MatchingRuleUse )
{
mrudPage.select( schemaElement );
tabFolder.setSelection( mrudTab );
}
- else if ( schemaElement instanceof LdapSyntaxDescription )
+ else if ( schemaElement instanceof LdapSyntax )
{
lsdPage.select( schemaElement );
tabFolder.setSelection( lsdTab );
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserInput.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserInput.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserInput.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserInput.java Fri Oct 8 16:58:54 2010
@@ -21,7 +21,7 @@
package org.apache.directory.studio.ldapbrowser.ui.editors.schemabrowser;
-import org.apache.directory.shared.ldap.schema.parsers.AbstractSchemaDescription;
+import org.apache.directory.shared.ldap.schema.AbstractSchemaObject;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants;
import org.apache.directory.studio.ldapbrowser.ui.BrowserUIPlugin;
@@ -54,7 +54,7 @@ public class SchemaBrowserInput implemen
private IBrowserConnection connection;
/** The schema element */
- private AbstractSchemaDescription schemaElement;
+ private AbstractSchemaObject schemaElement;
/** One instance hack flag */
private static boolean oneInstanceHackEnabled = true;
@@ -66,7 +66,7 @@ public class SchemaBrowserInput implemen
* @param connection the connection
* @param schemaElement the schema element input
*/
- public SchemaBrowserInput( IBrowserConnection connection, AbstractSchemaDescription schemaElement )
+ public SchemaBrowserInput( IBrowserConnection connection, AbstractSchemaObject schemaElement )
{
this.connection = connection;
this.schemaElement = schemaElement;
@@ -162,7 +162,7 @@ public class SchemaBrowserInput implemen
*
* @return the schema element or null
*/
- public AbstractSchemaDescription getSchemaElement()
+ public AbstractSchemaObject getSchemaElement()
{
return schemaElement;
}
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserManager.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserManager.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserManager.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserManager.java Fri Oct 8 16:58:54 2010
@@ -21,7 +21,7 @@
package org.apache.directory.studio.ldapbrowser.ui.editors.schemabrowser;
-import org.apache.directory.shared.ldap.schema.parsers.AbstractSchemaDescription;
+import org.apache.directory.shared.ldap.schema.AbstractSchemaObject;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.PlatformUI;
@@ -46,7 +46,7 @@ public class SchemaBrowserManager
* @param connection the connection
* @param schemaElement the schema element
*/
- public static void setInput( IBrowserConnection connection, AbstractSchemaDescription schemaElement )
+ public static void setInput( IBrowserConnection connection, AbstractSchemaObject schemaElement )
{
SchemaBrowserInput input = new SchemaBrowserInput( connection, schemaElement );
setInput( input );
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserNavigationLocation.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserNavigationLocation.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserNavigationLocation.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaBrowserNavigationLocation.java Fri Oct 8 16:58:54 2010
@@ -21,12 +21,12 @@
package org.apache.directory.studio.ldapbrowser.ui.editors.schemabrowser;
-import org.apache.directory.shared.ldap.schema.parsers.AbstractSchemaDescription;
-import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescription;
-import org.apache.directory.shared.ldap.schema.parsers.LdapSyntaxDescription;
-import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleDescription;
-import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleUseDescription;
-import org.apache.directory.shared.ldap.schema.parsers.ObjectClassDescription;
+import org.apache.directory.shared.ldap.schema.AbstractSchemaObject;
+import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.schema.LdapSyntax;
+import org.apache.directory.shared.ldap.schema.MatchingRule;
+import org.apache.directory.shared.ldap.schema.MatchingRuleUse;
+import org.apache.directory.shared.ldap.schema.ObjectClass;
import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils;
@@ -60,27 +60,27 @@ public class SchemaBrowserNavigationLoca
*/
public String getText()
{
- AbstractSchemaDescription schemaElement = getSchemElement();
+ AbstractSchemaObject schemaElement = getSchemaElement();
if ( schemaElement != null )
{
- if ( schemaElement instanceof ObjectClassDescription )
+ if ( schemaElement instanceof ObjectClass )
{
return Messages.getString( "SchemaBrowserNavigationLocation.ObjectClass" ) + SchemaUtils.toString( schemaElement ); //$NON-NLS-1$
}
- else if ( schemaElement instanceof AttributeTypeDescription )
+ else if ( schemaElement instanceof AttributeType )
{
return Messages.getString( "SchemaBrowserNavigationLocation.AttributeType" ) + SchemaUtils.toString( schemaElement ); //$NON-NLS-1$
}
- else if ( schemaElement instanceof LdapSyntaxDescription )
+ else if ( schemaElement instanceof LdapSyntax )
{
return Messages.getString( "SchemaBrowserNavigationLocation.Syntax" ) + SchemaUtils.toString( schemaElement ); //$NON-NLS-1$
}
- else if ( schemaElement instanceof MatchingRuleDescription )
+ else if ( schemaElement instanceof MatchingRule )
{
return Messages.getString( "SchemaBrowserNavigationLocation.MatchingRule" ) + SchemaUtils.toString( schemaElement ); //$NON-NLS-1$
}
- else if ( schemaElement instanceof MatchingRuleUseDescription )
+ else if ( schemaElement instanceof MatchingRuleUse )
{
return Messages.getString( "SchemaBrowserNavigationLocation.MatchingRuleUse" ) + SchemaUtils.toString( schemaElement ); //$NON-NLS-1$
}
@@ -102,10 +102,10 @@ public class SchemaBrowserNavigationLoca
public void saveState( IMemento memento )
{
IBrowserConnection connection = getConnection();
- AbstractSchemaDescription schemaElement = getSchemElement();
+ AbstractSchemaObject schemaElement = getSchemaElement();
memento.putString( "CONNECTION", connection.getConnection().getId() ); //$NON-NLS-1$
memento.putString( "SCHEMAELEMENTYPE", schemaElement.getClass().getName() ); //$NON-NLS-1$
- memento.putString( "SCHEMAELEMENTOID", schemaElement.getNumericOid() ); //$NON-NLS-1$
+ memento.putString( "SCHEMAELEMENTOID", schemaElement.getOid() ); //$NON-NLS-1$
}
@@ -118,24 +118,24 @@ public class SchemaBrowserNavigationLoca
memento.getString( "CONNECTION" ) ); //$NON-NLS-1$
String schemaElementType = memento.getString( "SCHEMAELEMENTYPE" ); //$NON-NLS-1$
String schemaElementOid = memento.getString( "SCHEMAELEMENTOID" ); //$NON-NLS-1$
- AbstractSchemaDescription schemaElement = null;
- if ( ObjectClassDescription.class.getName().equals( schemaElementType ) )
+ AbstractSchemaObject schemaElement = null;
+ if ( ObjectClass.class.getName().equals( schemaElementType ) )
{
schemaElement = connection.getSchema().getObjectClassDescription( schemaElementOid );
}
- else if ( AttributeTypeDescription.class.getName().equals( schemaElementType ) )
+ else if ( AttributeType.class.getName().equals( schemaElementType ) )
{
schemaElement = connection.getSchema().getAttributeTypeDescription( schemaElementOid );
}
- else if ( LdapSyntaxDescription.class.getName().equals( schemaElementType ) )
+ else if ( LdapSyntax.class.getName().equals( schemaElementType ) )
{
schemaElement = connection.getSchema().getLdapSyntaxDescription( schemaElementOid );
}
- else if ( MatchingRuleDescription.class.getName().equals( schemaElementType ) )
+ else if ( MatchingRule.class.getName().equals( schemaElementType ) )
{
schemaElement = connection.getSchema().getMatchingRuleDescription( schemaElementOid );
}
- else if ( MatchingRuleUseDescription.class.getName().equals( schemaElementType ) )
+ else if ( MatchingRuleUse.class.getName().equals( schemaElementType ) )
{
schemaElement = connection.getSchema().getMatchingRuleUseDescription( schemaElementOid );
}
@@ -182,8 +182,8 @@ public class SchemaBrowserNavigationLoca
}
SchemaBrowserNavigationLocation location = ( SchemaBrowserNavigationLocation ) currentLocation;
- AbstractSchemaDescription other = location.getSchemElement();
- AbstractSchemaDescription element = getSchemElement();
+ AbstractSchemaObject other = location.getSchemaElement();
+ AbstractSchemaObject element = getSchemaElement();
if ( other == null && element == null )
{
@@ -213,14 +213,14 @@ public class SchemaBrowserNavigationLoca
*
* @return the schema element
*/
- private AbstractSchemaDescription getSchemElement()
+ private AbstractSchemaObject getSchemaElement()
{
Object editorInput = getInput();
if ( editorInput != null && editorInput instanceof SchemaBrowserInput )
{
SchemaBrowserInput schemaBrowserInput = ( SchemaBrowserInput ) editorInput;
- AbstractSchemaDescription schemaElement = schemaBrowserInput.getSchemaElement();
+ AbstractSchemaObject schemaElement = schemaBrowserInput.getSchemaElement();
if ( schemaElement != null )
{
return schemaElement;
@@ -255,7 +255,7 @@ public class SchemaBrowserNavigationLoca
*/
public String toString()
{
- return "" + getSchemElement(); //$NON-NLS-1$
+ return "" + getSchemaElement(); //$NON-NLS-1$
}
}
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaDetailsPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaDetailsPage.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaDetailsPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaDetailsPage.java Fri Oct 8 16:58:54 2010
@@ -23,7 +23,7 @@ package org.apache.directory.studio.ldap
import java.util.List;
-import org.apache.directory.shared.ldap.schema.parsers.AbstractSchemaDescription;
+import org.apache.directory.shared.ldap.schema.AbstractSchemaObject;
import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema;
import org.apache.directory.studio.ldapbrowser.core.model.schema.SchemaUtils;
import org.eclipse.swt.SWT;
@@ -91,10 +91,10 @@ public abstract class SchemaDetailsPage
public void linkActivated( HyperlinkEvent e )
{
Object obj = e.getHref();
- if ( obj instanceof AbstractSchemaDescription )
+ if ( obj instanceof AbstractSchemaObject )
{
schemaPage.getSchemaBrowser().setInput(
- new SchemaBrowserInput( schemaPage.getConnection(), ( AbstractSchemaDescription ) obj ) );
+ new SchemaBrowserInput( schemaPage.getConnection(), ( AbstractSchemaObject ) obj ) );
}
}
@@ -157,7 +157,7 @@ public abstract class SchemaDetailsPage
*
* @param schemaPart the schema part to display
*/
- protected void createRawContents( AbstractSchemaDescription asd )
+ protected void createRawContents( AbstractSchemaObject asd )
{
if ( rawSection.getClient() != null && !rawSection.getClient().isDisposed() )
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaPage.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/SchemaPage.java Fri Oct 8 16:58:54 2010
@@ -21,7 +21,7 @@
package org.apache.directory.studio.ldapbrowser.ui.editors.schemabrowser;
-import org.apache.directory.shared.ldap.schema.parsers.AbstractSchemaDescription;
+import org.apache.directory.shared.ldap.schema.AbstractSchemaObject;
import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection;
import org.apache.directory.studio.ldapbrowser.core.model.schema.Schema;
import org.eclipse.jface.action.Separator;
@@ -349,10 +349,10 @@ public abstract class SchemaPage
// Do not set the input of the schema browser if
// the selection was changed programatically.
- if ( !inChange && obj instanceof AbstractSchemaDescription )
+ if ( !inChange && obj instanceof AbstractSchemaObject )
{
schemaBrowser.setInput( new SchemaBrowserInput( getConnection(),
- ( AbstractSchemaDescription ) obj ) );
+ ( AbstractSchemaObject ) obj ) );
}
}
}
Propchange: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/messages.properties
('svn:mergeinfo' removed)
Propchange: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/schemabrowser/messages_de.properties
('svn:mergeinfo' removed)
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenBestEditorAction.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenBestEditorAction.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenBestEditorAction.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenBestEditorAction.java Fri Oct 8 16:58:54 2010
@@ -23,7 +23,7 @@ package org.apache.directory.studio.ldap
import java.util.Collection;
-import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescription;
+import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.studio.ldapbrowser.core.BrowserCoreConstants;
import org.apache.directory.studio.ldapbrowser.core.model.AttributeHierarchy;
import org.apache.directory.studio.ldapbrowser.core.model.IEntry;
@@ -159,8 +159,8 @@ public class OpenBestEditorAction extend
{
// validate if value is allowed
IEntry entry = attributeHierarchy.getAttribute().getEntry();
- Collection<AttributeTypeDescription> allAtds = SchemaUtils.getAllAttributeTypeDescriptions( entry );
- AttributeTypeDescription atd = attributeHierarchy.getAttribute().getAttributeTypeDescription();
+ Collection<AttributeType> allAtds = SchemaUtils.getAllAttributeTypeDescriptions( entry );
+ AttributeType atd = attributeHierarchy.getAttribute().getAttributeTypeDescription();
if ( !allAtds.contains( atd ) )
{
message.append( NLS.bind( Messages.getString( "OpenBestEditorAction.AttributeNotInSubSchema" ), //$NON-NLS-1$
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorContentProvider.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorContentProvider.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorContentProvider.java Fri Oct 8 16:58:54 2010
@@ -151,7 +151,7 @@ public class SearchResultEditorContentPr
}
// url += search.getURL();
- url += Messages.getString( "SearchResultEditorContentProvider.SearchBase" ) + search.getSearchBase().getUpName() + " - "; //$NON-NLS-1$ //$NON-NLS-2$
+ url += Messages.getString( "SearchResultEditorContentProvider.SearchBase" ) + search.getSearchBase().getName() + " - "; //$NON-NLS-1$ //$NON-NLS-2$
url += Messages.getString( "SearchResultEditorContentProvider.Filter" ) + search.getFilter(); //$NON-NLS-1$
boolean showDn = BrowserUIPlugin.getDefault().getPreferenceStore().getBoolean(
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorFilter.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorFilter.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorFilter.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorFilter.java Fri Oct 8 16:58:54 2010
@@ -152,7 +152,7 @@ public class SearchResultEditorFilter ex
}
if ( showDn
- && searchResult.getDn().getUpName().toUpperCase().indexOf( quickFilterValue.toUpperCase() ) > -1 )
+ && searchResult.getDn().getName().toUpperCase().indexOf( quickFilterValue.toUpperCase() ) > -1 )
{
return true;
}
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorLabelProvider.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorLabelProvider.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorLabelProvider.java Fri Oct 8 16:58:54 2010
@@ -112,7 +112,7 @@ public class SearchResultEditorLabelProv
if ( property == BrowserUIConstants.DN )
{
- return result.getDn().getUpName();
+ return result.getDn().getName();
}
else
{
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorUniversalListener.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorUniversalListener.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorUniversalListener.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorUniversalListener.java Fri Oct 8 16:58:54 2010
@@ -726,7 +726,7 @@ public class SearchResultEditorUniversal
// dnLink.setText("<a>"+sr.getDn().toString()+"</a>");
dnLink.setData( sr );
- dnLink.setText( sr.getDn().getUpName() );
+ dnLink.setText( sr.getDn().getName() );
dnLink.setUnderlined( true );
dnLink.setFont( item.getFont() );
dnLink.setForeground( item.getForeground() );
Propchange: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages.properties
('svn:mergeinfo' removed)
Propchange: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages_de.properties
('svn:mergeinfo' removed)
Propchange: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/messages.properties
('svn:mergeinfo' removed)
Propchange: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/messages_de.properties
('svn:mergeinfo' removed)
Propchange: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/messages.properties
('svn:mergeinfo' removed)
Propchange: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/messages_de.properties
('svn:mergeinfo' removed)
Propchange: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/messages.properties
('svn:mergeinfo' removed)
Propchange: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/messages_de.properties
('svn:mergeinfo' removed)
Propchange: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/messages.properties
('svn:mergeinfo' removed)
Propchange: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/modificationlogs/messages_de.properties
('svn:mergeinfo' removed)
Propchange: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/messages.properties
('svn:mergeinfo' removed)
Propchange: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/searchlogs/messages_de.properties
('svn:mergeinfo' removed)
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationApplyOnWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationApplyOnWizardPage.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationApplyOnWizardPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationApplyOnWizardPage.java Fri Oct 8 16:58:54 2010
@@ -26,9 +26,8 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
-import javax.naming.InvalidNameException;
-
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.ldapbrowser.common.actions.BrowserSelectionUtils;
@@ -62,7 +61,7 @@ public class BatchOperationApplyOnWizard
private String[] initCurrentSelectionTexts;
- private LdapDN[][] initCurrentSelectionDns;
+ private DN[][] initCurrentSelectionDns;
private ISearch initSearch;
@@ -169,7 +168,7 @@ public class BatchOperationApplyOnWizard
}
- public LdapDN[] getApplyOnDns()
+ public DN[] getApplyOnDns()
{
if ( currentSelectionButton.getSelection() )
{
@@ -233,21 +232,21 @@ public class BatchOperationApplyOnWizard
IValue[] values = BrowserSelectionUtils.getValues( selection );
List<String> textList = new ArrayList<String>();
- List<LdapDN[]> dnsList = new ArrayList<LdapDN[]>();
+ List<DN[]> dnsList = new ArrayList<DN[]>();
if ( attributes.length + values.length > 0 )
{
- Set<LdapDN> internalDnSet = new LinkedHashSet<LdapDN>();
+ Set<DN> internalDnSet = new LinkedHashSet<DN>();
for ( int v = 0; v < values.length; v++ )
{
if ( values[v].isString() )
{
try
{
- LdapDN dn = new LdapDN( values[v].getStringValue() );
+ DN dn = new DN( values[v].getStringValue() );
internalDnSet.add( dn );
}
- catch ( InvalidNameException e )
+ catch ( LdapInvalidDnException e )
{
}
}
@@ -262,10 +261,10 @@ public class BatchOperationApplyOnWizard
{
try
{
- LdapDN dn = new LdapDN( vals[v].getStringValue() );
+ DN dn = new DN( vals[v].getStringValue() );
internalDnSet.add( dn );
}
- catch ( InvalidNameException e )
+ catch ( LdapInvalidDnException e )
{
}
}
@@ -274,7 +273,7 @@ public class BatchOperationApplyOnWizard
if ( !internalDnSet.isEmpty() )
{
- dnsList.add( internalDnSet.toArray( new LdapDN[internalDnSet.size()] ) );
+ dnsList.add( internalDnSet.toArray( new DN[internalDnSet.size()] ) );
textList
.add( NLS
.bind(
@@ -283,14 +282,14 @@ public class BatchOperationApplyOnWizard
}
if ( searches.length == 1 && searches[0].getSearchResults() != null )
{
- Set<LdapDN> internalDnSet = new LinkedHashSet<LdapDN>();
+ Set<DN> internalDnSet = new LinkedHashSet<DN>();
ISearchResult[] srs = searches[0].getSearchResults();
for ( int i = 0; i < srs.length; i++ )
{
internalDnSet.add( srs[i].getDn() );
}
- dnsList.add( internalDnSet.toArray( new LdapDN[internalDnSet.size()] ) );
+ dnsList.add( internalDnSet.toArray( new DN[internalDnSet.size()] ) );
textList
.add( NLS
.bind(
@@ -298,7 +297,7 @@ public class BatchOperationApplyOnWizard
}
if ( entries.length + searchResults.length + bookmarks.length > 0 )
{
- Set<LdapDN> internalDnSet = new LinkedHashSet<LdapDN>();
+ Set<DN> internalDnSet = new LinkedHashSet<DN>();
for ( int i = 0; i < entries.length; i++ )
{
internalDnSet.add( entries[i].getDn() );
@@ -312,7 +311,7 @@ public class BatchOperationApplyOnWizard
internalDnSet.add( bookmarks[i].getDn() );
}
- dnsList.add( internalDnSet.toArray( new LdapDN[internalDnSet.size()] ) );
+ dnsList.add( internalDnSet.toArray( new DN[internalDnSet.size()] ) );
textList
.add( NLS
.bind(
@@ -320,7 +319,7 @@ public class BatchOperationApplyOnWizard
}
this.initCurrentSelectionTexts = textList.toArray( new String[textList.size()] );
- this.initCurrentSelectionDns = dnsList.toArray( new LdapDN[0][0] );
+ this.initCurrentSelectionDns = dnsList.toArray( new DN[0][0] );
}
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationWizard.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationWizard.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/BatchOperationWizard.java Fri Oct 8 16:58:54 2010
@@ -21,7 +21,7 @@
package org.apache.directory.studio.ldapbrowser.ui.wizards;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.studio.connection.core.Connection;
import org.apache.directory.studio.connection.ui.RunnableContextRunner;
import org.apache.directory.studio.ldapbrowser.common.actions.BrowserSelectionUtils;
@@ -293,7 +293,7 @@ public class BatchOperationWizard extend
}
// get DNs
- LdapDN[] dns = applyOnPage.getApplyOnDns();
+ DN[] dns = applyOnPage.getApplyOnDns();
if ( dns == null )
{
if ( applyOnPage.getApplyOnSearch() != null )
@@ -308,7 +308,7 @@ public class BatchOperationWizard extend
if ( status.isOK() )
{
ISearchResult[] srs = search.getSearchResults();
- dns = new LdapDN[srs.length];
+ dns = new DN[srs.length];
for ( int i = 0; i < srs.length; i++ )
{
dns[i] = srs[i].getDn();
@@ -324,7 +324,7 @@ public class BatchOperationWizard extend
for ( int i = 0; i < dns.length; i++ )
{
ldif.append( "dn: " ); //$NON-NLS-1$
- ldif.append( dns[i].getUpName() );
+ ldif.append( dns[i].getName() );
ldif.append( BrowserCoreConstants.LINE_SEPARATOR );
ldif.append( ldifFragment );
ldif.append( BrowserCoreConstants.LINE_SEPARATOR );
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewBookmarkMainWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewBookmarkMainWizardPage.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewBookmarkMainWizardPage.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewBookmarkMainWizardPage.java Fri Oct 8 16:58:54 2010
@@ -21,7 +21,7 @@
package org.apache.directory.studio.ldapbrowser.ui.wizards;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.studio.common.ui.widgets.BaseWidgetUtils;
import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyEvent;
import org.apache.directory.studio.ldapbrowser.common.widgets.WidgetModifyListener;
@@ -123,7 +123,7 @@ public class NewBookmarkMainWizardPage e
Composite innerComposite = BaseWidgetUtils.createColumnContainer( composite, 3, 1 );
BaseWidgetUtils.createLabel( innerComposite, Messages.getString( "NewBookmarkMainWizardPage.BookmarkName" ), 1 ); //$NON-NLS-1$
- bookmarkNameText = BaseWidgetUtils.createText( innerComposite, entry.getDn().getUpName(), 2 );
+ bookmarkNameText = BaseWidgetUtils.createText( innerComposite, entry.getDn().getName(), 2 );
bookmarkNameText.setFocus();
bookmarkNameText.addModifyListener( new ModifyListener()
{
@@ -157,7 +157,7 @@ public class NewBookmarkMainWizardPage e
*
* @return the bookmark dn
*/
- public LdapDN getBookmarkDn()
+ public DN getBookmarkDn()
{
return bookmarkEntryWidget.getDn();
}
Modified: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewBookmarkWizard.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewBookmarkWizard.java?rev=1005899&r1=1005898&r2=1005899&view=diff
==============================================================================
--- directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewBookmarkWizard.java (original)
+++ directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/NewBookmarkWizard.java Fri Oct 8 16:58:54 2010
@@ -21,7 +21,7 @@
package org.apache.directory.studio.ldapbrowser.ui.wizards;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.studio.ldapbrowser.common.widgets.browser.BrowserCategory;
import org.apache.directory.studio.ldapbrowser.common.widgets.browser.BrowserEntryPage;
import org.apache.directory.studio.ldapbrowser.common.widgets.browser.BrowserSearchResultPage;
@@ -199,7 +199,7 @@ public class NewBookmarkWizard extends W
if ( selectedEntry != null )
{
String name = mainPage.getBookmarkName();
- LdapDN dn = mainPage.getBookmarkDn();
+ DN dn = mainPage.getBookmarkDn();
IBookmark bookmark = new Bookmark( selectedEntry.getBrowserConnection(), dn, name );
selectedEntry.getBrowserConnection().getBookmarkManager().addBookmark( bookmark );
}
Propchange: directory/studio/trunk/plugins/ldapbrowser.ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/wizards/messages.properties
('svn:mergeinfo' removed)