You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2015/11/06 18:58:19 UTC

svn commit: r1712998 - /directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/DatabaseWrapperLabelProvider.java

Author: elecharny
Date: Fri Nov  6 17:58:19 2015
New Revision: 1712998

URL: http://svn.apache.org/viewvc?rev=1712998&view=rev
Log:
o Fixed the way we access to the database name

Modified:
    directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/DatabaseWrapperLabelProvider.java

Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/DatabaseWrapperLabelProvider.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/DatabaseWrapperLabelProvider.java?rev=1712998&r1=1712997&r2=1712998&view=diff
==============================================================================
--- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/DatabaseWrapperLabelProvider.java (original)
+++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/DatabaseWrapperLabelProvider.java Fri Nov  6 17:58:19 2015
@@ -22,7 +22,6 @@ package org.apache.directory.studio.open
 import java.util.List;
 
 import org.apache.directory.api.ldap.model.name.Dn;
-import org.apache.directory.api.util.Strings;
 import org.apache.directory.studio.common.ui.CommonUIConstants;
 import org.apache.directory.studio.openldap.common.ui.model.DatabaseTypeEnum;
 import org.apache.directory.studio.openldap.config.OpenLdapConfigurationPlugin;
@@ -143,16 +142,16 @@ public class DatabaseWrapperLabelProvide
         if ( database != null )
         {
             String databaseType = OpenLdapConfigurationPluginUtils.stripOrderingPrefix( database.getOlcDatabase() );
-
-            DatabaseTypeEnum databasetype = DatabaseTypeEnum.valueOf( Strings.toUpperCase( databaseType ) );
+            
+            DatabaseTypeEnum databasetype = DatabaseTypeEnum.getDatabaseType( databaseType );
             
             if ( databaseType != null )
             {
-                return databasetype.getName();
+                return databasetype.name();
             }
             else
             {
-                return DatabaseTypeEnum.NONE.getName();
+                return DatabaseTypeEnum.NONE.name();
             }
         }