directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1066913 - in /directory/studio/branches/m1: ./ application/application-plugins/ plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/ plugins/schemaeditor/src/main/java/org/apache/dir...
Date Thu, 03 Feb 2011 19:16:52 GMT
Author: akarasulu
Date: Thu Feb  3 19:16:51 2011
New Revision: 1066913

URL: http://svn.apache.org/viewvc?rev=1066913&view=rev
Log:
merging from trunk to m1 - currently having compilation issues in m1

Modified:
    directory/studio/branches/m1/   (props changed)
    directory/studio/branches/m1/application/application-plugins/pom.xml
    directory/studio/branches/m1/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/KerberosServerPage.java
    directory/studio/branches/m1/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/LdapLdapsServersPage.java
    directory/studio/branches/m1/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProblemsViewController.java
    directory/studio/branches/m1/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java
    directory/studio/branches/m1/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewContentProvider.java
    directory/studio/branches/m1/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java
    directory/studio/branches/m1/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/messages.properties
    directory/studio/branches/m1/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/messages_de.properties
    directory/studio/branches/m1/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/messages_fr.properties
    directory/studio/branches/m1/pom.xml

Propchange: directory/studio/branches/m1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Feb  3 19:16:51 2011
@@ -1,3 +1,3 @@
 /directory/studio/branches/shared-trunk-merge:1004968-1005876
 /directory/studio/branches/studio-connection-refactoring:1022102-1030058
-/directory/studio/trunk:1066125-1066271
+/directory/studio/trunk:1066125-1066912

Modified: directory/studio/branches/m1/application/application-plugins/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/application/application-plugins/pom.xml?rev=1066913&r1=1066912&r2=1066913&view=diff
==============================================================================
--- directory/studio/branches/m1/application/application-plugins/pom.xml (original)
+++ directory/studio/branches/m1/application/application-plugins/pom.xml Thu Feb  3 19:16:51 2011
@@ -163,8 +163,8 @@
                   <artifactId>org.apache.logging.log4j</artifactId>
                 </artifactItem>
                 <artifactItem>
-                  <groupId>org.apache.directory.studio</groupId>
-                  <artifactId>org.apache.mina.core</artifactId>
+                  <groupId>org.apache.mina</groupId>
+                  <artifactId>mina-core</artifactId>
                 </artifactItem>
                 <artifactItem>
                   <groupId>org.apache.directory.studio</groupId>

Modified: directory/studio/branches/m1/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/KerberosServerPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/KerberosServerPage.java?rev=1066913&r1=1066912&r2=1066913&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/KerberosServerPage.java (original)
+++ directory/studio/branches/m1/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/KerberosServerPage.java Thu Feb  3 19:16:51 2011
@@ -21,6 +21,7 @@ package org.apache.directory.studio.apac
 
 
 import org.apache.directory.server.config.beans.ChangePasswordServerBean;
+import org.apache.directory.server.config.beans.DirectoryServiceBean;
 import org.apache.directory.server.config.beans.KdcServerBean;
 import org.apache.directory.server.config.beans.TransportBean;
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
@@ -377,23 +378,23 @@ public class KerberosServerPage extends 
         ChangePasswordServerBean changePasswordServerBean = getChangePasswordServerBean();
 
         setSelection( enableKerberosCheckbox, kdcServerBean.isEnabled() );
-        setText(kerberosPortText,"" + getKdcServerTransportBean().getSystemPort() );
+        setText( kerberosPortText, "" + getKdcServerTransportBean().getSystemPort() );
 
-        setSelection(enableChangePasswordCheckbox, changePasswordServerBean.isEnabled() );
-        setText(changePasswordPortText, "" + getChangePasswordServerTransportBean().getSystemPort() );
+        setSelection( enableChangePasswordCheckbox, changePasswordServerBean.isEnabled() );
+        setText( changePasswordPortText, "" + getChangePasswordServerTransportBean().getSystemPort() );
 
-        setText(kdcPrincipalText, kdcServerBean.getKrbKdcPrincipal().toString() );
-        setText(kdcSearchBaseDnText, kdcServerBean.getSearchBaseDn().toString() );
-        setText(encryptionTypesText, kdcServerBean.getKrbEncryptionTypes().toString() );
+        setText( kdcPrincipalText, kdcServerBean.getKrbKdcPrincipal().toString() );
+        setText( kdcSearchBaseDnText, kdcServerBean.getSearchBaseDn().toString() );
+        setText( encryptionTypesText, kdcServerBean.getKrbEncryptionTypes().toString() );
 
-        setSelection(verifyBodyChecksumCheckbox, kdcServerBean.isKrbBodyChecksumVerified() );
+        setSelection( verifyBodyChecksumCheckbox, kdcServerBean.isKrbBodyChecksumVerified() );
         setSelection( allowEmptyAddressesCheckbox, kdcServerBean.isKrbEmptyAddressesAllowed() );
-        setSelection(allowForwardableAddressesCheckbox, kdcServerBean.isKrbForwardableAllowed() );
-        setSelection(requirePreAuthByEncryptedTimestampCheckbox, kdcServerBean.isKrbPaEncTimestampRequired() );
+        setSelection( allowForwardableAddressesCheckbox, kdcServerBean.isKrbForwardableAllowed() );
+        setSelection( requirePreAuthByEncryptedTimestampCheckbox, kdcServerBean.isKrbPaEncTimestampRequired() );
         setSelection( allowPostdatedTicketsCheckbox, kdcServerBean.isKrbPostdatedAllowed() );
-        setSelection(allowRenewableTicketsCheckbox, kdcServerBean.isKrbRenewableAllowed() );
-        setText(maximumRenewableLifetimeText, kdcServerBean.getKrbMaximumRenewableLifetime() + "" );
-        setText(maximumTicketLifetimeText, kdcServerBean.getKrbMaximumTicketLifetime() + "" );
+        setSelection( allowRenewableTicketsCheckbox, kdcServerBean.isKrbRenewableAllowed() );
+        setText( maximumRenewableLifetimeText, kdcServerBean.getKrbMaximumRenewableLifetime() + "" );
+        setText( maximumTicketLifetimeText, kdcServerBean.getKrbMaximumTicketLifetime() + "" );
 
         addListeners();
     }
