diff options
| author | cletavernie | 2011-07-12 09:02:37 +0000 |
|---|---|---|
| committer | cletavernie | 2011-07-12 09:02:37 +0000 |
| commit | 3d8cdd971e276e82bde25ac81d07b16d09a8b7bb (patch) | |
| tree | a735b8eb7a6919c5cc0c43327d932b762971b2b1 | |
| parent | af52d05cd66d56bf827593b92e302bbdd7796f18 (diff) | |
| download | org.eclipse.papyrus-3d8cdd971e276e82bde25ac81d07b16d09a8b7bb.tar.gz org.eclipse.papyrus-3d8cdd971e276e82bde25ac81d07b16d09a8b7bb.tar.xz org.eclipse.papyrus-3d8cdd971e276e82bde25ac81d07b16d09a8b7bb.zip | |
351804: [EMF Embedded Editor] Papyrus shall provide an embedded EMF Editor
https://bugs.eclipse.org/bugs/show_bug.cgi?id=351804
First draft
19 files changed, 1201 insertions, 0 deletions
diff --git a/sandbox/org.eclipse.papyrus.emf.embeddededitor/.classpath b/sandbox/org.eclipse.papyrus.emf.embeddededitor/.classpath new file mode 100644 index 00000000000..2d1a4302f04 --- /dev/null +++ b/sandbox/org.eclipse.papyrus.emf.embeddededitor/.classpath @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/sandbox/org.eclipse.papyrus.emf.embeddededitor/.project b/sandbox/org.eclipse.papyrus.emf.embeddededitor/.project new file mode 100644 index 00000000000..3518f14c053 --- /dev/null +++ b/sandbox/org.eclipse.papyrus.emf.embeddededitor/.project @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.papyrus.emf.embeddededitor</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/sandbox/org.eclipse.papyrus.emf.embeddededitor/.settings/org.eclipse.jdt.core.prefs b/sandbox/org.eclipse.papyrus.emf.embeddededitor/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000000..74b2a7d94ca --- /dev/null +++ b/sandbox/org.eclipse.papyrus.emf.embeddededitor/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,8 @@ +#Thu Jul 07 09:57:26 CEST 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/sandbox/org.eclipse.papyrus.emf.embeddededitor/META-INF/MANIFEST.MF b/sandbox/org.eclipse.papyrus.emf.embeddededitor/META-INF/MANIFEST.MF new file mode 100644 index 00000000000..8a52fc46fe7 --- /dev/null +++ b/sandbox/org.eclipse.papyrus.emf.embeddededitor/META-INF/MANIFEST.MF @@ -0,0 +1,28 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: EML Editor (Incubation) +Bundle-SymbolicName: org.eclipse.papyrus.emf.embeddededitor +Bundle-Version: 0.9.0.qualifier +Bundle-Activator: org.eclipse.papyrus.emf.embeddededitor.Activator +Bundle-Vendor: Eclipse Modeling Project +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.eclipse.core.resources;bundle-version="3.7.100", + org.eclipse.emf;bundle-version="2.6.0", + org.eclipse.emf.common;bundle-version="2.7.0", + org.eclipse.emf.edit;bundle-version="2.7.0", + org.eclipse.emf.ecore.editor;bundle-version="2.7.0", + org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200", + org.eclipse.papyrus.properties;bundle-version="0.9.0", + org.eclipse.papyrus.widgets;bundle-version="0.9.0", + org.eclipse.emf.facet.infra.browser.custom;bundle-version="0.1.0", + org.eclipse.emf.facet.infra.browser.custom.core;bundle-version="0.1.0", + org.eclipse.emf.facet.infra.browser;bundle-version="0.1.0", + org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.1.0", + org.eclipse.papyrus.log;bundle-version="0.8.0", + org.eclipse.papyrus.newchild;bundle-version="1.0.0" +Bundle-RequiredExecutionEnvironment: J2SE-1.5 +Bundle-ActivationPolicy: lazy +Export-Package: org.eclipse.papyrus.emf.embeddededitor, + org.eclipse.papyrus.emf.embeddededitor.editor, + org.eclipse.papyrus.emf.embeddededitor.providers diff --git a/sandbox/org.eclipse.papyrus.emf.embeddededitor/build.properties b/sandbox/org.eclipse.papyrus.emf.embeddededitor/build.properties new file mode 100644 index 00000000000..41eb6ade2b4 --- /dev/null +++ b/sandbox/org.eclipse.papyrus.emf.embeddededitor/build.properties @@ -0,0 +1,4 @@ +source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
diff --git a/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/Activator.java b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/Activator.java new file mode 100644 index 00000000000..5c0a24180c3 --- /dev/null +++ b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/Activator.java @@ -0,0 +1,122 @@ +package org.eclipse.papyrus.emf.embeddededitor;
+
+import java.util.List;
+
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Status;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.facet.infra.browser.custom.MetamodelView;
+import org.eclipse.emf.facet.infra.browser.custom.core.CustomizationsCatalog;
+import org.eclipse.emf.facet.infra.browser.uicore.CustomizationManager;
+import org.eclipse.papyrus.emf.embeddededitor.editor.EmbeddedEditor;
+import org.eclipse.papyrus.log.LogHelper;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+ // The plug-in ID
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.editor.emf"; //$NON-NLS-1$
+
+ // The shared instance
+ private static Activator plugin;
+
+ public static LogHelper log;
+
+ private CustomizationManager fCustomizationManager;
+
+ /**
+ * The constructor
+ */
+ public Activator() {
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+ */
+ @Override
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ plugin = this;
+ log = new LogHelper(this);
+
+ // if(true) {
+ // return;
+ // }
+
+ Shell shell = new Shell(Display.getCurrent());
+ shell.setLayout(new FillLayout());
+ shell.setSize(400, 300);
+
+ try {
+ ResourceSet resourceSet = new ResourceSetImpl();
+ resourceSet.getResource(URI.createPlatformResourceURI("Test/seq_diagram2.uml", true), true);
+
+ EmbeddedEditor editor = new EmbeddedEditor(resourceSet);
+ editor.createWidget(shell);
+ } catch (Exception ex) {
+ log.error(ex);
+ }
+
+ shell.open();
+
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+ */
+ @Override
+ public void stop(BundleContext context) throws Exception {
+ plugin = null;
+ super.stop(context);
+ }
+
+ /**
+ * Returns the shared instance
+ *
+ * @return the shared instance
+ */
+ public static Activator getDefault() {
+ return plugin;
+ }
+
+ /**
+ *
+ * @return the customization manager in charge to adapt element in modisco
+ */
+ public CustomizationManager getCustomizationManager() {
+ if(this.fCustomizationManager == null) {
+ this.fCustomizationManager = new CustomizationManager();
+ init(this.fCustomizationManager);
+ }
+ return this.fCustomizationManager;
+ }
+
+ private void init(final CustomizationManager customizationManager) {
+ customizationManager.setShowContainer(false);
+ customizationManager.setShowDerivedLinks(false);
+ customizationManager.setShowEmptyLinks(false);
+
+ try {
+ List<MetamodelView> registryDefaultCustomizations = CustomizationsCatalog.getInstance().getRegistryDefaultCustomizations();
+ for(MetamodelView metamodelView : registryDefaultCustomizations) {
+ customizationManager.registerCustomization(metamodelView);
+ }
+
+ customizationManager.loadCustomizations();
+ } catch (Throwable e) {
+ Activator.getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Error initializing customizations", e)); //$NON-NLS-1$
+ }
+ }
+
+}
diff --git a/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/editor/ActionBarContributor.java b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/editor/ActionBarContributor.java new file mode 100644 index 00000000000..8c6a31aa6ea --- /dev/null +++ b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/editor/ActionBarContributor.java @@ -0,0 +1,166 @@ +/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.emf.embeddededitor.editor;
+
+import org.eclipse.emf.ecore.presentation.EcoreActionBarContributor;
+import org.eclipse.emf.ecore.presentation.EcoreEditorPlugin;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.ui.action.CopyAction;
+import org.eclipse.emf.edit.ui.action.CutAction;
+import org.eclipse.emf.edit.ui.action.DeleteAction;
+import org.eclipse.emf.edit.ui.action.PasteAction;
+import org.eclipse.emf.edit.ui.action.RedoAction;
+import org.eclipse.emf.edit.ui.action.UndoAction;
+import org.eclipse.jface.action.Action;
+import org.eclipse.jface.action.ActionContributionItem;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.papyrus.emf.embeddededitor.editor.actions.MoDiscoCopyAction;
+import org.eclipse.papyrus.emf.embeddededitor.editor.actions.MoDiscoCutAction;
+import org.eclipse.papyrus.emf.embeddededitor.editor.actions.MoDiscoDeleteAction;
+import org.eclipse.papyrus.emf.embeddededitor.editor.actions.MoDiscoPasteAction;
+import org.eclipse.papyrus.emf.embeddededitor.editor.actions.ValidationAction;
+import org.eclipse.papyrus.newchild.runtime.NewchildManager;
+import org.eclipse.ui.ISharedImages;
+import org.eclipse.ui.PlatformUI;
+
+/**
+ * The Action bar contributor for the Context Editor
+ * Mainly serves as an Adapter for the Ecore actions, as the Ecore actions are
+ * not natively compatible with the EMF Facet tree objects
+ *
+ * @author Camille Letavernier
+ */
+
+//TODO : Remove the EcoreActionBarContributor extension
+public class ActionBarContributor extends EcoreActionBarContributor {
+
+ protected IStructuredSelection lastSelection;
+
+ protected EditingDomain domain;
+
+ public void init(EditingDomain domain, final TreeViewer viewer) {
+ ISharedImages sharedImages = PlatformUI.getWorkbench().getSharedImages();
+
+ deleteAction = createDeleteAction(domain);
+ deleteAction.setImageDescriptor(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_DELETE));
+
+ cutAction = createCutAction(domain);
+ cutAction.setImageDescriptor(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_CUT));
+
+ copyAction = createCopyAction(domain);
+ copyAction.setImageDescriptor(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_COPY));
+
+ pasteAction = createPasteAction(domain);
+ pasteAction.setImageDescriptor(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_PASTE));
+
+ undoAction = createUndoAction(domain);
+ undoAction.setImageDescriptor(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_UNDO));
+
+ redoAction = createRedoAction(domain);
+ redoAction.setImageDescriptor(sharedImages.getImageDescriptor(ISharedImages.IMG_TOOL_REDO));
+
+ validateAction = new ValidationAction(domain);
+
+ refreshViewerAction = new Action(EcoreEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) {
+
+ @Override
+ public void run() {
+ viewer.refresh();
+ }
+ };
+
+ this.domain = domain;
+
+ viewer.addSelectionChangedListener(this);
+ }
+
+ /**
+ *
+ * Constructor.
+ *
+ */
+ public ActionBarContributor() {
+ super();
+ }
+
+ @Override
+ public void menuAboutToShow(IMenuManager menuManager) {
+ update();
+ super.menuAboutToShow(menuManager);
+ menuManager.insertBefore("edit", new Separator(NewchildManager.TOP)); //$NON-NLS-1$
+ NewchildManager.instance.fillMenu(menuManager, lastSelection);
+ }
+
+ @Override
+ public void update() {
+ undoAction.update();
+ redoAction.update();
+ deleteAction.setEnabled(deleteAction.updateSelection(lastSelection));
+ cutAction.setEnabled(cutAction.updateSelection(lastSelection));
+ copyAction.setEnabled(copyAction.updateSelection(lastSelection));
+ pasteAction.setEnabled(pasteAction.updateSelection(lastSelection));
+ validateAction.setEnabled(validateAction.updateSelection(lastSelection));
+ }
+
+ protected DeleteAction createDeleteAction(EditingDomain domain) {
+ return new MoDiscoDeleteAction(domain, removeAllReferencesOnDelete());
+ }
+
+ @Override
+ protected boolean removeAllReferencesOnDelete() {
+ return true;
+ }
+
+ protected CutAction createCutAction(EditingDomain domain) {
+ return new MoDiscoCutAction(domain);
+ }
+
+ protected CopyAction createCopyAction(EditingDomain domain) {
+ return new MoDiscoCopyAction(domain);
+ }
+
+ protected PasteAction createPasteAction(EditingDomain domain) {
+ return new MoDiscoPasteAction(domain);
+ }
+
+ protected UndoAction createUndoAction(EditingDomain domain) {
+ return new UndoAction(domain);
+ }
+
+ protected RedoAction createRedoAction(EditingDomain domain) {
+ return new RedoAction(domain);
+ }
+
+ @Override
+ public void selectionChanged(SelectionChangedEvent event) {
+ if(event.getSelection() instanceof IStructuredSelection) {
+ lastSelection = (IStructuredSelection)event.getSelection();
+ }
+ }
+
+ @Override
+ protected void addGlobalActions(IMenuManager menuManager) {
+ menuManager.insertAfter("additions-end", new Separator("ui-actions"));
+ refreshViewerAction.setEnabled(refreshViewerAction.isEnabled());
+ menuManager.insertAfter("ui-actions", refreshViewerAction);
+
+ String key = (style & ADDITIONS_LAST_STYLE) == 0 ? "additions-end" : "additions";
+ if(validateAction != null) {
+ menuManager.insertBefore(key, new ActionContributionItem(validateAction));
+ }
+ }
+
+}
diff --git a/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/editor/EmbeddedEditor.java b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/editor/EmbeddedEditor.java new file mode 100644 index 00000000000..7d3bcc5a45c --- /dev/null +++ b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/editor/EmbeddedEditor.java @@ -0,0 +1,255 @@ +/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.emf.embeddededitor.editor;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.EventObject;
+import java.util.HashMap;
+
+import org.eclipse.emf.common.command.BasicCommandStack;
+import org.eclipse.emf.common.command.CommandStack;
+import org.eclipse.emf.common.command.CommandStackListener;
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.provider.EcoreItemProviderAdapterFactory;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
+import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
+import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
+import org.eclipse.emf.edit.ui.celleditor.AdapterFactoryTreeEditor;
+import org.eclipse.emf.edit.ui.dnd.LocalTransfer;
+import org.eclipse.emf.edit.ui.dnd.ViewerDragAdapter;
+import org.eclipse.emf.facet.infra.browser.uicore.CustomizableModelLabelProvider;
+import org.eclipse.emf.facet.infra.browser.uicore.CustomizationManager;
+import org.eclipse.jface.action.IMenuListener;
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.IStructuredContentProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.jface.viewers.StructuredViewer;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.ViewerFilter;
+import org.eclipse.papyrus.emf.embeddededitor.Activator;
+import org.eclipse.papyrus.emf.embeddededitor.providers.CustomizableContentProvider;
+import org.eclipse.papyrus.emf.embeddededitor.providers.EditingDomainProviderAdapter;
+import org.eclipse.papyrus.properties.widgets.layout.GridData;
+import org.eclipse.papyrus.properties.widgets.layout.PropertiesLayout;
+import org.eclipse.papyrus.widgets.editors.AbstractEditor;
+import org.eclipse.papyrus.widgets.editors.ICommitListener;
+import org.eclipse.papyrus.widgets.editors.StringEditor;
+import org.eclipse.papyrus.widgets.providers.PatternViewerFilter;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.dnd.DND;
+import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.graphics.Color;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Menu;
+import org.eclipse.swt.widgets.Tree;
+
+/**
+ * @author Camille Letavernier
+ */
+@SuppressWarnings("restriction")
+public class EmbeddedEditor implements CommandStackListener, IMenuListener {
+
+ protected TreeViewer treeViewer;
+
+ protected ILabelProvider labelProvider;
+
+ protected IStructuredContentProvider contentProvider;
+
+ protected CustomizationManager customizationManager;
+
+ protected Composite container;
+
+ protected Composite parent;
+
+ protected ResourceSet resourceSet;
+
+ protected AdapterFactoryEditingDomain editingDomain;
+
+ protected AdapterFactory adapterFactory;
+
+ protected ActionBarContributor actionBarContributor;
+
+ protected Adapter editingDomainAdapter;
+
+ public EmbeddedEditor(ResourceSet resourceSet) {
+ if(resourceSet == null) {
+ throw new IllegalArgumentException("The resourceSet shall not be null"); //$NON-NLS-1$
+ }
+
+ CommandStack commandStack = new BasicCommandStack();
+ adapterFactory = createAdapterFactory();
+ editingDomain = new AdapterFactoryEditingDomain(adapterFactory, commandStack, resourceSet);
+ editingDomain.setResourceToReadOnlyMap(new HashMap<Resource, Boolean>());
+ this.resourceSet = resourceSet;
+ editingDomainAdapter = new EditingDomainProviderAdapter(editingDomain);
+ resourceSet.eAdapters().add(editingDomainAdapter);
+ }
+
+ protected AdapterFactory createAdapterFactory() {
+ ComposedAdapterFactory adapterFactory = new ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+
+ adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new EcoreItemProviderAdapterFactory());
+ adapterFactory.addAdapterFactory(new ReflectiveItemProviderAdapterFactory());
+
+ return adapterFactory;
+ }
+
+ public void createWidget(Composite parent) {
+
+ this.parent = parent;
+
+ container = new Composite(parent, SWT.NONE);
+ container.setLayout(new PropertiesLayout());
+
+ container.setBackground(new Color(parent.getDisplay(), 255, 255, 255));
+ container.setBackgroundMode(SWT.INHERIT_DEFAULT);
+
+ if(!resourceSet.getResources().isEmpty()) {
+ final PatternViewerFilter filter = new PatternViewerFilter();
+
+ final StringEditor filterPattern = new StringEditor(container, SWT.NONE, "Filter");
+ filterPattern.addCommitListener(new ICommitListener() {
+
+ public void commit(AbstractEditor editor) {
+ filter.setPattern((String)filterPattern.getValue());
+ treeViewer.refresh();
+ }
+
+ });
+
+ Tree tree = new Tree(container, SWT.BORDER | SWT.MULTI);
+ tree.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
+
+ treeViewer = new TreeViewer(tree);
+ treeViewer.setFilters(new ViewerFilter[]{ filter });
+ IStructuredContentProvider contentProvider = getContentProvider();
+ getCustomizationManager().installCustomPainter(tree);
+
+ ILabelProvider labelProvider = getLabelProvider();
+
+ editingDomain.getCommandStack().addCommandStackListener(this);
+
+ treeViewer.setContentProvider(contentProvider);
+ treeViewer.setLabelProvider(labelProvider);
+
+ treeViewer.setInput(resourceSet);
+
+ actionBarContributor = new ActionBarContributor();
+ actionBarContributor.init(editingDomain, treeViewer);
+
+ treeViewer.setSelection(new StructuredSelection(resourceSet.getResources().get(0)), true);
+
+ new AdapterFactoryTreeEditor(treeViewer.getTree(), adapterFactory);
+
+ createContextMenuFor(treeViewer);
+
+ parent.layout();
+ }
+
+ updateProblemIndication();
+ }
+
+ private void updateProblemIndication() {
+ // TODO
+ }
+
+ public IStructuredContentProvider getContentProvider() {
+ if(contentProvider == null) {
+ contentProvider = createContentProvider();
+ }
+ return contentProvider;
+ }
+
+ protected IStructuredContentProvider createContentProvider() {
+ //return new AdapterFactoryContentProvider(adapterFactory);
+ return new CustomizableContentProvider(getCustomizationManager());
+ }
+
+ public CustomizationManager getCustomizationManager() {
+ if(customizationManager == null) {
+ customizationManager = createCustomizationManager();
+ }
+ return customizationManager;
+ }
+
+ protected CustomizationManager createCustomizationManager() {
+ return Activator.getDefault().getCustomizationManager();
+ }
+
+ public ILabelProvider getLabelProvider() {
+ if(labelProvider == null) {
+ labelProvider = createLabelProvider();
+ }
+ return labelProvider;
+ }
+
+ protected ILabelProvider createLabelProvider() {
+ // return new AdapterFactoryLabelProvider(adapterFactory);
+ return new CustomizableModelLabelProvider(getCustomizationManager());
+ }
+
+ protected void createContextMenuFor(StructuredViewer viewer) {
+ MenuManager contextMenu = new MenuManager("#PopUp"); //$NON-NLS-1$
+ contextMenu.add(new Separator("additions")); //$NON-NLS-1$
+ contextMenu.setRemoveAllWhenShown(true);
+ contextMenu.addMenuListener(this);
+ Menu menu = contextMenu.createContextMenu(viewer.getControl());
+ viewer.getControl().setMenu(menu);
+
+ int dndOperations = DND.DROP_COPY | DND.DROP_MOVE | DND.DROP_LINK;
+ Transfer[] transfers = new Transfer[]{ LocalTransfer.getInstance() };
+ viewer.addDragSupport(dndOperations, transfers, new ViewerDragAdapter(viewer));
+ viewer.addDropSupport(dndOperations, transfers, new MoDiscoDropAdapter(editingDomain, viewer));
+ }
+
+ public void dispose() {
+ resourceSet.eAdapters().remove(editingDomainAdapter);
+ }
+
+ public void save() {
+ if(!((BasicCommandStack)editingDomain.getCommandStack()).isSaveNeeded()) {
+ return;
+ }
+
+ for(Resource resource : resourceSet.getResources()) {
+ try {
+ resource.save(Collections.EMPTY_MAP);
+ } catch (IOException ex) {
+ Activator.log.error(ex);
+ }
+ }
+
+ ((BasicCommandStack)editingDomain.getCommandStack()).saveIsDone();
+ }
+
+ public void saveAs(URI saveAsURI) {
+ //TODO
+ }
+
+ public void commandStackChanged(EventObject event) {
+ treeViewer.refresh();
+ }
+
+ public void menuAboutToShow(IMenuManager menuManager) {
+ actionBarContributor.menuAboutToShow(menuManager);
+ }
+}
diff --git a/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/editor/MoDiscoDropAdapter.java b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/editor/MoDiscoDropAdapter.java new file mode 100644 index 00000000000..4730502a6f9 --- /dev/null +++ b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/editor/MoDiscoDropAdapter.java @@ -0,0 +1,68 @@ +/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.emf.embeddededitor.editor;
+
+import java.util.Collection;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.ui.dnd.EditingDomainViewerDropAdapter;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.papyrus.emf.embeddededitor.util.ActionUtil;
+import org.eclipse.swt.widgets.Widget;
+
+/**
+ * An adapter for Drag & Drop in the Context editor. The default Ecore drag & drop
+ * is not compatible with the EMF Facet Tree Elements
+ *
+ * @author Camille Letavernier
+ */
+public class MoDiscoDropAdapter extends EditingDomainViewerDropAdapter {
+
+ /**
+ *
+ * Constructor.
+ *
+ * @param domain
+ * The Editing domain for this Drop Adapter
+ * @param viewer
+ * The Viewer for this Drop Adapter
+ */
+ public MoDiscoDropAdapter(EditingDomain domain, Viewer viewer) {
+ super(domain, viewer);
+ }
+
+ @Override
+ protected Collection<?> extractDragSource(Object object) {
+ if(object instanceof ISelection) {
+ return super.extractDragSource(ActionUtil.getAdaptedSelection((ISelection)object));
+ } else {
+ return super.extractDragSource(object);
+ }
+ }
+
+ @Override
+ protected Object extractDropTarget(Widget item) {
+ Object dropTarget = super.extractDropTarget(item);
+ if(dropTarget instanceof IAdaptable) {
+ Object adapter = ((IAdaptable)dropTarget).getAdapter(EObject.class);
+ if(adapter != null) {
+ return adapter;
+ }
+ }
+
+ return dropTarget;
+ }
+
+}
diff --git a/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/editor/actions/CompoundCommandActionDelegate.java b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/editor/actions/CompoundCommandActionDelegate.java new file mode 100644 index 00000000000..f0ee088208d --- /dev/null +++ b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/editor/actions/CompoundCommandActionDelegate.java @@ -0,0 +1,59 @@ +/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.emf.embeddededitor.editor.actions;
+
+import org.eclipse.emf.common.command.CompoundCommand;
+import org.eclipse.emf.edit.command.CommandActionDelegate;
+import org.eclipse.swt.graphics.Image;
+
+/**
+ * An EMF Compound Command with support for Images, Tooltip text and description
+ * (From CommandActionDelegate)
+ * The first sub-command should be a CommandActionDelegate
+ *
+ * @author Camille Letavernier
+ */
+public class CompoundCommandActionDelegate extends CompoundCommand implements CommandActionDelegate {
+
+ private Image image;
+
+ /**
+ * Sets the Image for this command
+ *
+ * @param image
+ * The image to display on the command
+ */
+ public void setImage(Image image) {
+ this.image = image;
+ }
+
+ public Object getImage() {
+ if(image == null)
+ return ((CommandActionDelegate)getCommandList().get(0)).getImage();
+ else
+ return image;
+ }
+
+ public String getText() {
+ return ((CommandActionDelegate)getCommandList().get(0)).getText();
+ }
+
+ public String getToolTipText() {
+ return ((CommandActionDelegate)getCommandList().get(0)).getToolTipText();
+ }
+
+ @Override
+ public String getDescription() {
+ return ((CommandActionDelegate)getCommandList().get(0)).getDescription();
+ }
+
+}
diff --git a/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/editor/actions/MoDiscoCopyAction.java b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/editor/actions/MoDiscoCopyAction.java new file mode 100644 index 00000000000..f630d881d7b --- /dev/null +++ b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/editor/actions/MoDiscoCopyAction.java @@ -0,0 +1,51 @@ +/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.emf.embeddededitor.editor.actions;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.ui.action.CopyAction;
+import org.eclipse.papyrus.emf.embeddededitor.util.ActionUtil;
+
+/**
+ * An adapter for the EMF "Copy" Action, compatible with the
+ * MoDisco customizable content provider.
+ *
+ * @author Camille Letavernier
+ */
+public class MoDiscoCopyAction extends CopyAction {
+
+ /**
+ * Constructor.
+ */
+ public MoDiscoCopyAction() {
+ }
+
+ /**
+ * Constructor.
+ *
+ * @param domain
+ * The Editing domain on which the action will be executed
+ */
+ public MoDiscoCopyAction(EditingDomain domain) {
+ super(domain);
+ }
+
+ @Override
+ public Command createCommand(Collection<?> selection) {
+ Collection<?> newSelection = ActionUtil.getAdaptedSelection(selection);
+ return super.createCommand(newSelection);
+ }
+
+}
diff --git a/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/editor/actions/MoDiscoCutAction.java b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/editor/actions/MoDiscoCutAction.java new file mode 100644 index 00000000000..f666202dd9b --- /dev/null +++ b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/editor/actions/MoDiscoCutAction.java @@ -0,0 +1,53 @@ +/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.emf.embeddededitor.editor.actions;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.ui.action.CutAction;
+import org.eclipse.papyrus.emf.embeddededitor.util.ActionUtil;
+
+/**
+ * An adapter for the EMF "Cut" Action, compatible with the
+ * MoDisco customizable content provider.
+ *
+ * @author Camille Letavernier
+ */
+public class MoDiscoCutAction extends CutAction {
+
+ /**
+ * Constructor.
+ */
+ public MoDiscoCutAction() {
+ }
+
+ /**
+ *
+ * Constructor.
+ *
+ * @param domain
+ * The Editing domain on which the command will be executed
+ */
+ public MoDiscoCutAction(EditingDomain domain) {
+ super(domain);
+ }
+
+ @Override
+ public Command createCommand(Collection<?> selection) {
+ Collection<?> newSelection = ActionUtil.getAdaptedSelection(selection);
+ return super.createCommand(newSelection);
+ }
+
+
+}
diff --git a/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/editor/actions/MoDiscoDeleteAction.java b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/editor/actions/MoDiscoDeleteAction.java new file mode 100644 index 00000000000..89249e6c839 --- /dev/null +++ b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/editor/actions/MoDiscoDeleteAction.java @@ -0,0 +1,79 @@ +/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.emf.embeddededitor.editor.actions;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.ui.action.DeleteAction;
+import org.eclipse.papyrus.emf.embeddededitor.util.ActionUtil;
+
+/**
+ * An adapter for the EMF "Delete" Action, compatible with the
+ * MoDisco customizable content provider.
+ *
+ * @author Camille Letavernier
+ */
+public class MoDiscoDeleteAction extends DeleteAction {
+
+ /**
+ * Constructor.
+ *
+ * @param domain
+ * The editing domain on which the action will be called
+ * @param removeAllReferences
+ * If true, all references to the deleted object will be removed.
+ * This causes the whole resourceSet to be loaded, which may
+ * lead to performance issues.
+ */
+ public MoDiscoDeleteAction(EditingDomain domain, boolean removeAllReferences) {
+ super(domain, removeAllReferences);
+ }
+
+ /**
+ * Constructor. All references to the deleted object will be removed.
+ *
+ * @param domain
+ * The editing domain on which the action will be called
+ */
+ public MoDiscoDeleteAction(EditingDomain domain) {
+ super(domain);
+ }
+
+ /**
+ *
+ * Constructor.
+ *
+ * @param removeAllReferences
+ * If true, all references to the deleted object will be removed.
+ * This causes the whole resourceSet to be loaded, which may
+ * lead to performance issues.
+ */
+ public MoDiscoDeleteAction(boolean removeAllReferences) {
+ super(removeAllReferences);
+ }
+
+ /**
+ * Constructor. All references to the deleted object will be removed.
+ */
+ public MoDiscoDeleteAction() {
+ super();
+ }
+
+ @Override
+ public Command createCommand(Collection<?> selection) {
+ Collection<?> newSelection = ActionUtil.getAdaptedSelection(selection);
+ return super.createCommand(newSelection);
+ }
+
+}
diff --git a/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/editor/actions/MoDiscoPasteAction.java b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/editor/actions/MoDiscoPasteAction.java new file mode 100644 index 00000000000..a8f94c3fad6 --- /dev/null +++ b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/editor/actions/MoDiscoPasteAction.java @@ -0,0 +1,52 @@ +/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.emf.embeddededitor.editor.actions;
+
+import java.util.Collection;
+
+import org.eclipse.emf.common.command.Command;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.ui.action.PasteAction;
+import org.eclipse.papyrus.emf.embeddededitor.util.ActionUtil;
+
+/**
+ * An adapter for the EMF "Paste" Action, compatible with the
+ * MoDisco customizable content provider.
+ *
+ * @author Camille Letavernier
+ */
+public class MoDiscoPasteAction extends PasteAction {
+
+ /**
+ * Constructor.
+ */
+ public MoDiscoPasteAction() {
+ }
+
+ /**
+ *
+ * Constructor.
+ *
+ * @param domain
+ * The editing domain on which the command will be called
+ */
+ public MoDiscoPasteAction(EditingDomain domain) {
+ super(domain);
+ }
+
+ @Override
+ public Command createCommand(Collection<?> selection) {
+ Collection<?> newSelection = ActionUtil.getAdaptedSelection(selection);
+ return super.createCommand(newSelection);
+ }
+
+}
diff --git a/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/editor/actions/ValidationAction.java b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/editor/actions/ValidationAction.java new file mode 100644 index 00000000000..a7ab229a5d8 --- /dev/null +++ b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/editor/actions/ValidationAction.java @@ -0,0 +1,35 @@ +/*****************************************************************************
+ * Copyright (c) 2011 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.emf.embeddededitor.editor.actions;
+
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.ui.action.ValidateAction;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.emf.embeddededitor.util.ActionUtil;
+
+/**
+ * An adapter for the EMF "Validate" Action, compatible with the
+ * MoDisco customizable content provider.
+ *
+ * @author Camille Letavernier
+ */
+public class ValidationAction extends ValidateAction {
+
+ public ValidationAction(EditingDomain domain) {
+ this.domain = domain;
+ }
+
+ @Override
+ public boolean updateSelection(IStructuredSelection selection) {
+ return super.updateSelection((IStructuredSelection)ActionUtil.getAdaptedSelection(selection));
+ }
+}
diff --git a/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/providers/CustomizableContentProvider.java b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/providers/CustomizableContentProvider.java new file mode 100644 index 00000000000..cfea99fe349 --- /dev/null +++ b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/providers/CustomizableContentProvider.java @@ -0,0 +1,28 @@ +package org.eclipse.papyrus.emf.embeddededitor.providers;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.facet.infra.browser.uicore.CustomizableModelContentProvider;
+import org.eclipse.emf.facet.infra.browser.uicore.CustomizationManager;
+
+
+public class CustomizableContentProvider extends CustomizableModelContentProvider {
+
+ public CustomizableContentProvider(CustomizationManager customizationManager) {
+ super(customizationManager);
+ }
+
+ @Override
+ public Object[] getRootElements(final Object inputElement) {
+ if(inputElement instanceof IFile) {
+ return super.getRootElements(inputElement);
+ }
+
+ if(inputElement instanceof ResourceSet) {
+ return ((ResourceSet)inputElement).getResources().get(0).getContents().toArray();
+ }
+
+ return new Object[0];
+ }
+
+}
diff --git a/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/providers/EditingDomainProviderAdapter.java b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/providers/EditingDomainProviderAdapter.java new file mode 100644 index 00000000000..b43b6efc0c9 --- /dev/null +++ b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/providers/EditingDomainProviderAdapter.java @@ -0,0 +1,38 @@ +package org.eclipse.papyrus.emf.embeddededitor.providers;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+
+
+public class EditingDomainProviderAdapter implements IEditingDomainProvider, Adapter {
+
+ private EditingDomain domain;
+
+ public EditingDomainProviderAdapter(EditingDomain domain) {
+ this.domain = domain;
+ }
+
+ public void notifyChanged(Notification notification) {
+ //Nothing
+ }
+
+ public Notifier getTarget() {
+ return null; //Nothing
+ }
+
+ public void setTarget(Notifier newTarget) {
+ //Nothing
+ }
+
+ public boolean isAdapterForType(Object type) {
+ return type == IEditingDomainProvider.class;
+ }
+
+ public EditingDomain getEditingDomain() {
+ return domain;
+ }
+
+}
diff --git a/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/providers/ModiscoLabelProvider.java b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/providers/ModiscoLabelProvider.java new file mode 100644 index 00000000000..1fa10b95e57 --- /dev/null +++ b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/providers/ModiscoLabelProvider.java @@ -0,0 +1,23 @@ +package org.eclipse.papyrus.emf.embeddededitor.providers;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.papyrus.properties.providers.EMFObjectLabelProvider;
+
+
+public class ModiscoLabelProvider extends EMFObjectLabelProvider {
+
+ @Override
+ public EObject getModel(Object element) {
+ EObject eObject = super.getModel(element);
+ if(eObject != null) {
+ return eObject;
+ }
+
+ if(element instanceof IAdaptable) {
+ eObject = (EObject)((IAdaptable)element).getAdapter(EObject.class);
+ }
+
+ return eObject;
+ }
+}
diff --git a/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/util/ActionUtil.java b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/util/ActionUtil.java new file mode 100644 index 00000000000..54362c3d6d3 --- /dev/null +++ b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/util/ActionUtil.java @@ -0,0 +1,97 @@ +/*****************************************************************************
+ * Copyright (c) 2010 CEA LIST.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.emf.embeddededitor.util;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.StructuredSelection;
+
+/**
+ * Utility class for Actions
+ *
+ * @author Camille Letavernier
+ *
+ */
+public class ActionUtil {
+
+ /**
+ * EMF can only handle collections of EObjects. However, as the
+ * customization plugin relies a lot on EMF Facet, we often have to handle
+ * objects that can be adapted to EObjects, but are not EObjects
+ * themselves. This method adapts a collections of such objects to their
+ * underlying EObjects, so that EMF can handle them.
+ * Objects that cannot be adapted remain as-is in the collection.
+ *
+ * @param selection
+ * The collection to adapt
+ * @return
+ * The adapted selection
+ */
+ public static Collection<Object> getAdaptedSelection(Collection<? extends Object> selection) {
+ Collection<Object> newSelection = new LinkedList<Object>();
+ for(Object o : selection) {
+ if(o instanceof IAdaptable) {
+ EObject eObject = (EObject)((IAdaptable)o).getAdapter(EObject.class);
+ newSelection.add(eObject);
+ } else {
+ newSelection.add(o);
+ }
+ }
+ return newSelection;
+ }
+
+ /**
+ * EMF can only handle ISelection containing EObjects. However, as the
+ * customization plugin relies a lot on EMF Facet, we often have to handle
+ * objects that can be adapted to EObjects, but are not EObjects
+ * themselves. This method adapts a ISelection of such objects to their
+ * underlying EObjects, so that EMF can handle them.
+ * Objects that cannot be adapted remain as-is in the selection.
+ *
+ * @param sourceSelection
+ * The selection to adapt
+ * @return
+ * The adapted selection
+ */
+ public static ISelection getAdaptedSelection(ISelection sourceSelection) {
+ if(sourceSelection instanceof StructuredSelection) {
+ StructuredSelection currentSelection = (StructuredSelection)sourceSelection;
+ List<Object> newSelection = new LinkedList<Object>();
+
+ Iterator<?> it = currentSelection.iterator();
+ while(it.hasNext()) {
+ Object object = it.next();
+ if(object instanceof IAdaptable) {
+ EObject eObject = (EObject)((IAdaptable)object).getAdapter(EObject.class);
+ if(eObject != null) {
+ newSelection.add(eObject);
+ } else {
+ newSelection.add(object);
+ }
+ } else {
+ newSelection.add(object);
+ }
+ }
+
+ StructuredSelection selection = new StructuredSelection(newSelection);
+ return selection;
+ } else {
+ return sourceSelection;
+ }
+ }
+}
|