From commits-return-15414-apmail-directory-commits-archive=directory.apache.org@directory.apache.org Fri Sep 07 09:08:48 2007 Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 14291 invoked from network); 7 Sep 2007 09:08:45 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Sep 2007 09:08:45 -0000 Received: (qmail 56006 invoked by uid 500); 7 Sep 2007 09:08:39 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 55961 invoked by uid 500); 7 Sep 2007 09:08:39 -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 55938 invoked by uid 99); 7 Sep 2007 09:08:39 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 07 Sep 2007 02:08:39 -0700 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; Fri, 07 Sep 2007 09:10:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4A7D61A9832; Fri, 7 Sep 2007 02:08:20 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r573512 - /directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SelectConnectionDialog.java Date: Fri, 07 Sep 2007 09:08:20 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20070907090820.4A7D61A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: seelmann Date: Fri Sep 7 02:08:19 2007 New Revision: 573512 URL: http://svn.apache.org/viewvc?rev=573512&view=rev Log: Fix for DIRSTUDIO-183 Modified: directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SelectConnectionDialog.java Modified: directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SelectConnectionDialog.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SelectConnectionDialog.java?rev=573512&r1=573511&r2=573512&view=diff ============================================================================== --- directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SelectConnectionDialog.java (original) +++ directory/studio/trunk/studio-ldapbrowser-common/src/main/java/org/apache/directory/studio/ldapbrowser/common/dialogs/SelectConnectionDialog.java Fri Sep 7 02:08:19 2007 @@ -21,11 +21,13 @@ package org.apache.directory.studio.ldapbrowser.common.dialogs; +import org.apache.directory.studio.connection.core.Connection; import org.apache.directory.studio.connection.core.ConnectionCorePlugin; import org.apache.directory.studio.connection.ui.widgets.ConnectionActionGroup; import org.apache.directory.studio.connection.ui.widgets.ConnectionConfiguration; import org.apache.directory.studio.connection.ui.widgets.ConnectionUniversalListener; import org.apache.directory.studio.connection.ui.widgets.ConnectionWidget; +import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin; import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection; import org.eclipse.jface.dialogs.Dialog; import org.eclipse.jface.dialogs.IDialogConstants; @@ -153,9 +155,13 @@ if ( !event.getSelection().isEmpty() ) { Object o = ( ( IStructuredSelection ) event.getSelection() ).getFirstElement(); - if ( o instanceof IBrowserConnection ) + if ( o instanceof Connection ) { - initialConnection = ( IBrowserConnection ) o; + Connection connection = ( Connection ) o; + IBrowserConnection browserConnection = BrowserCorePlugin.getDefault().getConnectionManager() + .getBrowserConnection( connection ); + initialConnection = browserConnection; + } } } @@ -168,9 +174,12 @@ if ( !event.getSelection().isEmpty() ) { Object o = ( ( IStructuredSelection ) event.getSelection() ).getFirstElement(); - if ( o instanceof IBrowserConnection ) + if ( o instanceof Connection ) { - initialConnection = ( IBrowserConnection ) o; + Connection connection = ( Connection ) o; + IBrowserConnection browserConnection = BrowserCorePlugin.getDefault().getConnectionManager() + .getBrowserConnection( connection ); + initialConnection = browserConnection; okPressed(); } } @@ -179,7 +188,7 @@ if ( this.initialConnection != null ) { - IBrowserConnection connection = this.initialConnection; + Connection connection = this.initialConnection.getConnection(); this.mainWidget.getViewer().reveal( connection ); this.mainWidget.getViewer().setSelection( new StructuredSelection( connection ), true ); }