Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 22113 invoked from network); 3 Sep 2009 20:10:30 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 3 Sep 2009 20:10:30 -0000 Received: (qmail 36611 invoked by uid 500); 3 Sep 2009 20:10:30 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 36540 invoked by uid 500); 3 Sep 2009 20:10:30 -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 36531 invoked by uid 99); 3 Sep 2009 20:10:30 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Sep 2009 20:10:30 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 03 Sep 2009 20:10:27 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id DC8732388906; Thu, 3 Sep 2009 20:10:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r811101 - in /directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views: browser/LinkWithEditorAction.java connection/LinkWithEditorAction.java Date: Thu, 03 Sep 2009 20:10:05 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090903201005.DC8732388906@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: seelmann Date: Thu Sep 3 20:10:05 2009 New Revision: 811101 URL: http://svn.apache.org/viewvc?rev=811101&view=rev Log: Make the link with editor action workable with each editor implementation Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/LinkWithEditorAction.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/LinkWithEditorAction.java Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/LinkWithEditorAction.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/LinkWithEditorAction.java?rev=811101&r1=811100&r2=811101&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/LinkWithEditorAction.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/browser/LinkWithEditorAction.java Thu Sep 3 20:10:05 2009 @@ -17,14 +17,13 @@ * under the License. * */ + package org.apache.directory.studio.ldapbrowser.ui.views.browser; import org.apache.directory.studio.entryeditors.EntryEditorInput; import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants; import org.apache.directory.studio.ldapbrowser.ui.BrowserUIPlugin; -import org.apache.directory.studio.ldapbrowser.ui.editors.entry.EntryEditor; -import org.apache.directory.studio.ldapbrowser.ui.editors.searchresult.SearchResultEditor; import org.apache.directory.studio.ldapbrowser.ui.editors.searchresult.SearchResultEditorInput; import org.eclipse.jface.action.Action; import org.eclipse.jface.viewers.IStructuredSelection; @@ -177,21 +176,16 @@ { Object objectToSelect = null; - if ( part instanceof EntryEditor ) + if ( part instanceof IEditorPart ) { - EntryEditor editor = ( EntryEditor ) part; + IEditorPart editor = ( IEditorPart ) part; IEditorInput input = editor.getEditorInput(); if ( input != null && input instanceof EntryEditorInput ) { EntryEditorInput eei = ( EntryEditorInput ) input; objectToSelect = eei.getInput(); } - } - else if ( part instanceof SearchResultEditor ) - { - SearchResultEditor editor = ( SearchResultEditor ) part; - IEditorInput input = editor.getEditorInput(); - if ( input != null && input instanceof SearchResultEditorInput ) + else if ( input != null && input instanceof SearchResultEditorInput ) { SearchResultEditorInput srei = ( SearchResultEditorInput ) input; objectToSelect = srei.getSearch(); Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/LinkWithEditorAction.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/LinkWithEditorAction.java?rev=811101&r1=811100&r2=811101&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/LinkWithEditorAction.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/views/connection/LinkWithEditorAction.java Thu Sep 3 20:10:05 2009 @@ -26,8 +26,6 @@ import org.apache.directory.studio.ldapbrowser.core.model.ISearch; import org.apache.directory.studio.ldapbrowser.ui.BrowserUIConstants; import org.apache.directory.studio.ldapbrowser.ui.BrowserUIPlugin; -import org.apache.directory.studio.ldapbrowser.ui.editors.entry.EntryEditor; -import org.apache.directory.studio.ldapbrowser.ui.editors.searchresult.SearchResultEditor; import org.apache.directory.studio.ldapbrowser.ui.editors.searchresult.SearchResultEditorInput; import org.eclipse.jface.action.Action; import org.eclipse.jface.util.IPropertyChangeListener; @@ -102,6 +100,7 @@ */ public void partInputChanged( IWorkbenchPartReference partRef ) { + linkViewWithEditor( partRef.getPart( false ) ); } @@ -203,9 +202,9 @@ { Object objectToSelect = null; - if ( part instanceof EntryEditor ) + if ( part instanceof IEditorPart ) { - EntryEditor editor = ( EntryEditor ) part; + IEditorPart editor = ( IEditorPart ) part; IEditorInput input = editor.getEditorInput(); if ( input != null && input instanceof EntryEditorInput ) { @@ -216,12 +215,7 @@ objectToSelect = entry.getBrowserConnection().getConnection(); } } - } - else if ( part instanceof SearchResultEditor ) - { - SearchResultEditor editor = ( SearchResultEditor ) part; - IEditorInput input = editor.getEditorInput(); - if ( input != null && input instanceof SearchResultEditorInput ) + else if ( input != null && input instanceof SearchResultEditorInput ) { SearchResultEditorInput srei = ( SearchResultEditorInput ) input; ISearch search = srei.getSearch();