From commits-return-43745-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Fri Nov 6 17:58:27 2015 Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7E75818EAF for ; Fri, 6 Nov 2015 17:58:27 +0000 (UTC) Received: (qmail 94787 invoked by uid 500); 6 Nov 2015 17:58:27 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 94741 invoked by uid 500); 6 Nov 2015 17:58:27 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 94732 invoked by uid 99); 6 Nov 2015 17:58:27 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 06 Nov 2015 17:58:27 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id BE642C0098 for ; Fri, 6 Nov 2015 17:58:26 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 0.99 X-Spam-Level: X-Spam-Status: No, score=0.99 tagged_above=-999 required=6.31 tests=[KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id nQ7ds9nPiV-F for ; Fri, 6 Nov 2015 17:58:24 +0000 (UTC) Received: from mailrelay1-us-west.apache.org (mailrelay1-us-west.apache.org [209.188.14.139]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with ESMTP id A5A9D24B3A for ; Fri, 6 Nov 2015 17:58:20 +0000 (UTC) Received: from svn01-us-west.apache.org (svn.apache.org [10.41.0.6]) by mailrelay1-us-west.apache.org (ASF Mail Server at mailrelay1-us-west.apache.org) with ESMTP id E137CE0044 for ; Fri, 6 Nov 2015 17:58:19 +0000 (UTC) Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id DF9FD3A0176 for ; Fri, 6 Nov 2015 17:58:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1712998 - /directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/editor/wrappers/DatabaseWrapperLabelProvider.java Date: Fri, 06 Nov 2015 17:58:19 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20151106175819.DF9FD3A0176@svn01-us-west.apache.org> 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(); } }