Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 27462 invoked from network); 21 Jan 2008 15:14:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 21 Jan 2008 15:14:19 -0000 Received: (qmail 94619 invoked by uid 500); 21 Jan 2008 15:14:09 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 94564 invoked by uid 500); 21 Jan 2008 15:14:09 -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 94552 invoked by uid 99); 21 Jan 2008 15:14:09 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Jan 2008 07:14:08 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 21 Jan 2008 15:14:03 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id D5B451A9832; Mon, 21 Jan 2008 07:13:54 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r613913 - in /directory/studio/trunk/studio-connection-ui: resources/icons/ src/main/java/org/apache/directory/studio/connection/ui/ src/main/java/org/apache/directory/studio/connection/ui/widgets/ Date: Mon, 21 Jan 2008 15:13:54 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080121151354.D5B451A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pamarcelot Date: Mon Jan 21 07:13:51 2008 New Revision: 613913 URL: http://svn.apache.org/viewvc?rev=613913&view=rev Log: Fix for DIRSTUDIO-138 (Add visual feedback to the user, if SSL (ldaps) is enabled). Added: directory/studio/trunk/studio-connection-ui/resources/icons/connection_ssl_connected.gif (with props) directory/studio/trunk/studio-connection-ui/resources/icons/connection_ssl_disconnected.gif (with props) Modified: directory/studio/trunk/studio-connection-ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIConstants.java directory/studio/trunk/studio-connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionLabelProvider.java Added: directory/studio/trunk/studio-connection-ui/resources/icons/connection_ssl_connected.gif URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-connection-ui/resources/icons/connection_ssl_connected.gif?rev=613913&view=auto ============================================================================== Binary file - no diff available. Propchange: directory/studio/trunk/studio-connection-ui/resources/icons/connection_ssl_connected.gif ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Added: directory/studio/trunk/studio-connection-ui/resources/icons/connection_ssl_disconnected.gif URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-connection-ui/resources/icons/connection_ssl_disconnected.gif?rev=613913&view=auto ============================================================================== Binary file - no diff available. Propchange: directory/studio/trunk/studio-connection-ui/resources/icons/connection_ssl_disconnected.gif ------------------------------------------------------------------------------ svn:mime-type = application/octet-stream Modified: directory/studio/trunk/studio-connection-ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIConstants.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-connection-ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIConstants.java?rev=613913&r1=613912&r2=613913&view=diff ============================================================================== --- directory/studio/trunk/studio-connection-ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIConstants.java (original) +++ directory/studio/trunk/studio-connection-ui/src/main/java/org/apache/directory/studio/connection/ui/ConnectionUIConstants.java Mon Jan 21 07:13:51 2008 @@ -50,6 +50,12 @@ /** The image used to display the disconnected state of connections. */ public static final String IMG_CONNECTION_DISCONNECTED = "resources/icons/connection_disconnected.gif"; + + /** The image used to display the connected state of SSL connections. */ + public static final String IMG_CONNECTION_SSL_CONNECTED = "resources/icons/connection_ssl_connected.gif"; + + /** The image used to display the disconnected state of SSL connections. */ + public static final String IMG_CONNECTION_SSL_DISCONNECTED = "resources/icons/connection_ssl_disconnected.gif"; /** The image to connect connections. */ public static final String IMG_CONNECTION_CONNECT = "resources/icons/connection_connect.gif"; Modified: directory/studio/trunk/studio-connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionLabelProvider.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionLabelProvider.java?rev=613913&r1=613912&r2=613913&view=diff ============================================================================== --- directory/studio/trunk/studio-connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionLabelProvider.java (original) +++ directory/studio/trunk/studio-connection-ui/src/main/java/org/apache/directory/studio/connection/ui/widgets/ConnectionLabelProvider.java Mon Jan 21 07:13:51 2008 @@ -50,7 +50,7 @@ { if ( obj instanceof ConnectionFolder ) { - ConnectionFolder folder = (ConnectionFolder) obj; + ConnectionFolder folder = ( ConnectionFolder ) obj; return folder.getName(); } if ( obj instanceof Connection ) @@ -94,9 +94,18 @@ else if ( obj instanceof Connection ) { Connection conn = ( Connection ) obj; - return conn.getJNDIConnectionWrapper().isConnected() ? ConnectionUIPlugin.getDefault().getImage( - ConnectionUIConstants.IMG_CONNECTION_CONNECTED ) : ConnectionUIPlugin.getDefault().getImage( - ConnectionUIConstants.IMG_CONNECTION_DISCONNECTED ); + if ( conn.getEncryptionMethod() == EncryptionMethod.LDAPS ) + { + return conn.getJNDIConnectionWrapper().isConnected() ? ConnectionUIPlugin.getDefault().getImage( + ConnectionUIConstants.IMG_CONNECTION_SSL_CONNECTED ) : ConnectionUIPlugin.getDefault().getImage( + ConnectionUIConstants.IMG_CONNECTION_SSL_DISCONNECTED ); + } + else + { + return conn.getJNDIConnectionWrapper().isConnected() ? ConnectionUIPlugin.getDefault().getImage( + ConnectionUIConstants.IMG_CONNECTION_CONNECTED ) : ConnectionUIPlugin.getDefault().getImage( + ConnectionUIConstants.IMG_CONNECTION_DISCONNECTED ); + } } else {