@@ -557,12 +558,26 @@ public class KerberosServerPage extends 
      */
     private KdcServerBean getKdcServerBean()
     {
-        KdcServerBean kdcServerBean = getDirectoryServiceBean().getKdcServerBean();
+        return getKdcServerBean( getDirectoryServiceBean() );
+    }
+
+
+    /**
+     * Gets the KDC Server bean.
+     *
+     * @param directoryServiceBean
+     *      the directory service bean
+     * @return
+     *      the KDC Server bean
+     */
+    public static KdcServerBean getKdcServerBean( DirectoryServiceBean directoryServiceBean )
+    {
+        KdcServerBean kdcServerBean = directoryServiceBean.getKdcServerBean();
 
         if ( kdcServerBean == null )
         {
             kdcServerBean = new KdcServerBean();
-            getDirectoryServiceBean().addServers( kdcServerBean );
+            directoryServiceBean.addServers( kdcServerBean );
         }
 
         return kdcServerBean;
@@ -577,12 +592,26 @@ public class KerberosServerPage extends 
      */
     private ChangePasswordServerBean getChangePasswordServerBean()
     {
-        ChangePasswordServerBean changePasswordServerBean = getDirectoryServiceBean().getChangePasswordServerBean();
+        return getChangePasswordServerBean( getDirectoryServiceBean() );
+    }
+
+
+    /**
+     * Gets the Change Password Server bean.
+     *
+     * @param directoryServiceBean
+     *      the directory service bean
+     * @return
+     *      the Change Password Server bean
+     */
+    public static ChangePasswordServerBean getChangePasswordServerBean( DirectoryServiceBean directoryServiceBean )
+    {
+        ChangePasswordServerBean changePasswordServerBean = directoryServiceBean.getChangePasswordServerBean();
 
         if ( changePasswordServerBean == null )
         {
             changePasswordServerBean = new ChangePasswordServerBean();
-            getDirectoryServiceBean().addServers( changePasswordServerBean );
+            directoryServiceBean.addServers( changePasswordServerBean );
         }
 
         return changePasswordServerBean;

Modified: directory/studio/branches/m1/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/LdapLdapsServersPage.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/LdapLdapsServersPage.java?rev=1066913&r1=1066912&r2=1066913&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/LdapLdapsServersPage.java (original)
+++ directory/studio/branches/m1/plugins/apacheds.configuration.v2/src/main/java/org/apache/directory/studio/apacheds/configuration/v2/editor/LdapLdapsServersPage.java Thu Feb  3 19:16:51 2011
@@ -50,9 +50,11 @@ import org.eclipse.ui.forms.widgets.Tabl
  */
 public class LdapLdapsServersPage extends ServerConfigurationEditorPage
 {
-    private static final int LDAPS_DEFAULT_PORT = 10636;
+    private static final String DEFAULT_ADDRESS = "0.0.0.0";
 
-    private static final int LDAP_DEFAULT_PORT = 10389;
+    private static final int DEFAULT_PORT_LDAPS = 10636;
+
+    private static final int DEFAULT_PORT_LDAP = 10389;
 
     private static final String TRANSPORT_ID_LDAP = "ldap";
 
@@ -538,6 +540,8 @@ public class LdapLdapsServersPage extend
     /**
      * Gets the LDAP Server bean.
      *
+     * @param directoryServiceBean
+     *      the directory service bean
      * @return
      *      the LDAP Server bean
      */
@@ -575,11 +579,6 @@ public class LdapLdapsServersPage extend
      * @return
      *      the LDAP Server transport bean
      */
-    /**
-     * TODO getLdapServerTransportBean.
-     *
-     * @return
-     */
     public static TransportBean getLdapServerTransportBean( DirectoryServiceBean directoryServiceBean )
     {
         return getTransportBean( directoryServiceBean, TRANSPORT_ID_LDAP );
@@ -629,6 +628,8 @@ public class LdapLdapsServersPage extend
     /**
      * Gets a transport bean based on its id.
      *
+     * @param directoryServiceBean
+     *      the directory service bean
      * @param id
      *      the id
      * @return
@@ -663,15 +664,18 @@ public class LdapLdapsServersPage extend
 
             // ID
             transportBean.setTransportId( id );
+            
+            // Address
+            transportBean.setTransportAddress( DEFAULT_ADDRESS );
 
             // Port
             if ( TRANSPORT_ID_LDAP.equals( id ) )
             {
-                transportBean.setSystemPort( LDAP_DEFAULT_PORT );
+                transportBean.setSystemPort( DEFAULT_PORT_LDAP );
             }
             else if ( TRANSPORT_ID_LDAPS.equals( id ) )
             {
-                transportBean.setSystemPort( LDAPS_DEFAULT_PORT );
+                transportBean.setSystemPort( DEFAULT_PORT_LDAPS );
             }
 
             // SSL

Modified: directory/studio/branches/m1/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProblemsViewController.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProblemsViewController.java?rev=1066913&r1=1066912&r2=1066913&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProblemsViewController.java (original)
+++ directory/studio/branches/m1/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/controller/ProblemsViewController.java Thu Feb  3 19:16:51 2011
@@ -113,34 +113,37 @@ public class ProblemsViewController
                 // Selecting the right editor and input
                 if ( objectSelection instanceof SchemaErrorWrapper )
                 {
-                    SchemaObject object = ( ( SchemaErrorWrapper ) objectSelection ).getLdapSchemaException().getSource();
+                    SchemaObject object = ( ( SchemaErrorWrapper ) objectSelection ).getLdapSchemaException()
+                        .getSourceObject();
 
                     if ( object instanceof AttributeType )
                     {
-                        input = new AttributeTypeEditorInput( ( AttributeType ) object );
+                        input = new AttributeTypeEditorInput( Activator.getDefault().getSchemaHandler()
+                            .getAttributeType( object.getOid() ) );
                         editorId = AttributeTypeEditor.ID;
                     }
                     else if ( object instanceof ObjectClass )
                     {
-                        input = new ObjectClassEditorInput( ( ObjectClass ) object );
+                        input = new ObjectClassEditorInput( Activator.getDefault().getSchemaHandler()
+                            .getObjectClass( object.getOid() ) );
                         editorId = ObjectClassEditor.ID;
                     }
                 }
                 else if ( objectSelection instanceof SchemaWarningWrapper )
                 {
                     // TODO
-//                    SchemaObject object = ( ( SchemaWarningWrapper ) objectSelection ).getSchemaWarning().getSource();
-//
-//                    if ( object instanceof AttributeType )
-//                    {
-//                        input = new AttributeTypeEditorInput( ( AttributeType ) object );
-//                        editorId = AttributeTypeEditor.ID;
-//                    }
-//                    else if ( object instanceof ObjectClass )
-//                    {
-//                        input = new ObjectClassEditorInput( ( ObjectClass ) object );
-//                        editorId = ObjectClassEditor.ID;
-//                    }
+                    //                    SchemaObject object = ( ( SchemaWarningWrapper ) objectSelection ).getSchemaWarning().getSource();
+                    //
+                    //                    if ( object instanceof AttributeType )
+                    //                    {
+                    //                        input = new AttributeTypeEditorInput( ( AttributeType ) object );
+                    //                        editorId = AttributeTypeEditor.ID;
+                    //                    }
+                    //                    else if ( object instanceof ObjectClass )
+                    //                    {
+                    //                        input = new ObjectClassEditorInput( ( ObjectClass ) object );
+                    //                        editorId = ObjectClassEditor.ID;
+                    //                    }
                 }
                 else if ( ( objectSelection instanceof Folder ) )
                 {

Modified: directory/studio/branches/m1/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java?rev=1066913&r1=1066912&r2=1066913&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java (original)
+++ directory/studio/branches/m1/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/schemachecker/SchemaChecker.java Thu Feb  3 19:16:51 2011
@@ -27,12 +27,15 @@ import org.apache.commons.collections.Mu
 import org.apache.commons.collections.map.MultiValueMap;
 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.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.model.schema.SchemaObject;
 import org.apache.directory.shared.ldap.schemamanager.impl.DefaultSchemaManager;
 import org.apache.directory.studio.schemaeditor.Activator;
 import org.apache.directory.studio.schemaeditor.controller.ProjectsHandlerAdapter;
+import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
 import org.apache.directory.studio.schemaeditor.controller.SchemaHandlerAdapter;
 import org.apache.directory.studio.schemaeditor.controller.SchemaHandlerListener;
 import org.apache.directory.studio.schemaeditor.model.Project;
@@ -78,8 +81,7 @@ public class SchemaChecker
         {
             synchronized ( this )
             {
-
-                notifyListeners();
+                recheckWholeSchema();
             }
         }
 
@@ -88,8 +90,7 @@ public class SchemaChecker
         {
             synchronized ( this )
             {
-
-                notifyListeners();
+                recheckWholeSchema();
             }
         }
 
@@ -98,8 +99,7 @@ public class SchemaChecker
         {
             synchronized ( this )
             {
-
-                notifyListeners();
+                recheckWholeSchema();
             }
         }
 
@@ -108,8 +108,7 @@ public class SchemaChecker
         {
             synchronized ( this )
             {
-
-                notifyListeners();
+                recheckWholeSchema();
             }
         }
 
@@ -118,8 +117,7 @@ public class SchemaChecker
         {
             synchronized ( this )
             {
-
-                notifyListeners();
+                recheckWholeSchema();
             }
         }
 
@@ -128,8 +126,7 @@ public class SchemaChecker
         {
             synchronized ( this )
             {
-
-                notifyListeners();
+                recheckWholeSchema();
             }
         }
 
@@ -138,8 +135,7 @@ public class SchemaChecker
         {
             synchronized ( this )
             {
-
-                notifyListeners();
+                recheckWholeSchema();
             }
         }
 
@@ -148,8 +144,7 @@ public class SchemaChecker
         {
             synchronized ( this )
             {
-
-                notifyListeners();
+                recheckWholeSchema();
             }
         }
     };
@@ -161,7 +156,7 @@ public class SchemaChecker
     private SchemaChecker()
     {
         listeners = new ArrayList<SchemaCheckerListener>();
-        
+
         schemaManager = new DefaultSchemaManager( new SchemaEditorSchemaLoader() );
         errorsMap = new MultiValueMap();
 
@@ -211,8 +206,7 @@ public class SchemaChecker
             {
                 Activator.getDefault().getSchemaHandler().addListener( schemaHandlerListener );
                 listeningToModifications = true;
-                checkWholeSchema();
-                notifyListeners();
+                recheckWholeSchema();
             }
         }
     }
@@ -241,10 +235,7 @@ public class SchemaChecker
     {
         synchronized ( this )
         {
-            schemaManager = new DefaultSchemaManager( new SchemaEditorSchemaLoader() );
-            errorsMap = new MultiValueMap();
-            
-            checkWholeSchema();
+            recheckWholeSchema();
         }
     }
 
@@ -266,7 +257,7 @@ public class SchemaChecker
     /**
      * Checks the whole schema.
      */
-    private synchronized void checkWholeSchema()
+    private synchronized void recheckWholeSchema()
     {
         Job job = new Job( "Checking Schema" )
         {
@@ -274,6 +265,7 @@ public class SchemaChecker
             {
                 try
                 {
+                    schemaManager = new DefaultSchemaManager( new SchemaEditorSchemaLoader() );
                     schemaManager.loadAllEnabled();
                 }
                 catch ( Exception e )
@@ -282,19 +274,7 @@ public class SchemaChecker
                     e.printStackTrace();
                 }
 
-                errorsList = schemaManager.getErrors();
-                for ( Throwable error : errorsList )
-                {
-                    if ( error instanceof LdapSchemaException )
-                    {
-                        LdapSchemaException ldapSchemaException = (LdapSchemaException) error;
-                        SchemaObject source = ldapSchemaException.getSource();
-                        if ( source != null )
-                        {
-                            errorsMap.put( source, ldapSchemaException );
-                        }
-                    }
-                }
+                updateErrorsList();
 
                 notifyListeners();
                 monitor.done();
@@ -306,6 +286,44 @@ public class SchemaChecker
     }
 
 
+    private void updateErrorsList()
+    {
+        errorsMap.clear();
+        errorsList = schemaManager.getErrors();
+        for ( Throwable error : errorsList )
+        {
+            if ( error instanceof LdapSchemaException )
+            {
+                LdapSchemaException ldapSchemaException = ( LdapSchemaException ) error;
+                SchemaObject source = ldapSchemaException.getSourceObject();
+                if ( source != null )
+                {
+                    SchemaHandler schemaHandler = Activator.getDefault().getSchemaHandler();
+
+                    if ( source instanceof AttributeType )
+                    {
+                        source = schemaHandler.getAttributeType( source.getOid() );
+                    }
+                    else if ( source instanceof LdapSyntax )
+                    {
+                        source = schemaHandler.getSyntax( source.getOid() );
+                    }
+                    else if ( source instanceof MatchingRule )
+                    {
+                        source = schemaHandler.getMatchingRule( source.getOid() );
+                    }
+                    else if ( source instanceof ObjectClass )
+                    {
+                        source = schemaHandler.getObjectClass( source.getOid() );
+                    }
+
+                    errorsMap.put( source, ldapSchemaException );
+                }
+            }
+        }
+    }
+
+
     /**
      * Gets the errors.
      *
@@ -418,7 +436,7 @@ public class SchemaChecker
     public List<Object> getWarnings( SchemaObject so )
     {
         return new ArrayList<Object>();
-     //   return ( List<?> ) warningsMap.get( so );
+        //   return ( List<?> ) warningsMap.get( so );
     }
 
 
@@ -443,4 +461,5 @@ public class SchemaChecker
             return warnings.size() > 0;
         }
     }
+
 }

Modified: directory/studio/branches/m1/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewContentProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewContentProvider.java?rev=1066913&r1=1066912&r2=1066913&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewContentProvider.java (original)
+++ directory/studio/branches/m1/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewContentProvider.java Thu Feb  3 19:16:51 2011
@@ -112,6 +112,7 @@ public class ProblemsViewContentProvider
                         }
                     }
 
+                    // TODO
 //                    SchemaWarning[] warnings = schemaChecker.getWarnings().toArray( new SchemaWarning[0] );
 //                    if ( !( warnings.length == 0 ) )
 //                    {

Modified: directory/studio/branches/m1/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java?rev=1066913&r1=1066912&r2=1066913&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java (original)
+++ directory/studio/branches/m1/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/ProblemsViewLabelProvider.java Thu Feb  3 19:16:51 2011
@@ -21,14 +21,20 @@ 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.ObjectClass;
 import org.apache.directory.shared.ldap.model.schema.SchemaObject;
 import org.apache.directory.studio.schemaeditor.Activator;
 import org.apache.directory.studio.schemaeditor.PluginConstants;
+import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
 import org.apache.directory.studio.schemaeditor.view.wrappers.Folder;
 import org.apache.directory.studio.schemaeditor.view.wrappers.SchemaErrorWrapper;
 import org.apache.directory.studio.schemaeditor.view.wrappers.SchemaWarningWrapper;
 import org.eclipse.jface.viewers.ITableLabelProvider;
 import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.osgi.util.NLS;
 import org.eclipse.swt.graphics.Image;
 
 
@@ -80,7 +86,7 @@ public class ProblemsViewLabelProvider e
             }
             else if ( columnIndex == 1 )
             {
-                return getDisplayName( errorWrapper.getLdapSchemaException().getSource() );
+                return getDisplayName( errorWrapper.getLdapSchemaException().getSourceObject() );
             }
         }
         else if ( element instanceof SchemaWarningWrapper )
@@ -125,166 +131,311 @@ public class ProblemsViewLabelProvider e
     }
 
 
-    //    private String getMessage( SchemaCheckerElement element )
-    //    {
-    //        if ( element instanceof DuplicateAliasError )
-    //        {
-    //            DuplicateAliasError duplicateAliasError = ( DuplicateAliasError ) element;
-    //
-    //            SchemaObject duplicate = duplicateAliasError.getDuplicate();
-    //            if ( duplicate instanceof AttributeType )
-    //            {
-    //                return NLS
-    //                    .bind(
-    //                        Messages.getString( "ProblemsViewLabelProvider.DuplicateAliasErrorAttributeType" ), new String[] { duplicateAliasError.getAlias(), duplicate.getOid() } ); //$NON-NLS-1$
-    //            }
-    //            else if ( duplicate instanceof ObjectClass )
-    //            {
-    //                return NLS
-    //                    .bind(
-    //                        Messages.getString( "ProblemsViewLabelProvider.DuplicateAliasErrorObjectClass" ), new String[] { duplicateAliasError.getAlias(), duplicate.getOid() } ); //$NON-NLS-1$
-    //            }
-    //        }
-    //        else if ( element instanceof DuplicateOidError )
-    //        {
-    //            DuplicateOidError duplicateOidError = ( DuplicateOidError ) element;
-    //            SchemaObject duplicate = duplicateOidError.getDuplicate();
-    //            if ( duplicate instanceof AttributeType )
-    //            {
-    //                return NLS
-    //                    .bind(
-    //                        Messages.getString( "ProblemsViewLabelProvider.DuplicateOidErrorAttributeType" ), new String[] { duplicateOidError.getOid(), duplicate.getName() } ); //$NON-NLS-1$
-    //            }
-    //            else if ( duplicate instanceof ObjectClass )
-    //            {
-    //                return NLS
-    //                    .bind(
-    //                        Messages.getString( "ProblemsViewLabelProvider.DuplicateOidErrorObjectClass" ), new String[] { duplicateOidError.getOid(), duplicate.getName() } ); //$NON-NLS-1$
-    //            }
-    //        }
-    //        else if ( element instanceof NonExistingATSuperiorError )
-    //        {
-    //            NonExistingATSuperiorError nonExistingATSuperiorError = ( NonExistingATSuperiorError ) element;
-    //            return NLS
-    //                .bind(
-    //                    Messages.getString( "ProblemsViewLabelProvider.NonExistingSuperiorAttribute" ), new String[] { nonExistingATSuperiorError.getSuperiorAlias() } ); //$NON-NLS-1$
-    //        }
-    //        else if ( element instanceof NonExistingOCSuperiorError )
-    //        {
-    //            NonExistingOCSuperiorError nonExistingOCSuperiorError = ( NonExistingOCSuperiorError ) element;
-    //            return NLS
-    //                .bind(
-    //                    Messages.getString( "ProblemsViewLabelProvider.NonExistingSuperiorObject" ), new String[] { nonExistingOCSuperiorError.getSuperiorAlias() } ); //$NON-NLS-1$
-    //        }
-    //        else if ( element instanceof NonExistingMandatoryATError )
-    //        {
-    //            NonExistingMandatoryATError nonExistingMandatoryATError = ( NonExistingMandatoryATError ) element;
-    //            return NLS
-    //                .bind(
-    //                    Messages.getString( "ProblemsViewLabelProvider.NonExistingMandatoryAttribute" ), new String[] { nonExistingMandatoryATError.getAlias() } ); //$NON-NLS-1$
-    //        }
-    //        else if ( element instanceof NonExistingOptionalATError )
-    //        {
-    //            NonExistingOptionalATError nonExistingOptionalATError = ( NonExistingOptionalATError ) element;
-    //            return NLS
-    //                .bind(
-    //                    Messages.getString( "ProblemsViewLabelProvider.NonExistingOptionalAttribute" ), new String[] { nonExistingOptionalATError.getAlias() } ); //$NON-NLS-1$
-    //        }
-    //        else if ( element instanceof NonExistingSyntaxError )
-    //        {
-    //            NonExistingSyntaxError nonExistingSyntaxError = ( NonExistingSyntaxError ) element;
-    //            return NLS
-    //                .bind(
-    //                    Messages.getString( "ProblemsViewLabelProvider.NonExistingSyntax" ), new String[] { nonExistingSyntaxError.getSyntaxOid() } ); //$NON-NLS-1$
-    //        }
-    //        else if ( element instanceof NonExistingMatchingRuleError )
-    //        {
-    //            NonExistingMatchingRuleError nonExistingMatchingRuleError = ( NonExistingMatchingRuleError ) element;
-    //            return NLS
-    //                .bind(
-    //                    Messages.getString( "ProblemsViewLabelProvider.NonExistingMatchingRule" ), new String[] { nonExistingMatchingRuleError.getMatchingRuleAlias() } ); //$NON-NLS-1$
-    //        }
-    //        else if ( element instanceof NoAliasWarning )
-    //        {
-    //            NoAliasWarning noAliasWarning = ( NoAliasWarning ) element;
-    //            SchemaObject source = noAliasWarning.getSource();
-    //            if ( source instanceof AttributeType )
-    //            {
-    //                return NLS
-    //                    .bind(
-    //                        Messages.getString( "ProblemsViewLabelProvider.NoAliasWarningAttributeType" ), new String[] { source.getOid() } ); //$NON-NLS-1$
-    //            }
-    //            else if ( source instanceof ObjectClass )
-    //            {
-    //                return NLS
-    //                    .bind(
-    //                        Messages.getString( "ProblemsViewLabelProvider.NoAliasWarningObjectClass" ), new String[] { source.getOid() } ); //$NON-NLS-1$
-    //            }
-    //        }
-    //        else if ( element instanceof ClassTypeHierarchyError )
-    //        {
-    //            ClassTypeHierarchyError classTypeHierarchyError = ( ClassTypeHierarchyError ) element;
-    //            ObjectClass source = ( ObjectClass ) classTypeHierarchyError.getSource();
-    //            ObjectClass superior = ( ObjectClass ) classTypeHierarchyError.getSuperior();
-    //            if ( source.getType().equals( ObjectClassTypeEnum.ABSTRACT ) )
-    //            {
-    //                if ( superior.getType().equals( ObjectClassTypeEnum.STRUCTURAL ) )
-    //                {
-    //                    return NLS
-    //                        .bind(
-    //                            Messages
-    //                                .getString( "ProblemsViewLabelProvider.ClassTypeHierarchyErrorAbstractStructuralObject" ), new String[] { getDisplayName( source ), getDisplayName( superior ) } ); //$NON-NLS-1$
-    //                }
-    //                else if ( superior.getType().equals( ObjectClassTypeEnum.AUXILIARY ) )
-    //                {
-    //                    return NLS
-    //                        .bind(
-    //                            Messages
-    //                                .getString( "ProblemsViewLabelProvider.ClassTypeHierarchyErrorAbstractAuxiliaryObject" ), new String[] { getDisplayName( source ), getDisplayName( superior ) } ); //$NON-NLS-1$
-    //                }
-    //            }
-    //            else if ( source.getType().equals( ObjectClassTypeEnum.AUXILIARY ) )
-    //            {
-    //                if ( superior.getType().equals( ObjectClassTypeEnum.STRUCTURAL ) )
-    //                {
-    //                    return NLS
-    //                        .bind(
-    //                            Messages
-    //                                .getString( "ProblemsViewLabelProvider.ClassTypeHierarchyErrorAuxiliaryStructuralObject" ), new String[] { getDisplayName( source ), getDisplayName( superior ) } ); //$NON-NLS-1$
-    //                }
-    //                else
-    //                {
-    //                    return NLS
-    //                        .bind(
-    //                            Messages.getString( "ProblemsViewLabelProvider.ClassTypeHierarchyErrorAuxiliary" ), new String[] { getDisplayName( source ) } ); //$NON-NLS-1$
-    //                }
-    //            }
-    //        }
-    //        else if ( element instanceof DifferentUsageAsSuperiorError )
-    //        {
-    //            DifferentUsageAsSuperiorError differentUsageAsSuperiorError = ( DifferentUsageAsSuperiorError ) element;
-    //            AttributeType source = ( AttributeType ) differentUsageAsSuperiorError.getSource();
-    //            AttributeType superior = ( AttributeType ) differentUsageAsSuperiorError.getSuperior();
-    //            return NLS
-    //                .bind(
-    //                    Messages.getString( "ProblemsViewLabelProvider.AttributeTypeUsage" ), new String[] { getDisplayName( source ), getDisplayName( superior ) } ); //$NON-NLS-1$
-    //        }
-    //        else if ( element instanceof DifferentCollectiveAsSuperiorError )
-    //        {
-    //            DifferentCollectiveAsSuperiorError differentCollectiveAsSuperiorError = ( DifferentCollectiveAsSuperiorError ) element;
-    //            AttributeType source = ( AttributeType ) differentCollectiveAsSuperiorError.getSource();
-    //            AttributeType superior = ( AttributeType ) differentCollectiveAsSuperiorError.getSuperior();
-    //            return NLS
-    //                .bind(
-    //                    Messages.getString( "ProblemsViewLabelProvider.AttributeTypeCollective" ), new String[] { getDisplayName( source ), getDisplayName( superior ) } ); //$NON-NLS-1$
-    //        }
-    //
-    //        return ""; //$NON-NLS-1$
-    //    }
+    private String getMessage( LdapSchemaException exception )
+    {
+        if ( exception != null )
+        {
+            switch ( exception.getCode() )
+            {
+                // Codes for all Schema Objects
+                case NAME_ALREADY_REGISTERED:
+                    return getMessageNameAlreadyRegistered( exception );
+                case OID_ALREADY_REGISTERED:
+                    return getMessageOidAlreadyRegistered( exception );
+                case NONEXISTENT_SCHEMA:
+                    return getMessageNonExistentSchema( exception );
+
+                    // Codes for Attribute Type
+                case AT_NONEXISTENT_SUPERIOR:
+                    return getMessageATNonExistentSuperior( exception );
+                case AT_CANNOT_SUBTYPE_COLLECTIVE_AT:
+                    return getMessageATCannotSubtypeCollectiveAT( exception );
+                case AT_CYCLE_TYPE_HIERARCHY:
+                    return getMessageATCycleTypeHierarchy( exception );
+                case AT_NONEXISTENT_SYNTAX:
+                    return getMessageATNonExistentSyntax( exception );
+                case AT_SYNTAX_OR_SUPERIOR_REQUIRED:
+                    return getMessageATSyntaxOrSuperiorRequired( exception );
+                case AT_NONEXISTENT_EQUALITY_MATCHING_RULE:
+                    return getMessageATNonExistentEqualityMatchingRule( exception );
+                case AT_NONEXISTENT_ORDERING_MATCHING_RULE:
+                    return getMessageATNonExistentOrderingMatchingRule( exception );
+                case AT_NONEXISTENT_SUBSTRING_MATCHING_RULE:
+                    return getMessageATNonExistentSubstringMatchingRule( exception );
+                case AT_MUST_HAVE_SAME_USAGE_THAN_SUPERIOR:
+                    return getMessageATMustHaveSameUsageThanSuperior( exception );
+                case AT_USER_APPLICATIONS_USAGE_MUST_BE_USER_MODIFIABLE:
+                    return getMessageATUserApplicationsUsageMustBeUserModifiable( exception );
+                case AT_COLLECTIVE_MUST_HAVE_USER_APPLICATIONS_USAGE:
+                    return getMessageATCollectiveMustHaveUserApplicationsUsage( exception );
+                case AT_COLLECTIVE_CANNOT_BE_SINGLE_VALUED:
+                    return getMessageATCollectiveCannotBeSingleValued( exception );
+
+                    // Codes for Object Class
+                case OC_ABSTRACT_MUST_INHERIT_FROM_ABSTRACT_OC:
+                    return getMessageOCAbstractMustInheritFromAbstractOC( exception );
+                case OC_AUXILIARY_CANNOT_INHERIT_FROM_STRUCTURAL_OC:
+                    return getMessageOCAuxiliaryCannotInheritFromStructuralOC( exception );
+                case OC_STRUCTURAL_CANNOT_INHERIT_FROM_AUXILIARY_OC:
+                    return getMessageOCStructuralCannotInheritFromAuxiliaryOC( exception );
+                case OC_NONEXISTENT_SUPERIOR:
+                    return getMessageOCNonExistentSuperior( exception );
+                case OC_CYCLE_CLASS_HIERARCHY:
+                    return getMessageOCCycleClassHierarchy( exception );
+                case OC_COLLECTIVE_NOT_ALLOWED_IN_MUST:
+                    return getMessageOCCollectiveNotAllowedInMust( exception );
+                case OC_COLLECTIVE_NOT_ALLOWED_IN_MAY:
+                    return getMessageOCCollectiveNotAllowedInMay( exception );
+                case OC_DUPLICATE_AT_IN_MUST:
+                    return getMessageOCDuplicateATInMust( exception );
+                case OC_DUPLICATE_AT_IN_MAY:
+                    return getMessageOCDuplicateATInMay( exception );
+                case OC_NONEXISTENT_MUST_AT:
+                    return getMessageOCNonExistentMustAT( exception );
+                case OC_NONEXISTENT_MAY_AT:
+                    return getMessageOCNonExistentMayAT( exception );
+                case OC_DUPLICATE_AT_IN_MAY_AND_MUST:
+                    return getMessageOCDuplicateATInMayAndMust( exception );
+
+                    // Codes for Matching Rule
+                case MR_NONEXISTENT_SYNTAX:
+                    return getMessageMRNonExistentSyntax( exception );
+            }
+        }
+
+        return ""; //$NON-NLS-1$
+
+        //        else if ( element instanceof NoAliasWarning )
+        //        {
+        //            NoAliasWarning noAliasWarning = ( NoAliasWarning ) element;
+        //            SchemaObject source = noAliasWarning.getSourceObject();
+        //            if ( source instanceof AttributeType )
+        //            {
+        //                return NLS
+        //                        .bind(
+        //                            Messages.getString( "ProblemsViewLabelProvider.NoAliasWarningAttributeType" ), new String[] { source.getOid() } ); //$NON-NLS-1$
+        //            }
+        //            else if ( source instanceof ObjectClass )
+        //            {
+        //                return NLS
+        //                        .bind(
+        //                            Messages.getString( "ProblemsViewLabelProvider.NoAliasWarningObjectClass" ), new String[] { source.getOid() } ); //$NON-NLS-1$
+        //            }
+        //        }
+    }
+
+
+    private String getMessageNameAlreadyRegistered( LdapSchemaException exception )
+    {
+        SchemaObject duplicate = exception.getOtherObject();
+        String message = null;
+
+        if ( duplicate instanceof AttributeType )
+        {
+            message = Messages.getString( "ProblemsViewLabelProvider.NameAlreadyRegisteredAT" ); //$NON-NLS-1$
+        }
+        else if ( duplicate instanceof ObjectClass )
+        {
+            message = Messages.getString( "ProblemsViewLabelProvider.NameAlreadyRegisteredOC" ); //$NON-NLS-1$
+        }
+
+        return NLS.bind( message, new String[]
+            { exception.getRelatedId(), duplicate.getOid() } );
+    }
+
+
+    private String getMessageOidAlreadyRegistered( LdapSchemaException exception )
+    {
+        SchemaObject duplicate = exception.getOtherObject();
+        String message = null;
+
+        if ( duplicate instanceof AttributeType )
+        {
+            message = Messages.getString( "ProblemsViewLabelProvider.OidAlreadyRegisteredAT" ); //$NON-NLS-1$
+        }
+        else if ( duplicate instanceof ObjectClass )
+        {
+            message = Messages.getString( "ProblemsViewLabelProvider.OidAlreadyRegisteredOC" ); //$NON-NLS-1$
+        }
+
+        return NLS.bind( message, new String[]
+            { exception.getRelatedId(), duplicate.getName() } );
+    }
+
+
+    private String getMessageNonExistentSchema( LdapSchemaException exception )
+    {
+        return NLS.bind( Messages.getString( "ProblemsViewLabelProvider.NonExistentSchema" ), new String[]//$NON-NLS-1$
+            { exception.getRelatedId() } );
+    }
+
+
+    private String getMessageATNonExistentSuperior( LdapSchemaException exception )
+    {
+        return NLS.bind( Messages.getString( "ProblemsViewLabelProvider.ATNonExistentSuperior" ), new String[]//$NON-NLS-1$
+            { exception.getRelatedId() } );
+    }
+
+
+    private String getMessageATCannotSubtypeCollectiveAT( LdapSchemaException exception )
+    {
+        return Messages.getString( "ProblemsViewLabelProvider.ATCannotSubtypeCollectiveAT" ); //$NON-NLS-1$;
+    }
+
+
+    private String getMessageATCycleTypeHierarchy( LdapSchemaException exception )
+    {
+        return Messages.getString( "ProblemsViewLabelProvider.ATCycleTypeHierarchy" ); //$NON-NLS-1$;
+    }
+
+
+    private String getMessageATNonExistentSyntax( LdapSchemaException exception )
+    {
+        return NLS.bind( Messages.getString( "ProblemsViewLabelProvider.NonExistentSyntax" ), new String[]//$NON-NLS-1$
+            { exception.getRelatedId() } );
+    }
+
+
+    private String getMessageATSyntaxOrSuperiorRequired( LdapSchemaException exception )
+    {
+        return NLS.bind( Messages.getString( "ProblemsViewLabelProvider.ATSyntaxOrSuperiorRequired" ), new String[]//$NON-NLS-1$
+            { exception.getRelatedId() } );
+    }
+
+
+    private String getMessageATNonExistentEqualityMatchingRule( LdapSchemaException exception )
+    {
+        return NLS.bind(
+            Messages.getString( "ProblemsViewLabelProvider.ATNonExistentEqualityMatchingRule" ), new String[]//$NON-NLS-1$
+            { exception.getRelatedId() } );
+    }
+
+
+    private String getMessageATNonExistentOrderingMatchingRule( LdapSchemaException exception )
+    {
+        return NLS.bind(
+            Messages.getString( "ProblemsViewLabelProvider.ATNonExistentOrderingMatchingRule" ), new String[]//$NON-NLS-1$
+            { exception.getRelatedId() } );
+    }
+
+
+    private String getMessageATNonExistentSubstringMatchingRule( LdapSchemaException exception )
+    {
+        return NLS.bind(
+            Messages.getString( "ProblemsViewLabelProvider.ATNonExistentSubstringMatchingRule" ), new String[]//$NON-NLS-1$
+            { exception.getRelatedId() } );
+    }
+
+
+    private String getMessageATMustHaveSameUsageThanSuperior( LdapSchemaException exception )
+    {
+        return Messages.getString( "ProblemsViewLabelProvider.ATMustHaveSameUsageThanSuperior" );
+    }
+
+
+    private String getMessageATUserApplicationsUsageMustBeUserModifiable( LdapSchemaException exception )
+    {
+        return Messages.getString( "ProblemsViewLabelProvider.ATUserApplicationsUsageMustBeUserModifiable" );
+    }
+
+
+    private String getMessageATCollectiveMustHaveUserApplicationsUsage( LdapSchemaException exception )
+    {
+        return Messages.getString( "ProblemsViewLabelProvider.ATCollectiveMustHaveUserApplicationsUsage" );
+    }
 
-    private String getMessage( LdapSchemaException ldapSchemaException )
+
+    private String getMessageATCollectiveCannotBeSingleValued( LdapSchemaException exception )
+    {
+        return Messages.getString( "ProblemsViewLabelProvider.ATCollectiveCannotBeSingleValued" );
+    }
+
+
+    private String getMessageOCAbstractMustInheritFromAbstractOC( LdapSchemaException exception )
+    {
+        return Messages.getString( "ProblemsViewLabelProvider.OCAbstractMustInheritFromAbstractOC" );
+    }
+
+
+    private String getMessageOCAuxiliaryCannotInheritFromStructuralOC( LdapSchemaException exception )
+    {
+        return Messages.getString( "ProblemsViewLabelProvider.OCAuxiliaryCannotInheritFromStructuralOC" );
+    }
+
+
+    private String getMessageOCStructuralCannotInheritFromAuxiliaryOC( LdapSchemaException exception )
+    {
+        return Messages.getString( "ProblemsViewLabelProvider.OCStructuralCannotInheritFromAuxiliaryOC" );
+    }
+
+
+    private String getMessageOCNonExistentSuperior( LdapSchemaException exception )
+    {
+        return NLS.bind( Messages.getString( "ProblemsViewLabelProvider.OCNonExistentSuperior" ), new String[]//$NON-NLS-1$
+            { exception.getRelatedId() } );
+    }
+
+
+    private String getMessageOCCycleClassHierarchy( LdapSchemaException exception )
+    {
+        return Messages.getString( "ProblemsViewLabelProvider.OCCycleClassHierarchy" );
+    }
+
+
+    private String getMessageOCCollectiveNotAllowedInMust( LdapSchemaException exception )
+    {
+        return NLS.bind( Messages.getString( "ProblemsViewLabelProvider.OCCollectiveNotAllowedInMust" ), new String[]//$NON-NLS-1$
+            { exception.getRelatedId() } );
+    }
+
+
+    private String getMessageOCCollectiveNotAllowedInMay( LdapSchemaException exception )
+    {
+        return NLS.bind( Messages.getString( "ProblemsViewLabelProvider.OCCollectiveNotAllowedInMay" ), new String[]//$NON-NLS-1$
+            { exception.getRelatedId() } );
+    }
+
+
+    private String getMessageOCDuplicateATInMust( LdapSchemaException exception )
+    {
+        return NLS.bind( Messages.getString( "ProblemsViewLabelProvider.OCDuplicateATInMust" ), new String[]//$NON-NLS-1$
+            { exception.getRelatedId() } );
+    }
+
+
+    private String getMessageOCDuplicateATInMay( LdapSchemaException exception )
+    {
+        return NLS.bind( Messages.getString( "ProblemsViewLabelProvider.OCDuplicateATInMay" ), new String[]//$NON-NLS-1$
+            { exception.getRelatedId() } );
+    }
+
+
+    private String getMessageOCNonExistentMustAT( LdapSchemaException exception )
+    {
+        return NLS.bind( Messages.getString( "ProblemsViewLabelProvider.OCNonExistentMustAT" ), new String[]//$NON-NLS-1$
+            { exception.getRelatedId() } );
+    }
+
+
+    private String getMessageOCNonExistentMayAT( LdapSchemaException exception )
     {
-        return ldapSchemaException.getCode().toString();
+        return NLS.bind( Messages.getString( "ProblemsViewLabelProvider.OCNonExistentMayAT" ), new String[] //$NON-NLS-1$
+            { exception.getRelatedId() } );
+
+    }
+
+
+    private String getMessageOCDuplicateATInMayAndMust( LdapSchemaException exception )
+    {
+        return NLS.bind( Messages.getString( "ProblemsViewLabelProvider.OCDuplicateATInMayAndMust" ), new String[] //$NON-NLS-1$;
+            { exception.getRelatedId() } );
+    }
+
+
+    private String getMessageMRNonExistentSyntax( LdapSchemaException exception )
+    {
+        return NLS.bind( Messages.getString( "ProblemsViewLabelProvider.NonExistentSyntax" ), new String[] //$NON-NLS-1$;
+            { exception.getRelatedId() } );
     }
 
 
@@ -298,15 +449,61 @@ public class ProblemsViewLabelProvider e
      */
     private String getDisplayName( SchemaObject so )
     {
-        String name = so.getName();
+        if ( so != null )
+        {
+            SchemaObject schemaObject = getSchemaObject( so );
+            if ( schemaObject != null )
+            {
+                String name = schemaObject.getName();
+                if ( ( name != null ) && ( !name.equals( "" ) ) ) // $NON-NLS-1$
+                {
+                    return name;
+                }
+                else
+                {
+                    return so.getOid();
+                }
+            }
+            else
+            {
+                return so.getOid();
+            }
+        }
+
+        return ""; // $NON-NLS-1$
+    }
+
+
+    /**
+     * Gets the original {@link SchemaObject} from the {@link SchemaHandler}.
+     *
+     * @param so
+     *      the schema object
+     * @return
+     *      the original schema object from the schema handler.
+     */
+    private SchemaObject getSchemaObject( SchemaObject so )
+    {
+        SchemaHandler schemaHandler = Activator.getDefault().getSchemaHandler();
+        SchemaObject schemaObject = null;
 
-        if ( ( name != null ) && ( !name.equals( "" ) ) ) //$NON-NLS-1$
+        if ( so instanceof AttributeType )
         {
-            return name;
+            schemaObject = schemaHandler.getAttributeType( so.getOid() );
         }
-        else
+        else if ( so instanceof LdapSyntax )
         {
-            return so.getOid();
+            schemaObject = schemaHandler.getSyntax( so.getOid() );
         }
+        else if ( so instanceof MatchingRule )
+        {
+            schemaObject = schemaHandler.getMatchingRule( so.getOid() );
+        }
+        else if ( so instanceof ObjectClass )
+        {
+            schemaObject = schemaHandler.getObjectClass( so.getOid() );
+        }
+
+        return schemaObject;
     }
 }

Modified: directory/studio/branches/m1/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/messages.properties?rev=1066913&r1=1066912&r2=1066913&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/messages.properties (original)
+++ directory/studio/branches/m1/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/messages.properties Thu Feb  3 19:16:51 2011
@@ -24,24 +24,37 @@ ProblemsView.Errors=errors
 ProblemsView.Resource=Resource
 ProblemsView.Warning=warning
 ProblemsView.Warnings=warnings
-ProblemsViewLabelProvider.DuplicateAliasErrorAttributeType=Alias "{0}" is already used by another item\: attribute type with OID "{1}".
-ProblemsViewLabelProvider.DuplicateAliasErrorObjectClass=Alias "{0}" is already used by another item\: object class with OID "{1}".
-ProblemsViewLabelProvider.DuplicateOidErrorAttributeType=OID "{0}" is already used by another item\: attribute type with alias "{1}".
-ProblemsViewLabelProvider.DuplicateOidErrorObjectClass=OID "{0}" is already used by another item\: object class with alias "{1}".
+ProblemsViewLabelProvider.NonExistentSchema=Schema "{0}" does not exist.
+ProblemsViewLabelProvider.ATCannotSubtypeCollectiveAT=A collective attribute type cannot be subtyped.
+ProblemsViewLabelProvider.ATCycleTypeHierarchy=A cycle has been detected in attribute type hierarchy.
+ProblemsViewLabelProvider.ATSyntaxOrSuperiorRequired=A syntax or a superior is required.
+ProblemsViewLabelProvider.ATMustHaveSameUsageThanSuperior=The attribute type must have the same usage than its superior.
+ProblemsViewLabelProvider.ATUserApplicationsUsageMustBeUserModifiable=Having a usage set to 'userApplications', the attribute type must be user modifiable.
+ProblemsViewLabelProvider.ATCollectiveMustHaveUserApplicationsUsage=Being collective, the attribute type must have a usage set to 'userApplications'.
+ProblemsViewLabelProvider.ATCollectiveCannotBeSingleValued=Being collective, the attribute type cannot be single valued.
+ProblemsViewLabelProvider.OCAbstractMustInheritFromAbstractOC=An abstract object class must inherit from another abstract object class.
+ProblemsViewLabelProvider.OCAuxiliaryCannotInheritFromStructuralOC=An auxiliary object class cannot inherit from a structural object class.
+ProblemsViewLabelProvider.OCStructuralCannotInheritFromAuxiliaryOC=A structural object class cannot inherit from an auxiliary object class.
+ProblemsViewLabelProvider.OCCycleClassHierarchy=A cycle has been detected in object class hierarchy.
+ProblemsViewLabelProvider.OCCollectiveNotAllowedInMust=Collective attribute type "{0}" is not allowed as a mandatory attribute type.
+ProblemsViewLabelProvider.OCCollectiveNotAllowedInMay=Collective attribute type "{0}" is not allowed as an optional attribute type.
+ProblemsViewLabelProvider.OCDuplicateATInMust=Duplicated attribute type "{0}" in the mandatory attribute types list.
+ProblemsViewLabelProvider.OCDuplicateATInMay=Duplicated attribute type "{0}" in the optional attribute types list.
+ProblemsViewLabelProvider.OCDuplicateATInMayAndMust=Duplicated attribute type "{0}" in the mandatory and optional attribute types lists.
+ProblemsViewLabelProvider.NameAlreadyRegisteredAT=Alias "{0}" is already used by another item\: attribute type with OID "{1}".
+ProblemsViewLabelProvider.NameAlreadyRegisteredOC=Alias "{0}" is already used by another item\: object class with OID "{1}".
+ProblemsViewLabelProvider.OidAlreadyRegisteredAT=OID "{0}" is already used by another item\: attribute type with alias "{1}".
+ProblemsViewLabelProvider.OidAlreadyRegisteredOC=OID "{0}" is already used by another item\: object class with alias "{1}".
 ProblemsViewLabelProvider.NoAliasWarningAttributeType=Attribute type with OID "{0}" does not have any alias.
 ProblemsViewLabelProvider.NoAliasWarningObjectClass=Object class with OID "{0}" does not have any alias.
-ProblemsViewLabelProvider.ClassTypeHierarchyErrorAbstractStructuralObject=Abstract object class "{0}" can not extend Structural object class : "{1}".
-ProblemsViewLabelProvider.ClassTypeHierarchyErrorAbstractAuxiliaryObject=Abstract object class "{0}" can not extend Auxiliary object class : "{1}".
-ProblemsViewLabelProvider.ClassTypeHierarchyErrorAuxiliaryStructuralObject=Auxiliary object class "{0}" Structural object class :"{1}".
-ProblemsViewLabelProvider.ClassTypeHierarchyErrorAuxiliary=Auxiliary object class "{0}" Structural object class :"{1}".
-ProblemsViewLabelProvider.AttributeTypeUsage=Attribute type "{0}" has a different usage value than its superior "{1}".
-ProblemsViewLabelProvider.AttributeTypeCollective=Attribute type "{0}" must be collective as its superior "{1}".
-ProblemsViewLabelProvider.NonExistingMandatoryAttribute=Mandatory attribute type "{0}" does not exist.
-ProblemsViewLabelProvider.NonExistingMatchingRule=Matching rule "{0}" does not exist.
-ProblemsViewLabelProvider.NonExistingOptionalAttribute=Optional attribute type "{0}" does not exist.
-ProblemsViewLabelProvider.NonExistingSuperiorAttribute=Superior attribute type "{0}" does not exist.
-ProblemsViewLabelProvider.NonExistingSuperiorObject=Superior object class "{0}" does not exist.
-ProblemsViewLabelProvider.NonExistingSyntax=Syntax with OID "{0}" does not exist.
+ProblemsViewLabelProvider.OCNonExistentMustAT=Mandatory attribute type "{0}" does not exist.
+ProblemsViewLabelProvider.ATNonExistentEqualityMatchingRule=Equality matching rule "{0}" does not exist.
+ProblemsViewLabelProvider.ATNonExistentOrderingMatchingRule=Ordering matching rule "{0}" does not exist.
+ProblemsViewLabelProvider.ATNonExistentSubstringMatchingRule=Substring matching rule "{0}" does not exist.
+ProblemsViewLabelProvider.OCNonExistentMayAT=Optional attribute type "{0}" does not exist.
+ProblemsViewLabelProvider.ATNonExistentSuperior=Superior attribute type "{0}" does not exist.
+ProblemsViewLabelProvider.OCNonExistentSuperior=Superior object class "{0}" does not exist.
+ProblemsViewLabelProvider.NonExistentSyntax=Syntax with OID "{0}" does not exist.
 SchemaViewLabelProvider.None=(None)
 SchemaViewSortingDialog.Ascending=Ascending
 SchemaViewSortingDialog.Descending=Descending

Modified: directory/studio/branches/m1/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/messages_de.properties?rev=1066913&r1=1066912&r2=1066913&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/messages_de.properties (original)
+++ directory/studio/branches/m1/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/messages_de.properties Thu Feb  3 19:16:51 2011
@@ -24,24 +24,37 @@ ProblemsView.Errors=Fehler
 ProblemsView.Resource=Resource
 ProblemsView.Warning=Warnung
 ProblemsView.Warnings=Warnungen
-ProblemsViewLabelProvider.DuplicateAliasErrorAttributeType=Alias "{0}" wird schon anderweitig\: Attribut-Typ mit OID "{1}".
-ProblemsViewLabelProvider.DuplicateAliasErrorObjectClass=Alias "{0}" wird schon anderweitig verwendet\: Objektklasse mit OID "{1}".
-ProblemsViewLabelProvider.DuplicateOidErrorAttributeType=OID "{0}" wird schon anderweitig verwendet\: Attribut-Typ mit Alias "{1}".
-ProblemsViewLabelProvider.DuplicateOidErrorObjectClass=OID "{0}" wird schon anderweitig verwendet\: Objektklasse mit Alias "{1}".
+ProblemsViewLabelProvider.NonExistentSchema=TODO:Schema "{0}" does not exist.
+ProblemsViewLabelProvider.ATCannotSubtypeCollectiveAT=TODO:A collective attribute type cannot be subtyped.
+ProblemsViewLabelProvider.ATCycleTypeHierarchy=TODO:A cycle has been detected in attribute type hierarchy.
+ProblemsViewLabelProvider.ATSyntaxOrSuperiorRequired=TODO:A syntax or a superior is required.
+ProblemsViewLabelProvider.ATMustHaveSameUsageThanSuperior=TODO:The attribute type must have the same usage than its superior.
+ProblemsViewLabelProvider.ATUserApplicationsUsageMustBeUserModifiable=TODO:Having a usage set to 'userApplications', the attribute type must be user modifiable.
+ProblemsViewLabelProvider.ATCollectiveMustHaveUserApplicationsUsage=TODO:Being collective, the attribute type must have a usage set to 'userApplications'.
+ProblemsViewLabelProvider.ATCollectiveCannotBeSingleValued=TODO:Being collective, the attribute type cannot be single valued.
+ProblemsViewLabelProvider.OCAbstractMustInheritFromAbstractOC=TODO:An abstract object class must inherit from another abstract object class.
+ProblemsViewLabelProvider.OCAuxiliaryCannotInheritFromStructuralOC=TODO:An auxiliary object class cannot inherit from a structural object class.
+ProblemsViewLabelProvider.OCStructuralCannotInheritFromAuxiliaryOC=TODO:A structural object class cannot inherit from an auxiliary object class.
+ProblemsViewLabelProvider.OCCycleClassHierarchy=TODO:A cycle has been detected in object class hierarchy.
+ProblemsViewLabelProvider.OCCollectiveNotAllowedInMust=TODO:Collective attribute type "{0}" is not allowed as a mandatory attribute type.
+ProblemsViewLabelProvider.OCCollectiveNotAllowedInMay=TODO:Collective attribute type "{0}" is not allowed as an optional attribute type.
+ProblemsViewLabelProvider.OCDuplicateATInMust=TODO:Duplicated attribute type "{0}" in the mandatory attribute types list.
+ProblemsViewLabelProvider.OCDuplicateATInMay=TODO:Duplicated attribute type "{0}" in the optional attribute types list.
+ProblemsViewLabelProvider.OCDuplicateATInMayAndMust=TODO:Duplicated attribute type "{0}" in the mandatory and optional attribute types lists.
+ProblemsViewLabelProvider.NameAlreadyRegisteredAT=Alias "{0}" wird schon anderweitig\: Attribut-Typ mit OID "{1}".
+ProblemsViewLabelProvider.NameAlreadyRegisteredOC=Alias "{0}" wird schon anderweitig verwendet\: Objektklasse mit OID "{1}".
+ProblemsViewLabelProvider.OidAlreadyRegisteredAT=OID "{0}" wird schon anderweitig verwendet\: Attribut-Typ mit Alias "{1}".
+ProblemsViewLabelProvider.OidAlreadyRegisteredOC=OID "{0}" wird schon anderweitig verwendet\: Objektklasse mit Alias "{1}".
 ProblemsViewLabelProvider.NoAliasWarningAttributeType=Attribut-Typ mit OID "{0}" hat keinen Alias.
 ProblemsViewLabelProvider.NoAliasWarningObjectClass=Objektklasse mit OID "{0}" hat keinen Alias.
-ProblemsViewLabelProvider.ClassTypeHierarchyErrorAbstractStructuralObject=Abstrakte Objektklasse "{0}" kann die strukturelle Objektklasse "{1}" nicht erweitern.
-ProblemsViewLabelProvider.ClassTypeHierarchyErrorAbstractAuxiliaryObject=Abstrakte Objektklasse "{0}" kann die zus?tzliche Objektklasse "{1}" nicht erweitern.
-ProblemsViewLabelProvider.ClassTypeHierarchyErrorAuxiliaryStructuralObject=Zus\u00E4tzliche Objektklasse "{0}" strukturelle Objektklasse \: "{1}".
-ProblemsViewLabelProvider.ClassTypeHierarchyErrorAuxiliary=Zus\u00E4tzliche Objektklasse "{0}" strukturelle Objektklasse \: "{1}".
-ProblemsViewLabelProvider.AttributeTypeUsage=Attribut-Typ "{0}" hat einen anderen Gebrauchswert als sein \u00DCbergeordneter "{1}".
-ProblemsViewLabelProvider.AttributeTypeCollective=Attribut Type "{0}" muss kollektiv sein wie sein \u00DCbergeordneter "{1}".
-ProblemsViewLabelProvider.NonExistingMandatoryAttribute=Pflichtattribut-Typ "{0}" existiert nicht.
-ProblemsViewLabelProvider.NonExistingMatchingRule=Passende Regel "{0}" existiert nicht.
-ProblemsViewLabelProvider.NonExistingOptionalAttribute=Optionaler Attribute-Typ "{0}" existiert nicht.
-ProblemsViewLabelProvider.NonExistingSuperiorAttribute=\u00DCbergeordneter Attribut-Typ "{0}" existiert nicht.
-ProblemsViewLabelProvider.NonExistingSuperiorObject=\u00DCbergeordnete Objektklasse "{0}" existiert nicht.
-ProblemsViewLabelProvider.NonExistingSyntax=Syntax mit OID "{0}" existiert nicht.
+ProblemsViewLabelProvider.OCNonExistentMustAT=Pflichtattribut-Typ "{0}" existiert nicht.
+ProblemsViewLabelProvider.ATNonExistentEqualityMatchingRule=TODO:Equality matching rule "{0}" does not exist.
+ProblemsViewLabelProvider.ATNonExistentOrderingMatchingRule=TODO:Ordering matching rule "{0}" does not exist.
+ProblemsViewLabelProvider.ATNonExistentSubstringMatchingRule=TODO:Substring matching rule "{0}" does not exist.
+ProblemsViewLabelProvider.OCNonExistentMayAT=Optionaler Attribute-Typ "{0}" existiert nicht.
+ProblemsViewLabelProvider.ATNonExistentSuperior=\u00DCbergeordneter Attribut-Typ "{0}" existiert nicht.
+ProblemsViewLabelProvider.OCNonExistentSuperior=\u00DCbergeordnete Objektklasse "{0}" existiert nicht.
+ProblemsViewLabelProvider.NonExistentSyntax=Syntax mit OID "{0}" existiert nicht.
 SchemaViewLabelProvider.None=(Keine)
 SchemaViewSortingDialog.Ascending=Aufsteigend
 SchemaViewSortingDialog.Descending=Absteigend

Modified: directory/studio/branches/m1/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/messages_fr.properties
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/messages_fr.properties?rev=1066913&r1=1066912&r2=1066913&view=diff
==============================================================================
--- directory/studio/branches/m1/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/messages_fr.properties (original)
+++ directory/studio/branches/m1/plugins/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/view/views/messages_fr.properties Thu Feb  3 19:16:51 2011
@@ -27,24 +27,37 @@ ProblemsView.Resource=Ressource
 ProblemsView.Warning=avertissement
 ProblemsView.Warnings=avertissements
 
-ProblemsViewLabelProvider.DuplicateAliasErrorAttributeType=L''alias "{0}" est d\u00E9j\u00E0 utilis\u00E9 par un autre \u00E9lement\: le type d'attribut avec pour OID "{1}".
-ProblemsViewLabelProvider.DuplicateAliasErrorObjectClass=L''alias "{0}" est d\u00E9j\u00E0 utilis\u00E9 par un autre \u00E9l\u00E9ment\: la classe d'objet avec pour OID "{1}".
-ProblemsViewLabelProvider.DuplicateOidErrorAttributeType=L''OID "{0}" est d\u00E9j\u00E0 utilis\u00E9 par un autre \u00E9l\u00E9ment\: le type d'attribut avec pour alias "{1}".
-ProblemsViewLabelProvider.DuplicateOidErrorObjectClass=L''OID "{0}" est d\u00E9j\u00E0 utilis\u00E9 par un autre \u00E9l\u00E9ment\: la classe d'objet avec pour alias "{1}".
+ProblemsViewLabelProvider.NonExistentSchema=TODO:Schema "{0}" does not exist.
+ProblemsViewLabelProvider.ATCannotSubtypeCollectiveAT=TODO:A collective attribute type cannot be subtyped.
+ProblemsViewLabelProvider.ATCycleTypeHierarchy=TODO:A cycle has been detected in attribute type hierarchy.
+ProblemsViewLabelProvider.ATSyntaxOrSuperiorRequired=TODO:A syntax or a superior is required.
+ProblemsViewLabelProvider.ATMustHaveSameUsageThanSuperior=TODO:The attribute type must have the same usage than its superior.
+ProblemsViewLabelProvider.ATUserApplicationsUsageMustBeUserModifiable=TODO:Having a usage set to 'userApplications', the attribute type must be user modifiable.
+ProblemsViewLabelProvider.ATCollectiveMustHaveUserApplicationsUsage=TODO:Being collective, the attribute type must have a usage set to 'userApplications'.
+ProblemsViewLabelProvider.ATCollectiveCannotBeSingleValued=TODO:Being collective, the attribute type cannot be single valued.
+ProblemsViewLabelProvider.OCAbstractMustInheritFromAbstractOC=TODO:An abstract object class must inherit from another abstract object class.
+ProblemsViewLabelProvider.OCAuxiliaryCannotInheritFromStructuralOC=TODO:An auxiliary object class cannot inherit from a structural object class.
+ProblemsViewLabelProvider.OCStructuralCannotInheritFromAuxiliaryOC=TODO:A structural object class cannot inherit from an auxiliary object class.
+ProblemsViewLabelProvider.OCCycleClassHierarchy=TODO:A cycle has been detected in object class hierarchy.
+ProblemsViewLabelProvider.OCCollectiveNotAllowedInMust=TODO:Collective attribute type "{0}" is not allowed as a mandatory attribute type.
+ProblemsViewLabelProvider.OCCollectiveNotAllowedInMay=TODO:Collective attribute type "{0}" is not allowed as an optional attribute type.
+ProblemsViewLabelProvider.OCDuplicateATInMust=TODO:Duplicated attribute type "{0}" in the mandatory attribute types list.
+ProblemsViewLabelProvider.OCDuplicateATInMay=TODO:Duplicated attribute type "{0}" in the optional attribute types list.
+ProblemsViewLabelProvider.OCDuplicateATInMayAndMust=TODO:Duplicated attribute type "{0}" in the mandatory and optional attribute types lists.
+ProblemsViewLabelProvider.NameAlreadyRegisteredAT=L''alias "{0}" est d\u00E9j\u00E0 utilis\u00E9 par un autre \u00E9lement\: le type d'attribut avec pour OID "{1}".
+ProblemsViewLabelProvider.NameAlreadyRegisteredOC=L''alias "{0}" est d\u00E9j\u00E0 utilis\u00E9 par un autre \u00E9l\u00E9ment\: la classe d'objet avec pour OID "{1}".
+ProblemsViewLabelProvider.OidAlreadyRegisteredAT=L''OID "{0}" est d\u00E9j\u00E0 utilis\u00E9 par un autre \u00E9l\u00E9ment\: le type d'attribut avec pour alias "{1}".
+ProblemsViewLabelProvider.OidAlreadyRegisteredOC=L''OID "{0}" est d\u00E9j\u00E0 utilis\u00E9 par un autre \u00E9l\u00E9ment\: la classe d'objet avec pour alias "{1}".
 ProblemsViewLabelProvider.NoAliasWarningAttributeType=Le type d''attribut avec pour OID "{0}" n''a aucun alias.
 ProblemsViewLabelProvider.NoAliasWarningObjectClass=La classe d''objet avec pour OID "{0}" n''a aucun alias.
-ProblemsViewLabelProvider.ClassTypeHierarchyErrorAbstractStructuralObject=La classe d''objet abstraite "{0}" ne peut \u00E9tendre une classe d'objet structurelle:"{1}".
-ProblemsViewLabelProvider.ClassTypeHierarchyErrorAbstractAuxiliaryObject=La classe d''objet abstraite "{0}" ne peut \u00E9tendre une classe d'objet auxiliaire:"{1}".
-ProblemsViewLabelProvider.ClassTypeHierarchyErrorAuxiliaryStructuralObject=La classe d''objet auxiliaire "{0}" ne peut \u00E9tendre une classe d'objet structurelle:"{1}".
-ProblemsViewLabelProvider.ClassTypeHierarchyErrorAuxiliary=La classe d''objet auxiliaire "{0}" ne peut \u00E9tendre une classe d'objet abstraite:"{1}".
-ProblemsViewLabelProvider.AttributeTypeUsage=Le type d''attribut "{0}" a une valeur d'usage diff\u00E9rente de celle de son sup\u00E9rieur "{1}".
-ProblemsViewLabelProvider.AttributeTypeCollective=Le type d''attribut "{0}" doit \u00EAtre collectif, comme son pr\u00E9d\u00E9cesseur "{1}".
-ProblemsViewLabelProvider.NonExistingMandatoryAttribute=Le type d''attibut obligatoire "{0}" n''existe pas.
-ProblemsViewLabelProvider.NonExistingMatchingRule=La r\u00E8gle de comparaison "{0}" n'existe pas.
-ProblemsViewLabelProvider.NonExistingOptionalAttribute=Le type d''attribut optionnel "{0}" n''existe pas.
-ProblemsViewLabelProvider.NonExistingSuperiorAttribute=Le type d''attribut sup\u00E9rieur "{0}" n''existe pas.
-ProblemsViewLabelProvider.NonExistingSuperiorObject=La classe d''objet sup\u00E9rieure "{0}" n''existe pas.
-ProblemsViewLabelProvider.NonExistingSyntax=La syntaxe avec l''OID "{0}" n''existe pas.
+ProblemsViewLabelProvider.OCNonExistentMustAT=Le type d''attibut obligatoire "{0}" n''existe pas.
+ProblemsViewLabelProvider.ATNonExistentEqualityMatchingRule=TODO:Equality matching rule "{0}" does not exist.
+ProblemsViewLabelProvider.ATNonExistentOrderingMatchingRule=TODO:Ordering matching rule "{0}" does not exist.
+ProblemsViewLabelProvider.ATNonExistentSubstringMatchingRule=TODO:Substring matching rule "{0}" does not exist.
+ProblemsViewLabelProvider.OCNonExistentMayAT=Le type d''attribut optionnel "{0}" n''existe pas.
+ProblemsViewLabelProvider.ATNonExistentSuperior=Le type d''attribut sup\u00E9rieur "{0}" n''existe pas.
+ProblemsViewLabelProvider.OCNonExistentSuperior=La classe d''objet sup\u00E9rieure "{0}" n''existe pas.
+ProblemsViewLabelProvider.NonExistentSyntax=La syntaxe avec l''OID "{0}" n''existe pas.
 
 SchemaViewLabelProvider.None=(Pas de nom)
 SearchViewLabelProvider.FromSchema=du sch\u00E9ma

Modified: directory/studio/branches/m1/pom.xml
URL: http://svn.apache.org/viewvc/directory/studio/branches/m1/pom.xml?rev=1066913&r1=1066912&r2=1066913&view=diff
==============================================================================
--- directory/studio/branches/m1/pom.xml (original)
+++ directory/studio/branches/m1/pom.xml Thu Feb  3 19:16:51 2011
@@ -25,6 +25,7 @@
     <artifactId>project</artifactId>
     <version>19</version>
   </parent>
+  
 
   <groupId>org.apache.directory.studio</groupId>
   <artifactId>parent</artifactId>
@@ -1374,16 +1375,6 @@
       </dependency>
       <dependency>
         <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-asn1-api</artifactId>
-        <version>${org.apache.directory.shared.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.directory.shared</groupId>
-        <artifactId>shared-asn1-ber</artifactId>
-        <version>${org.apache.directory.shared.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.directory.shared</groupId>
         <artifactId>shared-dsml-parser</artifactId>
         <version>${org.apache.directory.shared.version}</version>
       </dependency>



Mime
View raw message