diff options
| author | Ansgar Radermacher | 2014-02-27 08:54:57 +0000 |
|---|---|---|
| committer | Ansgar Radermacher | 2014-02-27 08:56:00 +0000 |
| commit | c4096338ea5dc3f25f14fd1c411e512a422f8305 (patch) | |
| tree | 6a6e1ef94e2d858391baa545c32428c1b05a9690 /plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui | |
| parent | fc397ab9c287801e82a3850dd08407ebff5173ad (diff) | |
| download | org.eclipse.papyrus-c4096338ea5dc3f25f14fd1c411e512a422f8305.tar.gz org.eclipse.papyrus-c4096338ea5dc3f25f14fd1c411e512a422f8305.tar.xz org.eclipse.papyrus-c4096338ea5dc3f25f14fd1c411e512a422f8305.zip | |
Merge of branch bugs/315231 to master
Diffstat (limited to 'plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui')
2 files changed, 6 insertions, 5 deletions
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/META-INF/MANIFEST.MF b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/META-INF/MANIFEST.MF index 8d500c582b7..2d3c7afd371 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/META-INF/MANIFEST.MF +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/META-INF/MANIFEST.MF @@ -24,7 +24,8 @@ Require-Bundle: org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext; org.apache.log4j;bundle-version="1.2.15",
org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="1.0.0",
org.eclipse.papyrus.infra.emf;bundle-version="1.0.0",
- org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.0.0"
+ org.eclipse.papyrus.uml.alf.common.ui;bundle-version="1.0.0",
+ org.eclipse.papyrus.uml.xtext.integration.ui;bundle-version="1.0.0"
Bundle-Vendor: %providerName
Bundle-Version: 1.0.0.qualifier
Bundle-ManifestVersion: 2
diff --git a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/src/org/eclipse/papyrus/uml/textedit/connectionpointreference/xtext/ui/contributions/ConnectionPointReferenceEditorConfiguration.java b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/src/org/eclipse/papyrus/uml/textedit/connectionpointreference/xtext/ui/contributions/ConnectionPointReferenceEditorConfiguration.java index 29960dbdf6f..3b83304cc27 100644 --- a/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/src/org/eclipse/papyrus/uml/textedit/connectionpointreference/xtext/ui/contributions/ConnectionPointReferenceEditorConfiguration.java +++ b/plugins/uml/textedit/org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui/src/org/eclipse/papyrus/uml/textedit/connectionpointreference/xtext/ui/contributions/ConnectionPointReferenceEditorConfiguration.java @@ -9,10 +9,8 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.gmf.runtime.common.core.command.CommandResult;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.eclipse.gmf.runtime.common.core.command.ICommand;
import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
-import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.extensionpoints.editors.ui.IPopupEditorHelper;
import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
import org.eclipse.papyrus.uml.textedit.connectionpointreference.xtext.ui.internal.UMLConnectionPointReferenceActivator;
@@ -67,6 +65,7 @@ public class ConnectionPointReferenceEditorConfiguration extends DefaultXtextDir return "not a ConnectionPointReference";
}
+ /*
@Override
public IPopupEditorHelper createPopupEditorHelper(Object editPart) {
// resolves the edit part, and the associated semantic element
@@ -119,7 +118,8 @@ public class ConnectionPointReferenceEditorConfiguration extends DefaultXtextDir };
return super.createPopupEditorHelper(graphicalEditPart, injector, reconciler, textToEdit, fileExtension, new DefaultXtextSemanticValidator());
}
-
+ */
+
/**
* @author CEA LIST
*
|