Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui/src/org/eclipse/papyrus/marte/textedit/stereotypeapplicationwithvsl/xtext/ui/contributions/OpenTextualEditorForStereotypeApplications.java')
-rw-r--r--extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui/src/org/eclipse/papyrus/marte/textedit/stereotypeapplicationwithvsl/xtext/ui/contributions/OpenTextualEditorForStereotypeApplications.java28
1 files changed, 14 insertions, 14 deletions
diff --git a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui/src/org/eclipse/papyrus/marte/textedit/stereotypeapplicationwithvsl/xtext/ui/contributions/OpenTextualEditorForStereotypeApplications.java b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui/src/org/eclipse/papyrus/marte/textedit/stereotypeapplicationwithvsl/xtext/ui/contributions/OpenTextualEditorForStereotypeApplications.java
index c6fddadf2c0..100cf001bd2 100644
--- a/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui/src/org/eclipse/papyrus/marte/textedit/stereotypeapplicationwithvsl/xtext/ui/contributions/OpenTextualEditorForStereotypeApplications.java
+++ b/extraplugins/marte/textedit/org.eclipse.papyrus.marte.textedit.stereotypeapplicationwithvsl.xtext.ui/src/org/eclipse/papyrus/marte/textedit/stereotypeapplicationwithvsl/xtext/ui/contributions/OpenTextualEditorForStereotypeApplications.java
@@ -1,7 +1,7 @@
/*****************************************************************************
* 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
@@ -22,10 +22,10 @@ import org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.action.IAction;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.papyrus.infra.emf.utils.EMFHelper;
import org.eclipse.swt.widgets.Display;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IObjectActionDelegate;
@@ -43,6 +43,7 @@ public class OpenTextualEditorForStereotypeApplications extends AbstractHandler
/**
* {@inheritDoc}
*/
+ @Override
public Object execute(ExecutionEvent event) {
Display current = Display.getCurrent();
@@ -63,19 +64,17 @@ public class OpenTextualEditorForStereotypeApplications extends AbstractHandler
/**
* Convert each selected elements from the explorator menu, or modeling view
* to an EObject and add it to a list
- *
+ *
* @return list of EObject
*/
public void updateSelectedEObject() {
Vector<EObject> currentSelectedEObjects = new Vector<EObject>();
// Retrieve selected elements
- IStructuredSelection selection = (IStructuredSelection)PlatformUI
- .getWorkbench().getActiveWorkbenchWindow()
- .getSelectionService().getSelection();
+ IStructuredSelection selection = (IStructuredSelection)PlatformUI.getWorkbench().getActiveWorkbenchWindow().getSelectionService().getSelection();
- Iterator<?> eltIt = (Iterator<?>)selection.iterator();
+ Iterator<?> eltIt = selection.iterator();
while(eltIt.hasNext()) {
Object currentObject = eltIt.next();
@@ -83,12 +82,10 @@ public class OpenTextualEditorForStereotypeApplications extends AbstractHandler
// If the object is an edit part, try to get semantic bridge
if(currentObject instanceof GraphicalEditPart) {
GraphicalEditPart editPart = (GraphicalEditPart)currentObject;
- if(editPart.getModel() instanceof View) {
- View view = (View)editPart.getModel();
- if(view.getElement() instanceof Element) {
- currentObject = (Element)view.getElement();
- new StereotypeApplicationPopupEditorConfigurationContribution().createPopupEditorHelper(editPart).showEditor();
- }
+ EObject semantic = EMFHelper.getEObject(editPart);
+ if(semantic instanceof Element) {
+ //FIXME: The new XText integration doesn't support direct dialog creation on an edit part (The TextAwareEditPart is supposed to handle this case itself)
+ //DirectEditManager manager = new StereotypeApplicationPopupEditorConfigurationContribution().createDirectEditManager(editPart);
}
}
@@ -110,7 +107,7 @@ public class OpenTextualEditorForStereotypeApplications extends AbstractHandler
/**
* Convert each selected elements from the explorator menu, or modeling view
* to an EObject and add it to a list
- *
+ *
* @return list of EObject
*/
public EObject getSelectedEObject() {
@@ -127,16 +124,19 @@ public class OpenTextualEditorForStereotypeApplications extends AbstractHandler
private List<EObject> selectedEObjects;
+ @Override
public void run(IAction action) {
// TODO Auto-generated method stub
this.execute(null);
}
+ @Override
public void selectionChanged(IAction action, ISelection selection) {
}
+ @Override
public void setActivePart(IAction action, IWorkbenchPart targetPart) {
}

Back to the top