diff options
Diffstat (limited to 'plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl')
6 files changed, 124 insertions, 124 deletions
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/ChoiceUtils_qvto.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/ChoiceUtils_qvto.xtend index 1febbf759e9..38e0ccecec7 100644 --- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/ChoiceUtils_qvto.xtend +++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/ChoiceUtils_qvto.xtend @@ -9,25 +9,25 @@ * Contributors: * Svyatoslav Kovalsky (Montages) - initial API and implementation * Michael Golubev (Montages) - #386838 - migrate to Xtend2 - */
-package aspects.impl.diagram.editparts
-
-import com.google.inject.Inject
-import com.google.inject.Singleton
-import org.eclipse.gmf.codegen.gmfgen.LabelModelFacet
-import org.eclipse.gmf.codegen.gmfgen.OclChoiceParser
-import org.eclipse.gmf.codegen.gmfgen.PredefinedEnumParser
-import xpt.Common_qvto
-
-@Singleton class ChoiceUtils_qvto extends impl.diagram.editparts.ChoiceUtils_qvto {
- @Inject extension Common_qvto
-
- override boolean isChoiceLabel(LabelModelFacet modelFacet) {
- var parser = modelFacet.parser;
- if (parser != null) {
- return parser.oclIsKindOf(typeof(PredefinedEnumParser)) || parser.oclIsKindOf(typeof(OclChoiceParser));
- } else {
- return false;
- }
- }
-}
+ */ +package aspects.impl.diagram.editparts + +import com.google.inject.Inject +import com.google.inject.Singleton +import org.eclipse.gmf.codegen.gmfgen.LabelModelFacet +import org.eclipse.gmf.codegen.gmfgen.OclChoiceParser +import org.eclipse.gmf.codegen.gmfgen.PredefinedEnumParser +import xpt.Common_qvto + +@Singleton class ChoiceUtils_qvto extends impl.diagram.editparts.ChoiceUtils_qvto { + @Inject extension Common_qvto + + override boolean isChoiceLabel(LabelModelFacet modelFacet) { + var parser = modelFacet.parser; + if (parser != null) { + return parser.oclIsKindOf(typeof(PredefinedEnumParser)) || parser.oclIsKindOf(typeof(OclChoiceParser)); + } else { + return false; + } + } +} diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/ExternalNodeLabelEditPart.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/ExternalNodeLabelEditPart.xtend index f6b5f6168ce..a2dec74c795 100644 --- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/ExternalNodeLabelEditPart.xtend +++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/ExternalNodeLabelEditPart.xtend @@ -1,30 +1,30 @@ -/*****************************************************************************
- * Copyright (c) 2014 CEA LIST and others.
- *
- * 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:
- * CEA LIST - Initial API and implementation
- *
- *****************************************************************************/
-
-package aspects.impl.diagram.editparts
-
-import org.eclipse.gmf.codegen.gmfgen.GenExternalNodeLabel
-
-/**
- * @author Mickael ADAM
- *
- */
-class ExternalNodeLabelEditPart extends impl.diagram.editparts.ExternalNodeLabelEditPart {
-
- override additionalEditPolicies(GenExternalNodeLabel it){
- '''
- installEditPolicy(org.eclipse.gef.EditPolicy.PRIMARY_DRAG_ROLE, new org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy());
- '''
- }
-
+/***************************************************************************** + * Copyright (c) 2014 CEA LIST and others. + * + * 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: + * CEA LIST - Initial API and implementation + * + *****************************************************************************/ + +package aspects.impl.diagram.editparts + +import org.eclipse.gmf.codegen.gmfgen.GenExternalNodeLabel + +/** + * @author Mickael ADAM + * + */ +class ExternalNodeLabelEditPart extends impl.diagram.editparts.ExternalNodeLabelEditPart { + + override additionalEditPolicies(GenExternalNodeLabel it){ + ''' + installEditPolicy(org.eclipse.gef.EditPolicy.PRIMARY_DRAG_ROLE, new org.eclipse.papyrus.infra.gmfdiag.common.editpolicies.ExternalLabelPrimaryDragRoleEditPolicy()); + ''' + } + }
\ No newline at end of file diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/LinkEditPart.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/LinkEditPart.xtend index a5e0e466ad2..5fd8ade4588 100644 --- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/LinkEditPart.xtend +++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/LinkEditPart.xtend @@ -12,15 +12,15 @@ * Michael Golubev (Montages) - #386838 - migrate to Xtend2 * Remi Schnekenburger (CEA LIST) - modification for Papyrus MDT */ -package aspects.impl.diagram.editparts
-
-import com.google.inject.Inject
-import com.google.inject.Singleton
-import org.eclipse.gmf.codegen.gmfgen.GenLink
-import org.eclipse.gmf.codegen.gmfgen.ModeledViewmap
-import org.eclipse.papyrus.papyrusgmfgenextension.ExtendedGenView
-import xpt.Common
-
+package aspects.impl.diagram.editparts + +import com.google.inject.Inject +import com.google.inject.Singleton +import org.eclipse.gmf.codegen.gmfgen.GenLink +import org.eclipse.gmf.codegen.gmfgen.ModeledViewmap +import org.eclipse.papyrus.papyrusgmfgenextension.ExtendedGenView +import xpt.Common + /** * Revisit: [MG]: @Inject extension same-named-api-class -> template extends api-class? */ diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/NodeLabelEditPart.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/NodeLabelEditPart.xtend index 2f07a0b25ff..5e0d1cb8524 100644 --- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/NodeLabelEditPart.xtend +++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/editparts/NodeLabelEditPart.xtend @@ -13,15 +13,15 @@ * Thibault Landre (Atos Origin) - initial API and implementation * Benoit Maggi (CEA LIST) -#510281 change dependency to replace gmft-runtime */ -package aspects.impl.diagram.editparts
-
-import com.google.inject.Inject
-import com.google.inject.Singleton
-import org.eclipse.gmf.codegen.gmfgen.GenNodeLabel
-import xpt.diagram.editparts.Common
+package aspects.impl.diagram.editparts + +import com.google.inject.Inject +import com.google.inject.Singleton +import org.eclipse.gmf.codegen.gmfgen.GenNodeLabel +import xpt.diagram.editparts.Common import xpt.diagram.editparts.Utils_qvto -import org.eclipse.gmf.codegen.gmfgen.GenDiagram
-
+import org.eclipse.gmf.codegen.gmfgen.GenDiagram + @Singleton class NodeLabelEditPart extends impl.diagram.editparts.NodeLabelEditPart { @Inject extension Utils_qvto; diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/update/CanonicalUpdate.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/update/CanonicalUpdate.xtend index ee25e102f69..6e4fe0a5516 100644 --- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/update/CanonicalUpdate.xtend +++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/diagram/update/CanonicalUpdate.xtend @@ -10,72 +10,72 @@ * Alexander Shatalin (Borland) - initial API and implementation * Artem Tikhomirov - refactoring of containerBaseCanonicalMethods.xpt; extraction of API/non-API of CEP templates * Michael Golubev (Montages) - #386838 - migrate to Xtend2 - */
-package aspects.impl.diagram.update
-
-import com.google.inject.Inject
-import com.google.inject.Singleton
-import metamodel.MetaModel
-import org.eclipse.gmf.codegen.gmfgen.GenContainerBase
-import org.eclipse.gmf.codegen.gmfgen.GenDiagram
-import xpt.Common
-import xpt.diagram.updater.DiagramUpdater
-import xpt.diagram.updater.NodeDescriptor
-import xpt.diagram.updater.Utils_qvto
-import xpt.diagram.updater.LinkDescriptor
-import xpt.editor.VisualIDRegistry
-
-@Singleton class CanonicalUpdate extends impl.diagram.update.CanonicalUpdate {
- @Inject extension Common;
- @Inject extension Utils_qvto;
-
- @Inject NodeDescriptor nodeDescriptor;
- @Inject MetaModel xptMetaModel;
- @Inject DiagramUpdater xptDiagramUpdater;
- @Inject LinkDescriptor linkDescriptor;
- @Inject VisualIDRegistry xptVisualIDRegistry;
-
- override def getFeaturesToSynchronizeMethod(GenContainerBase it) '''
- «IF getSemanticChildrenChildFeatures(it).size == 1»
+ */ +package aspects.impl.diagram.update + +import com.google.inject.Inject +import com.google.inject.Singleton +import metamodel.MetaModel +import org.eclipse.gmf.codegen.gmfgen.GenContainerBase +import org.eclipse.gmf.codegen.gmfgen.GenDiagram +import xpt.Common +import xpt.diagram.updater.DiagramUpdater +import xpt.diagram.updater.NodeDescriptor +import xpt.diagram.updater.Utils_qvto +import xpt.diagram.updater.LinkDescriptor +import xpt.editor.VisualIDRegistry + +@Singleton class CanonicalUpdate extends impl.diagram.update.CanonicalUpdate { + @Inject extension Common; + @Inject extension Utils_qvto; + + @Inject NodeDescriptor nodeDescriptor; + @Inject MetaModel xptMetaModel; + @Inject DiagramUpdater xptDiagramUpdater; + @Inject LinkDescriptor linkDescriptor; + @Inject VisualIDRegistry xptVisualIDRegistry; + + override def getFeaturesToSynchronizeMethod(GenContainerBase it) ''' + «IF getSemanticChildrenChildFeatures(it).size == 1» «generatedMemberComment» protected org.eclipse.emf.ecore.EStructuralFeature getFeatureToSynchronize() { return «xptMetaModel.MetaFeature(getSemanticChildrenContainmentFeatures(it).head)»; } - «ELSEIF getSemanticChildrenChildFeatures(it).size > 1»
+ «ELSEIF getSemanticChildrenChildFeatures(it).size > 1» «generatedMemberComment» protected java.util.Set<org.eclipse.emf.ecore.EStructuralFeature> getFeaturesToSynchronize() { if (myFeaturesToSynchronize == null) { myFeaturesToSynchronize = new java.util.HashSet<org.eclipse.emf.ecore.EStructuralFeature>(); - «FOR f : getSemanticChildrenContainmentFeatures(it)»
+ «FOR f : getSemanticChildrenContainmentFeatures(it)» «addContainmentFeature(f)» - «ENDFOR»
+ «ENDFOR» } return myFeaturesToSynchronize; } - «ENDIF»
- '''
-
- override def getSemanticChildrenListMethod(GenContainerBase it) '''
+ «ENDIF» + ''' + + override def getSemanticChildrenListMethod(GenContainerBase it) ''' «generatedMemberComment» protected java.util.List<org.eclipse.emf.ecore.EObject> getSemanticChildrenList() { - «IF hasSemanticChildren(it)/*REVISIT: is there real need for this check - Generator seems to consult needsCanonicalEP, which in turns ensures there are semantic children?*/»
+ «IF hasSemanticChildren(it)/*REVISIT: is there real need for this check - Generator seems to consult needsCanonicalEP, which in turns ensures there are semantic children?*/» org.eclipse.gmf.runtime.notation.View viewObject = (org.eclipse.gmf.runtime.notation.View) getHost().getModel(); java.util.LinkedList<org.eclipse.emf.ecore.EObject> result = new java.util.LinkedList<org.eclipse.emf.ecore.EObject>(); - java.util.List<«nodeDescriptor.qualifiedClassName(it.diagram.editorGen.diagramUpdater)»> childDescriptors = «xptDiagramUpdater.
+ java.util.List<«nodeDescriptor.qualifiedClassName(it.diagram.editorGen.diagramUpdater)»> childDescriptors = «xptDiagramUpdater. getSemanticChildrenMethodCall(it)»(viewObject); for («nodeDescriptor.qualifiedClassName(it.diagram.editorGen.diagramUpdater)» d : childDescriptors) { result.add(d.getModelElement()); } return result; - «ELSE»
+ «ELSE» return java.util.Collections.EMPTY_LIST; - «ENDIF»
+ «ENDIF» } - '''
-
- override def refreshConnectionsBody(GenDiagram it) '''
+ ''' + + override def refreshConnectionsBody(GenDiagram it) ''' «Domain2Notation(it)» domain2NotationMap = new «Domain2Notation(it)»(); java.util.Collection<«linkDescriptor.qualifiedClassName(editorGen.diagramUpdater)»> linkDescriptors = collectAllLinks(getDiagram(), domain2NotationMap); java.util.List<org.eclipse.gmf.runtime.notation.View> edges = new java.util.ArrayList<org.eclipse.gmf.runtime.notation.View>(); @@ -110,16 +110,16 @@ import xpt.editor.VisualIDRegistry } deleteViews(existingLinks.iterator()); return createConnections(linkDescriptors, domain2NotationMap); - '''
-
+ ''' + override def collectAllLinksMethod(GenDiagram it) ''' «generatedMemberComment» - private java.util.Collection<«linkDescriptor.qualifiedClassName(it.editorGen.diagramUpdater)»> collectAllLinks(org.eclipse.gmf.runtime.notation.View view, «Domain2Notation(
+ private java.util.Collection<«linkDescriptor.qualifiedClassName(it.editorGen.diagramUpdater)»> collectAllLinks(org.eclipse.gmf.runtime.notation.View view, «Domain2Notation( it)» domain2NotationMap) { if (!«VisualIDRegistry::modelID(it)».equals(«xptVisualIDRegistry.getModelIDMethodCall(it)»(view))) { return java.util.Collections.emptyList(); } - java.util.LinkedList<«linkDescriptor.qualifiedClassName(it.editorGen.diagramUpdater)»> result = new java.util.LinkedList<«linkDescriptor.
+ java.util.LinkedList<«linkDescriptor.qualifiedClassName(it.editorGen.diagramUpdater)»> result = new java.util.LinkedList<«linkDescriptor. qualifiedClassName(it.editorGen.diagramUpdater)»>(); String vid = «xptVisualIDRegistry.getVisualIDMethodCall(it)»(view); if (vid != null) { @@ -137,7 +137,7 @@ import xpt.editor.VisualIDRegistry } return result; } - '''
+ ''' override getEditPartMethod(GenDiagram it) ''' «generatedMemberComment» @@ -160,4 +160,4 @@ import xpt.editor.VisualIDRegistry return null; } ''' -}
+} diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/preferences/StandardPage.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/preferences/StandardPage.xtend index 0fbf120333e..f934212e028 100644 --- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/preferences/StandardPage.xtend +++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/impl/preferences/StandardPage.xtend @@ -10,17 +10,17 @@ * Dmitry Stadnik (Borland) - initial API and implementation * Michael Golubev (Montages) - #386838 - migrate to Xtend2 */ -package aspects.impl.preferences
-
-import com.google.inject.Inject
-import com.google.inject.Singleton
-import org.eclipse.gmf.codegen.gmfgen.GenStandardPreferencePage
-import org.eclipse.gmf.codegen.gmfgen.StandardPreferencePages
-import xpt.Common
-
+package aspects.impl.preferences + +import com.google.inject.Inject +import com.google.inject.Singleton +import org.eclipse.gmf.codegen.gmfgen.GenStandardPreferencePage +import org.eclipse.gmf.codegen.gmfgen.StandardPreferencePages +import xpt.Common + //DOCUMENTATION: PapyrusGencode //change the superclass and the initialization -
+ @Singleton class StandardPage extends impl.preferences.StandardPage { @Inject extension Common; |