Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 53492 invoked from network); 27 Aug 2008 23:20:59 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 27 Aug 2008 23:20:59 -0000 Received: (qmail 52066 invoked by uid 500); 27 Aug 2008 23:20:57 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 52032 invoked by uid 500); 27 Aug 2008 23:20:57 -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 52023 invoked by uid 99); 27 Aug 2008 23:20:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 27 Aug 2008 16:20:57 -0700 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; Wed, 27 Aug 2008 23:20:08 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 5717A238899B; Wed, 27 Aug 2008 16:20:08 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r689656 - in /directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors: entry/OpenEntryEditorAction.java searchresult/OpenEntryEditorAction.java Date: Wed, 27 Aug 2008 23:20:08 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080827232008.5717A238899B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: seelmann Date: Wed Aug 27 16:20:07 2008 New Revision: 689656 URL: http://svn.apache.org/viewvc?rev=689656&view=rev Log: Fixed execution of action Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/OpenEntryEditorAction.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenEntryEditorAction.java Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/OpenEntryEditorAction.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/OpenEntryEditorAction.java?rev=689656&r1=689655&r2=689656&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/OpenEntryEditorAction.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/entry/OpenEntryEditorAction.java Wed Aug 27 16:20:07 2008 @@ -24,10 +24,13 @@ import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants; import org.apache.directory.studio.ldapbrowser.common.widgets.entryeditor.AbstractOpenEditorAction; import org.apache.directory.studio.ldapbrowser.common.widgets.entryeditor.EntryEditorWidgetActionGroup; +import org.apache.directory.studio.ldapbrowser.common.wizards.EditEntryWizard; +import org.apache.directory.studio.ldapbrowser.core.model.IEntry; import org.apache.directory.studio.valueeditors.IValueEditor; import org.apache.directory.studio.valueeditors.ValueEditorManager; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.TreeViewer; +import org.eclipse.jface.wizard.WizardDialog; /** @@ -75,8 +78,23 @@ */ public void run() { - valueEditorManager.setUserSelectedValueEditor( valueEditor ); - super.run(); + IEntry entry = getSelectedValues().length > 0 ? getSelectedValues()[0].getAttribute().getEntry() + : getSelectedAttributes().length > 0 ? getSelectedAttributes()[0].getEntry() + : ( getInput() instanceof IEntry ) ? ( IEntry ) getInput() : null; + if ( entry != null ) + { + // disable action handlers + actionGroup.deactivateGlobalActionHandlers(); + + EditEntryWizard wizard = new EditEntryWizard( entry ); + WizardDialog dialog = new WizardDialog( getShell(), wizard ); + dialog.setBlockOnOpen( true ); + dialog.create(); + dialog.open(); + + // enable action handlers + actionGroup.activateGlobalActionHandlers(); + } } Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenEntryEditorAction.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenEntryEditorAction.java?rev=689656&r1=689655&r2=689656&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenEntryEditorAction.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenEntryEditorAction.java Wed Aug 27 16:20:07 2008 @@ -22,10 +22,13 @@ import org.apache.directory.studio.ldapbrowser.common.BrowserCommonConstants; +import org.apache.directory.studio.ldapbrowser.common.wizards.EditEntryWizard; +import org.apache.directory.studio.ldapbrowser.core.model.IEntry; import org.apache.directory.studio.valueeditors.IValueEditor; import org.apache.directory.studio.valueeditors.ValueEditorManager; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.TableViewer; +import org.eclipse.jface.wizard.WizardDialog; /** @@ -74,8 +77,21 @@ */ public void run() { - valueEditorManager.setUserSelectedValueEditor( valueEditor ); - super.run(); + IEntry entry = getSelectedSearchResults().length > 0 ? getSelectedSearchResults()[0].getEntry() : null; + if ( entry != null ) + { + // disable action handlers + actionGroup.deactivateGlobalActionHandlers(); + + EditEntryWizard wizard = new EditEntryWizard( entry ); + WizardDialog dialog = new WizardDialog( getShell(), wizard ); + dialog.setBlockOnOpen( true ); + dialog.create(); + dialog.open(); + + // enable action handlers + actionGroup.activateGlobalActionHandlers(); + } }