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/07 16:10:27 UTC
svn commit: r1005455 [2/5] - in
/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor: ./
src/main/java/org/apache/directory/studio/schemaeditor/
src/main/java/org/apache/directory/studio/schemaeditor/controller/
src/main/java/org/apache/d...
Modified: directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java?rev=1005455&r1=1005454&r2=1005455&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java Thu Oct 7 14:10:24 2010
@@ -30,13 +30,13 @@ import javax.naming.directory.Attribute;
import javax.naming.directory.SearchControls;
import javax.naming.directory.SearchResult;
-import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescription;
+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.ObjectClass;
import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.schema.parsers.LdapSyntaxDescription;
import org.apache.directory.shared.ldap.schema.parsers.LdapSyntaxDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleDescription;
import org.apache.directory.shared.ldap.schema.parsers.MatchingRuleDescriptionSchemaParser;
-import org.apache.directory.shared.ldap.schema.parsers.ObjectClassDescription;
import org.apache.directory.shared.ldap.schema.parsers.ObjectClassDescriptionSchemaParser;
import org.apache.directory.studio.common.core.jobs.StudioProgressMonitor;
import org.apache.directory.studio.connection.core.Connection;
@@ -200,24 +200,23 @@ public class GenericSchemaConnector exte
String value = ( String ) ne.nextElement();
AttributeTypeDescriptionSchemaParser parser = new AttributeTypeDescriptionSchemaParser();
parser.setQuirksMode( true );
- AttributeTypeDescription atd = parser.parseAttributeTypeDescription( value );
+ AttributeType atd = parser.parseAttributeTypeDescription( value );
- AttributeTypeImpl impl = new AttributeTypeImpl( atd.getNumericOid() );
- impl.setOid( atd.getNumericOid() );
+ AttributeTypeImpl impl = new AttributeTypeImpl( atd.getOid() );
impl.setNames( atd.getNames().toArray( new String[0] ) );
impl.setDescription( atd.getDescription() );
- impl.setSuperiorName( atd.getSuperType() );
+ impl.setSuperiorOid( atd.getSuperiorOid() );
impl.setUsage( atd.getUsage() );
- impl.setSyntaxOid( atd.getSyntax() );
- impl.setLength( atd.getSyntaxLength() );
+ impl.setSyntaxOid( atd.getSyntaxOid() );
+ impl.setSyntaxLength( atd.getSyntaxLength() );
impl.setObsolete( atd.isObsolete() );
impl.setCollective( atd.isCollective() );
- impl.setSingleValue( atd.isSingleValued() );
- impl.setCanUserModify( atd.isUserModifiable() );
- impl.setEqualityName( atd.getEqualityMatchingRule() );
- impl.setOrderingName( atd.getOrderingMatchingRule() );
- impl.setSubstrName( atd.getSubstringsMatchingRule() );
- impl.setSchema( schema.getName() );
+ impl.setSingleValued( atd.isSingleValued() );
+ impl.setUserModifiable( atd.isUserModifiable() );
+ impl.setEqualityOid( atd.getEqualityOid() );
+ impl.setOrderingOid( atd.getOrderingOid() );
+ impl.setSubstringOid( atd.getSubstringOid() );
+ impl.setSchemaName( schema.getName() );
impl.setSchemaObject( schema );
// Active Directory hack
@@ -242,18 +241,17 @@ public class GenericSchemaConnector exte
String value = ( String ) ne.nextElement();
ObjectClassDescriptionSchemaParser parser = new ObjectClassDescriptionSchemaParser();
parser.setQuirksMode( true );
- ObjectClassDescription ocd = parser.parseObjectClassDescription( value );
+ ObjectClass ocd = parser.parseObjectClassDescription( value );
- ObjectClassImpl impl = new ObjectClassImpl( ocd.getNumericOid() );
- impl.setOid( ocd.getNumericOid() );
+ ObjectClassImpl impl = new ObjectClassImpl( ocd.getOid() );
impl.setNames( ocd.getNames().toArray( new String[0] ) );
impl.setDescription( ocd.getDescription() );
- impl.setSuperClassesNames( ocd.getSuperiorObjectClasses().toArray( new String[0] ) );
- impl.setType( ocd.getKind() );
+ impl.setSuperiorOids( ocd.getSuperiorOids() );
+ impl.setType( ocd.getType() );
impl.setObsolete( ocd.isObsolete() );
- impl.setMustNamesList( ocd.getMustAttributeTypes().toArray( new String[0] ) );
- impl.setMayNamesList( ocd.getMayAttributeTypes().toArray( new String[0] ) );
- impl.setSchema( schema.getName() );
+ impl.setMustAttributeTypeOids( ocd.getMustAttributeTypeOids() );
+ impl.setMayAttributeTypeOids( ocd.getMayAttributeTypeOids() );
+ impl.setSchemaName( schema.getName() );
impl.setSchemaObject( schema );
schema.addObjectClass( impl );
@@ -272,15 +270,15 @@ public class GenericSchemaConnector exte
String value = ( String ) ne.nextElement();
LdapSyntaxDescriptionSchemaParser parser = new LdapSyntaxDescriptionSchemaParser();
parser.setQuirksMode( true );
- LdapSyntaxDescription lsd = parser.parseLdapSyntaxDescription( value );
+ LdapSyntax lsd = parser.parseLdapSyntaxDescription( value );
- SyntaxImpl impl = new SyntaxImpl( lsd.getNumericOid() );
+ SyntaxImpl impl = new SyntaxImpl( lsd.getOid() );
impl.setDescription( lsd.getDescription() );
impl.setNames( new String[]
{ lsd.getDescription() } );
//impl.setObsolete( lsd.isObsolete() );
impl.setHumanReadable( true );
- impl.setSchema( schema.getName() );
+ impl.setSchemaName( schema.getName() );
impl.setSchemaObject( schema );
schema.addSyntax( impl );
@@ -294,7 +292,7 @@ public class GenericSchemaConnector exte
if ( syntaxOid != null && schema.getSyntax( syntaxOid ) == null )
{
SyntaxImpl impl = new SyntaxImpl( syntaxOid );
- impl.setSchema( schema.getName() );
+ impl.setSchemaName( schema.getName() );
impl.setSchemaObject( schema );
String oidDescription = Utils.getOidDescription( syntaxOid );
impl.setDescription( oidDescription != null ? oidDescription : "Dummy" ); //$NON-NLS-1$
@@ -315,14 +313,14 @@ public class GenericSchemaConnector exte
String value = ( String ) ne.nextElement();
MatchingRuleDescriptionSchemaParser parser = new MatchingRuleDescriptionSchemaParser();
parser.setQuirksMode( true );
- MatchingRuleDescription mrd = parser.parseMatchingRuleDescription( value );
+ MatchingRule mrd = parser.parseMatchingRuleDescription( value );
- MatchingRuleImpl impl = new MatchingRuleImpl( mrd.getNumericOid() );
+ MatchingRuleImpl impl = new MatchingRuleImpl( mrd.getOid() );
impl.setDescription( mrd.getDescription() );
impl.setNames( mrd.getNames().toArray( new String[0] ) );
impl.setObsolete( mrd.isObsolete() );
- impl.setSyntaxOid( mrd.getSyntax() );
- impl.setSchema( schema.getName() );
+ impl.setSyntaxOid( mrd.getSyntaxOid() );
+ impl.setSchemaName( schema.getName() );
impl.setSchemaObject( schema );
schema.addMatchingRule( impl );
@@ -332,9 +330,9 @@ public class GenericSchemaConnector exte
// if online: assume all received matching rules in attributes are valid -> create dummy matching rules if missing
for ( AttributeTypeImpl at : schema.getAttributeTypes() )
{
- String equalityName = at.getEqualityName();
- String orderingName = at.getOrderingName();
- String substrName = at.getSubstrName();
+ String equalityName = at.getEqualityOid();
+ String orderingName = at.getOrderingOid();
+ String substrName = at.getSubstringOid();
checkMatchingRules( schema, equalityName, orderingName, substrName );
}
@@ -349,7 +347,7 @@ public class GenericSchemaConnector exte
if ( matchingRuleName != null && schema.getMatchingRule( matchingRuleName ) == null )
{
MatchingRuleImpl impl = new MatchingRuleImpl( matchingRuleName );
- impl.setSchema( schema.getName() );
+ impl.setSchemaName( schema.getName() );
impl.setSchemaObject( schema );
impl.setDescription( "Dummy" ); //$NON-NLS-1$
impl.setNames( new String[]
Modified: directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporter.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporter.java?rev=1005455&r1=1005454&r2=1005455&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporter.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileExporter.java Thu Oct 7 14:10:24 2010
@@ -20,6 +20,8 @@
package org.apache.directory.studio.schemaeditor.model.io;
+import java.util.List;
+
import org.apache.directory.shared.ldap.schema.ObjectClassTypeEnum;
import org.apache.directory.shared.ldap.schema.UsageEnum;
import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
@@ -80,11 +82,11 @@ public class OpenLdapSchemaFileExporter
sb.append( "attributetype ( " + at.getOid() + " \n" ); //$NON-NLS-1$ //$NON-NLS-2$
// NAME(S)
- String[] names = at.getNamesRef();
- if ( ( names != null ) && ( names.length > 0 ) )
+ List<String> names = at.getNames();
+ if ( ( names != null ) && ( names.size() > 0 ) )
{
sb.append( "\tNAME " ); //$NON-NLS-1$
- if ( names.length > 1 )
+ if ( names.size() > 1 )
{
sb.append( "( " ); //$NON-NLS-1$
for ( String name : names )
@@ -95,7 +97,7 @@ public class OpenLdapSchemaFileExporter
}
else
{
- sb.append( "'" + names[0] + "' \n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "'" + names.get( 0 ) + "' \n" ); //$NON-NLS-1$ //$NON-NLS-2$
}
}
@@ -130,24 +132,24 @@ public class OpenLdapSchemaFileExporter
}
// SUBSTR
- if ( ( at.getSubstrName() != null ) && ( !at.getSubstrName().equals( "" ) ) ) //$NON-NLS-1$
+ if ( ( at.getSubstringOid() != null ) && ( !at.getSubstringOid().equals( "" ) ) ) //$NON-NLS-1$
{
- sb.append( "\tSUBSTR " + at.getSubstrName() + " \n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "\tSUBSTR " + at.getSubstringOid() + " \n" ); //$NON-NLS-1$ //$NON-NLS-2$
}
// SYNTAX
if ( ( at.getSyntaxOid() != null ) && ( !at.getSyntaxOid().equals( "" ) ) ) //$NON-NLS-1$
{
sb.append( "\tSYNTAX " + at.getSyntaxOid() ); //$NON-NLS-1$
- if ( at.getLength() > 0 )
+ if ( at.getSyntaxLength() > 0 )
{
- sb.append( "{" + at.getLength() + "}" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "{" + at.getSyntaxLength() + "}" ); //$NON-NLS-1$ //$NON-NLS-2$
}
sb.append( " \n" ); //$NON-NLS-1$
}
// SINGLE-VALUE
- if ( at.isSingleValue() )
+ if ( at.isSingleValued() )
{
sb.append( "\tSINGLE-VALUE \n" ); //$NON-NLS-1$
}
@@ -159,7 +161,7 @@ public class OpenLdapSchemaFileExporter
}
// NO-USER-MODIFICATION
- if ( !at.isCanUserModify() )
+ if ( !at.isUserModifiable() )
{
sb.append( "\tNO-USER-MODIFICATION \n" ); //$NON-NLS-1$
}
@@ -210,11 +212,11 @@ public class OpenLdapSchemaFileExporter
sb.append( "objectclass ( " + oc.getOid() + " \n" ); //$NON-NLS-1$ //$NON-NLS-2$
// NAME(S)
- String[] names = oc.getNamesRef();
- if ( ( names != null ) && ( names.length > 0 ) )
+ List<String> names = oc.getNames();
+ if ( ( names != null ) && ( names.size() > 0 ) )
{
sb.append( "\tNAME " ); //$NON-NLS-1$
- if ( names.length > 1 )
+ if ( names.size() > 1 )
{
sb.append( "( " ); //$NON-NLS-1$
for ( String name : names )
@@ -225,7 +227,7 @@ public class OpenLdapSchemaFileExporter
}
else
{
- sb.append( "'" + names[0] + "' \n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "'" + names.get( 0 ) + "' \n" ); //$NON-NLS-1$ //$NON-NLS-2$
}
}
@@ -242,21 +244,21 @@ public class OpenLdapSchemaFileExporter
}
// SUP
- String[] superiors = oc.getSuperClassesNames();
- if ( ( superiors != null ) && ( superiors.length != 0 ) )
+ List<String> superiors = oc.getSuperiorOids();
+ if ( ( superiors != null ) && ( superiors.size() != 0 ) )
{
- if ( superiors.length > 1 )
+ if ( superiors.size() > 1 )
{
- sb.append( "\tSUP (" + superiors[0] ); //$NON-NLS-1$
- for ( int i = 1; i < superiors.length; i++ )
+ sb.append( "\tSUP (" + superiors.get( 0 ) ); //$NON-NLS-1$
+ for ( int i = 1; i < superiors.size(); i++ )
{
- sb.append( " $ " + superiors[i] ); //$NON-NLS-1$
+ sb.append( " $ " + superiors.get( i ) ); //$NON-NLS-1$
}
sb.append( ") \n" ); //$NON-NLS-1$
}
else
{
- sb.append( "\tSUP " + superiors[0] + " \n" ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "\tSUP " + superiors.get( 0 ) + " \n" ); //$NON-NLS-1$ //$NON-NLS-2$
}
}
@@ -276,42 +278,42 @@ public class OpenLdapSchemaFileExporter
}
// MUST
- String[] must = oc.getMustNamesList();
- if ( ( must != null ) && ( must.length != 0 ) )
+ List<String> must = oc.getMustAttributeTypeOids();
+ if ( ( must != null ) && ( must.size() != 0 ) )
{
sb.append( "\tMUST " ); //$NON-NLS-1$
- if ( must.length > 1 )
+ if ( must.size() > 1 )
{
- sb.append( "( " + must[0] + " " ); //$NON-NLS-1$ //$NON-NLS-2$
- for ( int i = 1; i < must.length; i++ )
+ sb.append( "( " + must.get( 0 ) + " " ); //$NON-NLS-1$ //$NON-NLS-2$
+ for ( int i = 1; i < must.size(); i++ )
{
- sb.append( "$ " + must[i] + " " ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "$ " + must.get( i ) + " " ); //$NON-NLS-1$ //$NON-NLS-2$
}
sb.append( ") \n" ); //$NON-NLS-1$
}
- else if ( must.length == 1 )
+ else if ( must.size() == 1 )
{
- sb.append( must[0] + " \n" ); //$NON-NLS-1$
+ sb.append( must.get( 0 ) + " \n" ); //$NON-NLS-1$
}
}
// MAY
- String[] may = oc.getMayNamesList();
- if ( ( may != null ) && ( may.length != 0 ) )
+ List<String> may = oc.getMayAttributeTypeOids();
+ if ( ( may != null ) && ( may.size() != 0 ) )
{
sb.append( "\tMAY " ); //$NON-NLS-1$
- if ( may.length > 1 )
+ if ( may.size() > 1 )
{
- sb.append( "( " + may[0] + " " ); //$NON-NLS-1$ //$NON-NLS-2$
- for ( int i = 1; i < may.length; i++ )
+ sb.append( "( " + may.get( 0 ) + " " ); //$NON-NLS-1$ //$NON-NLS-2$
+ for ( int i = 1; i < may.size(); i++ )
{
- sb.append( "$ " + may[i] + " " ); //$NON-NLS-1$ //$NON-NLS-2$
+ sb.append( "$ " + may.get( i ) + " " ); //$NON-NLS-1$ //$NON-NLS-2$
}
sb.append( ") \n" ); //$NON-NLS-1$
}
- else if ( may.length == 1 )
+ else if ( may.size() == 1 )
{
- sb.append( may[0] + " \n" ); //$NON-NLS-1$
+ sb.append( may.get( 0 ) + " \n" ); //$NON-NLS-1$
}
}
// Closing the definition
Modified: directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java?rev=1005455&r1=1005454&r2=1005455&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/OpenLdapSchemaFileImporter.java Thu Oct 7 14:10:24 2010
@@ -29,8 +29,8 @@ import java.util.List;
import java.util.Scanner;
import java.util.regex.MatchResult;
-import org.apache.directory.shared.ldap.schema.parsers.AttributeTypeLiteral;
-import org.apache.directory.shared.ldap.schema.parsers.ObjectClassLiteral;
+import org.apache.directory.shared.ldap.schema.AttributeType;
+import org.apache.directory.shared.ldap.schema.ObjectClass;
import org.apache.directory.shared.ldap.schema.parsers.OpenLdapSchemaParser;
import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
@@ -98,8 +98,8 @@ public class OpenLdapSchemaFileImporter
List<?> ats = parser.getAttributeTypes();
for ( int i = 0; i < ats.size(); i++ )
{
- AttributeTypeImpl at = convertAttributeType( ( AttributeTypeLiteral ) ats.get( i ) );
- at.setSchema( schemaName );
+ AttributeTypeImpl at = convertAttributeType( ( AttributeType ) ats.get( i ) );
+ at.setSchemaName( schemaName );
at.setSchemaObject( schema );
schema.addAttributeType( at );
}
@@ -107,8 +107,8 @@ public class OpenLdapSchemaFileImporter
List<?> ocs = parser.getObjectClassTypes();
for ( int i = 0; i < ocs.size(); i++ )
{
- ObjectClassImpl oc = convertObjectClass( ( ObjectClassLiteral ) ocs.get( i ) );
- oc.setSchema( schemaName );
+ ObjectClassImpl oc = convertObjectClass( ( ObjectClass ) ocs.get( i ) );
+ oc.setSchemaName( schemaName );
oc.setSchemaObject( schema );
schema.addObjectClass( oc );
}
@@ -147,22 +147,22 @@ public class OpenLdapSchemaFileImporter
* @return
* the corresponding AttributeTypeImpl
*/
- private static final AttributeTypeImpl convertAttributeType( AttributeTypeLiteral at )
+ private static final AttributeTypeImpl convertAttributeType( AttributeType at )
{
AttributeTypeImpl newAT = new AttributeTypeImpl( at.getOid() );
newAT.setNames( at.getNames() );
newAT.setDescription( at.getDescription() );
- newAT.setSuperiorName( at.getSuperior() );
+ newAT.setSuperiorOid( at.getSuperiorOid() );
newAT.setUsage( at.getUsage() );
- newAT.setSyntaxOid( at.getSyntax() );
- newAT.setLength( at.getLength() );
+ newAT.setSyntaxOid( at.getSyntaxOid() );
+ newAT.setSyntaxLength( at.getSyntaxLength() );
newAT.setObsolete( at.isObsolete() );
- newAT.setSingleValue( at.isSingleValue() );
+ newAT.setSingleValued( at.isSingleValued() );
newAT.setCollective( at.isCollective() );
- newAT.setCanUserModify( !at.isNoUserModification() );
- newAT.setEqualityName( at.getEquality() );
- newAT.setOrderingName( at.getOrdering() );
- newAT.setSubstrName( at.getSubstr() );
+ newAT.setUserModifiable( at.isUserModifiable() );
+ newAT.setEqualityOid( at.getEqualityOid() );
+ newAT.setOrderingOid( at.getOrderingOid() );
+ newAT.setSubstringOid( at.getSubstringOid() );
return newAT;
}
@@ -176,16 +176,16 @@ public class OpenLdapSchemaFileImporter
* @return
* the corresponding ObjectClassImpl
*/
- private static final ObjectClassImpl convertObjectClass( ObjectClassLiteral oc )
+ private static final ObjectClassImpl convertObjectClass( ObjectClass oc )
{
ObjectClassImpl newOC = new ObjectClassImpl( oc.getOid() );
newOC.setNames( oc.getNames() );
newOC.setDescription( oc.getDescription() );
- newOC.setSuperClassesNames( oc.getSuperiors() );
- newOC.setType( oc.getClassType() );
+ newOC.setSuperiorOids( oc.getSuperiorOids() );
+ newOC.setType( oc.getType() );
newOC.setObsolete( oc.isObsolete() );
- newOC.setMustNamesList( oc.getMust() );
- newOC.setMayNamesList( oc.getMay() );
+ newOC.setMustAttributeTypeOids( oc.getMustAttributeTypeOids() );
+ newOC.setMayAttributeTypeOids( oc.getMayAttributeTypeOids() );
return newOC;
}
Modified: directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java?rev=1005455&r1=1005454&r2=1005455&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java Thu Oct 7 14:10:24 2010
@@ -259,8 +259,8 @@ public class XMLSchemaFileExporter
}
// Aliases
- String[] aliases = at.getNamesRef();
- if ( ( aliases != null ) && ( aliases.length >= 1 ) )
+ List<String> aliases = at.getNames();
+ if ( ( aliases != null ) && ( aliases.size() >= 1 ) )
{
Element aliasesNode = atNode.addElement( ALIASES_TAG );
for ( String alias : aliases )
@@ -298,7 +298,7 @@ public class XMLSchemaFileExporter
}
// Syntax Length
- int syntaxLength = at.getLength();
+ long syntaxLength = at.getSyntaxLength();
if ( syntaxLength > 0 )
{
atNode.addElement( SYNTAX_LENGTH_TAG ).setText( "" + syntaxLength ); //$NON-NLS-1$
@@ -315,7 +315,7 @@ public class XMLSchemaFileExporter
}
// Single Value
- if ( at.isSingleValue() )
+ if ( at.isSingleValued() )
{
atNode.addAttribute( SINGLE_VALUE_TAG, BOOLEAN_TRUE );
}
@@ -335,7 +335,7 @@ public class XMLSchemaFileExporter
}
// No User Modification
- if ( at.isCanUserModify() )
+ if ( at.isUserModifiable() )
{
atNode.addAttribute( NO_USER_MODIFICATION_TAG, BOOLEAN_FALSE );
}
@@ -345,21 +345,21 @@ public class XMLSchemaFileExporter
}
// Equality
- String equality = at.getEqualityName();
+ String equality = at.getEqualityOid();
if ( ( equality != null ) && ( !equality.equals( "" ) ) ) //$NON-NLS-1$
{
atNode.addElement( EQUALITY_TAG ).setText( equality );
}
// Ordering
- String ordering = at.getOrderingName();
+ String ordering = at.getOrderingOid();
if ( ( ordering != null ) && ( !ordering.equals( "" ) ) ) //$NON-NLS-1$
{
atNode.addElement( ORDERING_TAG ).setText( ordering );
}
// Substring
- String substring = at.getSubstrName();
+ String substring = at.getSubstringOid();
if ( ( substring != null ) && ( !substring.equals( "" ) ) ) //$NON-NLS-1$
{
atNode.addElement( SUBSTRING_TAG ).setText( substring );
@@ -387,8 +387,8 @@ public class XMLSchemaFileExporter
}
// Aliases
- String[] aliases = oc.getNamesRef();
- if ( ( aliases != null ) && ( aliases.length >= 1 ) )
+ List<String> aliases = oc.getNames();
+ if ( ( aliases != null ) && ( aliases.size() >= 1 ) )
{
Element aliasesNode = ocNode.addElement( ALIASES_TAG );
for ( String alias : aliases )
@@ -405,8 +405,8 @@ public class XMLSchemaFileExporter
}
// Superiors
- String[] superiors = oc.getSuperClassesNames();
- if ( ( superiors != null ) && ( superiors.length >= 1 ) )
+ List<String> superiors = oc.getSuperiorOids();
+ if ( ( superiors != null ) && ( superiors.size() >= 1 ) )
{
Element superiorsNode = ocNode.addElement( SUPERIORS_TAG );
for ( String superior : superiors )
@@ -433,8 +433,8 @@ public class XMLSchemaFileExporter
}
// Mandatory Attribute Types
- String[] mandatoryATs = oc.getMustNamesList();
- if ( ( mandatoryATs != null ) && ( mandatoryATs.length >= 1 ) )
+ List<String> mandatoryATs = oc.getMustAttributeTypeOids();
+ if ( ( mandatoryATs != null ) && ( mandatoryATs.size() >= 1 ) )
{
Element mandatoryNode = ocNode.addElement( MANDATORY_TAG );
for ( String mandatoryAT : mandatoryATs )
@@ -444,8 +444,8 @@ public class XMLSchemaFileExporter
}
// Optional Attribute Types
- String[] optionalATs = oc.getMayNamesList();
- if ( ( optionalATs != null ) && ( optionalATs.length >= 1 ) )
+ List<String> optionalATs = oc.getMayAttributeTypeOids();
+ if ( ( optionalATs != null ) && ( optionalATs.size() >= 1 ) )
{
Element optionalNode = ocNode.addElement( OPTIONAL_TAG );
for ( String optionalAT : optionalATs )
@@ -476,8 +476,8 @@ public class XMLSchemaFileExporter
}
// Aliases
- String[] aliases = mr.getNamesRef();
- if ( ( aliases != null ) && ( aliases.length >= 1 ) )
+ List<String> aliases = mr.getNames();
+ if ( ( aliases != null ) && ( aliases.size() >= 1 ) )
{
Element aliasesNode = mrNode.addElement( ALIASES_TAG );
for ( String alias : aliases )
@@ -535,8 +535,8 @@ public class XMLSchemaFileExporter
}
// Aliases
- String[] aliases = syntax.getNamesRef();
- if ( ( aliases != null ) && ( aliases.length >= 1 ) )
+ List<String> aliases = syntax.getNames();
+ if ( ( aliases != null ) && ( aliases.size() >= 1 ) )
{
Element aliasesNode = syntaxNode.addElement( ALIASES_TAG );
for ( String alias : aliases )
Modified: directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java?rev=1005455&r1=1005454&r2=1005455&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java Thu Oct 7 14:10:24 2010
@@ -322,7 +322,7 @@ public class XMLSchemaFileImporter
}
// Schema
- at.setSchema( schema.getName() );
+ at.setSchemaName( schema.getName() );
at.setSchemaObject( schema );
// Aliases
@@ -352,7 +352,7 @@ public class XMLSchemaFileImporter
Element superiorElement = element.element( SUPERIOR_TAG );
if ( ( superiorElement != null ) && ( !superiorElement.getText().equals( "" ) ) ) //$NON-NLS-1$
{
- at.setSuperiorName( superiorElement.getText() );
+ at.setSuperiorOid( superiorElement.getText() );
}
// Usage
@@ -383,7 +383,7 @@ public class XMLSchemaFileImporter
{
try
{
- at.setLength( Integer.parseInt( syntaxLengthElement.getText() ) );
+ at.setSyntaxLength( Long.parseLong( syntaxLengthElement.getText() ) );
}
catch ( NumberFormatException e )
{
@@ -403,7 +403,7 @@ public class XMLSchemaFileImporter
Attribute singleValueAttribute = element.attribute( SINGLE_VALUE_TAG );
if ( ( singleValueAttribute != null ) && ( !singleValueAttribute.getValue().equals( "" ) ) ) //$NON-NLS-1$
{
- at.setSingleValue( readBoolean( singleValueAttribute.getValue() ) );
+ at.setSingleValued( readBoolean( singleValueAttribute.getValue() ) );
}
// Collective
@@ -417,28 +417,28 @@ public class XMLSchemaFileImporter
Attribute noUserModificationAttribute = element.attribute( NO_USER_MODIFICATION_TAG );
if ( ( noUserModificationAttribute != null ) && ( !noUserModificationAttribute.getValue().equals( "" ) ) ) //$NON-NLS-1$
{
- at.setCanUserModify( !readBoolean( noUserModificationAttribute.getValue() ) );
+ at.setUserModifiable( !readBoolean( noUserModificationAttribute.getValue() ) );
}
// Equality
Element equalityElement = element.element( EQUALITY_TAG );
if ( ( equalityElement != null ) && ( !equalityElement.getText().equals( "" ) ) ) //$NON-NLS-1$
{
- at.setEqualityName( equalityElement.getText() );
+ at.setEqualityOid( equalityElement.getText() );
}
// Ordering
Element orderingElement = element.element( ORDERING_TAG );
if ( ( orderingElement != null ) && ( !orderingElement.getText().equals( "" ) ) ) //$NON-NLS-1$
{
- at.setOrderingName( orderingElement.getText() );
+ at.setOrderingOid( orderingElement.getText() );
}
// Substring
Element substringElement = element.element( SUBSTRING_TAG );
if ( ( substringElement != null ) && ( !substringElement.getText().equals( "" ) ) ) //$NON-NLS-1$
{
- at.setSubstrName( substringElement.getText() );
+ at.setSubstringOid( substringElement.getText() );
}
// Adding the attribute type to the schema
@@ -493,7 +493,7 @@ public class XMLSchemaFileImporter
}
// Schema
- oc.setSchema( schema.getName() );
+ oc.setSchemaName( schema.getName() );
oc.setSchemaObject( schema );
// Aliases
@@ -531,7 +531,7 @@ public class XMLSchemaFileImporter
}
if ( superiors.size() >= 1 )
{
- oc.setSuperClassesNames( superiors.toArray( new String[0] ) );
+ oc.setSuperiorOids( superiors );
}
}
@@ -569,7 +569,7 @@ public class XMLSchemaFileImporter
}
if ( mandatoryATs.size() >= 1 )
{
- oc.setMustNamesList( mandatoryATs.toArray( new String[0] ) );
+ oc.setMustAttributeTypeOids( mandatoryATs );
}
}
@@ -585,7 +585,7 @@ public class XMLSchemaFileImporter
}
if ( optionalATs.size() >= 1 )
{
- oc.setMayNamesList( optionalATs.toArray( new String[0] ) );
+ oc.setMayAttributeTypeOids( optionalATs );
}
}
@@ -641,7 +641,7 @@ public class XMLSchemaFileImporter
}
// Schema
- mr.setSchema( schema.getName() );
+ mr.setSchemaName( schema.getName() );
mr.setSchemaObject( schema );
// Aliases
@@ -733,7 +733,7 @@ public class XMLSchemaFileImporter
}
// Schema
- syntax.setSchema( schema.getName() );
+ syntax.setSchemaName( schema.getName() );
syntax.setSchemaObject( schema );
// Aliases
Modified: directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java?rev=1005455&r1=1005454&r2=1005455&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java Thu Oct 7 14:10:24 2010
@@ -441,14 +441,14 @@ public class SchemaChecker
}
// Checking aliases
- String[] aliases = at.getNamesRef();
- if ( ( aliases == null ) || ( aliases.length == 0 ) )
+ List<String> aliases = at.getNames();
+ if ( ( aliases == null ) || ( aliases.size() == 0 ) )
{
SchemaWarning warning = new NoAliasWarning( at );
warningsList.add( warning );
warningsMap.put( at, warning );
}
- else if ( ( aliases != null ) && ( aliases.length >= 1 ) )
+ else if ( ( aliases != null ) && ( aliases.size() >= 1 ) )
{
for ( String alias : aliases )
{
@@ -530,7 +530,7 @@ public class SchemaChecker
}
// Equality matching rule
- String equality = at.getEqualityName();
+ String equality = at.getEqualityOid();
if ( ( equality != null ) && ( !"".equals( equality ) ) )
{
MatchingRuleImpl equalityMR = Activator.getDefault().getSchemaHandler().getMatchingRule( equality );
@@ -551,7 +551,7 @@ public class SchemaChecker
}
// Ordering matching rule
- String ordering = at.getOrderingName();
+ String ordering = at.getOrderingOid();
if ( ( ordering != null ) && ( !"".equals( ordering ) ) )
{
MatchingRuleImpl orderingMR = Activator.getDefault().getSchemaHandler().getMatchingRule( ordering );
@@ -572,7 +572,7 @@ public class SchemaChecker
}
// Substring matching rule
- String substring = at.getSubstrName();
+ String substring = at.getSubstringOid();
if ( ( substring != null ) && ( !"".equals( substring ) ) )
{
MatchingRuleImpl substringMR = Activator.getDefault().getSchemaHandler().getMatchingRule( substring );
@@ -625,14 +625,14 @@ public class SchemaChecker
}
// Checking aliases
- String[] aliases = oc.getNamesRef();
- if ( ( aliases == null ) || ( aliases.length == 0 ) )
+ List<String> aliases = oc.getNames();
+ if ( ( aliases == null ) || ( aliases.size() == 0 ) )
{
SchemaWarning warning = new NoAliasWarning( oc );
warningsList.add( warning );
warningsMap.put( oc, warning );
}
- else if ( ( aliases != null ) && ( aliases.length >= 1 ) )
+ else if ( ( aliases != null ) && ( aliases.size() >= 1 ) )
{
for ( String alias : aliases )
{
@@ -654,8 +654,8 @@ public class SchemaChecker
}
// Checking superiors
- String[] superiors = oc.getSuperClassesNames();
- if ( ( superiors != null ) && ( superiors.length >= 1 ) )
+ List<String> superiors = oc.getSuperiorOids();
+ if ( ( superiors != null ) && ( superiors.size() >= 1 ) )
{
ObjectClassTypeEnum type = oc.getType();
@@ -706,8 +706,8 @@ public class SchemaChecker
}
// Checking mandatory and optional attributes
- String[] mandatoryATNames = oc.getMustNamesList();
- String[] optionalATNames = oc.getMayNamesList();
+ List<String> mandatoryATNames = oc.getMustAttributeTypeOids();
+ List<String> optionalATNames = oc.getMayAttributeTypeOids();
if ( ( mandatoryATNames != null ) && ( optionalATNames != null ) )
{
for ( String mandatoryATName : mandatoryATNames )
@@ -1009,8 +1009,8 @@ public class SchemaChecker
}
// Checking aliases
- String[] aliases = sc.getNamesRef();
- if ( ( aliases != null ) && ( aliases.length > 0 ) )
+ List<String> aliases = sc.getNames();
+ if ( ( aliases != null ) && ( aliases.size() > 0 ) )
{
for ( String alias : aliases )
{
Modified: directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/ViewUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/ViewUtils.java?rev=1005455&r1=1005454&r2=1005455&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/ViewUtils.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/ViewUtils.java Thu Oct 7 14:10:24 2010
@@ -20,6 +20,8 @@
package org.apache.directory.studio.schemaeditor.view;
+import java.util.List;
+
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.widgets.MessageBox;
@@ -50,16 +52,16 @@ public class ViewUtils
* @return
* a String representing all aliases
*/
- public static String concateAliases( String[] aliases )
+ public static String concateAliases( List<String> aliases )
{
StringBuffer sb = new StringBuffer();
- if ( aliases.length > 0 )
+ if ( aliases.size() > 0 )
{
- sb.append( aliases[0] );
- for ( int i = 1; i < aliases.length; i++ )
+ sb.append( aliases.get( 0 ) );
+ for ( int i = 1; i < aliases.size(); i++ )
{
sb.append( ", " ); //$NON-NLS-1$
- sb.append( aliases[i] );
+ sb.append( aliases.get( i ) );
}
}
Modified: directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialog.java?rev=1005455&r1=1005454&r2=1005455&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialog.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialog.java Thu Oct 7 14:10:24 2010
@@ -179,7 +179,7 @@ public class AttributeTypeSelectionDialo
chooseButton.setEnabled( true );
}
schemaIconLabel.setImage( Activator.getDefault().getImage( PluginConstants.IMG_SCHEMA ) );
- schemaNameLabel.setText( ( ( AttributeTypeImpl ) selection.getFirstElement() ).getSchema() );
+ schemaNameLabel.setText( ( ( AttributeTypeImpl ) selection.getFirstElement() ).getSchemaName() );
}
}
} );
Modified: directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogContentProvider.java?rev=1005455&r1=1005454&r2=1005455&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogContentProvider.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogContentProvider.java Thu Oct 7 14:10:24 2010
@@ -85,26 +85,26 @@ public class AttributeTypeSelectionDialo
{
public int compare( AttributeTypeImpl at1, AttributeTypeImpl at2 )
{
- String[] at1Names = ( ( AttributeTypeImpl ) at1 ).getNamesRef();
- String[] at2Names = ( ( AttributeTypeImpl ) at2 ).getNamesRef();
+ List<String> at1Names = ( ( AttributeTypeImpl ) at1 ).getNames();
+ List<String> at2Names = ( ( AttributeTypeImpl ) at2 ).getNames();
- if ( ( at1Names == null || at1Names.length == 0 ) && ( at2Names == null || at2Names.length == 0 ) )
+ if ( ( at1Names == null || at1Names.size() == 0 ) && ( at2Names == null || at2Names.size() == 0 ) )
{
return 0;
}
- else if ( ( at1Names == null || at1Names.length == 0 )
- && ( at2Names != null && at2Names.length > 0 ) )
+ else if ( ( at1Names == null || at1Names.size() == 0 )
+ && ( at2Names != null && at2Names.size() > 0 ) )
{
- return "".compareToIgnoreCase( at2Names[0] ); //$NON-NLS-1$
+ return "".compareToIgnoreCase( at2Names.get( 0 ) ); //$NON-NLS-1$
}
- else if ( ( at1Names != null && at1Names.length > 0 )
- && ( at2Names == null || at2Names.length == 0 ) )
+ else if ( ( at1Names != null && at1Names.size() > 0 )
+ && ( at2Names == null || at2Names.size() == 0 ) )
{
- return at1Names[0].compareToIgnoreCase( "" ); //$NON-NLS-1$
+ return at1Names.get( 0 ).compareToIgnoreCase( "" ); //$NON-NLS-1$
}
else
{
- return at1Names[0].compareToIgnoreCase( at2Names[0] );
+ return at1Names.get( 0 ).compareToIgnoreCase( at2Names.get( 0 ) );
}
}
} );
@@ -112,7 +112,7 @@ public class AttributeTypeSelectionDialo
// Searching for all matching elements
for ( AttributeTypeImpl at : atList )
{
- for ( String name : at.getNamesRef() )
+ for ( String name : at.getNames() )
{
Matcher m = pattern.matcher( name );
if ( m.matches() )
Modified: directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogLabelProvider.java?rev=1005455&r1=1005454&r2=1005455&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogLabelProvider.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/AttributeTypeSelectionDialogLabelProvider.java Thu Oct 7 14:10:24 2010
@@ -21,6 +21,8 @@
package org.apache.directory.studio.schemaeditor.view.dialogs;
+import java.util.List;
+
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
@@ -61,8 +63,8 @@ public class AttributeTypeSelectionDialo
{
AttributeTypeImpl at = ( AttributeTypeImpl ) element;
- String[] names = at.getNamesRef();
- if ( ( names != null ) && ( names.length > 0 ) )
+ List<String> names = at.getNames();
+ if ( ( names != null ) && ( names.size() > 0 ) )
{
return ViewUtils.concateAliases( names ) + " - (" + at.getOid() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
}
Modified: directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/EditAliasesDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/EditAliasesDialog.java?rev=1005455&r1=1005454&r2=1005455&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/EditAliasesDialog.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/EditAliasesDialog.java Thu Oct 7 14:10:24 2010
@@ -105,7 +105,7 @@ public class EditAliasesDialog extends D
* @param aliases
* an array containing the aliases
*/
- public EditAliasesDialog( String[] aliases )
+ public EditAliasesDialog( List<String> aliases )
{
super( PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell() );
initialLowerCasedAliases = new ArrayList<String>();
Modified: directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialog.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialog.java?rev=1005455&r1=1005454&r2=1005455&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialog.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialog.java Thu Oct 7 14:10:24 2010
@@ -179,7 +179,7 @@ public class ObjectClassSelectionDialog
chooseButton.setEnabled( true );
}
schemaIconLabel.setImage( Activator.getDefault().getImage( PluginConstants.IMG_SCHEMA ) );
- schemaNameLabel.setText( ( ( ObjectClassImpl ) selection.getFirstElement() ).getSchema() );
+ schemaNameLabel.setText( ( ( ObjectClassImpl ) selection.getFirstElement() ).getSchemaName() );
}
}
} );
Modified: directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogContentProvider.java?rev=1005455&r1=1005454&r2=1005455&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogContentProvider.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogContentProvider.java Thu Oct 7 14:10:24 2010
@@ -85,26 +85,26 @@ public class ObjectClassSelectionDialogC
{
public int compare( ObjectClassImpl oc1, ObjectClassImpl oc2 )
{
- String[] oc1Names = ( ( ObjectClassImpl ) oc1 ).getNamesRef();
- String[] oc2Names = ( ( ObjectClassImpl ) oc2 ).getNamesRef();
+ List<String> oc1Names = ( ( ObjectClassImpl ) oc1 ).getNames();
+ List<String> oc2Names = ( ( ObjectClassImpl ) oc2 ).getNames();
- if ( ( oc1Names == null || oc1Names.length == 0 ) && ( oc2Names == null || oc2Names.length == 0 ) )
+ if ( ( oc1Names == null || oc1Names.size() == 0 ) && ( oc2Names == null || oc2Names.size() == 0 ) )
{
return 0;
}
- else if ( ( oc1Names == null || oc1Names.length == 0 )
- && ( oc2Names != null && oc2Names.length > 0 ) )
+ else if ( ( oc1Names == null || oc1Names.size() == 0 )
+ && ( oc2Names != null && oc2Names.size() > 0 ) )
{
- return "".compareToIgnoreCase( oc2Names[0] ); //$NON-NLS-1$
+ return "".compareToIgnoreCase( oc2Names.get( 0 ) ); //$NON-NLS-1$
}
- else if ( ( oc1Names != null && oc1Names.length > 0 )
- && ( oc2Names == null || oc2Names.length == 0 ) )
+ else if ( ( oc1Names != null && oc1Names.size() > 0 )
+ && ( oc2Names == null || oc2Names.size() == 0 ) )
{
- return oc1Names[0].compareToIgnoreCase( "" ); //$NON-NLS-1$
+ return oc1Names.get( 0 ).compareToIgnoreCase( "" ); //$NON-NLS-1$
}
else
{
- return oc1Names[0].compareToIgnoreCase( oc2Names[0] );
+ return oc1Names.get( 0 ).compareToIgnoreCase( oc2Names.get( 0 ) );
}
}
} );
@@ -112,7 +112,7 @@ public class ObjectClassSelectionDialogC
// Searching for all matching elements
for ( ObjectClassImpl oc : ocList )
{
- for ( String name : oc.getNamesRef() )
+ for ( String name : oc.getNames() )
{
Matcher m = pattern.matcher( name );
if ( m.matches() )
Modified: directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogLabelProvider.java?rev=1005455&r1=1005454&r2=1005455&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogLabelProvider.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/dialogs/ObjectClassSelectionDialogLabelProvider.java Thu Oct 7 14:10:24 2010
@@ -21,6 +21,8 @@
package org.apache.directory.studio.schemaeditor.view.dialogs;
+import java.util.List;
+
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.model.ObjectClassImpl;
@@ -61,8 +63,8 @@ public class ObjectClassSelectionDialogL
{
ObjectClassImpl oc = ( ObjectClassImpl ) element;
- String[] names = oc.getNamesRef();
- if ( ( names != null ) && ( names.length > 0 ) )
+ List<String> names = oc.getNames();
+ if ( ( names != null ) && ( names.size() > 0 ) )
{
return ViewUtils.concateAliases( names ) + " - (" + oc.getOid() + ")"; //$NON-NLS-2$
}
Modified: directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboComparator.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboComparator.java?rev=1005455&r1=1005454&r2=1005455&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboComparator.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboComparator.java Thu Oct 7 14:10:24 2010
@@ -21,6 +21,7 @@ package org.apache.directory.studio.sche
import java.util.Comparator;
+import java.util.List;
import org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl;
import org.apache.directory.studio.schemaeditor.view.editors.NonExistingMatchingRule;
@@ -40,32 +41,32 @@ public class ATEMatchingRulesComboCompar
{
if ( o1 instanceof MatchingRuleImpl && o2 instanceof MatchingRuleImpl )
{
- String[] mr1Names = ( ( MatchingRuleImpl ) o1 ).getNamesRef();
- String[] mr2Names = ( ( MatchingRuleImpl ) o2 ).getNamesRef();
+ List<String> mr1Names = ( ( MatchingRuleImpl ) o1 ).getNames();
+ List<String> mr2Names = ( ( MatchingRuleImpl ) o2 ).getNames();
- if ( ( mr1Names != null ) && ( mr2Names != null ) && ( mr1Names.length > 0 ) && ( mr2Names.length > 0 ) )
+ if ( ( mr1Names != null ) && ( mr2Names != null ) && ( mr1Names.size() > 0 ) && ( mr2Names.size() > 0 ) )
{
- return mr1Names[0].compareToIgnoreCase( mr2Names[0] );
+ return mr1Names.get( 0 ).compareToIgnoreCase( mr2Names.get( 0 ) );
}
}
else if ( o1 instanceof MatchingRuleImpl && o2 instanceof NonExistingMatchingRule )
{
- String[] mr1Names = ( ( MatchingRuleImpl ) o1 ).getNamesRef();
+ List<String> mr1Names = ( ( MatchingRuleImpl ) o1 ).getNames();
String mr2Name = ( ( NonExistingMatchingRule ) o2 ).getName();
- if ( ( mr1Names != null ) && ( mr2Name != null ) && ( mr1Names.length > 0 ) )
+ if ( ( mr1Names != null ) && ( mr2Name != null ) && ( mr1Names.size() > 0 ) )
{
- return mr1Names[0].compareToIgnoreCase( mr2Name );
+ return mr1Names.get( 0 ).compareToIgnoreCase( mr2Name );
}
}
else if ( o1 instanceof NonExistingMatchingRule && o2 instanceof MatchingRuleImpl )
{
String mr1Name = ( ( NonExistingMatchingRule ) o1 ).getName();
- String[] mr2Names = ( ( MatchingRuleImpl ) o2 ).getNamesRef();
+ List<String> mr2Names = ( ( MatchingRuleImpl ) o2 ).getNames();
- if ( ( mr1Name != null ) && ( mr2Names != null ) && ( mr2Names.length > 0 ) )
+ if ( ( mr1Name != null ) && ( mr2Names != null ) && ( mr2Names.size() > 0 ) )
{
- return mr1Name.compareToIgnoreCase( mr2Names[0] );
+ return mr1Name.compareToIgnoreCase( mr2Names.get( 0 ) );
}
}
else if ( o1 instanceof NonExistingMatchingRule && o2 instanceof NonExistingMatchingRule )
Modified: directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboComparator.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboComparator.java?rev=1005455&r1=1005454&r2=1005455&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboComparator.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboComparator.java Thu Oct 7 14:10:24 2010
@@ -21,6 +21,7 @@ package org.apache.directory.studio.sche
import java.util.Comparator;
+import java.util.List;
import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
import org.apache.directory.studio.schemaeditor.view.editors.NonExistingAttributeType;
@@ -40,32 +41,32 @@ public class ATESuperiorComboComparator
{
if ( o1 instanceof AttributeTypeImpl && o2 instanceof AttributeTypeImpl )
{
- String[] at1Names = ( ( AttributeTypeImpl ) o1 ).getNamesRef();
- String[] at2Names = ( ( AttributeTypeImpl ) o2 ).getNamesRef();
+ List<String> at1Names = ( ( AttributeTypeImpl ) o1 ).getNames();
+ List<String> at2Names = ( ( AttributeTypeImpl ) o2 ).getNames();
- if ( ( at1Names != null ) && ( at2Names != null ) && ( at1Names.length > 0 ) && ( at2Names.length > 0 ) )
+ if ( ( at1Names != null ) && ( at2Names != null ) && ( at1Names.size() > 0 ) && ( at2Names.size() > 0 ) )
{
- return at1Names[0].compareToIgnoreCase( at2Names[0] );
+ return at1Names.get( 0 ).compareToIgnoreCase( at2Names.get( 0 ) );
}
}
else if ( o1 instanceof AttributeTypeImpl && o2 instanceof NonExistingAttributeType )
{
- String[] at1Names = ( ( AttributeTypeImpl ) o1 ).getNamesRef();
+ List<String> at1Names = ( ( AttributeTypeImpl ) o1 ).getNames();
String at2Name = ( ( NonExistingAttributeType ) o2 ).getName();
- if ( ( at1Names != null ) && ( at2Name != null ) && ( at1Names.length > 0 ) )
+ if ( ( at1Names != null ) && ( at2Name != null ) && ( at1Names.size() > 0 ) )
{
- return at1Names[0].compareToIgnoreCase( at2Name );
+ return at1Names.get( 0 ).compareToIgnoreCase( at2Name );
}
}
else if ( o1 instanceof NonExistingAttributeType && o2 instanceof AttributeTypeImpl )
{
String at1Name = ( ( NonExistingAttributeType ) o1 ).getName();
- String[] at2Names = ( ( AttributeTypeImpl ) o2 ).getNamesRef();
+ List<String> at2Names = ( ( AttributeTypeImpl ) o2 ).getNames();
- if ( ( at1Name != null ) && ( at2Names != null ) && ( at2Names.length > 0 ) )
+ if ( ( at1Name != null ) && ( at2Names != null ) && ( at2Names.size() > 0 ) )
{
- return at1Name.compareToIgnoreCase( at2Names[0] );
+ return at1Name.compareToIgnoreCase( at2Names.get( 0 ) );
}
}
else if ( o1 instanceof NonExistingAttributeType && o2 instanceof NonExistingAttributeType )
Modified: directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboLabelProvider.java?rev=1005455&r1=1005454&r2=1005455&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboLabelProvider.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESuperiorComboLabelProvider.java Thu Oct 7 14:10:24 2010
@@ -20,6 +20,8 @@
package org.apache.directory.studio.schemaeditor.view.editors.attributetype;
+import java.util.List;
+
import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
import org.apache.directory.studio.schemaeditor.view.ViewUtils;
import org.apache.directory.studio.schemaeditor.view.editors.NonExistingAttributeType;
@@ -43,8 +45,8 @@ public class ATESuperiorComboLabelProvid
{
AttributeTypeImpl at = ( AttributeTypeImpl ) obj;
- String[] names = at.getNamesRef();
- if ( ( names != null ) && ( names.length > 0 ) )
+ List<String> names = at.getNames();
+ if ( ( names != null ) && ( names.size() > 0 ) )
{
return ViewUtils.concateAliases( names ) + " - (" + at.getOid() + ")"; //$NON-NLS-1$ //$NON-NLS-2$
}
Modified: directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboComparator.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboComparator.java?rev=1005455&r1=1005454&r2=1005455&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboComparator.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATESyntaxComboComparator.java Thu Oct 7 14:10:24 2010
@@ -21,6 +21,7 @@ package org.apache.directory.studio.sche
import java.util.Comparator;
+import java.util.List;
import org.apache.directory.studio.schemaeditor.model.SyntaxImpl;
import org.apache.directory.studio.schemaeditor.view.editors.NonExistingSyntax;
@@ -40,33 +41,33 @@ public class ATESyntaxComboComparator im
{
if ( o1 instanceof SyntaxImpl && o2 instanceof SyntaxImpl )
{
- String[] syntax1Names = ( ( SyntaxImpl ) o1 ).getNamesRef();
- String[] syntax2Names = ( ( SyntaxImpl ) o2 ).getNamesRef();
+ List<String> syntax1Names = ( ( SyntaxImpl ) o1 ).getNames();
+ List<String> syntax2Names = ( ( SyntaxImpl ) o2 ).getNames();
- if ( ( syntax1Names != null ) && ( syntax2Names != null ) && ( syntax1Names.length > 0 )
- && ( syntax2Names.length > 0 ) )
+ if ( ( syntax1Names != null ) && ( syntax2Names != null ) && ( syntax1Names.size() > 0 )
+ && ( syntax2Names.size() > 0 ) )
{
- return syntax1Names[0].compareToIgnoreCase( syntax2Names[0] );
+ return syntax1Names.get( 0 ).compareToIgnoreCase( syntax2Names.get( 0 ) );
}
}
else if ( o1 instanceof SyntaxImpl && o2 instanceof NonExistingSyntax )
{
- String[] syntax1Names = ( ( SyntaxImpl ) o1 ).getNamesRef();
+ List<String> syntax1Names = ( ( SyntaxImpl ) o1 ).getNames();
String syntax2Name = ( ( NonExistingSyntax ) o2 ).getName();
- if ( ( syntax1Names != null ) && ( syntax2Name != null ) && ( syntax1Names.length > 0 ) )
+ if ( ( syntax1Names != null ) && ( syntax2Name != null ) && ( syntax1Names.size() > 0 ) )
{
- return syntax1Names[0].compareToIgnoreCase( syntax2Name );
+ return syntax1Names.get( 0 ).compareToIgnoreCase( syntax2Name );
}
}
else if ( o1 instanceof NonExistingSyntax && o2 instanceof SyntaxImpl )
{
String syntax1Name = ( ( NonExistingSyntax ) o1 ).getName();
- String[] syntax2Names = ( ( SyntaxImpl ) o2 ).getNamesRef();
+ List<String> syntax2Names = ( ( SyntaxImpl ) o2 ).getNames();
- if ( ( syntax1Name != null ) && ( syntax2Names != null ) && ( syntax2Names.length > 0 ) )
+ if ( ( syntax1Name != null ) && ( syntax2Names != null ) && ( syntax2Names.size() > 0 ) )
{
- return syntax1Name.compareToIgnoreCase( syntax2Names[0] );
+ return syntax1Name.compareToIgnoreCase( syntax2Names.get( 0 ) );
}
}
else if ( o1 instanceof NonExistingSyntax && o2 instanceof NonExistingSyntax )
Modified: directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByMandatoryTableContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByMandatoryTableContentProvider.java?rev=1005455&r1=1005454&r2=1005455&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByMandatoryTableContentProvider.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByMandatoryTableContentProvider.java Thu Oct 7 14:10:24 2010
@@ -53,7 +53,7 @@ public class ATEUsedByMandatoryTableCont
List<String> names = new ArrayList<String>();
- String[] atNames = inputAT.getNamesRef();
+ List<String> atNames = inputAT.getNames();
if ( atNames != null )
{
for ( String name : atNames )
@@ -65,7 +65,7 @@ public class ATEUsedByMandatoryTableCont
List<ObjectClassImpl> objectClasses = schemaHandler.getObjectClasses();
for ( ObjectClassImpl oc : objectClasses )
{
- String[] musts = oc.getMustNamesList();
+ List<String> musts = oc.getMustAttributeTypeOids();
if ( musts != null )
{
for ( String must : musts )
@@ -85,13 +85,13 @@ public class ATEUsedByMandatoryTableCont
{
if ( oc1 instanceof ObjectClassImpl && oc1 instanceof ObjectClassImpl )
{
- String[] oc1Names = ( ( ObjectClassImpl ) oc1 ).getNamesRef();
- String[] oc2Names = ( ( ObjectClassImpl ) oc2 ).getNamesRef();
+ List<String> oc1Names = ( ( ObjectClassImpl ) oc1 ).getNames();
+ List<String> oc2Names = ( ( ObjectClassImpl ) oc2 ).getNames();
- if ( ( oc1Names != null ) && ( oc2Names != null ) && ( oc1Names.length > 0 )
- && ( oc2Names.length > 0 ) )
+ if ( ( oc1Names != null ) && ( oc2Names != null ) && ( oc1Names.size() > 0 )
+ && ( oc2Names.size() > 0 ) )
{
- return oc1Names[0].compareToIgnoreCase( oc2Names[0] );
+ return oc1Names.get( 0 ).compareToIgnoreCase( oc2Names.get( 0 ) );
}
}
Modified: directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByOptionalTableContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByOptionalTableContentProvider.java?rev=1005455&r1=1005454&r2=1005455&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByOptionalTableContentProvider.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByOptionalTableContentProvider.java Thu Oct 7 14:10:24 2010
@@ -53,7 +53,7 @@ public class ATEUsedByOptionalTableConte
List<String> names = new ArrayList<String>();
- String[] atNames = inputAT.getNamesRef();
+ List<String> atNames = inputAT.getNames();
if ( atNames != null )
{
for ( String name : atNames )
@@ -65,7 +65,7 @@ public class ATEUsedByOptionalTableConte
List<ObjectClassImpl> objectClasses = schemaHandler.getObjectClasses();
for ( ObjectClassImpl oc : objectClasses )
{
- String[] mays = oc.getMayNamesList();
+ List<String> mays = oc.getMayAttributeTypeOids();
if ( mays != null )
{
for ( String may : mays )
@@ -85,13 +85,13 @@ public class ATEUsedByOptionalTableConte
{
if ( oc1 instanceof ObjectClassImpl && oc1 instanceof ObjectClassImpl )
{
- String[] oc1Names = ( ( ObjectClassImpl ) oc1 ).getNamesRef();
- String[] oc2Names = ( ( ObjectClassImpl ) oc2 ).getNamesRef();
+ List<String> oc1Names = ( ( ObjectClassImpl ) oc1 ).getNames();
+ List<String> oc2Names = ( ( ObjectClassImpl ) oc2 ).getNames();
- if ( ( oc1Names != null ) && ( oc2Names != null ) && ( oc1Names.length > 0 )
- && ( oc2Names.length > 0 ) )
+ if ( ( oc1Names != null ) && ( oc2Names != null ) && ( oc1Names.size() > 0 )
+ && ( oc2Names.size() > 0 ) )
{
- return oc1Names[0].compareToIgnoreCase( oc2Names[0] );
+ return oc1Names.get( 0 ).compareToIgnoreCase( oc2Names.get( 0 ) );
}
}
Modified: directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByTablesLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByTablesLabelProvider.java?rev=1005455&r1=1005454&r2=1005455&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByTablesLabelProvider.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEUsedByTablesLabelProvider.java Thu Oct 7 14:10:24 2010
@@ -59,7 +59,7 @@ public class ATEUsedByTablesLabelProvide
{
if ( element instanceof ObjectClassImpl )
{
- return ViewUtils.concateAliases( ( ( ObjectClassImpl ) element ).getNamesRef() );
+ return ViewUtils.concateAliases( ( ( ObjectClassImpl ) element ).getNames() );
}
// Default
Modified: directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java?rev=1005455&r1=1005454&r2=1005455&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditor.java Thu Oct 7 14:10:24 2010
@@ -143,7 +143,7 @@ public class AttributeTypeEditor extends
modifiedAttributeType = PluginUtils.getClone( originalAttributeType );
SchemaHandler schemaHandler = Activator.getDefault().getSchemaHandler();
- originalSchema = schemaHandler.getSchema( originalAttributeType.getSchema() );
+ originalSchema = schemaHandler.getSchema( originalAttributeType.getSchemaName() );
schemaHandler.addListener( originalAttributeType, attributeTypeListener );
schemaHandler.addListener( schemaHandlerListener );
Modified: directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java?rev=1005455&r1=1005454&r2=1005455&view=diff
==============================================================================
--- directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java (original)
+++ directory/studio/branches/shared-trunk-merge/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorInput.java Thu Oct 7 14:10:24 2010
@@ -21,6 +21,8 @@
package org.apache.directory.studio.schemaeditor.view.editors.attributetype;
+import java.util.List;
+
import org.apache.directory.studio.schemaeditor.model.AttributeTypeImpl;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.osgi.util.NLS;
@@ -74,10 +76,10 @@ public class AttributeTypeEditorInput im
*/
public String getName()
{
- String[] names = attributeType.getNamesRef();
- if ( ( names != null ) && ( names.length > 0 ) )
+ List<String> names = attributeType.getNames();
+ if ( ( names != null ) && ( names.size() > 0 ) )
{
- return names[0];
+ return names.get( 0 );
}
else
{
@@ -101,7 +103,7 @@ public class AttributeTypeEditorInput im
public String getToolTipText()
{
return NLS.bind( Messages.getString( "AttributeTypeEditorInput.FromSchema" ), new String[] //$NON-NLS-1$
- { getName(), attributeType.getSchema() } );
+ { getName(), attributeType.getSchemaName() } );
}