diff options
author | Camille Letavernier | 2014-04-23 09:33:54 +0000 |
---|---|---|
committer | Camille Letavernier | 2014-04-23 09:34:25 +0000 |
commit | 320c3ccf412383cc779ed2f477646d4f013e9020 (patch) | |
tree | 6eaedfc4aa70ba819e3a37f7a8e32b897553c7cd /plugins | |
parent | 4e79660c421e073d6e99db631ebe647c8fda2c90 (diff) | |
parent | 006133197e1a7901487f64265352490b725bc16b (diff) | |
download | org.eclipse.papyrus-320c3ccf412383cc779ed2f477646d4f013e9020.tar.gz org.eclipse.papyrus-320c3ccf412383cc779ed2f477646d4f013e9020.tar.xz org.eclipse.papyrus-320c3ccf412383cc779ed2f477646d4f013e9020.zip |
Synchronize with master
Diffstat (limited to 'plugins')
3 files changed, 185 insertions, 115 deletions
diff --git a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/plugin/ActivatorImpl.xtend b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/plugin/ActivatorImpl.xtend index f9fdd6abd3e..165b18dd458 100644 --- a/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/plugin/ActivatorImpl.xtend +++ b/plugins/developer/org.eclipse.papyrus.def/xtend/aspects/xpt/plugin/ActivatorImpl.xtend @@ -2,72 +2,145 @@ package aspects.xpt.plugin import com.google.inject.Inject
import com.google.inject.Singleton
+import org.eclipse.gmf.codegen.gmfgen.GenExpressionInterpreter
import org.eclipse.gmf.codegen.gmfgen.GenPlugin
import plugin.Activator
import xpt.Common
+import xpt.editor.DocumentProvider
+import xpt.providers.ElementInitializers
+import xpt.expressions.getExpression
-@Singleton class ActivatorImpl extends xpt.plugin.ActivatorImpl { - @Inject extension Common; - - @Inject Activator xptActivator; - - - override ActivatorImpl(GenPlugin it)''' - «copyright(editorGen)» - package «xptActivator.packageName(it)»; - - «generatedClassComment» - public class «xptActivator.className(it)» extends org.eclipse.ui.plugin.AbstractUIPlugin { - - «attrs(it)» - «constructor(it)» - «start(it)» - «stop(editorGen)» - «getInstance(it)»
-
- «getPreferenceStore»
- - «createAdapterFactory(editorGen.diagram)» - «fillItemProviderFactories(editorGen)» - «getItemProvidersAdaptorFactory(it)» - «getItemImageDescriptor(it)» - «getBundleDescriptorImage(it)» - «findImageDescriptor(it)» - «getBundleImage(it)» - «getString(it)» - «documentProviderGetter(editorGen.diagram)» - «linkConstraint(editorGen.diagram)» - «initializerGetter(editorGen.diagram)» - «initializerSetter(editorGen.diagram)» - «providersAccessMethods(it)» - «logError(it)» - «logInfo(it)» - «additions(it)» - } -''' - - -override start(GenPlugin it)''' - «generatedMemberComment» - public void start(org.osgi.framework.BundleContext context) throws Exception { - super.start(context); - instance = this; - org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint.registerPreferenceStore(DIAGRAM_PREFERENCES_HINT, getPreferenceStore()); - adapterFactory = createAdapterFactory(); - «it.editorGen.diagram.preferencesPackageName».DiagramPreferenceInitializer diagramPreferenceInitializer = new «it.editorGen.diagram.preferencesPackageName».DiagramPreferenceInitializer(); - diagramPreferenceInitializer.initializeDefaultPreferences(); +@Singleton class ActivatorImpl extends xpt.plugin.ActivatorImpl {
+ @Inject extension Common;
+
+ @Inject Activator xptActivator;
+ @Inject DocumentProvider xptDocProvider;
+ @Inject ElementInitializers xptElementInitializers;
+ @Inject getExpression xptExpr;
+
+ override ActivatorImpl(GenPlugin it) '''
+ «copyright(editorGen)» + package «xptActivator.packageName(it)»; + + «generatedClassComment» + public class «xptActivator.className(it)» extends org.eclipse.ui.plugin.AbstractUIPlugin { + + «attrs(it)» + «constructor(it)» + «start(it)» + «stop(editorGen)» + «getInstance(it)»
+
+ «getPreferenceStore»
- } -''' + «createAdapterFactory(editorGen.diagram)» + «fillItemProviderFactories(editorGen)» + «getItemProvidersAdaptorFactory(it)» + «getItemImageDescriptor(it)» + «getBundleDescriptorImage(it)» + «findImageDescriptor(it)» + «getBundleImage(it)» + «getString(it)» + «documentProviderGetter(editorGen.diagram)» + «linkConstraint(editorGen.diagram)» + «initializerGetter(editorGen.diagram)» + «initializerSetter(editorGen.diagram)» + «providersAccessMethods(it)» + «logError(it)» + «logInfo(it)»
+ «getLogError(it)» + «additions(it)» + } + '''
+override attrs(GenPlugin it)'''
+ «generatedMemberComment»
+ public static final String ID = "«ID»"; //$NON-NLS-1$
+
+ «generatedMemberComment»
+ private org.eclipse.papyrus.infra.core.log.LogHelper myLogHelper;
+
+ «generatedMemberComment»
+ public static final org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint DIAGRAM_PREFERENCES_HINT =
+ new org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint(ID);
+
+ «generatedMemberComment»
+ private static «xptActivator.className(it)» instance;
+
+ «generatedMemberComment»
+ private org.eclipse.emf.edit.provider.ComposedAdapterFactory adapterFactory;
-def getPreferenceStore()'''
«generatedMemberComment»
- public org.eclipse.jface.preference.IPreferenceStore getPreferenceStore() {
- org.eclipse.jface.preference.IPreferenceStore store=org.eclipse.papyrus.infra.gmfdiag.preferences.Activator.getDefault().getPreferenceStore();
- return store;
- }
-
-''' - -}
\ No newline at end of file + private «xptDocProvider.qualifiedClassName(editorGen.diagram)» documentProvider;
+
+ «IF editorGen.diagram.links.exists(l| !l.sansDomain)»
+ «generatedMemberComment»
+ private «editorGen.diagram.getLinkCreationConstraintsQualifiedClassName()» linkConstraints;
+ «ENDIF»
+
+ «generatedMemberComment»
+ private «xptElementInitializers.qualifiedClassName(editorGen.diagram)» initializers;
+
+ «IF it.editorGen.expressionProviders != null»
+ «FOR p : it.editorGen.expressionProviders.providers.filter(typeof(GenExpressionInterpreter))»
+ «generatedMemberComment»
+ private «xptExpr.getExpressionInterpriterQualifiedClassName(p)» «p.language»Factory;
+ «ENDFOR»
+ «ENDIF»
+'''
+
+ override start(GenPlugin it) '''
+ «generatedMemberComment» + public void start(org.osgi.framework.BundleContext context) throws Exception { + super.start(context); + instance = this;
+ myLogHelper = new org.eclipse.papyrus.infra.core.log.LogHelper(this); + org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint.registerPreferenceStore(DIAGRAM_PREFERENCES_HINT, getPreferenceStore()); + adapterFactory = createAdapterFactory(); + «it.editorGen.diagram.preferencesPackageName».DiagramPreferenceInitializer diagramPreferenceInitializer = new «it.
+ editorGen.diagram.preferencesPackageName».DiagramPreferenceInitializer(); + diagramPreferenceInitializer.initializeDefaultPreferences(); + + } + '''
+
+ def getPreferenceStore() '''
+ «generatedMemberComment»
+ public org.eclipse.jface.preference.IPreferenceStore getPreferenceStore() {
+ org.eclipse.jface.preference.IPreferenceStore store=org.eclipse.papyrus.infra.gmfdiag.preferences.Activator.getDefault().getPreferenceStore();
+ return store;
+ }
+
+ '''
+
+ override logError(GenPlugin it) '''
+ «generatedMemberComment»
+ public void logError(String error) {
+ getLogHelper().warn(error);
+ }
+
+ «generatedMemberComment»
+ public void logError(String error, Throwable throwable) {
+ getLogHelper().error(error, throwable);
+ }
+ '''
+
+ override logInfo(GenPlugin it) '''
+ «generatedMemberComment»
+ public void logInfo(String message) {
+ getLogHelper().info(message);
+ }
+
+ «generatedMemberComment»
+ public void logInfo(String message, Throwable throwable) {
+ getLogHelper().error(message, throwable);
+ }
+ '''
+
+ override getLogError(GenPlugin it) '''
+ «generatedMemberComment»
+ public org.eclipse.papyrus.infra.core.log.LogHelper getLogHelper() {
+ return myLogHelper;
+ } + '''
+}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/GetContainedDiagrams.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/GetContainedDiagrams.java index c9ebb4e79b6..967aeec9a60 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/GetContainedDiagrams.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/GetContainedDiagrams.java @@ -18,13 +18,12 @@ import java.util.Iterator; import java.util.List; import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.gmf.runtime.notation.Diagram; -import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils; import org.eclipse.papyrus.emf.facet.efacet.core.IFacetManager; import org.eclipse.papyrus.emf.facet.efacet.core.exception.DerivedTypedElementException; import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2; import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2; +import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils; import org.eclipse.papyrus.views.modelexplorer.NavigatorUtils; import org.eclipse.papyrus.views.modelexplorer.queries.AbstractEditorContainerQuery; @@ -42,8 +41,9 @@ public class GetContainedDiagrams extends AbstractEditorContainerQuery implement while(roots.hasNext()) { EObject root = roots.next(); if(root instanceof Diagram) { - if (EcoreUtil.equals(DiagramUtils.getOwner((Diagram) root), source)) { - result.add((Diagram)root); + Diagram diagram = (Diagram)root; + if (DiagramUtils.getOwner(diagram) == source) { + result.add(diagram); } } } diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/IsDiagramContainer.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/IsDiagramContainer.java index 8eab806acd3..223a6b56b82 100644 --- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/IsDiagramContainer.java +++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.modelexplorer/src/org/eclipse/papyrus/infra/gmfdiag/modelexplorer/queries/IsDiagramContainer.java @@ -1,50 +1,47 @@ -/**
- * Copyright (c) 2011 Atos.
- *
- * 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:
- * Atos - Initial API and implementation
- *
- */
-package org.eclipse.papyrus.infra.gmfdiag.modelexplorer.queries;
-
-import java.util.Iterator;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.papyrus.emf.facet.efacet.core.IFacetManager;
-import org.eclipse.papyrus.emf.facet.efacet.core.exception.DerivedTypedElementException;
-import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2;
-import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2;
-import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils;
-import org.eclipse.papyrus.views.modelexplorer.NavigatorUtils;
-import org.eclipse.papyrus.views.modelexplorer.queries.AbstractEditorContainerQuery;
-
-public class IsDiagramContainer extends AbstractEditorContainerQuery implements IJavaQuery2<EObject, Boolean> {
-
- /**
- * Return true if the element is a Diagram Container
- */
- public Boolean evaluate(EObject source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException {
- Iterator<EObject> roots = NavigatorUtils.getNotationRoots(source);
-
- if(roots != null) {
- while(roots.hasNext()) {
- EObject root = roots.next();
- if(root instanceof Diagram) {
- if(EcoreUtil.equals(DiagramUtils.getOwner((Diagram)root), source)) {
- return true;
- }
- }
- }
- }
-
- return false; //Return super...
- }
-
-}
+/** + * Copyright (c) 2011 Atos. + * + * 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: + * Atos - Initial API and implementation + * + */ +package org.eclipse.papyrus.infra.gmfdiag.modelexplorer.queries; + +import java.util.Iterator; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.gmf.runtime.notation.Diagram; +import org.eclipse.papyrus.emf.facet.efacet.core.IFacetManager; +import org.eclipse.papyrus.emf.facet.efacet.core.exception.DerivedTypedElementException; +import org.eclipse.papyrus.emf.facet.query.java.core.IJavaQuery2; +import org.eclipse.papyrus.emf.facet.query.java.core.IParameterValueList2; +import org.eclipse.papyrus.infra.gmfdiag.common.utils.DiagramUtils; +import org.eclipse.papyrus.views.modelexplorer.NavigatorUtils; +import org.eclipse.papyrus.views.modelexplorer.queries.AbstractEditorContainerQuery; + +public class IsDiagramContainer extends AbstractEditorContainerQuery implements IJavaQuery2<EObject, Boolean> { + + /** + * Return true if the element is a Diagram Container + */ + public Boolean evaluate(EObject source, IParameterValueList2 parameterValues, IFacetManager facetManager) throws DerivedTypedElementException { + Iterator<EObject> roots = NavigatorUtils.getNotationRoots(source); + + if(roots != null) { + while(roots.hasNext()) { + EObject root = roots.next(); + if(root instanceof Diagram) { + return DiagramUtils.getOwner((Diagram)root) == source; + } + } + } + + return false; //Return super... + } + +} |