Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 22052 invoked from network); 23 Jul 2007 12:39:23 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 23 Jul 2007 12:39:23 -0000 Received: (qmail 59598 invoked by uid 500); 23 Jul 2007 12:39:24 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 59540 invoked by uid 500); 23 Jul 2007 12:39:24 -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 59529 invoked by uid 99); 23 Jul 2007 12:39:24 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Jul 2007 05:39:24 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME 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, 23 Jul 2007 05:39:22 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 0688F1A981A; Mon, 23 Jul 2007 05:39:02 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r558704 - in /directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller: SchemaViewController.java actions/DeleteProjectAction.java actions/OpenElementAction.java Date: Mon, 23 Jul 2007 12:39:01 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070723123902.0688F1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: pamarcelot Date: Mon Jul 23 05:38:59 2007 New Revision: 558704 URL: http://svn.apache.org/viewvc?view=rev&rev=558704 Log: Added implementation for the OpenElementAction. Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/SchemaViewController.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/actions/DeleteProjectAction.java directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/actions/OpenElementAction.java Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/SchemaViewController.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/SchemaViewController.java?view=diff&rev=558704&r1=558703&r2=558704 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/SchemaViewController.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/SchemaViewController.java Mon Jul 23 05:38:59 2007 @@ -365,7 +365,7 @@ newSchema = new NewSchemaAction(); newAttributeType = new NewAttributeTypeAction(); newObjectClass = new NewObjectClassAction(); - openElement = new OpenElementAction(); + openElement = new OpenElementAction( viewer ); deleteSchemaElement = new DeleteSchemaElementAction(); importSchemasFromOpenLdap = new ImportSchemasFromOpenLdapAction(); importSchemasFromXml = new ImportSchemasFromXmlAction(); Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/actions/DeleteProjectAction.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/actions/DeleteProjectAction.java?view=diff&rev=558704&r1=558703&r2=558704 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/actions/DeleteProjectAction.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/actions/DeleteProjectAction.java Mon Jul 23 05:38:59 2007 @@ -96,7 +96,6 @@ /* (non-Javadoc) * @see org.eclipse.jface.action.Action#run() */ - @SuppressWarnings("unchecked") public void run() { ProjectsHandler projectsHandler = Activator.getDefault().getProjectsHandler(); @@ -119,7 +118,7 @@ } if ( messageBox.open() == SWT.YES ) { - for ( Iterator iterator = selection.iterator(); iterator.hasNext(); ) + for ( Iterator iterator = selection.iterator(); iterator.hasNext(); ) { ProjectWrapper wrapper = ( ProjectWrapper ) iterator.next(); projectsHandler.removeProject( wrapper.getProject() ); Modified: directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/actions/OpenElementAction.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/actions/OpenElementAction.java?view=diff&rev=558704&r1=558703&r2=558704 ============================================================================== --- directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/actions/OpenElementAction.java (original) +++ directory/studio/trunk/studio-apacheds-schemaeditor/src/main/java/org/apache/directory/studio/apacheds/schemaeditor/controller/actions/OpenElementAction.java Mon Jul 23 05:38:59 2007 @@ -20,12 +20,26 @@ package org.apache.directory.studio.apacheds.schemaeditor.controller.actions; +import java.util.Iterator; + import org.apache.directory.studio.apacheds.schemaeditor.PluginConstants; +import org.apache.directory.studio.apacheds.schemaeditor.view.editors.attributetype.AttributeTypeEditor; +import org.apache.directory.studio.apacheds.schemaeditor.view.editors.attributetype.AttributeTypeEditorInput; +import org.apache.directory.studio.apacheds.schemaeditor.view.editors.objectclass.ObjectClassEditor; +import org.apache.directory.studio.apacheds.schemaeditor.view.editors.objectclass.ObjectClassEditorInput; +import org.apache.directory.studio.apacheds.schemaeditor.view.wrappers.AttributeTypeWrapper; +import org.apache.directory.studio.apacheds.schemaeditor.view.wrappers.Folder; +import org.apache.directory.studio.apacheds.schemaeditor.view.wrappers.ObjectClassWrapper; +import org.apache.directory.studio.apacheds.schemaeditor.view.wrappers.SchemaWrapper; import org.eclipse.jface.action.Action; import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.ISelection; +import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.jface.viewers.TreeViewer; import org.eclipse.ui.IWorkbenchWindow; import org.eclipse.ui.IWorkbenchWindowActionDelegate; +import org.eclipse.ui.PartInitException; +import org.eclipse.ui.PlatformUI; /** @@ -36,15 +50,20 @@ */ public class OpenElementAction extends Action implements IWorkbenchWindowActionDelegate { + /** The associated viewer */ + private TreeViewer viewer; + + /** * Creates a new instance of DeleteSchemaElementAction. */ - public OpenElementAction() + public OpenElementAction( TreeViewer viewer ) { super( "Open" ); setToolTipText( getText() ); setId( PluginConstants.CMD_OPEN_ELEMENT ); setEnabled( true ); + this.viewer = viewer; } @@ -53,7 +72,41 @@ */ public void run() { - // TODO implement + StructuredSelection selection = ( StructuredSelection ) viewer.getSelection(); + for ( Iterator iterator = selection.iterator(); iterator.hasNext(); ) + { + Object selectedItem = iterator.next(); + if ( selectedItem instanceof AttributeTypeWrapper ) + { + try + { + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().openEditor( + new AttributeTypeEditorInput( ( ( AttributeTypeWrapper ) selectedItem ).getAttributeType() ), + AttributeTypeEditor.ID ); + } + catch ( PartInitException e ) + { + // TODO Add logging + } + } + else if ( selectedItem instanceof ObjectClassWrapper ) + { + try + { + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().openEditor( + new ObjectClassEditorInput( ( ( ObjectClassWrapper ) selectedItem ).getObjectClass() ), + ObjectClassEditor.ID ); + } + catch ( PartInitException e ) + { + // TODO Add logging + } + } + else if ( ( selectedItem instanceof Folder ) || ( selectedItem instanceof SchemaWrapper ) ) + { + viewer.setExpandedState( selectedItem, !viewer.getExpandedState( selectedItem ) ); + } + } }