You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2011/03/12 20:05:20 UTC
svn commit: r1080977 [3/3] - in /directory:
apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/entry/
apacheds/branches/akarasulu/core-api/src/main/java/org/apache/directory/server/core/schema/
apacheds/branches/akarasu...
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandler.java Sat Mar 12 19:05:17 2011
@@ -28,7 +28,7 @@ import org.apache.commons.collections.ma
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.SchemaObject;
import org.apache.directory.studio.schemaeditor.model.Schema;
@@ -52,7 +52,7 @@ public class SchemaHandler
/** The attribute types List */
private List<AttributeType> attributeTypesList;
/** The matching rules List */
- private List<MatchingRule> matchingRulesList;
+ private List<MutableMatchingRuleImpl> matchingRulesList;
/** The object classes List */
private List<ObjectClass> objectClassesList;
/** The syntaxes List */
@@ -89,7 +89,7 @@ public class SchemaHandler
// Lists
schemasList = new ArrayList<Schema>();
attributeTypesList = new ArrayList<AttributeType>();
- matchingRulesList = new ArrayList<MatchingRule>();;
+ matchingRulesList = new ArrayList<MutableMatchingRuleImpl>();;
objectClassesList = new ArrayList<ObjectClass>();
syntaxesList = new ArrayList<MutableLdapSyntaxImpl>();
@@ -126,7 +126,7 @@ public class SchemaHandler
* @return
* the List of all the matching rules
*/
- public List<MatchingRule> getMatchingRules()
+ public List<MutableMatchingRuleImpl> getMatchingRules()
{
return matchingRulesList;
}
@@ -213,13 +213,13 @@ public class SchemaHandler
* @return
* the corresponding matching rule, or null if no one is found
*/
- public MatchingRule getMatchingRule( String id )
+ public MutableMatchingRuleImpl getMatchingRule( String id )
{
List<?> list = getMatchingRuleList( id.toLowerCase() );
if ( ( list != null ) && ( list.size() >= 1 ) )
{
- return ( MatchingRule ) list.get( 0 );
+ return ( MutableMatchingRuleImpl ) list.get( 0 );
}
else
{
@@ -492,7 +492,7 @@ public class SchemaHandler
}
// Adding its matching rules
- for ( MatchingRule mr : schema.getMatchingRules() )
+ for ( MutableMatchingRuleImpl mr : schema.getMatchingRules() )
{
addSchemaObject( mr );
}
@@ -535,9 +535,9 @@ public class SchemaHandler
}
attributeTypesMap.put( at.getOid(), at );
}
- else if ( object instanceof MatchingRule )
+ else if ( object instanceof MutableMatchingRuleImpl )
{
- MatchingRule mr = ( MatchingRule ) object;
+ MutableMatchingRuleImpl mr = ( MutableMatchingRuleImpl ) object;
matchingRulesList.add( mr );
List<String> names = mr.getNames();
if ( names != null )
@@ -599,7 +599,7 @@ public class SchemaHandler
}
// Removing its matching rules
- for ( MatchingRule mr : schema.getMatchingRules() )
+ for ( MutableMatchingRuleImpl mr : schema.getMatchingRules() )
{
removeSchemaObject( mr );
}
@@ -642,9 +642,9 @@ public class SchemaHandler
}
attributeTypesMap.remove( at.getOid() );
}
- else if ( object instanceof MatchingRule )
+ else if ( object instanceof MutableMatchingRuleImpl )
{
- MatchingRule mr = ( MatchingRule ) object;
+ MutableMatchingRuleImpl mr = ( MutableMatchingRuleImpl ) object;
matchingRulesList.remove( mr );
List<String> names = mr.getNames();
if ( names != null )
@@ -1060,7 +1060,7 @@ public class SchemaHandler
* @param mr
* the added matching rule
*/
- private void notifyMatchingRuleAdded( MatchingRule mr )
+ private void notifyMatchingRuleAdded( MutableMatchingRuleImpl mr )
{
// SchemaHandler Listeners
for ( SchemaHandlerListener listener : schemaHandlerListeners.toArray( new SchemaHandlerListener[0] ) )
@@ -1086,7 +1086,7 @@ public class SchemaHandler
* @param mr
* the modified matching rule
*/
- private void notifyMatchingRuleModified( MatchingRule mr )
+ private void notifyMatchingRuleModified( MutableMatchingRuleImpl mr )
{
// SchemaHandler Listeners
for ( SchemaHandlerListener listener : schemaHandlerListeners.toArray( new SchemaHandlerListener[0] ) )
@@ -1112,7 +1112,7 @@ public class SchemaHandler
* @param mr
* the removed matching rule
*/
- private void notifyMatchingRuleRemoved( MatchingRule mr )
+ private void notifyMatchingRuleRemoved( MutableMatchingRuleImpl mr )
{
// SchemaHandler Listeners
for ( SchemaHandlerListener listener : schemaHandlerListeners.toArray( new SchemaHandlerListener[0] ) )
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerAdapter.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerAdapter.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
(empty)
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerListener.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerListener.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerListener.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaHandlerListener.java Sat Mar 12 19:05:17 2011
@@ -22,7 +22,7 @@ package org.apache.directory.studio.sche
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.studio.schemaeditor.model.Schema;
@@ -68,7 +68,7 @@ public interface SchemaHandlerListener
* @param mr
* the added matching rule
*/
- public void matchingRuleAdded( MatchingRule mr );
+ public void matchingRuleAdded( MutableMatchingRuleImpl mr );
/**
@@ -77,7 +77,7 @@ public interface SchemaHandlerListener
* @param mr
* the modified matching rule
*/
- public void matchingRuleModified( MatchingRule mr );
+ public void matchingRuleModified( MutableMatchingRuleImpl mr );
/**
@@ -86,7 +86,7 @@ public interface SchemaHandlerListener
* @param mr
* the removed matching rule
*/
- public void matchingRuleRemoved( MatchingRule mr );
+ public void matchingRuleRemoved( MutableMatchingRuleImpl mr );
/**
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaListener.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaListener.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaListener.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/SchemaListener.java Sat Mar 12 19:05:17 2011
@@ -22,7 +22,7 @@ package org.apache.directory.studio.sche
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
@@ -67,7 +67,7 @@ public interface SchemaListener
* @param mr
* the added matching rule
*/
- public void matchingRuleAdded( MatchingRule mr );
+ public void matchingRuleAdded( MutableMatchingRuleImpl mr );
/**
@@ -76,7 +76,7 @@ public interface SchemaListener
* @param mr
* the modified matching rule
*/
- public void matchingRuleModified( MatchingRule mr );
+ public void matchingRuleModified( MutableMatchingRuleImpl mr );
/**
@@ -85,7 +85,7 @@ public interface SchemaListener
* @param mr
* the removed matching rule
*/
- public void matchingRuleRemoved( MatchingRule mr );
+ public void matchingRuleRemoved( MutableMatchingRuleImpl mr );
/**
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java Sat Mar 12 19:05:17 2011
@@ -29,7 +29,7 @@ import org.apache.commons.collections.Mu
import org.apache.commons.collections.map.MultiValueMap;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.SchemaObject;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
@@ -169,7 +169,7 @@ public class DependenciesComputer
String equalityName = attributeType.getEqualityOid();
if ( equalityName != null )
{
- MatchingRule equalityMatchingRule = schemaHandler.getMatchingRule( equalityName );
+ MutableMatchingRuleImpl equalityMatchingRule = schemaHandler.getMatchingRule( equalityName );
if ( equalityMatchingRule == null )
{
throw new DependencyComputerException( NLS.bind(
@@ -189,7 +189,7 @@ public class DependenciesComputer
String orderingName = attributeType.getOrderingOid();
if ( orderingName != null )
{
- MatchingRule orderingMatchingRule = schemaHandler.getMatchingRule( orderingName );
+ MutableMatchingRuleImpl orderingMatchingRule = schemaHandler.getMatchingRule( orderingName );
if ( orderingMatchingRule == null )
{
throw new DependencyComputerException( NLS.bind(
@@ -209,7 +209,7 @@ public class DependenciesComputer
String substringName = attributeType.getSubstringOid();
if ( substringName != null )
{
- MatchingRule substringMatchingRule = schemaHandler.getMatchingRule( substringName );
+ MutableMatchingRuleImpl substringMatchingRule = schemaHandler.getMatchingRule( substringName );
if ( substringMatchingRule == null )
{
throw new DependencyComputerException( NLS.bind(
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/Schema.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/Schema.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/Schema.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/Schema.java Sat Mar 12 19:05:17 2011
@@ -25,8 +25,9 @@ import java.util.List;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
-import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.registries.DefaultSchema;
@@ -48,7 +49,7 @@ public class Schema extends DefaultSchem
private List<ObjectClass> objectClasses = new ArrayList<ObjectClass>();
/** The MatchingRule List */
- private List<MatchingRule> matchingRules = new ArrayList<MatchingRule>();
+ private List<MutableMatchingRuleImpl> matchingRules = new ArrayList<MutableMatchingRuleImpl>();
/** The Syntax List */
private List<MutableLdapSyntaxImpl> syntaxes = new ArrayList<MutableLdapSyntaxImpl>();
@@ -84,7 +85,7 @@ public class Schema extends DefaultSchem
* @param mr
* the MatchingRule
*/
- public boolean addMatchingRule( MatchingRule mr )
+ public boolean addMatchingRule( MutableMatchingRuleImpl mr )
{
return matchingRules.add( mr );
}
@@ -171,7 +172,7 @@ public class Schema extends DefaultSchem
*/
public MatchingRule getMatchingRule( String id )
{
- for ( MatchingRule mr : matchingRules )
+ for ( MutableMatchingRuleImpl mr : matchingRules )
{
List<String> aliases = mr.getNames();
if ( aliases != null )
@@ -200,7 +201,7 @@ public class Schema extends DefaultSchem
* @return
* all the MatchingRule objects contained in the Schema
*/
- public List<MatchingRule> getMatchingRules()
+ public List<MutableMatchingRuleImpl> getMatchingRules()
{
return matchingRules;
}
@@ -328,7 +329,7 @@ public class Schema extends DefaultSchem
* @param mr
* the MatchingRule
*/
- public boolean removeMatchingRule( MatchingRule mr )
+ public boolean removeMatchingRule( MutableMatchingRuleImpl mr )
{
return matchingRules.remove( mr );
}
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/ApacheDsSchemaConnector.java Sat Mar 12 19:05:17 2011
@@ -31,7 +31,7 @@ import javax.naming.directory.SearchResu
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum;
import org.apache.directory.shared.ldap.model.schema.UsageEnum;
@@ -231,7 +231,7 @@ public class ApacheDsSchemaConnector ext
schema.addObjectClass( oc );
break;
case MATCHING_RULE:
- MatchingRule mr = createMatchingRule( searchResult );
+ MutableMatchingRuleImpl mr = createMatchingRule( searchResult );
mr.setSchemaName( name );
schema.addMatchingRule( mr );
break;
@@ -361,9 +361,9 @@ public class ApacheDsSchemaConnector ext
* ObjectClass could be created
* @throws NamingException
*/
- private static MatchingRule createMatchingRule( SearchResult sr ) throws NamingException
+ private static MutableMatchingRuleImpl createMatchingRule( SearchResult sr ) throws NamingException
{
- MatchingRule mr = new MatchingRule( getOid( sr ) );
+ MutableMatchingRuleImpl mr = new MutableMatchingRuleImpl( getOid( sr ) );
mr.setNames( getNames( sr ) );
mr.setDescription( getDescription( sr ) );
mr.setObsolete( isObsolete( sr ) );
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/GenericSchemaConnector.java Sat Mar 12 19:05:17 2011
@@ -32,7 +32,7 @@ import javax.naming.directory.SearchResu
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.parsers.AttributeTypeDescriptionSchemaParser;
import org.apache.directory.shared.ldap.model.schema.parsers.LdapSyntaxDescriptionSchemaParser;
@@ -304,9 +304,9 @@ public class GenericSchemaConnector exte
String value = ( String ) ne.nextElement();
MatchingRuleDescriptionSchemaParser parser = new MatchingRuleDescriptionSchemaParser();
parser.setQuirksMode( true );
- MatchingRule mrd = parser.parseMatchingRuleDescription( value );
+ MutableMatchingRuleImpl mrd = parser.parseMatchingRuleDescription( value );
- MatchingRule impl = new MatchingRule( mrd.getOid() );
+ MutableMatchingRuleImpl impl = new MutableMatchingRuleImpl( mrd.getOid() );
impl.setDescription( mrd.getDescription() );
impl.setNames( mrd.getNames().toArray( new String[0] ) );
impl.setObsolete( mrd.isObsolete() );
@@ -336,7 +336,7 @@ public class GenericSchemaConnector exte
{
if ( matchingRuleName != null && schema.getMatchingRule( matchingRuleName ) == null )
{
- MatchingRule impl = new MatchingRule( matchingRuleName );
+ MutableMatchingRuleImpl impl = new MutableMatchingRuleImpl( matchingRuleName );
impl.setSchemaName( schema.getSchemaName() );
impl.setDescription( "Dummy" ); //$NON-NLS-1$
impl.setNames( new String[]
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileExporter.java Sat Mar 12 19:05:17 2011
@@ -27,7 +27,7 @@ import java.util.List;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum;
import org.apache.directory.shared.ldap.model.schema.UsageEnum;
@@ -215,11 +215,11 @@ public class XMLSchemaFileExporter
}
// Matching Rules
- List<MatchingRule> mrs = schema.getMatchingRules();
+ List<MutableMatchingRuleImpl> mrs = schema.getMatchingRules();
if ( ( mrs != null ) && ( mrs.size() >= 1 ) )
{
Element matchingRulesNode = element.addElement( MATCHING_RULES_TAG );
- for ( MatchingRule mr : mrs )
+ for ( MutableMatchingRuleImpl mr : mrs )
{
toXml( mr, matchingRulesNode );
}
@@ -464,7 +464,7 @@ public class XMLSchemaFileExporter
* @param root
* the root Element
*/
- private static void toXml( MatchingRule mr, Element root )
+ private static void toXml( MutableMatchingRuleImpl mr, Element root )
{
Element mrNode = root.addElement( MATCHING_RULE_TAG );
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/io/XMLSchemaFileImporter.java Sat Mar 12 19:05:17 2011
@@ -28,7 +28,7 @@ import java.util.List;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum;
import org.apache.directory.shared.ldap.model.schema.UsageEnum;
@@ -621,13 +621,13 @@ public class XMLSchemaFileImporter
*/
private static void readMatchingRule( Element element, Schema schema ) throws XMLSchemaFileImportException
{
- MatchingRule mr = null;
+ MutableMatchingRuleImpl mr = null;
// OID
Attribute oidAttribute = element.attribute( OID_TAG );
if ( ( oidAttribute != null ) && ( !oidAttribute.getValue().equals( "" ) ) ) //$NON-NLS-1$
{
- mr = new MatchingRule( oidAttribute.getValue() );
+ mr = new MutableMatchingRuleImpl( oidAttribute.getValue() );
}
else
{
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
(empty)
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoader.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoader.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoader.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoader.java Sat Mar 12 19:05:17 2011
@@ -28,7 +28,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.registries.AbstractSchemaLoader;
import org.apache.directory.shared.ldap.model.schema.registries.Schema;
@@ -114,9 +114,9 @@ public class SchemaEditorSchemaLoader ex
{
for ( Schema schema : schemas )
{
- List<MatchingRule> matchingRules = project.getSchemaHandler().getSchema( schema.getSchemaName() )
+ List<MutableMatchingRuleImpl> matchingRules = project.getSchemaHandler().getSchema( schema.getSchemaName() )
.getMatchingRules();
- for ( MatchingRule matchingRule : matchingRules )
+ for ( MutableMatchingRuleImpl matchingRule : matchingRules )
{
matchingRuleList.add( SchemaEditorSchemaLoaderUtils.toEntry( matchingRule ) );
}
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoaderUtils.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoaderUtils.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoaderUtils.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemamanager/SchemaEditorSchemaLoaderUtils.java Sat Mar 12 19:05:17 2011
@@ -33,7 +33,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.model.name.Rdn;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.ObjectClassTypeEnum;
import org.apache.directory.shared.ldap.model.schema.MutableSchemaObject;
@@ -130,7 +130,7 @@ public class SchemaEditorSchemaLoaderUti
* the object class converted to an equivalent entry representation
* @throws LdapException
*/
- public static Entry toEntry( MatchingRule matchingRule ) throws LdapException
+ public static Entry toEntry( MutableMatchingRuleImpl matchingRule ) throws LdapException
{
// Creating a blank entry
Entry entry = new DefaultEntry();
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboComparator.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboComparator.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboComparator.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboComparator.java Sat Mar 12 19:05:17 2011
@@ -23,7 +23,7 @@ package org.apache.directory.studio.sche
import java.util.Comparator;
import java.util.List;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
import org.apache.directory.studio.schemaeditor.view.editors.NonExistingMatchingRule;
@@ -39,19 +39,19 @@ public class ATEMatchingRulesComboCompar
*/
public int compare( Object o1, Object o2 )
{
- if ( o1 instanceof MatchingRule && o2 instanceof MatchingRule )
+ if ( o1 instanceof MutableMatchingRuleImpl && o2 instanceof MutableMatchingRuleImpl )
{
- List<String> mr1Names = ( ( MatchingRule ) o1 ).getNames();
- List<String> mr2Names = ( ( MatchingRule ) o2 ).getNames();
+ List<String> mr1Names = ( ( MutableMatchingRuleImpl ) o1 ).getNames();
+ List<String> mr2Names = ( ( MutableMatchingRuleImpl ) o2 ).getNames();
if ( ( mr1Names != null ) && ( mr2Names != null ) && ( mr1Names.size() > 0 ) && ( mr2Names.size() > 0 ) )
{
return mr1Names.get( 0 ).compareToIgnoreCase( mr2Names.get( 0 ) );
}
}
- else if ( o1 instanceof MatchingRule && o2 instanceof NonExistingMatchingRule )
+ else if ( o1 instanceof MutableMatchingRuleImpl && o2 instanceof NonExistingMatchingRule )
{
- List<String> mr1Names = ( ( MatchingRule ) o1 ).getNames();
+ List<String> mr1Names = ( ( MutableMatchingRuleImpl ) o1 ).getNames();
String mr2Name = ( ( NonExistingMatchingRule ) o2 ).getName();
if ( ( mr1Names != null ) && ( mr2Name != null ) && ( mr1Names.size() > 0 ) )
@@ -59,10 +59,10 @@ public class ATEMatchingRulesComboCompar
return mr1Names.get( 0 ).compareToIgnoreCase( mr2Name );
}
}
- else if ( o1 instanceof NonExistingMatchingRule && o2 instanceof MatchingRule )
+ else if ( o1 instanceof NonExistingMatchingRule && o2 instanceof MutableMatchingRuleImpl )
{
String mr1Name = ( ( NonExistingMatchingRule ) o1 ).getName();
- List<String> mr2Names = ( ( MatchingRule ) o2 ).getNames();
+ List<String> mr2Names = ( ( MutableMatchingRuleImpl ) o2 ).getNames();
if ( ( mr1Name != null ) && ( mr2Names != null ) && ( mr2Names.size() > 0 ) )
{
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboContentProvider.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboContentProvider.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboContentProvider.java Sat Mar 12 19:05:17 2011
@@ -23,7 +23,7 @@ package org.apache.directory.studio.sche
import java.util.Collections;
import java.util.List;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.view.editors.NonExistingMatchingRule;
import org.eclipse.jface.viewers.IStructuredContentProvider;
@@ -52,9 +52,9 @@ public class ATEMatchingRulesComboConten
input.addChild( new NonExistingMatchingRule( NonExistingMatchingRule.NONE ) );
// Creating Children
- List<MatchingRule> equalityMatchingRules = Activator.getDefault().getSchemaHandler()
+ List<MutableMatchingRuleImpl> equalityMatchingRules = Activator.getDefault().getSchemaHandler()
.getMatchingRules();
- for ( MatchingRule matchingRule : equalityMatchingRules )
+ for ( MutableMatchingRuleImpl matchingRule : equalityMatchingRules )
{
input.addChild( matchingRule );
}
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboLabelProvider.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboLabelProvider.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/ATEMatchingRulesComboLabelProvider.java Sat Mar 12 19:05:17 2011
@@ -20,7 +20,7 @@
package org.apache.directory.studio.schemaeditor.view.editors.attributetype;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
import org.apache.directory.studio.schemaeditor.view.editors.NonExistingMatchingRule;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.osgi.util.NLS;
@@ -38,9 +38,9 @@ public class ATEMatchingRulesComboLabelP
*/
public String getText( Object obj )
{
- if ( obj instanceof MatchingRule )
+ if ( obj instanceof MutableMatchingRuleImpl )
{
- MatchingRule mr = ( MatchingRule ) obj;
+ MutableMatchingRuleImpl mr = ( MutableMatchingRuleImpl ) obj;
String name = mr.getName();
if ( name != null )
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/attributetype/AttributeTypeEditorOverviewPage.java Sat Mar 12 19:05:17 2011
@@ -27,8 +27,9 @@ import java.util.List;
import org.apache.directory.shared.asn1.util.OID;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
-import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableLdapSyntaxImpl;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.UsageEnum;
import org.apache.directory.studio.schemaeditor.Activator;
@@ -583,7 +584,7 @@ public class AttributeTypeEditorOverview
if ( selectedItem instanceof MatchingRule )
{
- modifiedAttributeType.setEqualityOid( ( ( MatchingRule ) selectedItem ).getName() );
+ modifiedAttributeType.setEqualityOid( ( ( MutableMatchingRuleImpl ) selectedItem ).getName() );
}
else if ( selectedItem instanceof NonExistingMatchingRule )
{
@@ -611,7 +612,7 @@ public class AttributeTypeEditorOverview
if ( selectedItem instanceof MatchingRule )
{
- modifiedAttributeType.setOrderingOid( ( ( MatchingRule ) selectedItem ).getName() );
+ modifiedAttributeType.setOrderingOid( ( ( MutableMatchingRuleImpl ) selectedItem ).getName() );
}
else if ( selectedItem instanceof NonExistingMatchingRule )
{
@@ -639,7 +640,7 @@ public class AttributeTypeEditorOverview
if ( selectedItem instanceof MatchingRule )
{
- modifiedAttributeType.setSubstringOid( ( ( MatchingRule ) selectedItem ).getName() );
+ modifiedAttributeType.setSubstringOid( ( ( MutableMatchingRuleImpl ) selectedItem ).getName() );
}
else if ( selectedItem instanceof NonExistingMatchingRule )
{
@@ -1086,7 +1087,7 @@ public class AttributeTypeEditorOverview
}
else
{
- MatchingRule matchingRule = schemaHandler.getMatchingRule( equalityName );
+ MutableMatchingRuleImpl matchingRule = schemaHandler.getMatchingRule( equalityName );
if ( matchingRule != null )
{
equalityComboViewer.setSelection( new StructuredSelection( matchingRule ), true );
@@ -1121,7 +1122,7 @@ public class AttributeTypeEditorOverview
}
else
{
- MatchingRule matchingRule = schemaHandler.getMatchingRule( orderingName );
+ MutableMatchingRuleImpl matchingRule = schemaHandler.getMatchingRule( orderingName );
if ( matchingRule != null )
{
orderingComboViewer.setSelection( new StructuredSelection( matchingRule ), true );
@@ -1157,7 +1158,7 @@ public class AttributeTypeEditorOverview
}
else
{
- MatchingRule matchingRule = schemaHandler.getMatchingRule( substringName );
+ MutableMatchingRuleImpl matchingRule = schemaHandler.getMatchingRule( substringName );
if ( matchingRule != null )
{
substringComboViewer.setSelection( new StructuredSelection( matchingRule ), true );
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/objectclass/ObjectClassEditorOverviewPage.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
(empty)
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorSourceCodePage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorSourceCodePage.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorSourceCodePage.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/editors/schema/SchemaEditorSourceCodePage.java Sat Mar 12 19:05:17 2011
@@ -23,7 +23,7 @@ package org.apache.directory.studio.sche
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
@@ -95,7 +95,7 @@ public class SchemaEditorSourceCodePage
/* (non-Javadoc)
* @see org.apache.directory.studio.schemaeditor.controller.SchemaListener#matchingRuleAdded(org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl)
*/
- public void matchingRuleAdded( MatchingRule mr )
+ public void matchingRuleAdded( MutableMatchingRuleImpl mr )
{
fillInUiFields();
}
@@ -104,7 +104,7 @@ public class SchemaEditorSourceCodePage
/* (non-Javadoc)
* @see org.apache.directory.studio.schemaeditor.controller.SchemaListener#matchingRuleModified(org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl)
*/
- public void matchingRuleModified( MatchingRule mr )
+ public void matchingRuleModified( MutableMatchingRuleImpl mr )
{
fillInUiFields();
}
@@ -113,7 +113,7 @@ public class SchemaEditorSourceCodePage
/* (non-Javadoc)
* @see org.apache.directory.studio.schemaeditor.controller.SchemaListener#matchingRuleRemoved(org.apache.directory.studio.schemaeditor.model.MatchingRuleImpl)
*/
- public void matchingRuleRemoved( MatchingRule mr )
+ public void matchingRuleRemoved( MutableMatchingRuleImpl mr )
{
fillInUiFields();
}
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java Sat Mar 12 19:05:17 2011
@@ -23,7 +23,7 @@ package org.apache.directory.studio.sche
import org.apache.directory.shared.ldap.model.exception.LdapSchemaException;
import org.apache.directory.shared.ldap.model.schema.AttributeType;
import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
import org.apache.directory.shared.ldap.model.schema.ObjectClass;
import org.apache.directory.shared.ldap.model.schema.MutableSchemaObject;
import org.apache.directory.shared.ldap.model.schema.SchemaObject;
@@ -496,7 +496,7 @@ public class ProblemsViewLabelProvider e
{
schemaObject = schemaHandler.getSyntax( so.getOid() );
}
- else if ( so instanceof MatchingRule )
+ else if ( so instanceof MutableMatchingRuleImpl )
{
schemaObject = schemaHandler.getMatchingRule( so.getOid() );
}
Modified: directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeMatchingRulesWizardPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeMatchingRulesWizardPage.java?rev=1080977&r1=1080976&r2=1080977&view=diff
==============================================================================
--- directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeMatchingRulesWizardPage.java (original)
+++ directory/studio/branches/akarasulu/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/wizards/NewAttributeTypeMatchingRulesWizardPage.java Sat Mar 12 19:05:17 2011
@@ -25,7 +25,7 @@ import java.util.Collections;
import java.util.Comparator;
import java.util.List;
-import org.apache.directory.shared.ldap.model.schema.MatchingRule;
+import org.apache.directory.shared.ldap.model.schema.MutableMatchingRuleImpl;
import org.apache.directory.studio.schemaeditor.Activator;
import org.apache.directory.studio.schemaeditor.PluginConstants;
import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
@@ -65,9 +65,9 @@ public class NewAttributeTypeMatchingRul
*/
public String getText( Object element )
{
- if ( element instanceof MatchingRule )
+ if ( element instanceof MutableMatchingRuleImpl )
{
- MatchingRule mr = ( MatchingRule ) element;
+ MutableMatchingRuleImpl mr = ( MutableMatchingRuleImpl ) element;
String name = mr.getName();
if ( name != null )
@@ -176,10 +176,10 @@ public class NewAttributeTypeMatchingRul
public int compare( Object o1, Object o2 )
{
- if ( ( o1 instanceof MatchingRule ) && ( o2 instanceof MatchingRule ) )
+ if ( ( o1 instanceof MutableMatchingRuleImpl ) && ( o2 instanceof MutableMatchingRuleImpl ) )
{
- List<String> o1Names = ( ( MatchingRule ) o1 ).getNames();
- List<String> o2Names = ( ( MatchingRule ) o2 ).getNames();
+ List<String> o1Names = ( ( MutableMatchingRuleImpl ) o1 ).getNames();
+ List<String> o2Names = ( ( MutableMatchingRuleImpl ) o2 ).getNames();
// Comparing the First Name
if ( ( o1Names != null ) && ( o2Names != null ) )
@@ -197,11 +197,11 @@ public class NewAttributeTypeMatchingRul
return o1Names.get( 0 ).compareToIgnoreCase( "" ); //$NON-NLS-1$
}
}
- else if ( ( o1 instanceof String ) && ( o2 instanceof MatchingRule ) )
+ else if ( ( o1 instanceof String ) && ( o2 instanceof MutableMatchingRuleImpl ) )
{
return Integer.MIN_VALUE;
}
- else if ( ( o1 instanceof MatchingRule ) && ( o2 instanceof String ) )
+ else if ( ( o1 instanceof MutableMatchingRuleImpl ) && ( o2 instanceof String ) )
{
return Integer.MAX_VALUE;
}
@@ -235,9 +235,9 @@ public class NewAttributeTypeMatchingRul
{
Object selection = ( ( StructuredSelection ) equalityComboViewer.getSelection() ).getFirstElement();
- if ( selection instanceof MatchingRule )
+ if ( selection instanceof MutableMatchingRuleImpl )
{
- MatchingRule mr = ( ( MatchingRule ) selection );
+ MutableMatchingRuleImpl mr = ( ( MutableMatchingRuleImpl ) selection );
List<String> names = mr.getNames();
if ( ( names != null ) && ( names.size() > 0 ) )
@@ -264,9 +264,9 @@ public class NewAttributeTypeMatchingRul
{
Object selection = ( ( StructuredSelection ) orderingComboViewer.getSelection() ).getFirstElement();
- if ( selection instanceof MatchingRule )
+ if ( selection instanceof MutableMatchingRuleImpl )
{
- MatchingRule mr = ( ( MatchingRule ) selection );
+ MutableMatchingRuleImpl mr = ( ( MutableMatchingRuleImpl ) selection );
List<String> names = mr.getNames();
if ( ( names != null ) && ( names.size() > 0 ) )
@@ -293,9 +293,9 @@ public class NewAttributeTypeMatchingRul
{
Object selection = ( ( StructuredSelection ) substringComboViewer.getSelection() ).getFirstElement();
- if ( selection instanceof MatchingRule )
+ if ( selection instanceof MutableMatchingRuleImpl )
{
- MatchingRule mr = ( ( MatchingRule ) selection );
+ MutableMatchingRuleImpl mr = ( ( MutableMatchingRuleImpl ) selection );
List<String> names = mr.getNames();
if ( ( names != null ) && ( names.size() > 0 ) )